From raeburn at source.lon-capa.org  Mon Sep 30 09:44:17 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 30 Sep 2013 13:44:17 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /xml londefdef.pm scripttag.pm
Message-ID: <cvsraeburn1380548657@cvsserver>

raeburn		Mon Sep 30 13:44:17 2013 EDT

  Modified files:              
    /loncom/xml	londefdef.pm scripttag.pm 
  Log:
  - Access to dependencies/links in HTML files uploaded directly to a course,
    where dependency or linked item was also uploaded directly to the same 
    course.
    - Fix regexp used to identify items referenced in javascript object in text
     within <script></script>.
    - .js files in src attribute of <script> tag still retrieved, even if
     (type ="text/javascript" is missing) i.e., not valid xhtml.
  
  
-------------- next part --------------
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.447 loncom/xml/londefdef.pm:1.448
--- loncom/xml/londefdef.pm:1.447	Thu Sep 26 22:03:36 2013
+++ loncom/xml/londefdef.pm	Mon Sep 30 13:44:16 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.447 2013/09/26 22:03:36 raeburn Exp $
+# $Id: londefdef.pm,v 1.448 2013/09/30 13:44:16 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1732,7 +1732,7 @@
                             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
                             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
                             if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) {
-                                my $cleanhref = &Apache::londefdef::clean_docs_httpref($linkurl,$url,$cdom,$cnum);
+                                my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum);
                                 if ($cleanhref) {
                                     &Apache::lonxml::extlink($cleanhref);
                                 }
@@ -3619,20 +3619,20 @@
                 } else {
                     $currentstring = $token->[4];
                 }
-                if (($url !~ m{^https?://}) && ($env{'request.course.id'})) {
-                    my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
-                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                    if ($url =~ m{^([^/]|/uploaded/)}) {
-                        my $cleanhref = &Apache::londefdef::clean_docs_httpref($url,$docuri,$cdom,$cnum);
-                        if ($cleanhref) {
-                            &Apache::lonxml::extlink($cleanhref);
-                        }
-                    } elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) {
-                        if (!&Apache::lonnet::allowed('bre',$url)) {
-                            if (&Apache::lonnet::is_on_map($url)) {
-                                &Apache::lonxml::extlink($url);
-                            }
+            }
+            if (($url !~ m{^https?://}) && ($env{'request.course.id'})) {
+                my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
+                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                if ($url =~ m{^([^/]|/uploaded/)}) {
+                    my $cleanhref = &clean_docs_httpref($url,$docuri,$cdom,$cnum);
+                    if ($cleanhref) {
+                        &Apache::lonxml::extlink($cleanhref);
+                    }
+                } elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) {
+                    if (!&Apache::lonnet::allowed('bre',$url)) {
+                        if (&Apache::lonnet::is_on_map($url)) {
+                            &Apache::lonxml::extlink($url);
                         }
                     }
                 }
@@ -4612,8 +4612,17 @@
                 return $cleanhref;
             }
         } else {
-            (my $path,$fname) = ($href =~ m{^(.+)/([^/]*)$});
-            $hrefpath = $relpath.$path;
+            if ($href =~ m{/}) {  
+                (my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$});
+                $hrefpath = $relpath.$path;
+                if ($path eq '') {
+                    $hrefpath =~ s{/$}{};
+                }
+            } else {
+                $fname = $href;
+                $hrefpath = $relpath;
+                $hrefpath =~ s{/$}{};
+            }
         }
         if ($fname ne '') {
             my $cleanrelpath;
@@ -4625,11 +4634,10 @@
                     $cleanrelpath .= $dir.'/';
                 }
             }
-            $cleanrelpath =~ s{/$}{};
             if ($cleanrelpath ne '') {
-                $cleanhref = $prefix.'/'.$cleanrelpath.'/'.$fname;
+                $cleanhref = $prefix.$cleanrelpath.$fname;
             } else {
-                $cleanhref = $prefix.'/'.$fname;
+                $cleanhref = $prefix.$fname;
             }
         }
     }
Index: loncom/xml/scripttag.pm
diff -u loncom/xml/scripttag.pm:1.167 loncom/xml/scripttag.pm:1.168
--- loncom/xml/scripttag.pm:1.167	Thu Sep 26 22:03:36 2013
+++ loncom/xml/scripttag.pm	Mon Sep 30 13:44:16 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.167 2013/09/26 22:03:36 raeburn Exp $
+# $Id: scripttag.pm,v 1.168 2013/09/30 13:44:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,29 +129,31 @@
       if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
 	  $result = $token->[4];
 	  $result.=$bodytext;
