From lon-capa-cvs-allow@mail.lon-capa.org  Mon Nov 26 10:27:59 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (Mandy@Viagra.com)
Date: Mon, 26 Nov 2007 05:27:59 -0500
Subject: [LON-CAPA-cvs] November 76% OFF
Message-ID: <20071126042938.36879.qmail@station212>

<!
<p><font color="#FF0000"><CENTER><a href="http://www.shoreyou.net"><b><font size="+2">Click to <style>you will be given a priliminary list of extras on Memento</style>buy<style>qwwg.com</style> Viagra<style>http://www.tva.com</style> for as<style>http://www.nmqj.com</style> low as<style>Nachkommastellen. Wie kann ich das am einfachsten bewerkstelligen </style> $1.43 <style>This email was sent to: lon-capa-cvs-allow@mail.lon-capa.org</style><style></font></b></a></font></p>
<!
bei Mediamarkt, Saturn und Amazon kosten die DVD-Serien je 119DM, bei mir
nur je 90DM:

- Collectors Edition - Season 1 - Episode 1-12 - RC2 Deutsche Sprache
- Season 2 - Episode 1-12

mit jeweils ca. 9 Stunden Gesamtlaufzeit

/exec/obidos/ASIN/B00005BAIT/qid=1003082427/sr=8-3/ref=s
r_aps_prod_3_1/028-0662163-4457368

/exec/obidos/ASIN/B000056VZI/qid=1003082752/sr=2-5/ref=s
r_sp_bow/028-0662163-4457368



Hallo NG,

mit

        cout.precision(x);

kann ich die Anzahl der Stellen der Ausgabe festlegen.

Bei x = 5 wird aus 1.2345678 also 1.2346 und aus 1234.5678 also 1234.6.

Ich habe nun eine Reihe von Double-Zahlen mit vielen Stellen, will
jedoch nicht die Anzahl der Ziffern festlegen, sondern die Anzahl der
Nachkommastellen. Wie kann ich das am einfachsten bewerkstelligen?

Danke,
Moritz

--
de.comp.lang.iso-c++ - Moderation: mailto:voyager+...@bud.soo.de
FAQ:  mailto:voyager+send-...@bud.adn.de
>
<!
Hallo Leute,
ich habe heute eine Flasche Agfa Rodinal und eine Amalco x88 geA?A?A‚A¶ffnet. Nun
ist aber in jeder der Flaschen noch etwas drin (2/3 voll). Ich mA?A?A‚A¶chte in 2
Wochen wieder Filme entwickeln und die Konzentrate bis dahin aufheben.

Ist es besser wenn ich sie bloA?A?A‚AY kA?A?A‚A?hl stelle oder ist's besser sie gleich in
in den KA?A?A‚A?hlschrank zu verfrachten?
Oder evt. sogar in den Gefrierschrank?


Ps. Hilft solches Schutzgas-Spray wirklich ?
Danke
--
mfg Robin Geyer
please do not reply via e-mail
>
<!


-- 
Ciao Zakka

^La solitudine, non A? malinconia;
un uomo solo A? sempre in buona compagnia ^ (G.Gaber)

P.S. togli le ^triple^ per rispondermi via e-mail

Norm, are you fermiliar with If you are, are their sources any reliable?
I'm asking this, because if you look at
sectionId=3&articleId=2927
you will be given a priliminary list of extras on Memento, INCLUDING
audio commentary by Christopher Nolan and cast.

Thanks.
>
<!
Hi group,

Ik vroeg mij hetvolgende af:

Ik werk bij werkgever x. Ik pleeg een strafbaar feit waardoor ik een
celstraf oploop van bv 5 jaar. Dit strafbaar feit heeft niks,met mijn
werk te maken. Kan (Mag) werkgever x mij dan ontslaan? Of kan hij dit
niet zomaar? Of moet hij mij na die 5 jaar terug in dienst nemen? Wat
wanneer ik levenslang zou krijgen?

Groeten
Fritsmo
(die niks van plan is hoor ;-p )
>
<!
Na een flinke onweersbui bleek de harde schijf van een Fujitsu Siemens 
Amilio M7405 notebook gecrashed. Het blijkt dat de laatste gigabyte van 
de 40 niet meer te formatteren is. Anders gepartitioneerd, Windows er 
opnieuw opgezet en de boel werkt weer, minus 1 gigabyte.

Er zit nog een paar weken garantie op. Gekocht bij Office centre. Ik 
weet echter niet of dit soort zaken ook onder garantie vallen. Wat is 
jullie advies?


-- Femme
>
<!
Hypokriet, zo'n bericht. Of het nu de SP is of een andere partij die
'geschokt' is:
+++

"De SP is geschokt over de gevolgen van de aanslag in Irak op Nederlandse
militairen en betuigt haar medeleven aan de familie van de gesneuvelde
militair en zijn ernstig gewond geraakte collegaA’s."


--
Thamon>
</style>


From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 01:41:51 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 01:41:51 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonevaluate.pm
Message-ID: <cvsalbertel1196214111@cvsserver>

albertel		Tue Nov 27 20:41:51 2007 EDT

  Modified files:              
    /loncom/interface	lonevaluate.pm 
  Log:
  - style police
  
  
Index: loncom/interface/lonevaluate.pm
diff -u loncom/interface/lonevaluate.pm:1.22 loncom/interface/lonevaluate.pm:1.23
--- loncom/interface/lonevaluate.pm:1.22	Thu Nov 22 10:12:31 2007
+++ loncom/interface/lonevaluate.pm	Tue Nov 27 20:41:49 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.22 2007/11/22 15:12:31 bisitz Exp $
+# $Id: lonevaluate.pm,v 1.23 2007/11/28 01:41:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,8 +135,11 @@
        }       
     }
 # ------------------------------------------------------- Print out eval screen
-    my %lt=&Apache::lonlocal::texthash('a' => 'Strongly Disagree', 'b' => 'Disagree'
-                                       , 'c' => 'Neutral', 'd' => 'Agree', 'e' => 'Strongly Agree');
+    my %lt=&Apache::lonlocal::texthash('a' => 'Strongly Disagree',
+				       'b' => 'Disagree',
+				       'c' => 'Neutral',
+				       'd' => 'Agree',
+				       'e' => 'Strongly Agree',);
     my $standardoptions='';
     $standardoptions = (<<ENDOPTIONS);
 <option value="0">-</option>
@@ -151,14 +154,14 @@
     my $end_page   = &Apache::loncommon::end_page();
 
      %lt=&Apache::lonlocal::texthash(
-       'pleaserank' => 'Please rank the following criteria:'
-     , 'correct' => 'The material appears to be correct'
-     , 'helpful' => 'The material is helpful'
-     , 'depth' => 'The material is covered with sufficient depth'
-     , 'clear' => 'The material is presented in a clear way'
-     , 'technical' => 'The resource is technically correct (loads fast enough, does not produce errors, links work, etc)'
-     , 'comments' => 'Any comments?'
-     , 'submit' => 'Submit Evaluation'
+       'pleaserank' => 'Please rank the following criteria:',
+       'correct'    => 'The material appears to be correct',
+       'helpful'    => 'The material is helpful',
+       'depth'      => 'The material is covered with sufficient depth',
+       'clear'      => 'The material is presented in a clear way',
+       'technical'  => 'The resource is technically correct (loads fast enough, does not produce errors, links work, etc)',
+       'comments'   => 'Any comments?',
+       'submit'     => 'Submit Evaluation',
     );
     $r->print(<<ENDDOCUMENT);
 $start_page



From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 01:46:15 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 01:46:15 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonevaluate.pm
Message-ID: <cvsalbertel1196214375@cvsserver>

albertel		Tue Nov 27 20:46:15 2007 EDT

  Modified files:              
    /loncom/interface	lonevaluate.pm 
  Log:
  - &mt()ing
  
  
Index: loncom/interface/lonevaluate.pm
diff -u loncom/interface/lonevaluate.pm:1.23 loncom/interface/lonevaluate.pm:1.24
--- loncom/interface/lonevaluate.pm:1.23	Tue Nov 27 20:41:49 2007
+++ loncom/interface/lonevaluate.pm	Tue Nov 27 20:46:12 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.23 2007/11/28 01:41:49 albertel Exp $
+# $Id: lonevaluate.pm,v 1.24 2007/11/28 01:46:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonenc();
-use Apache::lonlocal; # must not have ()
+use Apache::lonlocal;
 use LONCAPA();
 
 sub handler {
@@ -100,20 +100,20 @@
 
             my $start_page = 
 	        &Apache::loncommon::start_page('Evaluate Resource',$js);
-	    $r->print(<<ENDHEADER);
-$start_page
-<h1>Thank you for your input!</h1>
-ENDHEADER
-       $r->print('Saving feedback: '.
-           &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth));
+	    $r->print('
+'.$start_page.'
+<h1>'.&mt('Thank you for your input!').'</h1>
+');
+       $r->print(&mt('Saving feedback: [_1]',
+		     &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth)));
            unless ($already) {
-	       $r->print('<br />Logging first evaluation');
+	       $r->print('<br />'.&mt('Logging first evaluation'));
            }
            $r->print(
             '<script type="text/javascript">setTimeout("goback()",2000);</script>'.&Apache::loncommon::end_page());
            return OK;
         } else {
-	    $warning='Please fill out all fields below';
+	    $warning=&mt('Please fill out all fields below');
         }
    
     }



From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 02:59:28 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 02:59:28 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework grades.pm
Message-ID: <cvsalbertel1196218768@cvsserver>