-          if ($type eq "text/javascript") {
-              my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
-              my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
-              my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-              my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-              if ($src =~ /\.js$/) {
-                  if ($src !~ m{^(/|https?://)}) {
-                      my $cleanhref = &Apache::londefdef::clean_docs_httpref($src,$url,$cdom,$cnum);
-                      if ($cleanhref) {
-                          &Apache::lonxml::extlink($cleanhref);
-                      }
+          my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+          my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+          my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+          my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+          if ($src ne '') {
+              if ($src !~ m{^(/|https?://)}) {
+                  my $cleanhref = &Apache::londefdef::clean_docs_httpref($src,$url,$cdom,$cnum);
+                  if ($cleanhref) {
+                      &Apache::lonxml::extlink($cleanhref);
                   }
-              } elsif (($src eq '') && ($bodytext ne '')) {
-                  if ($url =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E}) {
-                      if ($bodytext =~ m{\.set\w+(Src|Swf)\(["']}i) {
-                          my @srcs = split(/\.set/,$bodytext);
-                          if (@srcs > 1) {
-                              foreach my $item (@srcs) {
-                                  if ($item =~ m{^(?:FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\(['"])([^$1]+)$1\)}is) {
-                                      my $cleanhref = &Apache::londefdef::clean_docs_httpref($2,$url,$cdom,$cnum);
-                                      if ($cleanhref) {
-                                          &Apache::lonxml::extlink($cleanhref);
-                                      }
+              }
+          } elsif (($type eq 'text/javascript') && ($bodytext ne '')) {
+              if ($url =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E}) {
+                  if ($bodytext =~ m{\.set\w+(Src|Swf)\(["']}i) {
+                      my @srcs = split(/\.set/,$bodytext);
+                      if (scalar(@srcs) > 1) {
+                          foreach my $item (@srcs) {
+                              if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) {
+                                  my $srctype = $1;
+                                  my $quote = $2;
+                                  
+                                  my ($fname) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E}); 
+                                  my $cleanhref = &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum);
+                                  if ($cleanhref) {
+                                      &Apache::lonxml::extlink($cleanhref);
                                   }
                               }
                           }

From bisitz at source.lon-capa.org  Mon Sep 30 13:42:18 2013
From: bisitz at source.lon-capa.org (bisitz)
Date: Mon, 30 Sep 2013 17:42:18 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /imspackages imsimport.pm
	imsimportdocs.pm /localize/localize de.pm
Message-ID: <cvsbisitz1380562938@cvsserver>

bisitz		Mon Sep 30 17:42:18 2013 EDT

  Modified files:              
    /loncom/imspackages	imsimport.pm imsimportdocs.pm 
    /loncom/localize/localize	de.pm 
  Log:
  - Internationalization and Localization:
      Added missing &mt() calls and added related phrases and translations to de.pm
  - Consistent wording and punctuation 
  - Consistent and improved layout using confirm_success and actionbox
  - Added error handling for failed IMS package upload
  
  
  
-------------- next part --------------
Index: loncom/imspackages/imsimport.pm
diff -u loncom/imspackages/imsimport.pm:1.44 loncom/imspackages/imsimport.pm:1.45
--- loncom/imspackages/imsimport.pm:1.44	Mon Sep 23 17:35:05 2013
+++ loncom/imspackages/imsimport.pm	Mon Sep 30 17:42:12 2013
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # 
-# $Id: imsimport.pm,v 1.44 2013/09/23 17:35:05 bisitz Exp $
+# $Id: imsimport.pm,v 1.45 2013/09/30 17:42:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -133,6 +133,20 @@
     $course_list = '"'.join('","', at crslist).'"';
     $$numcrs = @crslist;
 
+    my %lt = &Apache::lonlocal::texthash(
+                  sel    => 'Please select',
+                  impto  => 'Import topics only',
+                  imptpa => 'Import topics + posts (with author)',
+                  imptpn => 'Import topics + posts (no author)',
+                  enrst  => 'Enroll students only',
+                  enrall => 'Enroll all users',
+                  notreq => 'Not required',
+                  errao  => 'You must select one of the additional options when importing Discussion Boards.',
+                  errtd  => 'You must select a target course when importing Discussion Boards.',
+                  errap  => 'You must select one of the additional options when importing Enrollment.',
+                  errte  => 'You must select a target course when importing enrollment information.',
+                  errcc  => 'You must check at least one Content Type.',
+       );
     return <<"END_OF_TWO";
 
 function checkCourse() {
@@ -181,7 +195,7 @@
     step2Form.targetcourse.length = 0
     if (call == 'add') {
         step2Form.targetcourse.length = 0
-        step2Form.targetcourse.options[0] = new Option("Please Select","0",true,true)
+        step2Form.targetcourse.options[0] = new Option("$lt{'sel'}","0",true,true)
         for (var i=0; i<courseID_array.length; i++) {
             step2Form.targetcourse.options[i+1] = new Option(courseTitle_array[i],courseID_array[i],false,false)
         }
@@ -201,22 +215,22 @@
   opForm.elements[menu].length = 0
   if (opForm.elements[itemnum*2].checked == true) {
     if (caller == "board") {
-      opForm.elements[menu].options[0] = new Option("Select","-1",true,true)
-      opForm.elements[menu].options[1] = new Option("Import topics only","topics",true,true)
-      opForm.elements[menu].options[2] = new Option("Import topics + posts (with author)","allpost",true,true)
-      opForm.elements[menu].options[3] = new Option("Import topics + posts (no author)","allanon",true,true)
+      opForm.elements[menu].options[0] = new Option("$lt{'sel'}","-1",true,true)
+      opForm.elements[menu].options[1] = new Option("$lt{'impto'}","topics",true,true)
+      opForm.elements[menu].options[2] = new Option("$lt{'imptpa'}","allpost",true,true)
+      opForm.elements[menu].options[3] = new Option("$lt{'imptpn'}","allanon",true,true)
     }
     else { 
       if (caller == "users") {
         opForm.elements[menu].length = 0
-        opForm.elements[menu].options[0] = new Option("Select","-1",true,true)
-        opForm.elements[menu].options[1] = new Option("Enroll students only","students",true,true)
-        opForm.elements[menu].options[2] = new Option("Enroll all users","all",true,true)
+        opForm.elements[menu].options[0] = new Option("$lt{'sel'}","-1",true,true)
+        opForm.elements[menu].options[1] = new Option("$lt{'enrst'}","students",true,true)
+        opForm.elements[menu].options[2] = new Option("$lt{'enrall'}","all",true,true)
       }
     }
   }
   else {
-    opForm.elements[menu].options[0] = new Option("Not required","0",true,true)
+    opForm.elements[menu].options[0] = new Option("$lt{'notreq'}","0",true,true)
   }
   opForm.elements[menu].selectedIndex = 0
   if (numCrs > 0) {
@@ -234,7 +248,7 @@
       totcheck ++
       if (opForm.elements[2*i].name == "board") { 
         if (opForm.elements[2*i+1].selectedIndex == 0) {     
-          alert("You must select one of the additional options when importing Discussion Boards ")
+          alert("$lt{'errao'}")
           return false
         }
         if (numCrs == 0) {
@@ -243,14 +257,14 @@
         }
         else {
           if (opForm.targetcourse.selectedIndex == 0) {
-            alert("You must select a target course when importing Discussion Boards")
+            alert("$lt{'errtd'}")
             return false
           }
         }
       }
       if (opForm.elements[2*i].name == "users") {
         if (opForm.elements[2*i+1].selectedIndex == 0) {     
-          alert("You must select one of the additional options when importing Enrollment")
+          alert("$lt{'errap'}")
           return false
         }
         if (numCrs == 0) {
@@ -259,7 +273,7 @@
         }
         else {
           if (opForm.targetcourse.selectedIndex == 0) {
-            alert("You must select a target course when importing enrollment information")
+            alert("$lt{'errte'}")
             return false
           }
         }
@@ -267,7 +281,7 @@
     }
   }
   if (totcheck == 0) {
-    alert("You must check the Checkbox for at least one Content Type");
+    alert("$lt{'errcc'}");
     return false
   }
   return true
@@ -290,7 +304,7 @@
               &Apache::lonhtmlcommon::topic_bar(1,&mt('Specify the Course Management system used to create the package')).
         &mt('Choose the CMS used to create your IMS content package.').'&nbsp;&nbsp;
         <select name="source">
-         <option value="-1" selected="selected">Please select</option>
+         <option value="-1" selected="selected">'.&mt('Please select').'</option>
          <option value="bb5">Blackboard 5</option>
          <option value="bb6">Blackboard 6</option>
          <option value="angel5">ANGEL 5.5</option>
@@ -298,7 +312,7 @@
          <option value="webctvista4">WebCT Vista 4</option>
         </select><br />'."\n".
         &Apache::lonhtmlcommon::topic_bar(2,&mt('Create a directory where you will unpack your IMS package'))."\n".
-         &mt('Create a destination LON-CAPA directory in which to store the contents of the IMS package file.').'&nbsp;&nbsp;<input type="button" name="createdir" value="Create Directory" onclick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /><br /><br />
+         &mt('Create a destination LON-CAPA directory in which to store the contents of the IMS package file.').'&nbsp;&nbsp;<input type="button" name="createdir" value="'.&mt('Create Directory').'" onclick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /><br /><br />
           <input type="hidden" name="filename" value="'.$fn.'" />
           <input type="hidden" name="phase" value="three" />
           <input type="button" name="nextpage" value="'.&mt('Proceed').'" onclick="javascript:nextPage();" />&nbsp;&nbsp;&nbsp;&nbsp;
@@ -465,7 +479,11 @@
             $r->print($lt{'unpa'});
         }
     } else {
-        $r->print($lt{'proc'});
+        $r->print(
+            '<br />'.&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success($lt{'proc'},1)
+               .'<br />'.&mt('Error: [_1]',$unzip_result))
+        );
     }
 }
 
@@ -598,20 +616,32 @@
    
         &Apache::imsprocessor::build_structure($cms,'CSTR',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,$dirpath,$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems,\%randompicks);
 
-        $r->print("<h3>IMS import completed</h3>");
+        my $message =
+            &Apache::lonhtmlcommon::confirm_success(
+                &mt('IMS import completed'))
+           .'<br />'.$lt{'yims'}.' ';
 
         if ($cms eq 'angel5') {
-            $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], and [quant,_3,discussion board] have been created, and [quant,_4,file] copied.',$total{seq},$total{page},$total{board},$total{file})."\n");
+            $message .= &mt('A total of [quant,_1,sequence], [quant,_2,composite page], and [quant,_3,discussion board] have been created, and [quant,_4,file] copied.',$total{seq},$total{page},$total{board},$total{file})."\n";
         } else {
-            $r->print($lt{'yims'}.' '.&mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,discussion board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n");
+            $message .= &mt('A total of [quant,_1,sequence], [quant,_2,composite page], [quant,_3,discussion board], [quant,_4,quiz,quizzes], [quant,_5,survey], and [quant,_6,problem] have been created, and [quant,_7,file] copied.',$total{seq},$total{page},$total{board},$total{quiz},$total{surv},$total{prob},$total{file})."\n";
         }
-        $r->print('<br /><br />'.$lt{'plsv'}.' '.$lt{'tseq'}.'<br /><br />'.$lt{'tfin'}.'<br /><br /><a href="/priv/'.$udom.'/'.$uname.'/'.$dirpath.'/">'.$lt{'disp'}.'</a>');
+        $r->print(
+            '<br />'.&Apache::loncommon::confirmwrapper($message)
+           .'<p>'.$lt{'plsv'}.' '.$lt{'tseq'}.'</p>'
+           .'<p>'.$lt{'tfin'}.'</p>'
+           .&Apache::lonhtmlcommon::actionbox(
+                ['<a href="/priv/'.$udom.'/'.$uname.'/'.$dirpath.'/">'.$lt{'disp'}.'</a>'])
+        );
         my $londocroot = $r->dir_config('lonDocRoot');
         if ($destdir =~ m{^\Q$londocroot/priv/$udom/$uname/$dirpath\E}) {
             system (" rm -r -f $destdir/temp");
         }
     } elsif ($manifest_result eq 'nomanifest') {
-        $r->print($lt{'proc'});
+        $r->print(
+            '<br />'.&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success($lt{'proc'},1))
+        );
     }
 }
 
@@ -749,6 +779,12 @@
         my $flag = &Apache::lonupload::phasetwo($r,$fn,'imsimport');
         if ($flag eq 'ok') {
             &display_one($r,$fn,$fullpath,$formname_one);
+        } else {
+            $r->print(
+                '<br />'.&Apache::loncommon::confirmwrapper(
+                    &Apache::lonhtmlcommon::confirm_success(
+                        &mt('Error uploading IMS package'),1))
+            );
         }
     } elsif ( ($env{'form.phase'} eq 'three') || ($env{'form.phase'} eq 'four') ) {
         my $destdir = $env{'form.newdir'};
Index: loncom/imspackages/imsimportdocs.pm
diff -u loncom/imspackages/imsimportdocs.pm:1.31 loncom/imspackages/imsimportdocs.pm:1.32
--- loncom/imspackages/imsimportdocs.pm:1.31	Sat Jul 27 22:04:49 2013
+++ loncom/imspackages/imsimportdocs.pm	Mon Sep 30 17:42:12 2013
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: imsimportdocs.pm,v 1.31 2013/07/27 22:04:49 raeburn Exp $
+# $Id: imsimportdocs.pm,v 1.32 2013/09/30 17:42:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,9 +48,9 @@
                es => 'Enroll students only',
                ea => 'Enroll all users',
                nr => 'Not required',
-               id => 'You must select one of the additional options when importing Disussion Boards',
-               ie => 'You must select one of the additional options when importing Enrollment',
-               ct => 'You must check at least one Content Type', 
+               id => 'You must select one of the additional options when importing Discussion Boards.',
+               ie => 'You must select one of the additional options when importing Enrollment.',
+               ct => 'You must check at least one Content Type.', 
     );
     return <<"ENDJS";
 function setOptions(caller,itemnum) {
@@ -225,10 +225,11 @@
 
     if ($unzip_result ne 'ok') {
         $r->print(
-            '<p class="LC_warning">'
-           .&mt('Processing of your IMS package failed because the file you'
-               .' uploaded could not be unzipped.')
-           .'</p>'
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Processing of your IMS package failed because the file you'
+                       .' uploaded could not be unzipped.'),1)
+           .'<br />'.&mt('Error: [_1]',$unzip_result))
         );
         return();
     }
@@ -239,9 +240,10 @@
                            \%resinfo,'choose',\%includedres,\%includeditems);
     if ($manifest_result ne 'ok') {
         $r->print(
-           '<p class="LC_warning">'
-          .&mt('Unpacking of your IMS package failed because an IMS manifest file was not located in the package.')
-          .'</p>'
+            '<br />'.&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Unpacking of your IMS package failed because an IMS manifest file'
+                       .' was not located in the package.'),1))
         );
         return();
     }
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.546 loncom/localize/localize/de.pm:1.547
--- loncom/localize/localize/de.pm:1.546	Fri Sep 27 13:55:14 2013
+++ loncom/localize/localize/de.pm	Mon Sep 30 17:42:18 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.546 2013/09/27 13:55:14 bisitz Exp $
+# $Id: de.pm,v 1.547 2013/09/30 17:42:18 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -11685,6 +11685,9 @@
    'Directory'
 => 'Verzeichnis',
 
+   'Create Directory'
+=> 'Verzeichnis erstellen',
+
    'Only empty directories may be deleted.'
 => 'Es k??nnen nur leere Verzeichnisse gel??scht werden.',
 
@@ -15729,6 +15732,9 @@
    'Error uploading new folder.'
 => 'Fehler beim Hochladen des neuen Verzeichnisses.',
 
+   'Error uploading IMS package'
+=> 'Fehler beim Hochladen des IMS-Pakets',
+
    'Error reading contents of parent folder.'
 => 'Fehler beim Lesen der Inhalte des ??bergeordneten Verzeichnisses.',
 
@@ -23323,7 +23329,7 @@
 => 'Erstellung eines Verzeichnisses, in dem Sie Ihr IMS-Paket entpacken k??nnen',
 
    'Display new directory'
-=> 'Neues Verzeichnis anzeigen',
+=> 'Das neue Verzeichnis anzeigen',
 
    'Enter the name of the new directory where you will store the contents of your IMS package.'
 => 'Geben Sie den Namen des neuen Verzeichnisses ein, in dem die Inhalte Ihres IMS-Pakets gespeichert werden sollen.',
@@ -23347,7 +23353,7 @@
 => 'Bitte [_1]erneut starten[_2].',
 
    'Please view the imported items and use the LON-CAPA editing tools to make changes.'
-=> 'Bitte schauen Sie sich die importieren Elemente an und verwenden Sie die in LON-CAPA integrierten Bearbeitungswerkzeuge, um ggf. ??nderungen vorzunehmen.',
+=> 'Bitte schauen Sie sich die importierten Elemente an und verwenden Sie die in LON-CAPA integrierten Bearbeitungswerkzeuge, um ggf. ??nderungen vorzunehmen.',
 
    'Sorry, your authentication has expired.'
 => 'Ihre Authentifizierung ist abgelaufen.',
@@ -25285,15 +25291,21 @@
    'Import topics only'
 => 'Nur Themen importieren',
 
-   'You must check at least one Content Type'
+   'You must check at least one Content Type.'
 => 'Sie m??ssen mindestens einen Inhaltstypen ausw??hlen.',
 
-   'You must select one of the additional options when importing Disussion Boards'
+   'You must select one of the additional options when importing Discussion Boards.'
 => 'Um Diskussionsforen importieren zu k??nnen, m??ssen Sie eine der zus??tzlichen Optionen ausw??hlen.',
 
-   'You must select one of the additional options when importing Enrollment'
+   'You must select one of the additional options when importing Enrollment.'
 => 'Um Kursbelegungen importieren zu k??nnen, m??ssen Sie eine der zus??tzlichen Optionen ausw??hlen.',
 
+   'You must select a target course when importing enrollment information.'
+=> 'Um Kursbelegungs-Informationen importieren zu k??nnen, m??ssen Sie eine der zus??tzlichen Optionen ausw??hlen.',
+
+   'You must select a target course when importing Discussion Boards.'
+=> 'Um Diskussionsforen importieren zu k??nnen, m??ssen Sie einen Zielkurs ausw??hlen.',
+
    'Other css'
 => 'Anderes CSS',
 
@@ -27613,7 +27625,7 @@
 => 'erwartete Version',
 
    'IMS Upload'
-=> 'IMS-Hochladen',
+=> 'IMS-Paket hochladen',
 
    'Upload Content'
 => 'Inhalt hochladen',
@@ -28053,6 +28065,9 @@
    'You do not have active course coordinator status in any LON-CAPA courses currently, so discussion boards and enrollment information included in your IMS package will be discarded, regardless of your import choice for these two items above (step 3).'
 => 'Sie haben in keinem LON-CAPA-Kurs eine aktive Kurs-Koordinatoren-Rolle. Daher werden Diskussionsforen und Kursbelegungs-Informationen in Ihrem IMS-Paket verworfen, unabh??ngig von Ihrer getroffenen Import-Auswahl f??r diese beiden Elemente (Schritt 3).',
 
+   'IMS import completed'
+=> 'IMS-Import abgeschlossen',
+
 #SYNCMARKER
 );
 1;

From raeburn at source.lon-capa.org  Mon Sep 30 20:52:58 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 01 Oct 2013 00:52:58 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /xml scripttag.pm
Message-ID: <cvsraeburn1380588778@cvsserver>

raeburn		Tue Oct  1 00:52:58 2013 EDT

  Modified files:              
    /loncom/xml	scripttag.pm 
  Log:
  - Support for Camtasia 8.1 file uploaded directly to a course. 
  
  
Index: loncom/xml/scripttag.pm
diff -u loncom/xml/scripttag.pm:1.168 loncom/xml/scripttag.pm:1.169
--- loncom/xml/scripttag.pm:1.168	Mon Sep 30 13:44:16 2013
+++ loncom/xml/scripttag.pm	Tue Oct  1 00:52:58 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.168 2013/09/30 13:44:16 raeburn Exp $
+# $Id: scripttag.pm,v 1.169 2013/10/01 00:52:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,11 +149,41 @@
                               if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) {
                                   my $srctype = $1;
                                   my $quote = $2;
-                                  
                                   my ($fname) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E}); 
-                                  my $cleanhref = &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum);
+                                  my $cleanhref =
+                                      &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum);
                                   if ($cleanhref) {
                                       &Apache::lonxml::extlink($cleanhref);
+                                      if ($srctype eq 'ConfigurationSrc') {
+                                          if ($cleanhref =~ m{^(.+/)configuration_express\.xml$}) {
+#
+# Camtasia 8.1: express_show/spritesheet.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so call lonxml::extlink() here to include httpref for the uploaded file.
+# (where <main> is name user gave to file/archive).
+#
+
+                                              my $spritesheet = $1.'express_show/spritesheet.png';
+                                              if (&Apache::lonnet::repcopy_userfile($spritesheet) eq 'ok') {
+                                                  &Apache::lonxml::extlink($spritesheet);
+                                              }
+                                          }
+                                      } elsif ($srctype eq 'PosterImageSrc') {
+                                          if ($fname =~ m{^(.+)_First_Frame\.png$}) {
+                                              my $prefix = $1;
+                                              my ($path) = ($cleanhref =~ m{^(.+/)\Q$fname\E});
+#
+# Camtasia 8.1: <main>_Thumbnails.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so call lonxml::extlink() here to include httpref for the uploaded file
+# (where <main> is name user gave to file/archive).
+#
+                                              my $thumbnail = $path.$prefix.'_Thumbnails.png';
+                                              if (&Apache::lonnet::repcopy_userfile($thumbnail) eq 'ok') {
+                                                  &Apache::lonxml::extlink($thumbnail);
+                                              }
+                                          }
+                                      }
                                   }
                               }
                           }



From raeburn at source.lon-capa.org  Tue Oct  1 10:05:16 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 01 Oct 2013 14:05:16 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) / startup.pl
Message-ID: <cvsraeburn1380636316@cvsserver>

raeburn		Tue Oct  1 14:05:16 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	startup.pl 
  Log:
  - For 2.11
    - Reverse changes in 1.41.2.1.  lonhtmlgateway.pm, lonwshlist.pm and
      lonwishlistdisplay.pm all now included in 2.11
  
  
Index: loncom/startup.pl
diff -u loncom/startup.pl:1.41.2.1 loncom/startup.pl:1.41.2.2
--- loncom/startup.pl:1.41.2.1	Tue May 15 22:46:07 2012
+++ loncom/startup.pl	Tue Oct  1 14:05:16 2013
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: startup.pl,v 1.41.2.1 2012/05/15 22:46:07 raeburn Exp $
+# $Id: startup.pl,v 1.41.2.2 2013/10/01 14:05:16 raeburn Exp $
 
 BEGIN {
     eval "use Apache2::compat();";
@@ -92,6 +92,7 @@
 use Apache::londefdef();
 use Apache::londocs();
 use Apache::lonhtmlcommon();
+use Apache::lonhtmlgateway();
 use Apache::lonmsg();
 use Apache::lonmysql();
 use Apache::lonpercentage();
@@ -113,6 +114,8 @@
 use Apache::lonuploadedacc();
 use Apache::lonwrapper();
 use Apache::admannotations();
+use Apache::lonwishlist();
+use Apache::lonwishlistdisplay();
 use Apache::style();
 use Apache::lontex();
 use Apache::matchresponse();



From bisitz at source.lon-capa.org  Tue Oct  1 10:52:54 2013
From: bisitz at source.lon-capa.org (bisitz)
Date: Tue, 01 Oct 2013 14:52:54 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface/statistics
	lonproblemanalysis.pm /localize/localize de.pm
Message-ID: <cvsbisitz1380639174@cvsserver>

bisitz		Tue Oct  1 14:52:54 2013 EDT

  Modified files:              
    /loncom/interface/statistics	lonproblemanalysis.pm 
    /loncom/localize/localize	de.pm 
  Log:
  - Internationalization and localization of labels in statistical graphs
  - Improved quantity in result phrases about correct and incorrect submissions
  - Added missing phrases and translations to de.pm
  
  
  
-------------- next part --------------
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.143 loncom/interface/statistics/lonproblemanalysis.pm:1.144
--- loncom/interface/statistics/lonproblemanalysis.pm:1.143	Mon Dec 17 03:51:02 2012
+++ loncom/interface/statistics/lonproblemanalysis.pm	Tue Oct  1 14:52:47 2013
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.143 2012/12/17 03:51:02 raeburn Exp $
+# $Id: lonproblemanalysis.pm,v 1.144 2013/10/01 14:52:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -400,10 +400,13 @@
         if ($max <$_) { $max = $_; last; }
     }
     #
-    my $title = &mt('Percent Difference');
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Percent Difference',
+                 'xlabel' => 'Percent Difference from Correct',
+                 'ylabel' => 'Percent of Answers');
     my @labels = (1..scalar(@bins)-1);
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'Percent Difference from Correct','Percent of Answers',
+        ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
          $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
          {xskip=>1});
     #
@@ -473,10 +476,13 @@
         if ($max <$_) { $max = $_; last; }
     }
     #
-    my $title = &mt('Difference between submission and correct');
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Difference between submission and correct',
+                 'xlabel' => 'Difference from Correct',
+                 'ylabel' => 'Percent of Answers');
     my @labels = (1..scalar(@bins)-1);
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'Difference from Correct','Percent of Answers',
+        ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
          $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
          {xskip=>1});
     #
@@ -858,8 +864,8 @@
             $no_data_text, at extra_data);
         if ($env{'form.AnalyzeOver'} eq 'tries') {
             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
-            $correct_foil_title = 'Attempt '.$plot_num;
-            $incorrect_foil_title = 'Attempt '.$plot_num;
+            $correct_foil_title = &mt('Attempt [_1]',$plot_num);
+            $incorrect_foil_title = &mt('Attempt [_1]',$plot_num);
             $pre_graph_text = 
                 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
             $post_graph_text = '';
@@ -917,8 +923,9 @@
         # Concept Plot
         my $concept_plot = '';
         if (scalar(@$concepts) > 1) {
+            my $title = &mt('Correct Concepts');
             $concept_plot = &RR_concept_plot($concepts,$foil_choice_data,
-                                             'Correct Concepts');
+                                             $title);
         }
         # % Choosing plot
         my $choice_plot = &RR_create_percent_selected_plot
@@ -1033,10 +1040,11 @@
     for (my $i=0;$i<=$#correct;$i++) { 
         $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
     }
-    my $xlabel = 'concept';
+    my $xlabel = &mt('concept');
+    my $ylabel = &mt('Percent Choosing');
     my $plot=  &Apache::loncommon::DrawBarGraph($title,
                                                 $xlabel,
-                                                'Percent Choosing',
+                                                $ylabel,
                                                 100,
                                                 ['#33ff00','#ff3300'],
                                                 undef,
@@ -1102,10 +1110,11 @@
         @labels = (1 .. scalar(@correct));
     }
     #
-    my $xlabel = 'foil chosen';
+    my $xlabel = &mt('foil chosen');
+    my $ylabel = &mt('Percent Choosing');
     my $plot=  &Apache::loncommon::DrawBarGraph($title,
                                                 $xlabel,
-                                                'Percent Choosing',
+                                                $ylabel,
                                                 100,
                                                 ['#33ff00','#ff3300'],
                                                 \@labels,
@@ -1166,8 +1175,10 @@
         push(@empty_row,0);
     }
     #
+    my $xlabel = &mt('Correct Foil');
+    my $ylabel = &mt('foils chosen Incorrectly');
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'Correct Foil','foils chosen Incorrectly',
+        ($title,$xlabel,$ylabel,
          100,$plotcolors,\@labels,\@empty_row, at dataset);
     return ($graph,\%count_per_foil);
 }
@@ -1363,8 +1374,12 @@
                 }
             }
             #
+            my %lt = &Apache::lonlocal::texthash(
+                         'title'  => 'Correct Concepts',
+                         'xlabel' => 'Concept Number',
+                         'ylabel' => 'Percent Correct');
             $concept_graph = &Apache::loncommon::DrawBarGraph
-                ('Correct Concepts','Concept Number','Percent Correct',
+                ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
                  100,$plotcolors,undef,\@concept_plot_data,{xskip=>1});
         }
         #
@@ -1402,8 +1417,12 @@
             push(@Labels,'');
         }
         #
+       my %lt = &Apache::lonlocal::texthash(
+                    'title'  => 'Correct Statements',
+                    'xlabel' => 'Statement',
+                    'ylabel' => '% Answered Correct');
         my $correct_graph = &Apache::loncommon::DrawBarGraph
-            ('Correct Statements','Statement','% Answered Correct',
+            ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
              100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1});
         
         #
@@ -1414,8 +1433,12 @@
         }
         my $count = $response_data{'_total'}->[$try] - 
                                            $response_data{'_correct'}->[$try];
+        %lt = &Apache::lonlocal::texthash(
+                  'title'  => 'Incorrect Statements',
+                  'xlabel' => 'Statement',
+                  'ylabel' => '% Chosen Incorrectly');
         my $incorrect_graph = &Apache::loncommon::DrawBarGraph
-            ('Incorrect Statements','Statement','% Chosen Incorrectly',
+            ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
              100,$plotcolors,\@Labels, at Datasets,{xskip=>1});
         $analysis_html.= 
             '<tr><td colspan="4" align="center">'.
@@ -1477,10 +1500,11 @@
     if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
     #
     if ($num_concepts < 2) {
-        $table = '<h3>'.
-                 &mt('Not enough data for concept analysis.').' '.
-                 &mt('Performing Foil Analysis').
-                 '</h3>'.$table;
+        $table = '<p class="LC_info">'.
+                 &mt('Not enough data for concept analysis.'.
+                     ' Performing Foil Analysis instead.').
+                 '</p>'.
+                 $table;
     }
     #
     my $num_plots = $env{'form.NumPlots'};
@@ -1537,7 +1561,7 @@
         $correct |= 0;
         ##
         $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
-            &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect',
+            &mt('[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect',
                 $data_count,$student_count,$correct,$data_count-$correct).
                 '</font></td></tr>'.$/;
         my $concept_correct_plot = '';
@@ -1609,9 +1633,13 @@
     }
     #
     # Create the plot
-    my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements',
-                                                        'Statement Number',
-                                                        'Percent Correct',
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Correct Statements',
+                 'xlabel' => 'Statement Number',
+                 'ylabel' => 'Percent Correct');
+    my $correct_plot = &Apache::loncommon::DrawBarGraph($lt{'title'},
+                                                        $lt{'xlabel'},
+                                                        $lt{'ylabel'},
                                                         100,
                                                         $plotcolors,
                                                         undef,
@@ -1620,10 +1648,14 @@
     for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
         $plotdata[0]->[$j]=0;
     }
+    %lt = &Apache::lonlocal::texthash(
+              'title'  => 'Incorrect Statements',
+              'xlabel' => 'Statement Number',
+              'ylabel' => 'Incorrect Option Choice');
     my $incorrect_plot = 