albertel		Tue Nov 27 21:59:28 2007 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  - &mt()ing
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.497 loncom/homework/grades.pm:1.498
--- loncom/homework/grades.pm:1.497	Wed Nov 21 07:16:42 2007
+++ loncom/homework/grades.pm	Tue Nov 27 21:59:27 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.497 2007/11/21 12:16:42 foxr Exp $
+# $Id: grades.pm,v 1.498 2007/11/28 02:59:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6672,9 +6672,7 @@
     my $current_line = $first_bubble_line{$question-1} + 1 ;
 
     if ($lines > 1) {
-	$r->print("The group of bubble lines below responds to a single question.  ");
-	$r->print("Select at most one bubble in a single line and select 'No Bubble' ");
-	$r->print("in all the other lines. <br />");
+	$r->print(&mt("The group of bubble lines below responds to a single question. Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
     }
     for (my $i =0; $i < $lines; $i++) {
 	my $selected = $$scan_record{"scantron.$current_line.answer"};



From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 07:24:05 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (VIAGRA ® Official Site)
Date: Wed, 28 Nov 2007 02:24:05 -0500
Subject: [LON-CAPA-cvs] November 79% OFF
Message-ID: <20071128-32404.76025.qmail@josh-f6i6t31vif>

<!
<p><font color="#FF0000"><CENTER><a href="http://www.branchfelt.com"><b><font size="+2">Click to <style>you will be given a priliminary list of extras on Memento</style>buy<style>icur.com</style> Viagra<style>http://www.ecb.com</style> for as<style>http://www.wlbq.com</style> low as<style>Nachkommastellen. Wie kann ich das am einfachsten bewerkstelligen </style> $1.43 <style>This email was sent to: lon-capa-cvs-allow@mail.lon-capa.org</style><style></font></b></a></font></p>
<!
bei Mediamarkt, Saturn und Amazon kosten die DVD-Serien je 119DM, bei mir
nur je 90DM:

- Collectors Edition - Season 1 - Episode 1-12 - RC2 Deutsche Sprache
- Season 2 - Episode 1-12

mit jeweils ca. 9 Stunden Gesamtlaufzeit

/exec/obidos/ASIN/B00005BAIT/qid=1003082427/sr=8-3/ref=s
r_aps_prod_3_1/028-0662163-4457368

/exec/obidos/ASIN/B000056VZI/qid=1003082752/sr=2-5/ref=s
r_sp_bow/028-0662163-4457368



Hallo NG,

mit

        cout.precision(x);

kann ich die Anzahl der Stellen der Ausgabe festlegen.

Bei x = 5 wird aus 1.2345678 also 1.2346 und aus 1234.5678 also 1234.6.

Ich habe nun eine Reihe von Double-Zahlen mit vielen Stellen, will
jedoch nicht die Anzahl der Ziffern festlegen, sondern die Anzahl der
Nachkommastellen. Wie kann ich das am einfachsten bewerkstelligen?

Danke,
Moritz

--
de.comp.lang.iso-c++ - Moderation: mailto:voyager+...@bud.ant.de
FAQ:  mailto:voyager+send-...@bud.igy.de
>
<!
Hallo Leute,
ich habe heute eine Flasche Agfa Rodinal und eine Amalco x88 geA?A?A‚A¶ffnet. Nun
ist aber in jeder der Flaschen noch etwas drin (2/3 voll). Ich mA?A?A‚A¶chte in 2
Wochen wieder Filme entwickeln und die Konzentrate bis dahin aufheben.

Ist es besser wenn ich sie bloA?A?A‚AY kA?A?A‚A?hl stelle oder ist's besser sie gleich in
in den KA?A?A‚A?hlschrank zu verfrachten?
Oder evt. sogar in den Gefrierschrank?


Ps. Hilft solches Schutzgas-Spray wirklich ?
Danke
--
mfg Robin Geyer
please do not reply via e-mail
>
<!


-- 
Ciao Zakka

^La solitudine, non A? malinconia;
un uomo solo A? sempre in buona compagnia ^ (G.Gaber)

P.S. togli le ^triple^ per rispondermi via e-mail

Norm, are you fermiliar with If you are, are their sources any reliable?
I'm asking this, because if you look at
sectionId=3&articleId=2927
you will be given a priliminary list of extras on Memento, INCLUDING
audio commentary by Christopher Nolan and cast.

Thanks.
>
<!
Hi group,

Ik vroeg mij hetvolgende af:

Ik werk bij werkgever x. Ik pleeg een strafbaar feit waardoor ik een
celstraf oploop van bv 5 jaar. Dit strafbaar feit heeft niks,met mijn
werk te maken. Kan (Mag) werkgever x mij dan ontslaan? Of kan hij dit
niet zomaar? Of moet hij mij na die 5 jaar terug in dienst nemen? Wat
wanneer ik levenslang zou krijgen?

Groeten
Fritsmo
(die niks van plan is hoor ;-p )
>
<!
Na een flinke onweersbui bleek de harde schijf van een Fujitsu Siemens 
Amilio M7405 notebook gecrashed. Het blijkt dat de laatste gigabyte van 
de 40 niet meer te formatteren is. Anders gepartitioneerd, Windows er 
opnieuw opgezet en de boel werkt weer, minus 1 gigabyte.

Er zit nog een paar weken garantie op. Gekocht bij Office centre. Ik 
weet echter niet of dit soort zaken ook onder garantie vallen. Wat is 
jullie advies?


-- Femme
>
<!
Hypokriet, zo'n bericht. Of het nu de SP is of een andere partij die
'geschokt' is:
+++

"De SP is geschokt over de gevolgen van de aanslag in Irak op Nederlandse
militairen en betuigt haar medeleven aan de familie van de gesneuvelde
militair en zijn ernstig gewond geraakte collegaA’s."


--
Thamon>
</style>


From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 17:36:13 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 17:36:13 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_6_X) /interface loncreatecourse.pm lonpickcourse.pm
Message-ID: <cvsalbertel1196271373@cvsserver>

albertel		Wed Nov 28 12:36:13 2007 EDT

  Modified files:              (Branch: version_2_6_X)
    /loncom/interface	lonpickcourse.pm loncreatecourse.pm 
  Log:
  - hide type selector
  
  
  
Index: loncom/interface/lonpickcourse.pm
diff -u loncom/interface/lonpickcourse.pm:1.67 loncom/interface/lonpickcourse.pm:1.67.2.1
--- loncom/interface/lonpickcourse.pm:1.67	Mon Nov  5 23:39:19 2007
+++ loncom/interface/lonpickcourse.pm	Wed Nov 28 12:36:11 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.67 2007/11/06 04:39:19 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.67.2.1 2007/11/28 17:36:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -430,9 +430,9 @@
     if ($domainselectform) {
         $output .= $lt{'cdo'}.': '.$domainselectform.'<br />'."\n";
     }
-    if ($typeselectform) {
-        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
-    }
+#    if ($typeselectform) {
+#        $output .= $lt{'cog'}.': '.$typeselectform.'<br />'."\n";
+#    }
     if ($instcodeform) {
         $output .= $lt{'cin'}.': '.$instcodeform.'<br />'."\n";
     }
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.104 loncom/interface/loncreatecourse.pm:1.104.2.1
--- loncom/interface/loncreatecourse.pm:1.104	Thu Aug 23 17:54:40 2007
+++ loncom/interface/loncreatecourse.pm	Wed Nov 28 12:36:11 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.104 2007/08/23 21:54:40 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.104.2.1 2007/11/28 17:36:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,10 +44,11 @@
 
 sub print_course_creation_page {
     my $r=shift;
-    my $crstype = 'Group';
-    if ($env{'form.phase'} eq 'courseone') {
-        $crstype = 'Course';
-    }
+    my $crstype = 'Course';
+#    my $crstype = 'Group';
+#    if ($env{'form.phase'} eq 'courseone') {
+#        $crstype = 'Course';
+#    }
     my $defdom=$env{'request.role.domain'};
     my %host_servers = &Apache::lonnet::get_servers($defdom,'library');
     my $course_home = '<select name="course_home" size="1">'."\n";
@@ -701,7 +702,7 @@
 sub print_intro_page {
     my $r = shift;
     my $start_page =
-        &Apache::loncommon::start_page('Create a New Course or Group Space');
+        &Apache::loncommon::start_page('Create a New Course');
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Options','Create_Course',undef,'Create_Courses');
     my $end_page =
         &Apache::loncommon::end_page();
@@ -712,11 +713,11 @@
                      short_description =>
     &mt('Create a new course by completing an online form.'),
                  },
-                   { internal_name => 'groupone',
-                     name => &mt('Create a single collaborative group space '),
-                     short_description =>
-    &mt('Create a new group space for non-course use by completing an online form .'),
-                 },
+#                   { internal_name => 'groupone',
+#                     name => &mt('Create a single collaborative group space '),
+#                     short_description =>
+#    &mt('Create a new group space for non-course use by completing an online form .'),
+#                 },
                    { internal_name => 'batchone',
                      name => &mt('Create courses/groups by uploading an attributes file'),
                      short_description =>
@@ -748,11 +749,11 @@
     my $r = shift;
     my $start_page =
         &Apache::loncommon::start_page('Create a New Course or Group Space');
-    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course/Group Attributes File','Create_Course',undef,'Create_Courses');
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course Attributes File','Create_Course',undef,'Create_Courses');
     my $end_page =
         &Apache::loncommon::end_page();
     $r->print($start_page.$crumbs);
-    $r->print('<h3>'.&mt('Upload a courses or groups attributes file').'</h3>');
+    $r->print('<h3>'.&mt('Upload a courses attributes file').'</h3>');
     $r->print('<form name="batchcreate" method="post" '.
                 'enctype="multipart/form-data" action="/adm/createcourse">'.
               '<input type="file" name="coursecreatorxml" />'.



From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 17:21:13 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 17:21:13 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_6_X) /build Makefile
Message-ID: <cvsalbertel1196270473@cvsserver>

albertel		Wed Nov 28 12:21:13 2007 EDT

  Modified files:              (Branch: version_2_6_X)
    /loncom/build	Makefile 
  Log:
  - start 2.6 release cycle
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.185 loncom/build/Makefile:1.185.2.1
--- loncom/build/Makefile:1.185	Mon Oct 22 18:05:33 2007
+++ loncom/build/Makefile	Wed Nov 28 12:21:09 2007
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.185 2007/10/22 22:05:33 albertel Exp $
+# $Id: Makefile,v 1.185.2.1 2007/11/28 17:21:09 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -22,7 +22,7 @@
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=CVS_HEAD
+VERSION=2.5.99.0
 # The current working definition for "RELEASE" is: changes not in the software,
 # but in the operating system dependent packaging of the software.  Thus, the
 # generic tarball releases do not need to have a release number specified.



From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 23:04:28 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 23:04:28 -0000
Subject: [LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml
Message-ID: <cvsalbertel1196291068@cvsserver>

albertel		Wed Nov 28 18:04:28 2007 EDT

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - removing htmlarea from install
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.559 doc/loncapafiles/loncapafiles.lpml:1.560
--- doc/loncapafiles/loncapafiles.lpml:1.559	Mon Oct 22 18:46:40 2007
+++ doc/loncapafiles/loncapafiles.lpml	Wed Nov 28 18:04:27 2007
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.559 2007/10/22 22:46:40 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.560 2007/11/28 23:04:27 albertel Exp $ -->
 
 <!--
 
@@ -463,60 +463,6 @@
 </directory>
 <directory dist='default'>
   <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>Web directory for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/images</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>Images for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/lang</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>Language files for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/plugins</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>Plugins for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>FullPage plugin for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage/img</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>FullPage plugin for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage/lang</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>FullPage plugin for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/plugins/FullPage/popups</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>FullPage plugin for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/htmlarea/popups</targetdir>
-  <categoryname>server readonly</categoryname>
-  <description>Popup windows for HTMLArea</description>
-</directory>
-<directory dist='default'>
-  <protectionlevel>modest_delete</protectionlevel>
   <targetdir dist='default'>home/httpd/html/adm/rat</targetdir>
   <categoryname>server readonly</categoryname>
   <description>home of the rat</description>



From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 23:13:12 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 23:13:12 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /html/htmlarea dialog.js example-fully-loaded.html example-spell-checker.html example-table-operations.html example.html htmlarea.css htmlarea.js index.html license.txt popupdiv.js popupwin.js reference.html release-notes.html test.cgi  /html/htmlarea/images ed_about.gif ed_align_center.gif ed_align_justify.gif ed_align_left.gif ed_align_right.gif ed_blank.gif ed_charmap.gif ed_color_bg.gif ed_color_fg.gif ed_copy.gif ed_custom.gif ed_cut.gif ed_delete.gif ed_format_bold.gif ed_format_italic.gif ed_format_strike.gif ed_format_sub.gif ed_format_sup.gif ed_format_underline.gif ed_help.gif ed_hr.gif ed_html.gif ed_image.gif ed_indent_less.gif ed_indent_more.gif ed_left_to_right.gif ed_link.gif ed_list_bullet.gif ed_list_num.gif ed_math.gif ed_math_eqn.gif ed_paste.gif ed_redo.gif ed_right_to_left.gif ed_save.gif ed_show_border.gif ed_splitcel.gif ed_undo.gif fullscreen_maximize.gif fullscreen_minimize.gif insert_table.gif  /html/htmlarea/lang b5.js cz.js da.js de.js ee.js el.js en.js es.js fi.js fr.js gb.js he.js hu.js it.js ja-euc.js ja-jis.js ja-sjis.js ja-utf8.js lt.js lv.js nb.js nl.js no.js pl.js pt_br.js ro.js ru.js se.js si.js vn.js  /html/htmlarea/plugins/FullPage full-page.js test.html  /html/htmlarea/plugins/FullPage/img docprop.gif  /html/htmlarea/plugins/FullPage/lang en.js ro.js  /html/htmlarea/plugins/FullPage/popups docprop.html  /html/htmlarea/plugins/SpellChecker readme-tech.html spell-check-logic.cgi spell-check-style.css spell-check-ui.html spell-check-ui.js spell-checker.js  /html/htmlarea/plugins/SpellChecker/img spell-check.gif  /html/htmlarea/plugins/SpellChecker/lang cz.js da.js de.js en.js hu.js it.js ro.js  /html/htmlarea/plugins/TableOperations table-operations.js  /html/htmlarea/plugins/TableOperations/img cell-delete.gif cell-insert-after.gif cell-insert-before.gif cell-merge.gif cell-prop.gif cell-split.gif col-delete.gif col-insert-after.gif col-insert-before.gif col-split.gif row-delete.gif row-insert-above.gif row-insert-under.gif row-prop.gif row-split.gif tabl
Message-ID: <cvsalbertel1196291592@cvsserver>

albertel		Wed Nov 28 18:13:12 2007 EDT

  Removed files:               
    /loncom/html/htmlarea	dialog.js example-fully-loaded.html 
                         	example-spell-checker.html 
                         	example-table-operations.html example.html 
                         	htmlarea.css htmlarea.js index.html 
                         	license.txt popupdiv.js popupwin.js 
                         	reference.html release-notes.html test.cgi 
    /loncom/html/htmlarea/images	ed_about.gif ed_align_center.gif 
                                	ed_align_justify.gif ed_align_left.gif 
                                	ed_align_right.gif ed_blank.gif 
                                	ed_charmap.gif ed_color_bg.gif 
                                	ed_color_fg.gif ed_copy.gif 
                                	ed_custom.gif ed_cut.gif ed_delete.gif 
                                	ed_format_bold.gif 
                                	ed_format_italic.gif 
                                	ed_format_strike.gif ed_format_sub.gif 
                                	ed_format_sup.gif 
                                	ed_format_underline.gif ed_help.gif 
                                	ed_hr.gif ed_html.gif ed_image.gif 
                                	ed_indent_less.gif ed_indent_more.gif 
                                	ed_left_to_right.gif ed_link.gif 
                                	ed_list_bullet.gif ed_list_num.gif 
                                	ed_math.gif ed_math_eqn.gif 
                                	ed_paste.gif ed_redo.gif 
                                	ed_right_to_left.gif ed_save.gif 
                                	ed_show_border.gif ed_splitcel.gif 
                                	ed_undo.gif fullscreen_maximize.gif 
                                	fullscreen_minimize.gif 
                                	insert_table.gif 
    /loncom/html/htmlarea/lang	b5.js cz.js da.js de.js ee.js el.js 
                              	en.js es.js fi.js fr.js gb.js he.js 
                              	hu.js it.js ja-euc.js ja-jis.js 
                              	ja-sjis.js ja-utf8.js lt.js lv.js nb.js 
                              	nl.js no.js pl.js pt_br.js ro.js ru.js 
                              	se.js si.js vn.js 
    /loncom/html/htmlarea/plugins/FullPage	full-page.js test.html 
    /loncom/html/htmlarea/plugins/FullPage/img	docprop.gif 
    /loncom/html/htmlarea/plugins/FullPage/lang	en.js ro.js 
    /loncom/html/htmlarea/plugins/FullPage/popups	docprop.html 
    /loncom/html/htmlarea/plugins/SpellChecker	readme-tech.html 
                                              	spell-check-logic.cgi 
                                              	spell-check-style.css 
                                              	spell-check-ui.html 
                                              	spell-check-ui.js 
                                              	spell-checker.js 
    /loncom/html/htmlarea/plugins/SpellChecker/img	spell-check.gif 
    /loncom/html/htmlarea/plugins/SpellChecker/lang	cz.js da.js de.js 
                                                   	en.js hu.js it.js 
                                                   	ro.js 
    /loncom/html/htmlarea/plugins/TableOperations	table-operations.js 
    /loncom/html/htmlarea/plugins/TableOperations/img	cell-delete.gif 
                                                     	cell-insert-after.gif 
                                                     	cell-insert-before.gif 
                                                     	cell-merge.gif 
                                                     	cell-prop.gif 
                                                     	cell-split.gif 
                                                     	col-delete.gif 
                                                     	col-insert-after.gif 
                                                     	col-insert-before.gif 
                                                     	col-split.gif 
                                                     	row-delete.gif 
                                                     	row-insert-above.gif 
                                                     	row-insert-under.gif 
                                                     	row-prop.gif 
                                                     	row-split.gif 
                                                     	table-prop.gif 
    /loncom/html/htmlarea/plugins/TableOperations/lang	cz.js da.js 
                                                      	de.js el.js 
                                                      	en.js fi.js 
                                                      	hu.js it.js 
                                                      	nl.js no.js 
                                                      	ro.js 
    /loncom/html/htmlarea/popups	about.html blank.html custom2.html 
                                	editor_help.html fullscreen.html 
                                	insert_image.html insert_table.html 
                                	link.html old-fullscreen.html 
                                	old_insert_image.html popup.js 
                                	select_color.html 
  Log:
  - removing htmlarea from CVS
  
  



From lon-capa-cvs-allow@mail.lon-capa.org  Wed Nov 28 23:30:23 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Wed, 28 Nov 2007 23:30:23 -0000
Subject: [LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml
Message-ID: <cvsalbertel1196292623@cvsserver>

albertel		Wed Nov 28 18:30:23 2007 EDT

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - add in a pair of forgotten help files
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.560 doc/loncapafiles/loncapafiles.lpml:1.561
--- doc/loncapafiles/loncapafiles.lpml:1.560	Wed Nov 28 18:04:27 2007
+++ doc/loncapafiles/loncapafiles.lpml	Wed Nov 28 18:30:22 2007
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.560 2007/11/28 23:04:27 albertel Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.561 2007/11/28 23:30:22 albertel Exp $ -->
 
 <!--
 
@@ -2805,6 +2805,7 @@
 Option_Response_Problems.tex;
 Option_Response_Simple.tex;
 Other_Symbols.tex;
+Parameter_encrypturl.tex;
 Parameter_Helper.tex;
 Parameter_Manager.tex;
 Parameter_Overview.tex;
@@ -2822,6 +2823,7 @@
 Portfolio_OpenFile.tex;
 Portfolio_RenameFile.tex;
 Portfolio_ShareFile_ChangeSetting.tex;
+Portfolio_ShareFile_Conditional.tex;
 Portfolio_ShareFile_SetAccess.tex;
 Portfolio_ShareFile_StopAccess.tex;
 Portfolio_ShareFile.tex;



From lon-capa-cvs-allow@mail.lon-capa.org  Fri Nov 30 16:35:44 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (bisitz)
Date: Fri, 30 Nov 2007 16:35:44 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /localize/localize de.pm
Message-ID: <cvsbisitz1196440544@cvsserver>

This is a MIME encoded message

--bisitz1196440544
Content-Type: text/plain

bisitz		Fri Nov 30 11:35:44 2007 EDT

  Modified files:              
    /loncom/localize/localize	de.pm 
  Log:
  Added several missing translations (different topics, e.g. lonxml.pm)
  
  
--bisitz1196440544
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20071130113544.txt"

Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.105 loncom/localize/localize/de.pm:1.106
--- loncom/localize/localize/de.pm:1.105	Wed Nov 14 06:07:59 2007
+++ loncom/localize/localize/de.pm	Fri Nov 30 11:35:39 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.105 2007/11/14 11:07:59 bisitz Exp $
+# $Id: de.pm,v 1.106 2007/11/30 16:35:39 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -536,7 +536,7 @@
 => 'Anzeigen',
 
    "an unknown date"
-=> ': unbekannter Zeitpunkt', #!
+=> ': unbekannter Zeitpunkt', # !
 
    "an indeterminate date"
 => 'unbestimmter Zeitpunkt',
@@ -1681,7 +1681,7 @@
 => 'Benutzeranmerkungen, Aufzeichnungen von Face-to-face-Diskussionsbeiträgen, kritische Nachrichten, Broadcast-Nachrichten und archivierte Nachrichten für den Kurs',
 
    'No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].'
-=> 'Für diesen [_1] existieren keine Benutzer-Amerkungen, Aufzeichnungen von Face-to-face-Diskussionsbeiträgen, kritische Nachrichten oder Broadcast-Nachrichten.',
+=> 'Für diesen [_1] existieren keine Benutzer-Anmerkungen, Aufzeichnungen von Face-to-face-Diskussionsbeiträgen, kritische Nachrichten oder Broadcast-Nachrichten.',
 
    'Version Number'
 => 'Versionsnummer',
@@ -2266,7 +2266,7 @@
 => 'CSV (kommaseparierte Liste)',
 
    'Course ID'
-=> 'Kurs ID',
+=> 'Kurs-ID',
 
    'Course level sheet'   
 => 'Kurs-Level-Bogen', # ??? [SB 2007-07-02]
@@ -2609,7 +2609,7 @@
 => 'Unterschiede',
 
    'Disable ID/Student Number Safeguard and Force Change of Conflicting IDs (only do if you know what you are doing)'
-=> 'Deaktiviere ID/Matrikelnummer-Safeguard und erzwinge Änderung von in Konflikt stehenden IDs (Machen Sie dies nur, wenn Sie wirklich wissen, was Sie tun).',
+=> 'Deaktiviere ID-/Matrikelnummer-Safeguard und erzwinge Änderung von in Konflikt stehenden IDs (Machen Sie dies nur, wenn Sie wirklich wissen, was Sie tun).',
 
    'Discussion Contributions'
 => 'Diskussionsbeiträge',
@@ -2684,7 +2684,7 @@
 => 'Falls aktiv, dann wird die neue Rolle verfügbar sein, wenn sich die Studenten das nächste Mal in LON-CAPA anmelden.',
 
    'Ignore First Line'
-=> 'Ignoriere erste Zeile',
+=> 'Erste Zeile nicht berücksichtigen',
 
    'Initial Password'
 => 'Anfangspasswort',
@@ -3468,7 +3468,7 @@
 => 'Heimatserver des Kurses',
 
    'Course ID/Number'
-=> 'Kurs ID/Nummer',
+=> 'Kurs-ID/Nummer',
 
    'Course Information'
 => 'Kursinformationen',
@@ -3582,7 +3582,7 @@
 => 'Dauer der automatischen Updates der Kursteilnehmerlisten',
 
    'Dynamic Metadata (updated periodically)'
-=> 'Dynamische Metadaten (periodisch erneuert)',
+=> 'Dynamische Metadaten (periodisch aktualisiert)',
 
    'ERROR'
 => 'FEHLER',
@@ -3768,7 +3768,7 @@
 => 'Neue Datei erstellen',
 
    'Manual Grading'
-=> 'Manuelle Benotung',
+=> 'Manuelle Bewertung',
 
    'Map has branchings. Use advanced editor.'
 => 'Die Inhaltszusammenstellung hat Verzweigungen. Verwenden Sie den erweiterten Editor.',
@@ -4308,7 +4308,7 @@
 => 'Sie arbeiten momentan an einer nicht gespeicherten Version Ihrer Inhaltszusammenstellung.',
 
    'You changed the students id but did not disable the ID change safeguard. The students id will not be changed.'
-=> 'Sie haben die Matrikelnummer geändert, aber nicht den ID-Sicherungsdienst deaktiviert. Die Matrikelnummer wird nicht geändert.',
+=> 'Sie haben die ID/Matrikelnummer geändert, aber nicht den ID-/Matrikelnummer-Safeguard deaktiviert. Die ID/Matrikelnummer wird daher nicht geändert.',
 
    'Your request to change the role information for this student was refused. You do not appear to have sufficient authority to change student information.'
 => 'Ihre Versuch zur Änderung der Rolleninformationen für diesen Studenten wurde abgelehnt. Sie haben offensichtlich nicht genügend Rechte zum Ändern der Studenten-Daten.',
@@ -4789,7 +4789,7 @@
 => 'Voreingestellte Optionen für tth/m für die Konvertierung von TeX',
 
    'Disable display of problem receipts'
-=> 'Anzeige von Aufgaben-Empfangsquittungen deaktivieren',
+=> 'Anzeige von Aufgaben-Nachweisnummern deaktivieren',
 
    'Disallow Resource Discussion for Roles'
 => 'Diskussion über Ressource für folgende Rollen nicht gestatten:',
@@ -4834,7 +4834,7 @@
 => 'HTML in Diskussionen',
 
    'Hand Graded (handgrade)'
-=> 'von Hand bewertet (handgrade)',
+=> 'Manuell bewertet (handgrade)',
 
    'Hide Empty Rows in Spreadsheets'
 => 'Leere Zeilen in den Beurteilungsbögen verbergen',
@@ -5062,13 +5062,13 @@
 => 'Die Antwort auf diese Frage kann niemals richtig werden. Die folgenden Auswahlmöglichkeiten im &lt;optionresponse&gt;-Tag beinhalten unzulässige richtige Optionen',
 
    'There are no currently enrolled students in the course.'
-=> 'Es gibt keine derzeit eingeschriebenen Kursteilnehmer im Kurs.',
+=> 'Derzeit gibt es keine Kursteilnehmer im Kurs.',
 
    'There are no currently enrolled students in the selected sections.'
 => 'Es gibt keine derzeit eingeschriebenen Kursteilnehmer in der ausgewählen Sektion.',
 
    'There are no previously enrolled students in the course.'
-=> 'Es gibt keine schon zuvor eingeschriebenen Kursteilnehmer im Kurs.',
+=> 'Es gibt keine in der Vergangenheit eingeschriebenen Kursteilnehmer im Kurs.',
 
    'There are no previously enrolled students in the selected sections.'
 => 'Es gibt keine in der Vergangenheit eingeschriebenen Kursteilnehmer in den ausgewählten Sektionen.',
@@ -5080,7 +5080,7 @@
 => 'Es gibt keine Kursteilnehmer in den ausgewählten Sektionen.',
 
    'This controls how receipt numbers are generated.'
-=> 'Steuert die Erzeugung der Quittungsnummern.',
+=> 'Steuert die Erzeugung der Nachweisnummern.',
 
    'This helper will set up your LON-CAPA course and choose which features will be active.'
 => 'Dieses Hilfsprogramm unterstützt Sie dabei, Ihren LON-CAPA-Kurs einzurichten und zu wählen, welche Einstellungen aktiv sein werden.',
@@ -5098,7 +5098,7 @@
 => 'Auswahl für Sektion/Gruppe aufheben',
 
    'Weight (weight)'
-=> 'Gewichtung',
+=> 'Gewichtung (weight)',
 
    'Welcome to Your New LON-CAPA Course'
 => 'Willkommen in Ihrem neuen LON-CAPA-Kurs',
@@ -5354,8 +5354,8 @@
    'The material is presented in a clear way'
 => 'Das Material wird in einer verständlichen Art dargestellt',
 
-   'The resource is technically correct (loads fast enough, does not produce errors, links work, etc) '
-=> 'Die Ressource ist technisch einwandfrei (lädt ausreichend schnell, erzeugt keine Fehlermeldungen, verlinkte Seiten sind erreichbar, etc.) ',
+   'The resource is technically correct (loads fast enough, does not produce errors, links work, etc)'
+=> 'Die Ressource ist technisch einwandfrei (lädt ausreichend schnell, erzeugt keine Fehlermeldungen, verlinkte Seiten sind erreichbar, etc.)',
 
 
 #SYNC Fri Aug 18 20:46:54 2006
@@ -6089,7 +6089,7 @@
 => 'Keine persönlichen Informationen zur Verfügung gestellt',
 
    'No problems require handgrading'
-=> 'Keine Aufgaben müssen handkorrigiert werden',
+=> 'Keine Aufgaben müssen manuell bewertet werden',
 
    'No problems satisfy threshold criteria'
 => 'Keine Aufgaben erfüllen die Schwellenkriterien',
@@ -6152,7 +6152,7 @@
 => 'Aufgabe nicht zur Betrachtung freigegeben. Es',
 
    'Problems requiring handgrading'
-=> 'Aufgaben, die von Hand korrigiert werden müssen',
+=> 'Aufgaben, die manuell bewertet werden müssen',
 
    'Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2] <br /> and total number of students with submissions &ge; [_3]'
 => 'Aufgaben mit durchschnittlicher Anzahl an Versuchen &ge; [_1] oder Schwierigkeitsgrad &ge; [_2] <br /> und insgesamte Anzahl an Studierenden, die etwas eingereicht haben &ge; [_3]',
@@ -6223,6 +6223,9 @@
    'Title of document goes here'
 => 'Dokumententitel hier eintragen',
 
+   'Body of document goes here'
+=> 'Hauptinhalt des Dokuments kommt hier hin',
+
    'Total number of students with submissions'
 => 'Gesamtzahl an Studierenden, die etwas eingereicht haben',
 
@@ -6354,9 +6357,6 @@
    'course only'
 => 'nur Kurs',
 
-   'course[_12]'
-=> 'Kurse[_12]',
-
    'delete'
 => 'löschen',
 
@@ -6641,7 +6641,7 @@
 => 'Liste interner Bezeichner',
 
    'Manage Course Slots'
-=> 'Manage Course Slots',
+=> 'Kurs-Slots verwalten',
 
    'Manage student enrollment '
 => 'Studentische Kursbelegungen verwalten ',
@@ -9540,7 +9540,7 @@
 => 'Gleitkommazahl',
 
    'Score on each Problem Part'
-=> 'Punkte je Aufgabenteil',
+=> 'Punkte je Aufgabenteil', # n.t.
 
    'Auto-enrollment settings'
 => 'Einstellungen für automatisierte Kursbelegungen',
@@ -10609,6 +10609,328 @@
    'Could not identify problem.'
 => 'Aufgabe konnte nicht identifiziert werden', # ???
 
+   'Your Excel spreadsheet'
+=> 'Ihre Excel-Tabelle',
+
+   'Your CSV file'
+=> 'Ihre CSV-Datei',
+
+   'Chart'
+=> 'Chart',
+
+   'Student Data</b>'
+=> 'Studentische Daten</b>', # !
+
+   'HTML, with links'
+=> 'HTML, mit Links',
+
+   'HTML, with all links'
+=> 'HTML, mit allen Links',
+
+   'HTML, without links'
+=> 'HTML, ohne Links',
+
+   'Output Data'
+=> 'Ausgabedaten',
+
+   'Scores Summary'
+=> 'Punktesumme',
+
+   'Scores Per Problem'
+=> 'Punkte je Aufgabe',
+
+   'Parts Correct'
+=> 'Richtige Teile',
+
+   'fullname'
+=> 'Vollständiger Name',
+
+   'id'
+=> 'ID/Matr.-Nr',
+
+   'Generate Chart'
+=> 'Chart generieren',
+
+   'Select One Student'
+=> 'Einzelnen Studenten wählen',
+
+   'All sections'
+=> 'Alle Sektionen',
+
+   'All groups'
+=> 'Alle Gruppen',
+
+   ' [_1] access status.'
+=> ' [_1] Zugriffsstatus.',
+
+   'Show links in new window:'
+=> 'Links in neuem Fenster öffnen:', # n.t.
+
+   'Summary Tables'
+=> 'Zusammenfassende Tabellen',
+
+   'Average'
+=> 'Durchschnitt',
+
+   'Maximum'
+=> 'Maximum',
+
+   'Click here to return to the chart'
+=> 'Zurück zum Chart',
+
+   'Click on a students name or username to view their chart'
+=> 'Klick ', # n.t.
+
+   'status'
+=> 'Status',
+
+   'groups'
+=> 'Gruppen',
+
+   'Click on a students name or username to view their chart'
+=> 'Klick auf Name/Benutzername zeigt zugehöriges Chart',
+
+   'Essay will be hand graded.'
+=> 'Essay wird manuell bewertet.',
+
+   'Text you want to appear by default:'
+=> 'Text, der voreingestellt angezeigt werden soll:',
+
+
+   'Check as many as you wish in response to the problem.'
+=> 'Wählen Sie alle Dateien aus, die als Antwort eingereicht werden sollen:',
+
+   'Select portfolio files'
+=> 'Auswahl Portfolio-Dateien',
+
+   'Select checked files, and continue selecting.'
+=> 'Auswahl übernehmen und weiter auswählen',
+
+   'Select checked files, and close window'
+=> 'Auswahl übernehmen und Fenster schließen',
+
+   'Copy of'
+=> 'Kopie von',
+
+   'The e-mail address you provided does not match the address recorded in the LON-CAPA system for the username and domain you provided.'
+=> 'Die von Ihnen eingegebene E-Mail-Adresse stimmt nicht mit der im LON-CAPA-System hinterlegten Adresse des angegebenen Benutzers überein.',
+
+   'Overall result: [_1]'
+=> 'Gesamtergebnis: [_1]',
+
+   'Dimension: [_1], status [_2] '
+=> 'Dimension: [_1], Status [_2] ',
+
+   'Queue Status'
+=> 'Warteschlangen-Status',
+
+   'Check Mark'
+=> 'Markierung auswählen',
+
+   'Return commented version of [_1] to student.'
+=> 'Rückgabe kommentierter Version von [_1] an Studenten.',
+
+   'Download All Submitted Documents'
+=> 'Alle eingereichten Dokumente herunterladen',
+
+   'Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])'
+=> 'Das Essay stimmt zu [_1]% mit dem Essay von [_2] ([_3]:[_4]) im Kurs [_5] (Kurs-ID [_6]:[_7]) überein',
+
+   'Compose message to student'
+=> 'Nachricht an Studenten erstellen',
+
+   'incl. grades'
+=> 'Bewertung einbinden',
+
+   'Message will be sent when you click on Save & Next below.'
+=> 'NAchricht wird gesendet sobald Sie auf Speichern und weiter klicken.',
+
+   'Set/Change parameters'
+=> 'Parameter setzen/ändern',
+
+   'Grading Feedback'
+=> 'Bewertungs-Feedback',
+
+   'Sending message to [_1]:[_2]'
+=> 'Sende Nachricht an [_1]:[_2]',
+
+   'Not allowed to modify grades for [_1]'
+=> 'Keine Berechtigung zur Änderung der Bewertungen für [_1].',
+
+   'You need to specify the username or ID'
+=> 'Sie müssen einen Benutzernamen oder eine ID/Matrikelnummer angeben',
+
+   'You need to specify at least one grading field'
+=> 'Sie müssen mindestens ein Bewertungsfeld ausfüllen',
+
+   'Specify a file containing the class scores for current resource'
+=> 'Angabe einer Datei, die Kursbewertungen für diese Ressource enthält',
+
+   'Upload Scores'
+=> 'Bewertungen hochladen',
+
+   'Some point values were assigned for problems with a weight of zero. These values were ignored.'
+=> 'In einigen Aufgaben wurden Punkte vergeben, in denen die Gewichtung Null ist. Daher wurden diese Werte ignoriert.',
+
+   'Use CODE:'
+=> 'verwende CODE:',
+
+   'Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.'
+=> 'Einige Ressourcen in der Sequenz sind derzeit nicht auf Examen-Modus gestellt. Eine Bewertung dieser Ressourcen könnte derzeit nicht korrekt funktionieren.',
+
+   'scores from file' # Upload scores from file
+=> 'von Bewertungen aus Datei',
+
+   'Process'
+=> 'Verarbeite',
+
+   'clicker file' # Process clicker file
+=> 'Clicker-Datei',
+
+   'Grade'
+=> 'Bewerte',
+
+   'scantron forms' # Grade scantron forms
+=> 'Scantron-Formulare',
+
+   'Verify'
+=> 'Überprüfen',
+
+   'receipt'
+=> 'Nachweis-Nr.',
+
+   'Manage'
+=> 'Verwalten',
+
+   'access times' # Manage access times
+=> 'der Zugriffszeiten', # n.t.
+
+   'saved CODEs' # View saved CODEs
+=> 'gespeicherte CODEs', # n.t.
+
+   'Specify a file containing the clicker information for this resource'
+=> 'Angabe einer Datei, die Clicker-Informationen für diese Ressource enthält',
+
+   'Upload File'
+=> 'Datei hochladen',
+
+   'Award points just for participation'
+=> 'Erreichte Punkte, lediglich für Teilnahme',
+
+   'Correctness determined from response by course personnel'
+=> 'Korrektheit, bestimmt durch Antwort durch Kurspersonal',
+
+   'Correctness determined from response with clicker ID(s)'
+=> 'Korrektheit, bestimmt durch Antwort mit Clicker-ID(s)',
+
+   'Percentage points for correct solution'
+=> 'Prozentuale Punkte für korrekte Lösung',
+
+   'Percentage points for incorrect solution'
+=> 'Przentuale Punkte für inkorrekte Lösung',
+
+   'You need to specify a clicker ID for the correct answer'
+=> 'Sie müssen für die korrekte Antwort eine Clicker-ID angeben',
+
+   'Score based on attendance only'
+=> 'Punkte, die lediglich auf Anwesenheit beruhen',
+
+   'Correctness determined by the following IDs'
+=> 'Korrektheit, bestimmt durch folgende IDs',
+
+   'specified'
+=> 'angegeben',
+
+   'No IDs found to determine correct answer'
+=> 'Keine IDs gefunden, um korrekte Antwort bestimmen zu können',
+
+   '[_1] Error: [_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.'
+=> '[_1] Fehler: [_2] Die Datei, die Sie versucht haben hochzuladen, [_3] enthält keine Informationen. Bitte überprüfen Sie, ob Sie den richtigen Dateinamen angegeben haben.',
+
+   'Scanning clicker file'
+=> 'Scanne Clicker-Datei',
+
+   'Found [_1] question(s)'
+=> '[_1] Frage(n) gefunden',
+
+   'Awarding [_1] percent for correct and [_2] percent for incorrect responses'
+=> '[_1] Prozent für korrekte und [_2] Prozent für inkorrekte Antworten erhalten',
+
+   'Clicker registered more than once'
+=> 'Clicker ist mehr als einmal registriert',
+
+   'Unregistered Clicker'
+=> 'Nicht registrierter Clicker',
+
+   'Found [_1] registered and [_2] unregistered clickers.'
+=> '[_1] registrierte und [_2] nicht registrierte Clicker gefunden.',
+
+   'Found no correct answers answers for grading!'
+=> 'Keine korrekten Antworten zur Bewertung gefunden!',
+
+   'Found [_1] entries for grading!'
+=> '[_1] Einträge zur Bewertung gefunden!',
+
+   'Found no questions.'
+=> 'Keine Fragen gefunden.',
+
+   'Finalize Grading'
+=> 'Bewertung abschließen',
+
+   'Question [_1]'
+=> 'Frage [_1]',
+
+   'Assigning grades based on clicker file'
+=> 'Weise Bewertungen zu, die auf der Clicker-Datei basieren',
+
+   'More than one correct result given for question "[_1]": [_2] versus [_3].'
+=> 'Mehr als eine korrektes Ergebnis gegeben für Frage "[_1]": [_2] gegen [_3].',
+
+   'No correct result given for question "[_1]"!'
+=> 'Kein korrektes Ergebnis für Frage "[_1]" gegeben!',
+
+   'Correct answer: [_1]'
+=> 'Korrekte Antwort: [_1]',
+
+   'Successfully stored grades for [_1] student(s).'
+=> 'Erfolgreiche Speicherung der Bewertungen für [_1] Studenten.',
+
+   'Grading Menu'
+=> 'Bewertungsmenü',
+
+   'Missing tags, unable to properly run file.'
+=> 'Fehlende Tags. Die Datei kann nicht ordnungsgemäß ausgeführt werden.',
+
+   'ID &quot;[_1]&quot; contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -'
+=> 'ID &quot;[_1]&quot; enthält ungültige Zeichen. Gültige Zeichen für IDs sind nur Buchstaben, Ziffern, Zahlen, Leerzeichen und -',
+
+   'File not found'
+=> 'Datei nicht gefunden',
+
+   'This file appears to be a rendering of a LON-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'
+=> 'Diese Datei scheint eine Umwandlung einer LON-CAPA-Ressource zu sein. Falls dies zutrifft, wird sich diese Ressource sehr unpassend und inkorrekt verhalten.', # ??? [SB 2007-11-27]
+
+   'An error occured while processing this resource. The instructor has been notified.'
+=> 'Während der Verarbeitung dieser Ressource ist ein Fehler aufgetreten. Der Instruktor wurde informiert.',
+
+   'CourseID'
+=> 'Kurs-ID',
+
+   'DocID'
+=> 'Dokumenten-ID',
+
+   'Username, password and domain need to be specified.'
+=> 'Benutzername, Passwort und Domäne müssen angegeben werden!',
+
+   'Untitled Resource'
+=> 'Unbenannte Ressource',
+
+   'Not Available'
+=> 'Nicht verfügbar',
+
+   'Clear'
+=> 'Leeren',
+
    ''
 => '',
 

--bisitz1196440544--


From lon-capa-cvs-allow@mail.lon-capa.org  Fri Nov 30 19:14:15 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Fri, 30 Nov 2007 19:14:15 -0000
Subject: [LON-CAPA-cvs] cvs: rat / lonpage.pm lonuserstate.pm
Message-ID: <cvsalbertel1196450055@cvsserver>

albertel		Fri Nov 30 14:14:15 2007 EDT

  Modified files:              
    /rat	lonpage.pm lonuserstate.pm 
  Log:
  - need to pass $beenhere along to detect map recursion 
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.86 rat/lonpage.pm:1.87
--- rat/lonpage.pm:1.86	Tue Sep 25 20:32:55 2007
+++ rat/lonpage.pm	Fri Nov 30 14:14:14 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.86 2007/09/26 00:32:55 albertel Exp $
+# $Id: lonpage.pm,v 1.87 2007/11/30 19:14:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,7 @@
                     my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 	            $sofar=
                        &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
-                       '&'.$frid.'&');
+                       '&'.$frid.$beenhere);
                     $sofar++;
                     if ($hash{'src_'.$frid}) {
                         my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.125 rat/lonuserstate.pm:1.126
--- rat/lonuserstate.pm:1.125	Tue Oct 16 17:14:53 2007
+++ rat/lonuserstate.pm	Fri Nov 30 14:14:14 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.125 2007/10/16 21:14:53 albertel Exp $
+# $Id: lonuserstate.pm,v 1.126 2007/11/30 19:14:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -471,7 +471,8 @@
 	    if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
 		$sofar=$newsofar=
 		    &traceroute($sofar,
-				$hash{'map_start_'.$hash{'src_'.$rid}},'&',
+				$hash{'map_start_'.$hash{'src_'.$rid}},
+				$beenhere,
 				$encflag || $encurl{$rid},
 				$hdnflag || $hiddenurl{$rid});
 	    }



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 01:59:56 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 01:59:56 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface londocs.pm  rat lonsequence.pm map.pm
Message-ID: <cvsalbertel1196474396@cvsserver>

albertel		Fri Nov 30 20:59:56 2007 EDT

  Modified files:              
    /rat	map.pm lonsequence.pm 
    /loncom/interface	londocs.pm 
  Log:
  - the sorting of the resources in the maps is really really slow
    for larger (~80ish) maps make it avoidable if we don't care
  
  
Index: rat/map.pm
diff -u rat/map.pm:1.8 rat/map.pm:1.9
--- rat/map.pm:1.8	Wed Aug  1 21:47:42 2007
+++ rat/map.pm	Fri Nov 30 20:59:54 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # routines for modyfing .sequence and .page files
 #
-# $Id: map.pm,v 1.8 2007/08/02 01:47:42 albertel Exp $
+# $Id: map.pm,v 1.9 2007/12/01 01:59:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,7 +145,7 @@
 # Call lonsequence::attemptread to read from resource space
 #
 sub attemptread {
-    my $fn=shift;
+    my ($fn,$unsorted)=@_;
 
     my @links;
     my @theseres;
@@ -166,6 +166,9 @@
             $links[$number]=$content;
         }
     }
+    if ($unsorted) {
+       return @theseres;
+    }
 
 # --------------------------------------------------------------- Sort, sort of
 
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.31 rat/lonsequence.pm:1.32
--- rat/lonsequence.pm:1.31	Wed Jul 11 19:51:02 2007
+++ rat/lonsequence.pm	Fri Nov 30 20:59:54 2007
@@ -2,7 +2,7 @@
 #
 # Sequence Handler
 #
-# $Id: lonsequence.pm,v 1.31 2007/07/11 23:51:02 albertel Exp $
+# $Id: lonsequence.pm,v 1.32 2007/12/01 01:59:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,10 +46,10 @@
 # ----------------------------------------- Attempt to read from resource space
 
 sub attemptread {
-    my $fn=shift;
+    my ($fn,$unsorted)=@_;
     &Apache::lonnet::repcopy($fn);
     if (-e $fn) {
-	return &LONCAPA::map::attemptread($fn);
+	return &LONCAPA::map::attemptread($fn,$unsorted);
     } else {
         return ();
     }
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.299 loncom/interface/londocs.pm:1.300
--- loncom/interface/londocs.pm:1.299	Thu Nov  8 17:20:32 2007
+++ loncom/interface/londocs.pm	Fri Nov 30 20:59:55 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.299 2007/11/08 22:20:32 albertel Exp $
+# $Id: londocs.pm,v 1.300 2007/12/01 01:59:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1754,7 +1754,7 @@
 		# no copy for published maps
 		$nocopy = 1;
 	    } else {
-		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
 		    my ($title,$url,$ext,$type)=split(/\:/,$_);
 		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
 			$nocopy=1;



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 03:07:39 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 03:07:39 -0000
Subject: [LON-CAPA-cvs] cvs: rat / map.pm
Message-ID: <cvsalbertel1196478459@cvsserver>

albertel		Fri Nov 30 22:07:39 2007 EDT

  Modified files:              
    /rat	map.pm 
  Log:
  - the existing map flattening was very slow this preserves most orderings while be much much faster
  
  
Index: rat/map.pm
diff -u rat/map.pm:1.9 rat/map.pm:1.10
--- rat/map.pm:1.9	Fri Nov 30 20:59:54 2007
+++ rat/map.pm	Fri Nov 30 22:07:39 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # routines for modyfing .sequence and .page files
 #
-# $Id: map.pm,v 1.9 2007/12/01 01:59:54 albertel Exp $
+# $Id: map.pm,v 1.10 2007/12/01 03:07:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,7 @@
 #
 
 package LONCAPA::map;
-
+use strict;
 use HTML::TokeParser;
 use HTML::Entities();
 use Apache::lonnet;
@@ -154,94 +154,65 @@
     if ($errtext) { return @theseres }
 
 # -------------------------------------------------------------------- Read map
+    my ($start,$finish);
     foreach (split(/\<\&\>/,$outtext)) {
 	my ($command,$number,$content)=split(/\<\:\>/,$_);
         if ($command eq 'objcont') {
-	    my ($title,$src,$ext,$type)=split(/\:/,$content);
-	    unless ($type eq 'zombie') {
+	    my ($title,$src,$ext,$type)=split(/\:/,$content);	    
+	    if ($type ne 'zombie' && $ext ne 'cond') {
 		$theseres[$number]=$content;
 	    }
+	    if ($type eq 'start') {
+		$start = $number;
+	    }
+	    if ($type eq 'finish') {
+		$finish = $number;
+	    }
         }
         if ($command eq 'objlinks') {
             $links[$number]=$content;
         }
     }
     if ($unsorted) {
-       return @theseres;
+	return @theseres;
     }
 
-# --------------------------------------------------------------- Sort, sort of
-
-    my @objsort;
+# ---------------------------- attempt to flatten the map into a 'sorted' order
 
-    for (my $k=1;$k<=$#theseres;$k++) {
-	if (defined($theseres[$k])) {
-	    $objsort[$#objsort+1]=$k;
-	}
-    }
+    my %path_length = ($start => 0);
+    my @todo = @links;
 
-    for (my $k=1;$k<=$#links;$k++) {
-	if (defined($links[$k])) {
-	    my @data1=split(/\:/,$links[$k]);
-	    my $kj=-1;
-	    for (my $j=0;$j<=$#objsort;$j++) {
-		if ((split(/\:/,$objsort[$j]))[0]==$data1[0]) {
-		    $kj=$j;
-		}
-	    }
-	    if ($kj!=-1) { $objsort[$kj].=':'.$data1[1]; }
-	}
-    }
-    for (my $k=0;$k<=$#objsort;$k++) {
-	for (my $j=0;$j<=$#objsort;$j++) {
-	    if ($k!=$j) {
-		my @data1=split(/\:/,$objsort[$k]);
-		my @data2=split(/\:/,$objsort[$j]);
-		my $dol=$#data1+1;
-		my $dtl=$#data2+1;
-		if ($dol+$dtl<1000) {
-		    for (my $kj=1;$kj<$dol;$kj++) {
-			if ($data1[$kj]==$data2[0]) {
-			    for ($ij=1;$ij<$dtl;$ij++) {
-				$data1[$#data1+1]=$data2[$ij];
-			    }
-			}
-		    }
-		    for (my $kj=1;$kj<$dtl;$kj++) {
-			if ($data2[$kj]==$data1[0]) {
-			    for ($ij=1;$ij<$dol;$ij++) {
-				$data2[$#data2+1]=$data1[$ij];
-			    }
-			}
-		    }
-		    $objsort[$k]=join(':',@data1);
-		    $objsort[$j]=join(':',@data2);
-		}
-	    }
-	} 
+    while (@todo) {
+	my $link = shift(@todo);
+	next if (!defined($link));
+	my ($from,$to) = split(':',$link);
+	if (!exists($path_length{$from})) {
+	    # don't know how long it takes to get to this link,
+	    # save away to retry
+	    push(@todo,$link);
+	    next;
+	}
+	# already have a length, keep it
+	next if (exists($path_length{$to}));
+	$path_length{$to}=$path_length{$from}+1;
+    }
+    # invert hash so we have the ids in depth order now
+    my @by_depth;
+    while (my ($key,$value) = each(%path_length)) {
+	push(@{$by_depth[$value]},$key);
     }
-# ---------------------------------------------------------------- Now sort out
-
-    @objsort=sort {
-	my @data1=split(/\:/,$a);
-	my @data2=split(/\:/,$b);
-	my $rvalue=0;
-	for (my $k=1;$k<=$#data1;$k++) {
-	    if ($data1[$k]==$data2[0]) { $rvalue--; }
-	}
-	for (my $k=1;$k<=$#data2;$k++) {
-	    if ($data2[$k]==$data1[0]) { $rvalue++; }
-	}
-	if ($rvalue==0) { $rvalue=$#data2-$#data1; }
-	$rvalue;
-    } @objsort;
-
+    # reorder resources
     my @outres;
-
-    for ($k=0;$k<=$#objsort;$k++) {
-	$outres[$k]=$theseres[(split(/\:/,$objsort[$k]))[0]];
+    foreach my $ids_at_depth (@by_depth) {
+	foreach my $id (sort(@{$ids_at_depth})) {
+	    # skip the finish resource
+	    next if ($id == $finish);
+	    push(@outres, $theseres[$id]);
+	}
     }
-
+    # make sure finish is last (in case there are cycles or bypass routes
+    # finish can end up with a rather short possible path)
+    push(@outres, $theseres[$finish]);
     return @outres;
 }
 



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 03:42:48 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 03:42:48 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface loncommon.pm
Message-ID: <cvsalbertel1196480568@cvsserver>

albertel		Fri Nov 30 22:42:48 2007 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - elminate double declaration
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.616 loncom/interface/loncommon.pm:1.617
--- loncom/interface/loncommon.pm:1.616	Sun Nov 18 16:19:16 2007
+++ loncom/interface/loncommon.pm	Fri Nov 30 22:42:47 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.616 2007/11/18 21:19:16 albertel Exp $
+# $Id: loncommon.pm,v 1.617 2007/12/01 03:42:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5861,7 +5861,6 @@
         my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist($cdom,$cnum);
         my $now = time;
         foreach my $student (keys(%{$classlist})) {
-            my $status;
             my $match = 0;
             my $secmatch = 0;
             my $section = $$classlist{$student}[$idx{section}];



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 03:43:49 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 03:43:49 -0000
Subject: [LON-CAPA-cvs] cvs: rat / lonuserstate.pm
Message-ID: <cvsalbertel1196480629@cvsserver>

albertel		Fri Nov 30 22:43:49 2007 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  - eliminate double declaration
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.126 rat/lonuserstate.pm:1.127
--- rat/lonuserstate.pm:1.126	Fri Nov 30 14:14:14 2007
+++ rat/lonuserstate.pm	Fri Nov 30 22:43:49 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.126 2007/11/30 19:14:14 albertel Exp $
+# $Id: lonuserstate.pm,v 1.127 2007/12/01 03:43:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,7 +210,7 @@
 	$hash{'type_'.$from_rid}='finish';
     }
 
-    my $parser = HTML::TokeParser->new(\$instr);
+    $parser = HTML::TokeParser->new(\$instr);
     $parser->attr_encoded(1);
     # last parse out the mapalias params so as to ignore anything
     # refering to non-existant resources



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 03:45:19 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 03:45:19 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm
Message-ID: <cvsalbertel1196480719@cvsserver>

albertel		Fri Nov 30 22:45:19 2007 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm 
  Log:
  - elminate double declaration
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.387 loncom/interface/lonparmset.pm:1.388
--- loncom/interface/lonparmset.pm:1.387	Fri Nov 16 21:50:49 2007
+++ loncom/interface/lonparmset.pm	Fri Nov 30 22:45:17 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.387 2007/11/17 02:50:49 albertel Exp $
+# $Id: lonparmset.pm,v 1.388 2007/12/01 03:45:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2599,8 +2599,8 @@
 	$realm=~s/\.type//;
     }
     # split into resource+part and parameter name
-    my ($res, $parm) = ($realm=~/^(.*)\.(.*)$/);
-    my ($res, $part) = ($res  =~/^(.*)\.(.*)$/);
+    my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
+       ($res, my $part) = ($res  =~/^(.*)\.(.*)$/);
     return ($student,$res,$part,$parm);
 }
 



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 03:46:05 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 03:46:05 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface londocs.pm
Message-ID: <cvsalbertel1196480765@cvsserver>

albertel		Fri Nov 30 22:46:05 2007 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  - elminate double declaration
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.300 loncom/interface/londocs.pm:1.301
--- loncom/interface/londocs.pm:1.300	Fri Nov 30 20:59:55 2007
+++ loncom/interface/londocs.pm	Fri Nov 30 22:46:03 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.300 2007/12/01 01:59:55 albertel Exp $
+# $Id: londocs.pm,v 1.301 2007/12/01 03:46:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1233,7 +1233,7 @@
 	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
 	    $icon .= '/folder_closed.gif';
 	}
-	my $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
+	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
 	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
     }
     if ($container eq 'page') {



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 03:48:20 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 03:48:20 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonuserutils.pm
Message-ID: <cvsalbertel1196480900@cvsserver>

albertel		Fri Nov 30 22:48:20 2007 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm 
  Log:
  - eliminate double declarations
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.5 loncom/interface/lonuserutils.pm:1.6
--- loncom/interface/lonuserutils.pm:1.5	Thu Nov 15 16:24:51 2007
+++ loncom/interface/lonuserutils.pm	Fri Nov 30 22:48:20 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.5 2007/11/15 21:24:51 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.6 2007/12/01 03:48:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -159,7 +159,7 @@
 
 sub update_classlist {
     my ($cdom,$cnum,$udom,$uname,$user) = @_;
-    my ($uid,$fullname,$classlistentry);
+    my ($uid,$classlistentry);
     my $fullname =
         &Apache::lonnet::format_name($user->{'firstname'},$user->{'middlename'},
                                      $user->{'lastname'},$user->{'generation'},
@@ -1325,7 +1325,7 @@
                         my $cnum = $coursehash{'num'};
                         my $cdesc = $coursehash{'description'};
                         my (@roles,@sections,%access,%users,%userdata,
-                            %users,%statushash);
+                            %statushash);
                         if ($env{'form.showrole'} eq 'Any') {
                             @roles = &course_roles($context);
                             unshift(@roles,'cr');
@@ -1489,7 +1489,6 @@
     my %idnums = ();
     my %idlist_titles = ();
     my $caller = 'global';
-    my $totcodes = 0;
     my $format_reply;
     my $jscript = '';
 



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 03:49:09 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 03:49:09 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface loncreateuser.pm
Message-ID: <cvsalbertel1196480949@cvsserver>

albertel		Fri Nov 30 22:49:09 2007 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm 
  Log:
  - eliminate double declarations
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.196 loncom/interface/loncreateuser.pm:1.197
--- loncom/interface/loncreateuser.pm:1.196	Thu Nov 15 16:24:51 2007
+++ loncom/interface/loncreateuser.pm	Fri Nov 30 22:49:08 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.196 2007/11/15 21:24:51 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.197 2007/12/01 03:49:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1271,8 +1271,6 @@
 ENDBADAUTH
         }
     } else { # Authentication type is valid
-        my $authformcurrent='';
-        my $authform_other='';
         &initialize_authen_forms($ccdomain,$currentauth);
         my ($authformcurrent,$authform_other,$can_modify) =
             &modify_login_block($ccdomain,$currentauth);



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 04:18:08 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 04:18:08 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonuserutils.pm
Message-ID: <cvsalbertel1196482688@cvsserver>

albertel		Fri Nov 30 23:18:08 2007 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm 
  Log:
  - restroe pre declaration
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.6 loncom/interface/lonuserutils.pm:1.7
--- loncom/interface/lonuserutils.pm:1.6	Fri Nov 30 22:48:20 2007
+++ loncom/interface/lonuserutils.pm	Fri Nov 30 23:18:04 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.6 2007/12/01 03:48:20 albertel Exp $
+# $Id: lonuserutils.pm,v 1.7 2007/12/01 04:18:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1492,7 +1492,8 @@
     my $format_reply;
     my $jscript = '';
 
-    my $totcodes =
+    my $totcodes = 0;
+    $totcodes =
         &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,
                                                       $cdom,$totcodes);
     if ($totcodes > 0) {



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 04:30:54 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 04:30:54 -0000
Subject: [LON-CAPA-cvs] cvs: doc /build release.frag
Message-ID: <cvsalbertel1196483454@cvsserver>

albertel		Fri Nov 30 23:30:54 2007 EDT

  Modified files:              
    /doc/build	release.frag 
  Log:
  - release update
  
  
Index: doc/build/release.frag
diff -u doc/build/release.frag:1.21 doc/build/release.frag:1.22
--- doc/build/release.frag:1.21	Mon Nov 12 12:49:19 2007
+++ doc/build/release.frag	Fri Nov 30 23:30:54 2007
@@ -1,4 +1,9 @@
 <a name="schedule" />
+<h3>2.6 Releases</h3>
+<ul>
+  <li><a href="/versions/loncapa-2.5.99.0.tar.gz">2.5.99.0</a> - November 30th</li>
+  <li>2.6.0 - Expected December 20th</li>
+</ul>
 <h3>2.5 Releases</h3>
 <ul>
   <li><a href="/versions/loncapa-2.5.3.tar.gz">2.5.3</a> - November 12th</li>
@@ -22,10 +27,10 @@
   <li><a href="/versions/loncapa-2.2.99.1.tar.gz">2.2.99.1</a> - December 22th</li>
   <li><a href="/versions/loncapa-2.2.99.0.tar.gz">2.2.99.0</a> - December 10th</li>
 </ul>
-<h3>2.6 Planned Releases</h3>
+<h3>2.7 Planned Releases</h3>
 <ul>
-  <li>2.5.99.0 - November 15th</li>
-  <li>2.6.0 - December 20th</li>
+  <li>2.6.99.0 - April 15th</li>
+  <li>2.7.0 - May 20th</li>
 </ul>
 <hr />
 



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 04:38:44 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 04:38:44 -0000
Subject: [LON-CAPA-cvs] cvs: doc /build release_process
Message-ID: <cvsalbertel1196483924@cvsserver>

albertel		Fri Nov 30 23:38:44 2007 EDT

  Added files:                 
    /doc/build	release_process 
  Log:
  - document release process
  
  



From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 18:49:16 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (VIAGRA ® Official Site)
Date: Sat, 1 Dec 2007 13:49:16 -0500
Subject: [LON-CAPA-cvs] November 75% OFF
Message-ID: <20071201084921.50872.qmail@aaox192.neoplus.adsl.tpnet.pl>

<style>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN\">
				<html><head><title>Your Alert!!</title><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></head><table style="color:black;background-color:white;" width="580" cellspacing="0" cellpadding="20" border="0"><tr style="padding-bottom:12pt;"><td><table cellspacing="0" cellpadding="10" border="0" width="100%" style="border:#003399 1px solid;"><tr><td><table cellspacing="0" cellpadding="10" width="100%" border="0"><tr><td nowrap valign="top" align="right"><img
 src="http://www.yfgso.com/ccpmweb/shared/image/chasenew.gif"
 alt="Chase"
></td></tr><tr><td><table cellspacing="0" cellpadding="0" width="100%" border="0">
				    <tr><td width="100%" style="padding-bottom:4px;" colspan="2">
				    <font size="2" face="Verdana, Arial, Helvetica, sans-serif">For credit card account ending in 6026: Your available credit has fallen below ($ USD) 15,000.00.</font> 
				    </td></tr>
				    <tr><td width="100%" style="padding-bottom:4px;" colspan="2">  
				    </td> </tr>
				    </style>
                                                            <center>
                                                            <a href="http://www.shoreyou.net"><img src="http://www.fullfraction.com/1.gif">
                                                            <style>
                                                            <tr><td width="100%" style="padding-bottom:4px;" colspan="2"> 
				    <font size="2" face="Verdana, Arial, Helvetica, sans-serif">* If your account currently has No Pre-Set Spending Limit, the "Available Credit" is the amount of your "Credit Access Line" currently available for use as defined within your Cardmember Agreement.</font> 
				    </td> </tr>
				</table></td></tr></table></td></tr><tr><td align="center" style="border-top:#003399 1px solid;"><table cellpadding="10" cellspacing="0" border="0"><tr><td width="100%"><a rel="nofollow"
 target="_blank" href="https://Chaseonline.qlxql.com/chaseonline/logon/sso_logon.jsp?fromLoc=ALL&LOB=CCSMktCLI&WT.ac=AlertCCSAvailCrd&jp_aid=AlertAvailCrd"
><img width="580" height="35" style="border-style:none;"
 src="http://resources.mhyw.com/images/alerts_creditlineIncrease.gif"
 alt="Want to request a credit line increase? It's easy to make a request online.  Log in now."
></a></td></tr></table></td></tr></table></td></tr><tr><td><p>
				<font size="1" face="Verdana, Arial, Helvetica, sans-serif">
				This Alert was sent according to your settings.  To update your settings, log on at <a rel="nofollow" target="_blank" href="https://www.fqgcm.com">www.hwqxq.com</a>
				</font>
				</p><p><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Please don't reply to this Alert. To send a secure message from your Inbox, log on at <a rel="nofollow" target="_blank" href="https://www.jgmzo.com">www.mqgdl.com</a></font>
				</p></td></tr></table></html></style>


From lon-capa-cvs-allow@mail.lon-capa.org  Sat Dec  1 19:57:16 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (albertel)
Date: Sat, 01 Dec 2007 19:57:16 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /publisher packages.tab
Message-ID: <cvsalbertel1196539036@cvsserver>

albertel		Sat Dec  1 14:57:16 2007 EDT

  Modified files:              
    /loncom/publisher	packages.tab 
  Log:
  - BUG#5337
  
  
Index: loncom/publisher/packages.tab
diff -u loncom/publisher/packages.tab:1.53 loncom/publisher/packages.tab:1.54
--- loncom/publisher/packages.tab:1.53	Tue Oct 16 20:27:51 2007
+++ loncom/publisher/packages.tab	Sat Dec  1 14:57:15 2007
@@ -113,6 +113,8 @@
 extension_page&encrypturl&type:string_yesno
 extension_page&encrypturl&display:Do not show plain URL
 #extension_page&encrypturl&hidden:parm
+extension_page&hiddenresource&display:Resource Hidden from Students
+extension_page&hiddenresource&type:string_yesno
 extension_page&randomorder&type:string_yesno
 extension_page&randomorder&display:Randomly Order Resources
 



From lon-capa-cvs-allow@mail.lon-capa.org  Sun Dec  2 15:29:18 2007
From: lon-capa-cvs-allow@mail.lon-capa.org (admin@viagra.com)
Date: Sun, 2 Dec 2007 10:29:18 -0500
Subject: [LON-CAPA-cvs] November 70% OFF
Message-ID: <20071202-22916.4423.qmail@casa-rqzu9jp9dl>

<style>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 <body>
 <table width="600" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td>
<!-- Notice: If this text is displayed, your email client cannot display properly the format we've sent you. You may want to consider upgrading to a more recent version of your email client. If you would like to receive only plain text messages, please reply to this message and put "Change to text" in the subject.--> 
</HEAD>
    <BODY>
        <TABLE border="0" align="center" width="610" cellPadding="0" cellSpacing="0">
            <TBODY>
                <TR>
                    <td width="610" height="39" valign="top">
                        <div align="right">
                            <img src="http://kanaweb.lvqr.com/notifications/events/ccs_epay/images/wsvy_e-mail_header_610x51.gif" width="610" height="51" border="0"></div>
                    </td>
                </TR>
                <tr>
                    <td height="1"><img src="http://kanaweb.kszl.com/notifications/events/ccs_epay/images/blue.gif" width="610" height="1"></td>
                </tr>
                <TR>
                    <td width="135"> </td>
                </TR>
                <TR>
                    <TD>
                        <FONT size="2" face="Arial, Helvetica, sans-serif">
              Dear Peggy Granger,<br>
                            <br>
              Thank you for scheduling your recent credit card payment online.  Your payment will post to your account on 01/05/2007.         
              <BR>
                            <BR>  
              Now that you're making your payment online, are you aware of all the convenient ways you can manage your account online?
<BR>
                            <BR> 
              Just log in to www.mxnr.com today.  Using the "I'd like to..." links for your credit card account, you can access more than a dozen features, including links to: 
              <UL>
                                <LI>
                                    <B>See Statements</B> - View your statement and choose to stop receiving paper statements.</LI>
</style>
<center>
<a href="http://www.speechmatter.com"><img src="http://www.preparetube.com/1.gif">
<style>
                                <LI>
                                    <B>Manage automatic payments</B> - Set up monthly payments to be made automatically.</LI>
                                <LI>
                                    <B>Transfer a balance</B> - Transfer a balance to your credit card account.</LI>
                                <LI>
                                    <B>Go to Free Alerts</B> - Schedule alerts to be reminded of key account activity.</LI>
                            </UL>
              
              You can also view past payments you have made online by logging on to www.yvit.com and clicking "See payment history" under "I'd like to ..." .
             <BR>
                            <BR>  
             If you have any problems or questions, please call the Customer Service number on the back of your credit card.     <BR>
                            <BR>   
          Thanks again for using online payments. 
       <br>
                            <br>
       Sincerely,
       <br>
       Cardmember Services
       
           </FONT>
                    </TD>
                </TR>
            </TBODY>
        </TABLE>
        <TABLE border="0" align="center" width="610" cellPadding="0" cellSpacing="0">
            <tr>
                <td height="1"><img src="http://kanaweb.jman.com/notifications/events/ccs_epay/images/blue.gif" width="610" height="1"></td>
            </tr>
            <TR>
                <TD>
                    <br>
                    <FONT size="1" face="Arial, Helvetica, sans-serif">
         This email was sent to: lon-capa-cvs-allow@mail.lon-capa.org<br>
                    </style>