-        &Apache::loncommon::DrawBarGraph('Incorrect Statements',
-                                         'Statement Number',
-                                         'Incorrect Option Choice',
+        &Apache::loncommon::DrawBarGraph($lt{'title'},
+                                         $lt{'xlabel'},
+                                         $lt{'ylabel'},
                                          100,
                                          $plotcolors,
                                          undef,
@@ -1652,9 +1684,13 @@
     }
     #
     # Create the plot
-    return &Apache::loncommon::DrawBarGraph('Correct Concepts',
-                                            'Concept Number',
-                                            'Percent Correct',
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Correct Concepts',
+                 'xlabel' => 'Concept Number',
+                 'ylabel' => 'Percent Correct');
+    return &Apache::loncommon::DrawBarGraph($lt{'title'},
+                                            $lt{'xlabel'},
+                                            $lt{'ylabel'},
                                             100,
                                             $plotcolors,
                                             undef,
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.547 loncom/localize/localize/de.pm:1.548
--- loncom/localize/localize/de.pm:1.547	Mon Sep 30 17:42:18 2013
+++ loncom/localize/localize/de.pm	Tue Oct  1 14:52:53 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.547 2013/09/30 17:42:18 bisitz Exp $
+# $Id: de.pm,v 1.548 2013/10/01 14:52:53 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3003,7 +3003,7 @@
 => 'Analysieren: [_1] [_2]',
 
    'Analyze Problem'
-=> 'Analysiere Aufgabe',
+=> 'Aufgabe analysieren',
 
    'Analyze Problem Again'
 => 'Aufgabe erneut analysieren',
@@ -24747,8 +24747,8 @@
    'Maximum number of coinciding values: [_1]'
 => 'Maximale Anzahl an ??bereinstimmenden Werten: [_1]',
 
-   'Not enough data for concept analysis.'
-=> 'Nicht genug Daten f??r Konzeptanalyse vorhanden',
+   'Not enough data for concept analysis. Performing Foil Analysis instead.'
+=> 'Es liegen nicht gen??gend Daten f??r eine Konzeptanalyse vor. Stattdessen wird eine Analyse der Auswahlm??glichkeiten ausgef??hrt.',
 
    'Percent Difference'
 => 'Prozent Unterschied',
@@ -24762,6 +24762,9 @@
    '[_1] submissions from [_2] students, [_3] correct, [_4] incorrect'
 => '[_1] Einreichungen von [_2] Studierenden, [_3] korrekt, [_4] inkorrekt',
 
+   '[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect'
+=> '[quant,_1,Einreichung,Einreichungen,Keine Einreichungen] von [quant,_2,Student/in,Studierenden,Studierenden], [_3] korrekt, [_4] inkorrekt',
+
    'correct foil chosen'
 => 'korrekte Auswahlm??glichkeit ausgew??hlt',
 
@@ -26745,9 +26748,6 @@
    'To complete the transaction you [_1]must confirm[_2] you want to [_3]process the change[_4] to [_5].'
 => 'Um die Transaktion abzuschlie??en, [_1]m??ssen Sie best??tigen[_2], dass Sie [_3]die ??nderung in [_5] vornehmen[_4] m??chten.',
 
-   'Performing Foil Analysis'
-=> 'Analyse der Auswahlm??glichkeiten wird ausgef??hrt',
-
    'Student Submission Data'
 => 'Studentische Einreichungsdaten',
 
@@ -28068,6 +28068,62 @@
    'IMS import completed'
 => 'IMS-Import abgeschlossen',
 
+
+#SYNC Tue Oct  1 14:39:03 2013
+   'Attempt [_1]'
+=> 'Versuch [_1]',
+
+   '% Answered Correct'
+=> '% korrekte Antworten',
+
+   '% Chosen Incorrectly'
+=> '% falsch gew??hlt',
+
+   'Correct Concepts'
+=> 'Korrekte Konzepte',
+
+   'Correct Foil'
+=> 'Korrekte Ausw.-m??gl.',
+
+   'Statement'
+=> 'Angabe',
+
+   'Statement Number'
+=> 'Nummer der Angabe',
+
+   'Correct Statements'
+=> 'Korrekte Angaben',
+
+   'Incorrect Statements'
+=> 'Inkorrekte Angaben',
+
+   'Difference from Correct'
+=> 'Unterschiede zu korrekt',
+
+   'Incorrect Option Choice'
+=> 'Inkorrekte Optionsauwahl',
+
+   'Percent Choosing'
+=> 'Prozent ausgew??hlt',
+
+   'Percent Correct'
+=> 'Prozent korrekt',
+
+   'Percent Difference from Correct'
+=> 'Prozent Unterschied zu korrekt',
+
+   'Percent of Answers'
+=> 'Prozent an Antworten',
+
+   'concept'
+=> 'Konzept',
+
+   'foil chosen'
+=> 'gew??hlte Ausw.-m??gl.',
+
+   'foils chosen Incorrectly'
+=> 'inkorrekt gew??hlte Ausw.-m??gl.',
+
 #SYNCMARKER
 );
 1;

From bisitz at source.lon-capa.org  Tue Oct  1 13:52:10 2013
From: bisitz at source.lon-capa.org (bisitz)
Date: Tue, 01 Oct 2013 17:52:10 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface/statistics
	lonproblemstatistics.pm /localize/localize de.pm
Message-ID: <cvsbisitz1380649930@cvsserver>

bisitz		Tue Oct  1 17:52:10 2013 EDT

  Modified files:              
    /loncom/interface/statistics	lonproblemstatistics.pm 
    /loncom/localize/localize	de.pm 
  Log:
  - Internationalization and localization of labels in and for statistical graphs
  - Use more descriptive "long_title" in plot graph option list if available
  - Improved quantity handling in compiling data phrase
  - Consistent styles (warning/info style, no headline)
  - XHTML: "selected"
  
  - Added missing phrases and translations to de.pm
  - Corrected some translations related to statistics
  - Consistent translation
  
  
  
-------------- next part --------------
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.122 loncom/interface/statistics/lonproblemstatistics.pm:1.123
--- loncom/interface/statistics/lonproblemstatistics.pm:1.122	Thu May  3 11:21:33 2012
+++ loncom/interface/statistics/lonproblemstatistics.pm	Tue Oct  1 17:52:03 2013
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.122 2012/05/03 11:21:33 goltermann Exp $
+# $Id: lonproblemstatistics.pm,v 1.123 2013/10/01 17:52:03 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,6 +74,14 @@
 ## header for plots created with Graph.pm, both of which more than likely do
 ## not support localization.
 ##
+## Additional Notes:
+## Localization can be done and is done before passing the phrases
+## to the output.
+## This might conflict with special characters, e.g. German Umlaute or
+## chinese characters. Do not use such characters in this case.
+## If this failed, consider that the sequence and folder names
+## are also passed to the output and would fail the same way.
+##
 #
 #
 ##
@@ -85,7 +93,7 @@
 ## title           yes      any scalar  This is what the user sees to identify
 ##                                      the field.  Passed through &mt().
 ## long_title      yes      any scalar  Used as graph heading and in excel
-##                                      output.  NOT translated
+##                                      output.  Passed through &mt().
 ## align           no    (left|right|center)  HTML cell contents alignment
 ## color           yes      html color  HTML cell background color
 ##                                      used to visually group statistics
@@ -275,7 +283,7 @@
              sortable  => 'yes',
              graphable => 'yes',
              long_title => 'Degree of Difficulty'.
-                           '[ 1 - ((#YES+#yes) / Tries) ]',
+                           ' { 1 - ((#YES+#yes) / Tries) }',
              selectable => 'yes',
              defaultselected => 'yes',
            },
@@ -759,11 +767,11 @@
             $count += scalar(@resources);
         }
         if ($count > 10) {
-            $r->print('<h2>'.
-                      &mt('Compiling statistics for [_1] problems',$count).
-                      '</h2>');
+            $r->print('<p>'.
+                      &mt('Compiling statistics for [quant,_1,problem]',$count).
+                      '</p>');
             if ($count > 30) {
-                $r->print('<h3>'.&mt('This will take some time.').'</h3>');
+                $r->print('<p class="LC_info">'.&mt('This will take some time.').'</p>');
             }
             $r->rflush();
         }
@@ -1007,15 +1015,15 @@
     my $title; my $yaxis;
     foreach my $field (@Fields) {
         next if ($field->{'name'} ne $datafield);
-        $title = $field->{'long_title'};
-        $yaxis = $field->{'title'};
+        $title = &mt($field->{'long_title'});
+        $yaxis = &mt($field->{'title'});
         last;
     }
     if ($title eq '' || $yaxis eq '') {
         # datafield is something we do not know enough about to plot
-        $r->print('<h3>'.
+        $r->print('<p class="LC_warning">'.
                   &mt('Unable to plot the requested statistic.').
-                  '</h3>');
+                  '</p>');
         return;
     }
     #
@@ -1042,7 +1050,7 @@
     }
     #
     $r->print("<p>".&Apache::loncommon::DrawBarGraph($title,
-                                                     'Problem Number',
+                                                     &mt('Problem Number'),
                                                      $yaxis,
                                                      $max,
                                                      undef, # colors
@@ -1107,10 +1115,14 @@
     my $diffdata .= '<data>'.join(',', at Labels).'</data>'.$/.
                     '<data>'.join(',', at Diff).'</data>'.$/;
     #
-    my $title = 'Degree of Discrimination\nand Degree of Difficulty';
+    my $title = &mt('Degree of Discrimination[_1]and Degree of Difficulty','\n');
     if ($xmax > 50) {
-        $title = 'Degree of Discrimination and Degree of Difficulty';
+        $title = &mt('Degree of Discrimination and Degree of Difficulty');
     }
+    my %lt = &Apache::lonlocal::texthash(
+        'alttag' => 'Degree of Discrimination and Degree of Difficulty Plot',
+        'xlabel' => 'Problem Number',
+    );
     #
     $plot=<<"END";
 <gnuplot 
@@ -1122,7 +1134,7 @@
     align="center"
     border="on"
     transparent="on"
-    alttag="Degree of Discrimination and Degree of Difficulty Plot"
+    alttag="$lt{'alttag'}"
     samples="100"
     bgcolor="xffffff"
     height="$height"
@@ -1133,7 +1145,7 @@
         box="off" />
     <title>$title</title>
     <axis xmin="0" ymin="$ymin" xmax="$xmax" ymax="$ymax" color="x000000" />
-    <xlabel>Problem Number</xlabel>
+    <xlabel>$lt{'xlabel'}</xlabel>
     <curve 
         linestyle="linespoints" 
         name="DoDisc" 
@@ -1195,11 +1207,16 @@
                           '<data>'.join(',', at Mean).'</data>'.$/.
                           '<data>'.join(',', at STD).'</data>'.$/;
     #
-    my $title = 'Mean and S.D. of Tries';
-    if ($xmax > 25) {
-        $title = 'Mean and Standard Deviation of Tries';
+    my $title = &mt('Mean and S.D. of Tries');
+    if ($xmax > 30) {
+        $title = &mt('Mean and Standard Deviation of Tries');
     }
     #
+    my %lt = &Apache::lonlocal::texthash(
+        'alttag' => 'Mean and S.D of Tries Plot',
+        'xlabel' => 'Problem Number',
+        'ylabel' => 'Number of Tries',
+    );
     $plot=<<"END";
 <gnuplot 
     texfont="10"
@@ -1210,15 +1227,15 @@
     align="center"
     border="on"
     transparent="on"
-    alttag="Mean and S.D of Tries Plot"
+    alttag="$lt{'alttag'}"
     samples="100"
     bgcolor="xffffff"
     height="$height"
     width="$width">
     <title>$title</title>
     <axis xmin="0" ymin="0" xmax="$xmax" ymax="$ymax" color="x000000" />
-    <xlabel>Problem Number</xlabel>
-    <ylabel>Number of Tries</ylabel>
+    <xlabel>$lt{'xlabel'}</xlabel>
+    <ylabel>$lt{'ylabel'}</ylabel>
     <curve 
         linestyle="yerrorbars"
         name="S.D. Tries" 
@@ -1243,6 +1260,7 @@
 
 sub plot_dropdown {
     my $current = '';
+    my $title;
     #
     if (defined($env{'form.plot'})) {
         $current = $env{'form.plot'};
@@ -1258,7 +1276,7 @@
     #
     my $Str= "\n".'<select name="plot" size="1">';
     $Str .= '<option name="none"></option>'."\n";
-    $Str .= '<option name="none2">none</option>'."\n";
+    $Str .= '<option name="none2">'.&mt('none').'</option>'."\n";
     foreach my $field (@Additional_Plots, at Fields) {
         if (! exists($field->{'graphable'}) ||
             $field->{'graphable'} ne 'yes') {
@@ -1266,9 +1284,11 @@
         }
         $Str .= '<option value="'.$field->{'name'}.'"';
         if ($field->{'name'} eq $current) {
-            $Str .= ' selected ';
+            $Str .= ' selected="selected"';
         }
-        $Str.= '>'.&mt($field->{'title'}).'</option>'."\n";
+        $title = &mt($field->{'long_title'});
+        $title = &mt($field->{'title'}) if (!$title);
+        $Str.= '>'.$title.'</option>'."\n";
     }
     $Str .= '</select>'."\n";
     return $Str;
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.548 loncom/localize/localize/de.pm:1.549
--- loncom/localize/localize/de.pm:1.548	Tue Oct  1 14:52:53 2013
+++ loncom/localize/localize/de.pm	Tue Oct  1 17:52:10 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.548 2013/10/01 14:52:53 bisitz Exp $
+# $Id: de.pm,v 1.549 2013/10/01 17:52:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2288,18 +2288,99 @@
    'waiting on'
 => 'warte auf',
 
+   'P#'
+=> 'P#', # ?
+
    '#Stdnts'
 => 'Anzahl Stud.',
 
+   'Number of Students Attempting Problem'
+=> 'Anzahl Studierender, die die Aufgabe versucht haben',
+
+   'Total Number of Tries'
+=> 'Gesamtanzahl an Versuchen',
+
    '#YES'
-=> 'Anz. JA',
+=> 'Anz. KORR.',
+
+   'Number of Students able to Solve'
+=> 'Anzahl Studierender, die loesen konnten', # gnuplot! Umlaute?!?
 
    '#yes'
-=> 'Anz. ja',
+=> 'Anz. korr.',
+
+   'Number of Students given Override'
+=> 'Anzahl Studierender, fuer die ueberschrieben wurde', # ?
 
    '%Wrng'
 => '%Falsch',
 
+   'Percent of students whose final answer is wrong'
+=> 'Prozent Studierender, deren endgueltige Antwort falsch ist', # gnuplot! Umlaute?!?
+
+   '#Items'
+=> 'Anz. El.',
+
+   'Number of Items in Sequence'
+=> 'Anzahl Elemente in Sequenz',
+
+   'Score Mean'
+=> 'Pkt.-Durchschn.',
+
+   'Count Mean'
+=> 'Anz. Durchschn.',
+
+   'Mean Sequence Score'
+=> 'Durchschnittliche Punkte der Sequenz',
+
+   'Score STD'
+=> 'Std.-Abw. Pkt.',
+
+   'Count STD'
+=> 'Anz. Std.-Abw.',
+
+   'Standard Deviation of Sequence Scores'
+=> 'Standardabweichung der Punkte in der Sequenz',
+
+   'Score Max'
+=> 'Max. Pkt.',
+
+   'Maximum Sequence Score'
+=> 'Maximale Punkte in der Sequenz',
+
+   'Score Min'
+=> 'Min. Pkt.',
+
+   'Minumum Sequence Score'
+=> 'Minimale Punkte in der Sequenz',
+
+   'Score N'
+=> 'Anz. St. Pkt.-Berech.',
+
+   'Count N'
+=> 'Anz. Stud.',
+
+   'Number of Students in score computations'
+=> 'Anzahl Studierender in Punkteberechnungen',
+
+   'Count Max'
+=> 'Max. Anz. korr.',
+
+   'Maximum Number of Correct Problems'
+=> 'Maximale Anzahl korrekter Aufgaben',
+
+   'Count Min'
+=> 'Min. Anz. korr.',
+
+   'Minumum Number of Correct Problems'
+=> 'Minimale Anzahl korrekter Aufgaben',
+
+   'KR-21'
+=> 'KR-21',
+
+   'KR-21 reliability statistic'
+=> 'KR-21-Reliabilit??ts-Statistik',
+
    'Brief view of each students performance in course.'
 => 'Kurze ??bersicht der Leistungen eines jeden Studierenden im Kurs.',
 
@@ -2313,7 +2394,10 @@
 => 'Ausf??hrliche Statistiken und Graphen der studentischen Leistung hinsichtlich der Aufgaben',
 
    'DoDiff'
-=> 'Verwende diff',
+=> 'Schw.-Grad',
+
+   'Degree of Difficulty { 1 - ((#YES+#yes) / Tries) }'
+=> 'Schwierigkeitsgrad { 1 - ((Anz. KORR. + Anz. korr.) / Anz. Vers.) }',
 
    'Enrollment Status'
 => 'Kursbelegungs-Status',
@@ -2322,10 +2406,10 @@
 => 'Statistiken erstellen',
 
    'Max Tries'
-=> 'Max. Anz. an Vers.',
+=> 'Max. Anz. Vers.',
 
    'Mean Tries'
-=> 'Mittl. Anz. Vers.',
+=> 'Durchschn. Anz. Vers.',
 
    'Output'
 => 'Ausgabe',
@@ -2351,6 +2435,9 @@
    'S.D. tries'
 => 'Std.-Abw. d. Vers.', # Standardabweichung der Versuche
 
+   'Standard Deviation of Number of Tries'
+=> 'Standardabweichung der Anzahl an Versuchen',
+
    'Sections'
 => 'Sektionen',
 
@@ -2366,6 +2453,9 @@
    'Skew Tries'
 => 'Schiefe d. Vers.',
 
+   'Skew of Number of Tries'
+=> 'Schiefe der Anzahl an Versuchen',
+
    'Statistics and Problem Analysis'
 => 'Statistiken und Aufgabenanalysen',
 
@@ -3090,7 +3180,7 @@
 => 'Weiter',
 
    'Number of Plots [_1]'
-=> 'Anzahl an Graphen: [_1]',
+=> 'Anzahl Graphen: [_1]',
 
    'Option Response Problem Analysis'
 => 'Analyse von option response-Aufgabe',
@@ -3735,7 +3825,7 @@
 => 'Probleme',
 
    'Produce Excel Output'
-=> 'Erstelle Excel-Ausgabe',
+=> 'Excel-Ausgabe erstellen',
 
    'Question Text'
 => 'Fragetext',
@@ -5732,6 +5822,9 @@
    'number of tries'
 => 'Anzahl der Versuche',
 
+   'Number of Tries'
+=> 'Anzahl der Versuche',
+
    'opening date'
 => 'Startdatum',
 
@@ -6756,7 +6849,7 @@
 => 'Aufgaben, die manuell bewertet werden m??ssen',
 
    '(Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2]) [_3] and total number of students with submissions &ge; [_4]'
-=> '(Aufgaben mit durchschnittlicher Anzahl an Versuchen &ge; [_1] oder Schwierigkeitsgrad &ge; [_2]) [_3] und insgesamte Anzahl an Studierenden, die etwas eingereicht haben &ge; [_4]',
+=> '(Aufgaben mit durchschnittlicher Anzahl an Versuchen &ge; [_1] oder Schwierigkeitsgrad &ge; [_2]) [_3] und insgesamte Anzahl Studierender, die etwas eingereicht haben &ge; [_4]',
 
    '(Problems with av. attempts &ge; [_1] or deg. difficulty &ge; [_2]) [_3] and total number of members with submissions &ge; [_4]'
 => '(Aufgaben mit durchschnittlicher Anzahl an Versuchen &ge; [_1] oder Schwierigkeitsgrad &ge; [_2]) [_3] und insgesamte Anzahl an Mitgliedern, die etwas eingereicht haben &ge; [_4]',
@@ -8281,7 +8374,7 @@
 => 'Aufgaben-Statistiken',
 
    'Statistics calculated for number of students'
-=> 'Statistiken berechnet f??r folgende Anzahl an Studierenden',
+=> 'Statistiken berechnet f??r folgende Anzahl Studierende',
 
    'Portfolio and Catalog Search'
 => 'Datenbank ver??ffentlichter Ressourcen und Portfolio-Dateien',
@@ -13006,9 +13099,24 @@
    'Degree of Difficulty'
 => 'Schwierigkeitsgrad',
 
+   'DoDisc'
+=> 'Grad d. Abgr.',
+
    'Degree of Discrimination'
 => 'Grad der Abgrenzung',
 
+   'Degree of Discrimination and Degree of Difficulty'
+=> 'Grad der Abgrenzung und Schwierigkeitsgrad',
+
+   'Degree of Discrimination[_1]and Degree of Difficulty'
+=> 'Grad der Abgrenzung[_1]und Schwierigkeitsgrad',
+
+   'Degree of Discrimination and Degree of Difficulty Plot'
+=> 'Grad-der-Abgrenzung- und Schwierigkeitsgrad-Plot',
+
+   'Problem Number'
+=> 'Nummer der Aufgabe',
+
    'Time of computation'
 => 'Zeitpunkt der Berechnung',
 
@@ -15438,6 +15546,12 @@
    'Weight (weight)'
 => 'Gewichtung (weight)',
 
+   'weight'
+=> 'Aufg.-Gew.',
+
+   'Problem weight (for instructor)'
+=> 'Aufgaben-Gewichtung (f??r Dozent)',
+
    'Weight'
 => 'Aufgaben-Gewichtung',
 
@@ -18975,7 +19089,10 @@
 => 'Nachrichten und Benachrichtigungen',
 
    'Min Tries'
-=> 'Min Versuche',
+=> 'Min. Anz. Vers.',
+
+   'Minumum Number of Tries'
+=> 'Minimale Anzahl an Versuchen',
 
    'Modify course configuration'
 => 'Kurskonfiguration ??ndern',
@@ -19280,6 +19397,9 @@
    '#Wrng'
 => 'Anz. Falsch',
 
+   'Number of students whose final answer is wrong'
+=> 'Anzahl Studierender, deren endgueltige Antwort falsch ist', # gnuplot! Umlaute?!?
+
    'Reset times on a single folder/map, resource or the course for a section or the whole class.'
 => 'Zeiten f??r ein einzelnes Verzeichnis/Inhaltszusammenstellung, eine Ressource oder den ganzen Kurs f??r eine Sektion oder den gesamten Kurs zur??cksetzen.',
 
@@ -22708,7 +22828,7 @@
 => 'Slots verwalten',
 
    'Maximum number of students allowed in this slot:&nbsp;&nbsp;&nbsp;'
-=> 'Maximale Anzahl an erlaubten Studierenden in diesem Slot:&nbsp;&nbsp;&nbsp;',
+=> 'Maximale Anzahl erlaubter Studierender in diesem Slot:&nbsp;&nbsp;&nbsp;',
 
    'Name: &nbsp;&nbsp;&nbsp;'
 => 'Name: &nbsp;&nbsp;&nbsp;',
@@ -24771,8 +24891,8 @@
    'correct option chosen'
 => 'korrekte Option ausgew??hlt',
 
-   'Compiling statistics for [_1] problems'
-=> 'Erstelle Statistik f??r [_1] Aufgaben',
+   'Compiling statistics for [quant,_1,problem]'
+=> 'Erstelle Statistik f??r [quant,_1,Aufgabe,Aufgaben]',
 
    'It may take some time to update the student data.'
 => 'Es kann einige Zeit dauern, bis die studentischen Daten aktualisiert sind.',
@@ -24844,7 +24964,7 @@
 => 'Interner Fehler',
 
    'The number of students matching the selection criteria is too few for display of submission data for anonymous surveys.'
-=> 'Die Anzahl an Studierenden, auf die die gew??hlte Auswahl zutrifft, ist zu gering, um Einreichungsdaten f??r anonyme Umfragen anzuzeigen.',
+=> 'Die Anzahl Studierender, auf die die gew??hlte Auswahl zutrifft, ist zu gering, um Einreichungsdaten f??r anonyme Umfragen anzuzeigen.',
 
    'There must be at least [quant,_1,student].'
 => 'Es sind mindestens [quant,_1,Student/in,Studierende] notwendig.',
@@ -27165,6 +27285,9 @@
    'tries/correct'
 => 'Versuche/korrekt',
 
+   'Tries per Correct Answer'
+=> 'Versuche pro korrekter Antwort',
+
    'Choose single CODE from list:'
 => 'Einzelnen CODE aus Liste ausw??hlen:',
 
@@ -28124,6 +28247,15 @@
    'foils chosen Incorrectly'
 => 'inkorrekt gew??hlte Ausw.-m??gl.',
 
+   'Mean and S.D. of Tries'
+=> 'Durchschn. u. Std.-Abw. d. Vers.', # Standardabweichung der Versuche
+
+   'Mean and Standard Deviation of Tries'
+=> 'Durchschnitt und Standardabweichung der Versuche',
+
+   'Mean and S.D of Tries Plot'
+=> 'Durchschn.- u. Std.-Abw.-d.-Vers.-Plot',
+
 #SYNCMARKER
 );
 1;

From bisitz at source.lon-capa.org  Wed Oct  2 11:44:17 2013
From: bisitz at source.lon-capa.org (bisitz)
Date: Wed, 02 Oct 2013 15:44:17 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /localize/localize de.pm
Message-ID: <cvsbisitz1380728657@cvsserver>

bisitz		Wed Oct  2 15:44:17 2013 EDT

  Modified files:              
    /loncom/localize/localize	de.pm 
  Log:
  Added missing phrases and translations for 2.11.0 (bug #6632), related to update from 30.08.2013
  - loncom_interface_domainprefs.pm ("set to" messages skipped)
  
  
  
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.549 loncom/localize/localize/de.pm:1.550
--- loncom/localize/localize/de.pm:1.549	Tue Oct  1 17:52:10 2013
+++ loncom/localize/localize/de.pm	Wed Oct  2 15:44:16 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.549 2013/10/01 17:52:10 bisitz Exp $
+# $Id: de.pm,v 1.550 2013/10/02 15:44:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -17814,12 +17814,14 @@
    'modifiable fields (if institutional data blank): '
 => '??nderbare Felder (falls Daten der Einrichtung leer sind): ',
 
-# domainprefs.pm
-#   'Formats disallowed for $text{$type}: '
-#=> 'Formats disallowed for $text{$type}: ',
-#
-#   'Format rules to check for $text{$type}: '
-#=> 'Format rules to check for $text{$type}: ',
+   'Format rules to check for IDs: '
+=> 'Formatregeln, die auf IDs angewendet werden: ',
+
+   'Format rules to check for new usernames: '
+=> 'Formatregeln, die auf neue Benutzerkennungen angewendet werden: ',
+
+   'Formats disallowed for self-created accounts (e-mail): '
+=> 'Nicht erlaubte Regeln f??r selbst erstellte Accounts (E-Mail): ', # ?
 
    'Source Code'
 => 'Quellcode',
@@ -28256,6 +28258,84 @@
    'Mean and S.D of Tries Plot'
 => 'Durchschn.- u. Std.-Abw.-d.-Vers.-Plot',
 
+   'Authoring'
+=> 'Authoring',
+
+   'Authoring space default quotas'
+=> 'Voreingestellter Speicherplatz f??r Autorenbereiche',
+
+   'Banner for login role'
+=> 'Banner f??r Login-Rolle',
+
+   'Default quota for content uploaded to a course/community via Course Editor set as follows:'
+=> 'Voreingestellter Speicherplatz f??r Inhalt, der ??ber den Kurs-Editor in einen Kurs / eine Community hochgeladen wurde, wie folgt eingestellt:',
+
+   'Default quota for content uploaded via Course Editor remains default: [_1] MB'
+=> 'Voreingestellter Speicherplatz f??r Inhalt, der ??ber den Kurs-Editor hochgeladen wurde, bleibt unver??ndert beim voreingestellten Wert von [_1] MB.',
+
+   'E-mail from bi-nightly check for multiple users sharing same student/employee ID'
+=> 'E-Mail von alle zwei N??chte stattfindender ??berpr??fung auf mehrere Benutzer, ob die gleiche Studierenden-/Mitarbeiter-ID verwendet wird',
+
+   'E-mail from nightly check of LON-CAPA module integrity/updates'
+=> 'E-Mail von n??chtlicher ??berpr??fung der LON-CAPA-Modulintegrit??t/-aktualisierungen',
+
+   'However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.'
+=> 'Dies trifft allerdings nicht zu, wenn neue Dom??nen zu einem Multi-Dom??nen-Server hinzugef??gt werden und "./UPDATE" in letzter Zeit nicht ausgef??hrt wurde.',
+
+   'LON-CAPA core group - MSU'
+=> 'LON-CAPA-Hauptentwicklerteam an der MSU',
+
+   'Communities: [_1] MB'
+=> 'Communitys: [_1] MB',
+
+   'Official courses: [_1]'
+=> 'Offizielle Kurse: [_1]',
+
+   'Official courses: [_1] MB'
+=> 'Offizielle Kurse: [_1] MB',
+
+   'Unofficial courses: [_1]'
+=> 'Inoffizielle Kurse: [_1]',
+
+   'Unofficial courses: [_1] MB'
+=> 'Inoffizielle Kurse: [_1] MB',
+
+   'Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain'
+=> 'Sobald das erledigt ist, k??nnen Sie die webbasierte "Dom??nen-Konfiguration" verwenden, um Ihre Dom??ne zu konfigurieren.',
+
+   'Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.'
+=> '??blicherweise wir der Dom??nen-Konfigurations-Benutzer erstellt, wenn das "./UPDATE"-Skript bei der Erstinstallation von LON-CAPA ausgef??hrt wird.',
+
+   'Student credits can be set per course by a Domain Coordinator, with the following defaults applying:'
+=> 'Studentische Credits k??nnen pro Kurs durch einen Dom??nen-Koordinator gesetzt werden. Folgende Voreinstellungen gelten:',
+
+   'Student credits not in use for courses in this domain'
+=> 'F??r Kurse in dieser Dom??ne sind keine studentischen Credits in Verwendung.',
+
+   'The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.'
+=> 'Der "[_1]"-Benutzer wird automatisch erstellt, wenn ein Dom??nen-Koordinator die web-basierte "Dom??nen-Konfiguration"-Seite aufruft (sofern dies in einer Sitzung geschieht, die auf dem prim??ren Library-Server gehostet wird).',
+
+   'The domain configuration user "[_1]" has yet to be created.'
+=> 'Der Dom??nen-Konfigurations-Benutzer "[_1]" muss noch erstellt werden.',
+
+   'To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.'
+=> 'Um diesen Benutzer ??ber die Kommandozeile zu erstellen, f??hren Sie das "./UPDATE"-Skript aus. Sie finden das Skript in dem Hauptverzeichnis des extrahierten LON-CAPA-Installationspakets ("tarball").',
+
+   'To do that now, use the following link: [_1]'
+=> 'Um dies jetzt zu machen, folgen Sie dem Link: [_1]',
+
+   'Upload of [_1] image for login page(s) failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].'
+=> 'Das Hochladen des [_1]-Bildes f??r die Login-Seite(n) ist fehlgeschlagen, da ein Dom??nen-Konfigurations-Benutzer ([_2]) f??r die Dom??ne [_3] nicht erstellt werden konnte. Der Fehler war: [_4]',
+
+   'Upload of [_1] image for login page(s) failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].'
+=> 'Das Hochladen des [_1]-Bildes f??r die Login-Seite(n) ist fehlgeschlagen, da an den Dom??nen-Konfigurations-Benutzer ([_2]) f??r die Dom??ne [_3] keine Autorenrolle zugewiesen werden konnte. Der Fehler war: [_4]',
+
+   'Upload of [_1] image for login page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].'
+=> 'Das Hochladen des [_1]-Bildes f??r die Login-Seite(n) ist fehlgeschlagen, da beim Ver??ffentlichen der Datei in den Ressourcenpool ein Fehler aufgetreten ist. Der Fehler war: [_2]',
+
+   'Upload of [_1] image for login page(s) is not permitted to this server: [_2]'
+=> 'Das Hochladen des [_1]-Bildes f??r die Login-Seite(n) ist f??r diesen Server [_2] nicht zul??ssig.',
+
 #SYNCMARKER
 );
 1;



From raeburn at source.lon-capa.org  Wed Oct  2 16:12:40 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 02 Oct 2013 20:12:40 -0000
Subject: [LON-CAPA-cvs] cvs: loncom / mime.types  /interface filetypes.tab
Message-ID: <cvsraeburn1380744760@cvsserver>

raeburn		Wed Oct  2 20:12:40 2013 EDT

  Modified files:              
    /loncom	mime.types 
    /loncom/interface	filetypes.tab 
  Log:
  - Bug 6679
    - Support upload of .webm HTML5 video files.
  
  
Index: loncom/mime.types
diff -u loncom/mime.types:1.4 loncom/mime.types:1.5
--- loncom/mime.types:1.4	Tue Aug 18 01:02:29 2009
+++ loncom/mime.types	Wed Oct  2 20:12:33 2013
@@ -498,4 +498,5 @@
 video/vnd.vivo
 video/x-msvideo			avi
 video/x-sgi-movie		movie
+video/webm			webm
 x-conference/x-cooltalk		ice
Index: loncom/interface/filetypes.tab
diff -u loncom/interface/filetypes.tab:1.37 loncom/interface/filetypes.tab:1.38
--- loncom/interface/filetypes.tab:1.37	Sat Jul 18 01:42:18 2009
+++ loncom/interface/filetypes.tab	Wed Oct  2 20:12:40 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # file extension description file
 #
-# $Id: filetypes.tab,v 1.37 2009/07/18 01:42:18 raeburn Exp $
+# $Id: filetypes.tab,v 1.38 2013/10/02 20:12:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3290,3 +3290,4 @@
 docx            unk     application/vnd.openxmlformats-officedocument.wordprocessingml.document         Microsoft Word Document
 dotx            unk     application/vnd.openxmlformats-officedocument.wordprocessingml.template Microsoft Word Document Template
 xlsx            unk     application/vnd.openxmlformats-officedocument.spreadsheetml.sheet       Microsoft Excel Worksheet
+webm            unk     video/webm                        Audio Video WebM File



From raeburn at source.lon-capa.org  Wed Oct  2 19:47:17 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 02 Oct 2013 23:47:17 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /misc checkforupdates.pl
Message-ID: <cvsraeburn1380757637@cvsserver>

raeburn		Wed Oct  2 23:47:17 2013 EDT

  Modified files:              
    /loncom/misc	checkforupdates.pl 
  Log:
  - Bring punctuation into agreement with usage in similar phrase in lonmodulecheck.pl
  
  
Index: loncom/misc/checkforupdates.pl
diff -u loncom/misc/checkforupdates.pl:1.2 loncom/misc/checkforupdates.pl:1.3
--- loncom/misc/checkforupdates.pl:1.2	Thu Feb 14 14:18:27 2013
+++ loncom/misc/checkforupdates.pl	Wed Oct  2 23:47:17 2013
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # The LearningOnline Network
 #
-# $Id: checkforupdates.pl,v 1.2 2013/02/14 14:18:27 raeburn Exp $
+# $Id: checkforupdates.pl,v 1.3 2013/10/02 23:47:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,7 +84,7 @@
 my $loncaparev = &Apache::lonnet::get_server_loncaparev($defdom);
 my ($version,$timestamp) = split(/\-/,$loncaparev);
 if ($loncaparev =~ /CVS_HEAD/) {
-    $message = &Apache::lonlocal::mt('Code checking unavailable for LON-CAPA CVS HEAD.')."\n";
+    $message = &Apache::lonlocal::mt('Code checking unavailable for LON-CAPA CVS HEAD')."\n";
 } else {
     # Get Linux distro
     if (open(PIPE, "$londaemons/distprobe |")) {



From raeburn at source.lon-capa.org  Thu Oct  3 08:45:14 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Thu, 03 Oct 2013 12:45:14 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonsyllabus.pm
Message-ID: <cvsraeburn1380804314@cvsserver>

raeburn		Thu Oct  3 12:45:14 2013 EDT

  Modified files:              
    /loncom/interface	lonsyllabus.pm 
  Log:
  - Fix typo.
  
  
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.134 loncom/interface/lonsyllabus.pm:1.135
--- loncom/interface/lonsyllabus.pm:1.134	Sat Sep 21 23:44:46 2013
+++ loncom/interface/lonsyllabus.pm	Thu Oct  3 12:45:14 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.134 2013/09/21 23:44:46 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.135 2013/10/03 12:45:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -410,7 +410,7 @@
                 }
                 $rsslinktext = &mt('Manage Course RSS Feeds/Blogs');
                 if ($crstype eq 'Community') {
-                    $rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs');
+                    $rsslinktext = &mt('Manage Community RSS Feeds/Blogs');
                 }
             }
             my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';



From raeburn at source.lon-capa.org  Thu Oct  3 09:01:57 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Thu, 03 Oct 2013 13:01:57 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /localize/localize de.pm
Message-ID: <cvsraeburn1380805317@cvsserver>

raeburn		Thu Oct  3 13:01:57 2013 EDT

  Modified files:              
    /loncom/localize/localize	de.pm 
  Log:
  - Update phrase to correspond to change in lonstatistics.pm rev 1.157
  
  
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.550 loncom/localize/localize/de.pm:1.551
--- loncom/localize/localize/de.pm:1.550	Wed Oct  2 15:44:16 2013
+++ loncom/localize/localize/de.pm	Thu Oct  3 13:01:57 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.550 2013/10/02 15:44:16 bisitz Exp $
+# $Id: de.pm,v 1.551 2013/10/03 13:01:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -12706,8 +12706,8 @@
    'Compiled on [_1]'
 => 'Erstellt am [_1]',
 
-   "Click on a student's name or username to view their chart"
-=> "Klicken Sie auf den Namen oder die Benutzerkennung eines/r Studenten/in, um dessen Chart anzuzeigen",
+   "Click on a student's name or username to view their chart."
+=> "Klicken Sie auf den Namen oder die Benutzerkennung eines/r Studenten/in, um dessen Chart anzuzeigen.",
 
    'status'
 => 'Status',



From raeburn at source.lon-capa.org  Thu Oct  3 23:04:45 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 04 Oct 2013 03:04:45 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm
Message-ID: <cvsraeburn1380855885@cvsserver>

raeburn		Fri Oct  4 03:04:45 2013 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  - Facilitate translation by applying &mt() to complete sentences.
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.367 loncom/interface/lonfeedback.pm:1.368
--- loncom/interface/lonfeedback.pm:1.367	Mon Sep 23 17:35:07 2013
+++ loncom/interface/lonfeedback.pm	Fri Oct  4 03:04:45 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.367 2013/09/23 17:35:07 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.368 2013/10/04 03:04:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -468,18 +468,18 @@
             my $numhidden = keys(%notshown);
             if ($numhidden > 0) {
                 my $colspan = $maxdepth+1;
-                $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
-                         '<a href="/adm/feedback?allposts=1&amp;symb='.$escsymb;
+                $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">';
+                my $href = '/adm/feedback?allposts=1&amp;symb='.$escsymb;
                 if ($newpostsflag) {
-                    $discussion .= '&amp;previous='.$prevread;
+                    $href .= '&amp;previous='.$prevread;
                 }
-		$discussion .= &group_args($group);
-                $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
-                         $numhidden.' ';
+		$href .= &group_args($group);
                 if ($showunmark) {
-                    $discussion .= &mt('posts previously marked read');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously marked read',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 } else {
-                    $discussion .= &mt('previously viewed posts');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously viewed',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 }
                 $discussion .= '<br/></td></tr>';
             }



From raeburn at source.lon-capa.org  Sun Oct  6 10:20:37 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 06 Oct 2013 14:20:37 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm
Message-ID: <cvsraeburn1381069237@cvsserver>

raeburn		Sun Oct  6 14:20:37 2013 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - &get_domain_defaults() can take a second (optional) arg -- $ignore_cache
    which causes domain configuration to be loaded from configuration.db or
    domain.tab, and not cache.
  - Update POD for &get_domain_defaults().
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1239 loncom/lonnet/perl/lonnet.pm:1.1240
--- loncom/lonnet/perl/lonnet.pm:1.1239	Sun Sep 29 14:15:08 2013
+++ loncom/lonnet/perl/lonnet.pm	Sun Oct  6 14:20:36 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1239 2013/09/29 14:15:08 raeburn Exp $
+# $Id: lonnet.pm,v 1.1240 2013/10/06 14:20:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1984,12 +1984,14 @@
 # ------------- Get Authentication, Language and User Tools Defaults for Domain
 
 sub get_domain_defaults {
-    my ($domain) = @_;
+    my ($domain,$ignore_cache) = @_;
     my $cachetime = 60*60*24;
-    my ($result,$cached)=&is_cached_new('domdefaults',$domain);
-    if (defined($cached)) {
-        if (ref($result) eq 'HASH') {
-            return %{$result};
+    unless ($ignore_cache) {
+        my ($result,$cached)=&is_cached_new('domdefaults',$domain);
+        if (defined($cached)) {
+            if (ref($result) eq 'HASH') {
+                return %{$result};
+            }
         }
     }
     my %domdefaults;
@@ -13220,15 +13222,90 @@
 
 =item * 
 
-get_domain_defaults($target_domain) : returns hash with defaults for
-authentication and language in the domain. Keys are: auth_def, auth_arg_def,
-lang_def; corresponsing values are authentication type (internal, krb4, krb5,
-or localauth), initial password or a kerberos realm, language (e.g., en-us).
-Values are retrieved from cache (if current), or from domain's configuration.db
-(if available), or lastly from values in lonTabs/dns_domain,tab, 
-or lonTabs/domain.tab. 
+get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults 
+for: authentication, language, quotas, timezone, date locale, and portal URL in
+the target domain.
+
+May also include additional key => value pairs for the following groups:
+
+=over
+
+=item
+disk quotas (MB allocated by default to portfolios and authoring spaces).
+
+=over
+
+=item defaultquota, authorquota
+
+=back
+
+=item
+tools (availability of aboutme page, blog, webDAV access for authoring spaces,
+portfolio for users).
+
+=over
+
+=item
+aboutme, blog, webdav, portfolio
+
+=back
+
+=item
+requestcourses: ability to request courses, and how requests are processed.
+
+=over
+
+=item
+official, unofficial, community
+
+=back
+
+=item
+inststatus: types of institutional affiliation, and order in which they are displayed.
+
+=over
+
+=item
+inststatustypes, inststatusorder
+
+=back
+
+=item
+coursedefaults: can PDF forms can be created, default credits for courses, default quotas (MB)
+for course's uploaded content.
+
+=over
+
+=item
+canuse_pdfforms, officialcredits, unofficialcredits, officialquota, unofficialquota, communityquota
+
+=back
+
+=item
+usersessions: set options for hosting of your users in other domains, and hosting of users from other domains
+on your servers.
+
+=over
+
+=item 
+remotesessions, hostedsessions
+
+=back
+
+=back
+
+In cases where a domain coordinator has never used the "Set Domain Configuration"
+utility to create a configuration.db file on a domain's primary library server 
+only the following domain defaults: auth_def, auth_arg_def, lang_def
+-- corresponding values are authentication type (internal, krb4, krb5,
+or localauth), initial password or a kerberos realm, language (e.g., en-us) -- 
+will be available. Values are retrieved from cache (if current), unless the
+optional $ignore_cache arg is true, or from domain's configuration.db (if available),
+or lastly from values in lonTabs/dns_domain,tab, or lonTabs/domain.tab.
+
+Typical usage:
 
-%domdefaults = &get_auth_defaults($target_domain);
+%domdefaults = &get_domain_defaults($target_domain);
 
 =back
 



From raeburn at source.lon-capa.org  Sun Oct  6 16:33:52 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 06 Oct 2013 20:33:52 -0000
Subject: [LON-CAPA-cvs] cvs: loncom / lond /interface domainprefs.pm
	londocs.pm /lonnet/perl lonnet.pm
Message-ID: <cvsraeburn1381091632@cvsserver>

raeburn		Sun Oct  6 20:33:52 2013 EDT

  Modified files:              
    /loncom	lond 
    /loncom/interface	domainprefs.pm londocs.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Change to args expected by lonnet::remote_devalidate_cache() and
    change to corresponding &server_devalidatecache_handler() on lond side.
    - On the lonnet side remote_devalidate_cache() now expects an array of 
      escaped cache keys as the second argument.
    - On the lond side &server_devalidatecache_handler() calls 
      lonnet::devalidate_cache_new() on each of the cache keys passed to it.
  
  
Index: loncom/lond
diff -u loncom/lond:1.502 loncom/lond:1.503
--- loncom/lond:1.502	Sat Aug 10 01:27:31 2013
+++ loncom/lond	Sun Oct  6 20:33:38 2013
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.502 2013/08/10 01:27:31 raeburn Exp $
+# $Id: lond,v 1.503 2013/10/06 20:33:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.502 $'; #' stupid emacs
+my $VERSION='$Revision: 1.503 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1685,8 +1685,14 @@
 sub server_devalidatecache_handler {
     my ($cmd,$tail,$client) = @_;
     my $userinput = "$cmd:$tail";
-    my ($name,$id) = map { &unescape($_); } split(/:/,$tail);
-    &Apache::lonnet::devalidate_cache_new($name,$id);
+    my $items = &unescape($tail);
+    my @cached = split(/\&/,$items);
+    foreach my $key (@cached) {
+        if ($key =~ /:/) {
+            my ($name,$id) = map { &unescape($_); } split(/:/,$key);
+            &Apache::lonnet::devalidate_cache_new($name,$id);
+        }
+    }
     my $result = 'ok';
     &Reply($client,\$result,$userinput);
     return 1;
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.210 loncom/interface/domainprefs.pm:1.211
--- loncom/interface/domainprefs.pm:1.210	Sun Sep 29 06:53:35 2013
+++ loncom/interface/domainprefs.pm	Sun Oct  6 20:33:45 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.210 2013/09/29 06:53:35 raeburn Exp $
+# $Id: domainprefs.pm,v 1.211 2013/10/06 20:33:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8412,7 +8412,8 @@
                                 foreach my $lonhost (sort(keys(%{$changes{$prefix}}))) {
                                     $resulttext .= '<li><b>'.$lonhost.'</b> ';
                                     my $lonhostdom = &Apache::lonnet::host_domain($lonhost);
-                                    &Apache::lonnet::remote_devalidate_cache($lonhost,'spares',$lonhostdom);
+                                    my $cachekey = &escape('spares').':'.&escape($lonhostdom);
+                                    &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
                                     if (ref($changes{$prefix}{$lonhost}) eq 'HASH') {
                                         foreach my $type (@{$types{$prefix}}) {
                                             if ($changes{$prefix}{$lonhost}{$type}) {
@@ -8599,7 +8600,8 @@
                 if (ref($changes{'delete'}) eq 'ARRAY') {
                     foreach my $balancer (sort(@{$changes{'delete'}})) {
                         $resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>';
-                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
+                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
+                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
                     }
                 }
                 if (ref($changes{'add'}) eq 'ARRAY') {
@@ -8655,7 +8657,8 @@
                                 }
                             }
                         }
-                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
+                        my $cachekey = &scape('loadbalancing').':'.&escape($dom);
+                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
                     }
                 }
                 if ($resulttext ne '') {
@@ -9386,7 +9389,8 @@
     if (keys(%servers) > 1) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
-            &Apache::lonnet::remote_devalidate_cache($server,'domainconfig',$dom);
+            my $cachekey = &escape('domainconfig').':'.&escape($dom);
+            &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
         }
     }
     return;
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.565 loncom/interface/londocs.pm:1.566
--- loncom/interface/londocs.pm:1.565	Mon Sep 23 17:35:07 2013
+++ loncom/interface/londocs.pm	Sun Oct  6 20:33:45 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.565 2013/09/23 17:35:07 bisitz Exp $
+# $Id: londocs.pm,v 1.566 2013/10/06 20:33:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4997,7 +4997,8 @@
                    foreach my $server (keys(%servers)) {
                        next if (grep(/^\Q$server\E$/, at ids));
                        my $hashid=$coursenum.':'.$coursedom;
-                       &Apache::lonnet::remote_devalidate_cache($server,'suppcount',$hashid);
+                       my $cachekey = &escape('suppcount').':'.&escape($hashid);
+                       &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
                    }
                    &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
                    undef($suppchanges);
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1240 loncom/lonnet/perl/lonnet.pm:1.1241
--- loncom/lonnet/perl/lonnet.pm:1.1240	Sun Oct  6 14:20:36 2013
+++ loncom/lonnet/perl/lonnet.pm	Sun Oct  6 20:33:51 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1240 2013/10/06 14:20:36 raeburn Exp $
+# $Id: lonnet.pm,v 1.1241 2013/10/06 20:33:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -356,8 +356,11 @@
 }
 
 sub remote_devalidate_cache {
-    my ($lonhost,$name,$id) = @_;
-    my $response = &reply('devalidatecache:'.&escape($name).':'.&escape($id),$lonhost);
+    my ($lonhost,$cachekeys) = @_;
+    my $items;
+    return unless (ref($cachekeys) eq 'ARRAY');
+    my $cachestr = join('&',@{$cachekeys});
+    my $response = &reply('devalidatecache:'.&escape($cachestr),$lonhost);
     return $response;
 }
 



From raeburn at source.lon-capa.org  Sun Oct  6 17:25:59 2013
From: raeburn at source.lon-capa.org (raeburn)
Date: Sun, 06 Oct 2013 21:25:59 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm
	lonconfigsettings.pm
Message-ID: <cvsraeburn1381094759@cvsserver>

raeburn		Sun Oct  6 21:25:59 2013 EDT

  Modified files:              
    /loncom/interface	lonconfigsettings.pm domainprefs.pm 
  Log:
  - Setting domain configuration for items included in domdefaults, which is
    cached for 24hrs in memcache. 
    - &devalidate_remote_domconfs() takes second arg -- $cachekeys -- a reference
      to a hash of items to devalidate on the domain's servers.
      - two possible hash keys: domainconfig or domdefaults              
    - Update of domdefaults as a result of processing changes in domain configuration
      cause lonnet::do_cache_new() to be called on current server, and also 
      domdefaults to be added to the $cachekeys hash.
    - Seventh arg in domainprefs::process_changes() is now a ref to a hash instead
      of a ref to a scalar.
    - lonconfigsettings::make_changes() now returns a ref to a HASH, where keys
      (if any) are items to devalidate on the domain's servers.
    - Retrieval of domdefaults when displaying domain configuration screen or
      processing changes includes directive to ignore_cache and read from
      configuration.db file on domain's primary library server.
  
  
-------------- next part --------------
Index: loncom/interface/lonconfigsettings.pm
diff -u loncom/interface/lonconfigsettings.pm:1.26 loncom/interface/lonconfigsettings.pm:1.27
--- loncom/interface/lonconfigsettings.pm:1.26	Sat Sep  7 00:19:00 2013
+++ loncom/interface/lonconfigsettings.pm	Sun Oct  6 21:25:59 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.26 2013/09/07 00:19:00 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.27 2013/10/06 21:25:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -188,7 +188,7 @@
        {href=>"javascript:changePage(document.$phase,'$phase')",
         text=>"Updated"});
     &print_header($r,$phase,$context,undef,$container);
-    my ($crstype,$lastact);
+    my ($crstype,%lastact);
     if ($context eq 'course') {
         $crstype = &Apache::loncommon::course_type();
     }
@@ -199,7 +199,7 @@
                 if ($context eq 'domain') {
                     $r->print('<h3>'.&mt($prefs->{$item}{'text'}).'</h3>'.
                               &Apache::domainprefs::process_changes($r,$dom,
-                                          $confname,$item,$roles,$values,\$lastact));
+                                          $confname,$item,$roles,$values,\%lastact));
                 } else {
                     $changes{$item} = {};
                     &Apache::courseprefs::process_changes($dom,$item,$values,
@@ -244,7 +244,7 @@
     }
     &print_footer($r,$phase,'display',$footer_text,\@actions,$container);
     $r->print('</p>');
-    return $lastact;
+    return \%lastact;
 }
 
 sub display_settings {
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.211 loncom/interface/domainprefs.pm:1.212
--- loncom/interface/domainprefs.pm:1.211	Sun Oct  6 20:33:45 2013
+++ loncom/interface/domainprefs.pm	Sun Oct  6 21:25:59 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.211 2013/10/06 20:33:45 raeburn Exp $
+# $Id: domainprefs.pm,v 1.212 2013/10/06 21:25:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -416,10 +416,11 @@
     my $confname = $dom.'-domainconfig';
 
     if ($phase eq 'process') {
-        if (&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
-                                                     \%prefs,\%domconfig,$confname,\@roles) eq 'update') {
+        my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
+                                                              \%prefs,\%domconfig,$confname,\@roles);
+        if (ref($result) eq 'HASH') {
             $r->rflush();
-            &devalidate_remote_domconfs($dom);
+            &devalidate_remote_domconfs($dom,$result);
         }
     } elsif ($phase eq 'display') {
         my $js = &recaptcha_js().
@@ -514,7 +515,7 @@
         $output = &modify_rolecolors($r,$dom,$confname,$roles,
                                      $lastactref,%domconfig);
     } elsif ($action eq 'quotas') {
-        $output = &modify_quotas($dom,$action,%domconfig);
+        $output = &modify_quotas($dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'autoenroll') {
         $output = &modify_autoenroll($dom,$lastactref,%domconfig);
     } elsif ($action eq 'autoupdate') {
@@ -530,7 +531,7 @@
     } elsif ($action eq 'contacts') {
         $output = &modify_contacts($dom,$lastactref,%domconfig);
     } elsif ($action eq 'defaults') {
-        $output = &modify_defaults($dom,$r,%domconfig);
+        $output = &modify_defaults($dom,$lastactref,%domconfig);
     } elsif ($action eq 'scantron') {
         $output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'coursecategories') {
@@ -538,15 +539,15 @@
     } elsif ($action eq 'serverstatuses') {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
-        $output = &modify_quotas($dom,$action,%domconfig);
+        $output = &modify_quotas($dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'requestauthor') {
-        $output = &modify_quotas($dom,$action,%domconfig);
+        $output = &modify_quotas($dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'helpsettings') {
         $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursedefaults') {
-        $output = &modify_coursedefaults($dom,%domconfig);
+        $output = &modify_coursedefaults($dom,$lastactref,%domconfig);
     } elsif ($action eq 'usersessions') {
-        $output = &modify_usersessions($dom,%domconfig);
+        $output = &modify_usersessions($dom,$lastactref,%domconfig);
     } elsif ($action eq 'loadbalancing') {
         $output = &modify_loadbalancing($dom,%domconfig);
     }
@@ -794,7 +795,7 @@
         } elsif ($action eq 'contacts') {
             $output .= &print_contacts($dom,$settings,\$rowtotal);
         } elsif ($action eq 'defaults') {
-            $output .= &print_defaults($dom,\$rowtotal);
+            $output .= &print_defaults($dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
@@ -3759,10 +3760,18 @@
 }
 
 sub print_defaults {
-    my ($dom,$rowtotal) = @_;
+    my ($dom,$settings,$rowtotal) = @_;
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
                  'datelocale_def','portal_def');
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %defaults;
+    if (ref($settings) eq 'HASH') {
+        %defaults = %{$settings};    
+    } else {
+        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+        foreach my $item (@items) {
+            $defaults{$item} = $domdefaults{$item};
+        }
+    }
     my $titles = &defaults_titles($dom);
     my $rownum = 0;
     my ($datatable,$css_class);
@@ -3786,7 +3795,7 @@
             my %authnames = &authtype_names();
             foreach my $auth (@authtypes) {
                 my $checked = ' ';
-                if ($domdefaults{$item} eq $auth) {
+                if ($defaults{$item} eq $auth) {
                     $checked = ' checked="checked" ';
                 }
                 $datatable .= '<label><input type="radio" name="'.$item.
@@ -3795,15 +3804,15 @@
             }
         } elsif ($item eq 'timezone_def') {
             my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty);
+            $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
         } elsif ($item eq 'datelocale_def') {
             my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
+            $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
         } elsif ($item eq 'lang_def') {
             my %langchoices = &get_languages_hash();
             $langchoices{''} = 'No language preference';
             %langchoices = &Apache::lonlocal::texthash(%langchoices);
-            $datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item,
+            $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
                                                           \%langchoices);
         } else {
             my $size;
@@ -3811,7 +3820,7 @@
                 $size = ' size="25"';
             }
             $datatable .= '<input type="text" name="'.$item.'" value="'.
-                          $domdefaults{$item}.'"'.$size.' />';
+                          $defaults{$item}.'"'.$size.' />';
         }
         $datatable .= '</td></tr>';
         $rownum ++;
@@ -4980,7 +4989,9 @@
         }
         if (keys(%changes) > 0 || $colchgtext) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            $$lastactref = 'update';
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domainconfig'} = 1;
+            }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'loginvia') {
@@ -5128,7 +5139,9 @@
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            $$lastactref = 'update';
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domainconfig'} = 1;
+            }
             $resulttext = &display_colorchgs($dom,\%changes,$roles,
                                              $rolehash{'rolecolors'});
         } else {
@@ -5809,7 +5822,7 @@
 }
 
 sub modify_quotas {
-    my ($dom,$action,%domconfig) = @_;
+    my ($dom,$action,$lastactref,%domconfig) = @_;
     my ($context, at usertools, at options,%validations,%titles,%confhash,%toolshash,
         %limithash,$toolregexp,%conditions,$resulttext,%changes);
     if ($action eq 'quotas') {
@@ -5831,7 +5844,7 @@
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
     }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     foreach my $key (keys(%env)) {
         if ($context eq 'requestcourses') {
@@ -6030,7 +6043,9 @@
         if (keys(%changes) > 0) {
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
             $resulttext = &mt('Changes made:').'<ul>';
             unless (($context eq 'requestcourses') ||
                     ($context eq 'requestauthor')) {
@@ -6241,7 +6256,9 @@
             if ($changes{'coowners'}) {
                 $resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
-                $$lastactref = 'update';
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domainconfig'} = 1;
+                }
             }
             $resulttext .= '</ul>';
         } else {
@@ -6799,7 +6816,9 @@
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            $$lastactref = 'update';
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domainconfig'} = 1;
+            }
             my ($titles,$short_titles)  = &contact_titles();
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (@contacts) {
@@ -6874,7 +6893,7 @@
     foreach my $item(@contexts) {
         if ($item eq 'selfcreate') {
             @{$cancreate{$item}} = &Apache::loncommon::get_env_multiple('form.can_createuser_'.$item);
-            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
             if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth'))) {
                 if (ref($cancreate{$item}) eq 'ARRAY') { 
                     if (grep(/^login$/,@{$cancreate{$item}})) {
@@ -7441,9 +7460,9 @@
 }
 
 sub modify_defaults {
-    my ($dom,$r,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes, at errors);
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
@@ -7503,7 +7522,7 @@
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
-            my $version = $r->dir_config('lonVersion');
+            my $version = &Apache::lonnet::get_server_loncaparev($dom);
             my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";
             foreach my $item (sort(keys(%changes))) {
                 my $value = $env{'form.'.$item};
@@ -7526,6 +7545,9 @@
             $mailmsgtext .= "\n";
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
             if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) {
                 my $notify = 1;
                 if (ref($domconfig{'contacts'}) eq 'HASH') {
@@ -7618,7 +7640,9 @@
                 }
                 $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
-                $$lastactref = 'update';
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domainconfig'} = 1;
+                }
             } else {
                 $resulttext = &mt('No changes made to bubblesheet format file');
             }
@@ -8042,7 +8066,7 @@
 }
 
 sub modify_coursedefaults {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = ('canuse_pdfforms' => 'off');
     my @toggles = ('canuse_pdfforms');
@@ -8133,10 +8157,9 @@
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
     if ($putresult eq 'ok') {
-        my %domdefaults;
         if (keys(%changes) > 0) {
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); 
             if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) {
-                %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
                 if ($changes{'canuse_pdfforms'}) {
                     $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
                 }
@@ -8157,6 +8180,9 @@
                 }
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
             }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
@@ -8208,7 +8234,7 @@
 }
 
 sub modify_usersessions {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my @hostingtypes = ('version','excludedomain','includedomain');
     my @offloadtypes = ('primary','default');
     my %types = (
@@ -8225,7 +8251,7 @@
     foreach my $prefix (@prefixes) {
         $defaultshash{'usersessions'}{$prefix} = {};
     }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
     my $resulttext;
     my %iphost = &Apache::lonnet::get_iphost();
     foreach my $prefix (@prefixes) {
@@ -8401,6 +8427,9 @@
             }
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+            if (ref($lastactref) eq 'HASH') {
+                $lastactref->{'domdefaults'} = 1;
+            }
             if (keys(%changes) > 0) {
                 my %lt = &usersession_titles();
                 $resulttext = &mt('Changes made:').'<ul>';
@@ -9380,17 +9409,24 @@
 }
 
 sub devalidate_remote_domconfs {
-    my ($dom) = @_;
-    my $primary_id = &Apache::lonnet::domain($dom,'primary');
-    my $intdom = &Apache::lonnet::internet_dom($primary_id);
+    my ($dom,$cachekeys) = @_;
+    return unless (ref($cachekeys) eq 'HASH');
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+    my @posscached = ('domainconfig','domdefaults');
     if (keys(%servers) > 1) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
-            my $cachekey = &escape('domainconfig').':'.&escape($dom);
-            &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]);
+            my @cached;
+            foreach my $name (@posscached) {
+                if ($cachekeys->{$name}) {
+                    push(@cached,&escape($name).':'.&escape($dom));
+                }
+            }
+            if (@cached) {
+                &Apache::lonnet::remote_devalidate_cache($server,\@cached);
+            }
         }
     }
     return;