Diff for /loncom/interface/lonpreferences.pm between versions 1.186 and 1.212

version 1.186, 2010/03/12 15:09:23 version 1.212, 2014/02/15 17:59:33
Line 36  use strict; Line 36  use strict;
 use LONCAPA;  use LONCAPA;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::File;  use Apache::File;
 use Crypt::DES;  
 use DynaLoader; # for Crypt::DES version  
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
Line 45  use Apache::lonnet; Line 43  use Apache::lonnet;
 use LONCAPA::lonauthcgi();  use LONCAPA::lonauthcgi();
 use LONCAPA();  use LONCAPA();
   
 #  
 # Write lonnet::passwd to do the call below.  
 # Use:  
 #   my $answer=reply("encrypt:passwd:$udom:$uname:$upass",$tryserver);  
 #  
 ##################################################  
 #          password associated functions         #  
 ##################################################  
 sub des_keys {  
     # Make a new key for DES encryption.  
     # Each key has two parts which are returned separately.  
     # Please note:  Each key must be passed through the &hex function  
     # before it is output to the web browser.  The hex versions cannot  
     # be used to decrypt.  
     my @hexstr=('0','1','2','3','4','5','6','7',  
                 '8','9','a','b','c','d','e','f');  
     my $lkey='';  
     for (0..7) {  
         $lkey.=$hexstr[rand(15)];  
     }  
     my $ukey='';  
     for (0..7) {  
         $ukey.=$hexstr[rand(15)];  
     }  
     return ($lkey,$ukey);  
 }  
   
 sub des_decrypt {  
     my ($key,$cyphertext) = @_;  
     my $keybin=pack("H16",$key);  
     my $cypher;  
     if ($Crypt::DES::VERSION>=2.03) {  
         $cypher=new Crypt::DES $keybin;  
     } else {  
         $cypher=new DES $keybin;  
     }  
     my $plaintext=  
  $cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,0,16))));  
     $plaintext.=  
  $cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,16,16))));  
     $plaintext=substr($plaintext,1,ord(substr($plaintext,0,1)) );  
     return $plaintext;  
 }  
   
 ################################################################  ################################################################
 #                       Handler subroutines                    #  #                       Handler subroutines                    #
 ################################################################  ################################################################
Line 152  sub languagechanger { Line 106  sub languagechanger {
                 text => 'Change Language'});                  text => 'Change Language'});
     $r->print(Apache::loncommon::start_page('Content Display Settings'));      $r->print(Apache::loncommon::start_page('Content Display Settings'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));       $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language')); 
     my $user       = $env{'user.name'};      my %userenv = &Apache::lonnet::get('environment',['languages']);
     my $domain     = $env{'user.domain'};  
     my %userenv = &Apache::lonnet::get  
         ('environment',['languages']);  
     my $language=$userenv{'languages'};      my $language=$userenv{'languages'};
   
     my $pref=&mt('Preferred language');      $r->print(
     my %langchoices=('' => 'No language preference');          '<form name="prefs" action="/adm/preferences" method="post">'."\n".
     foreach (&Apache::loncommon::languageids()) {          '<input type="hidden" name="action" value="verify_and_change_languages" />'.
  if (&Apache::loncommon::supportedlanguagecode($_)) {          '<br /><span class="LC_nobreak">'.&mt('Preferred language').':&nbsp;'.
     $langchoices{&Apache::loncommon::supportedlanguagecode($_)}          &Apache::loncommon::select_language('language',$language,1).'</span>'."\n".
                = &Apache::loncommon::plainlanguagedescription($_);          '<br /><input type="submit" value="'.&mt('Save').'" /></form>'
  }      );
     }  
     my $selectionbox=  
            &Apache::loncommon::select_form(  
                $language,  
                'language',  
                &Apache::lonlocal::texthash(%langchoices));  
     $r->print(<<ENDLSCREEN);  
 <form name="prefs" action="/adm/preferences" method="post">  
 <input type="hidden" name="action" value="verify_and_change_languages" />  
 <br />$pref: $selectionbox  
 ENDLSCREEN  
     $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');  
 }  }
   
   
Line 226  sub texenginechanger { Line 165  sub texenginechanger {
      'tth' => 'tth (TeX to HTML)',       'tth' => 'tth (TeX to HTML)',
      #'ttm' => 'TeX to MathML',       #'ttm' => 'TeX to MathML',
      'jsMath' => 'jsMath',       'jsMath' => 'jsMath',
        'MathJax' => 'MathJax',
      'mimetex' => 'mimetex (Convert to Images)',       'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'                       'raw' => 'Raw (Screen Reader)'
                      );                       );
       %mathchoices = &Apache::lonlocal::texthash(%mathchoices);
     my $selectionbox=      my $selectionbox=
            &Apache::loncommon::select_form(             &Apache::loncommon::select_form(
                $texengine,                 $texengine,
                'texengine',                 'texengine',
                &Apache::lonlocal::texthash(%mathchoices));                 \%mathchoices);
       my $MathJax_start=&Apache::lontexconvert::MathJax_header();
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();      my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',        'headline' => 'Change how math is displayed',
       'preftxt'  => 'Preferred method to display math',        'preftxt'  => 'Preferred method to display math',
       'change'   => 'Save',        'change'   => 'Save',
       'exmpl'    => 'Examples',        'exmpl'    => 'Examples',
         'mathjax'  => 'MathJax:',
       'jsmath'   => 'jsMath:',        'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',        'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',        'mimetex'  => 'mimetex (Convert to Images):',
Line 274  $lt{'preftxt'}: $selectionbox Line 217  $lt{'preftxt'}: $selectionbox
 <hr />  <hr />
 $lt{'exmpl'}  $lt{'exmpl'}
   
   <h3>$lt{'mathjax'}</h3>
   </script>
   <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="120"></iframe>
   </p>
   <p>
   MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.
   </p>
   
 <h3>$lt{'jsmath'}</h3>   <h3>$lt{'jsmath'}</h3> 
 <p>  <p>
 $jsMath_start  $jsMath_start
Line 281  $jsMath_start Line 232  $jsMath_start
 if (jsMath.nofonts == 1) {  if (jsMath.nofonts == 1) {
     document.writeln($jsMathWarning);      document.writeln($jsMathWarning);
 }  }
   
 </script>  </script>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>  <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
 </p>  </p>
Line 340  sub rolesprefchanger { Line 292  sub rolesprefchanger {
     my $domain     = $env{'user.domain'};      my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get      my %userenv = &Apache::lonnet::get
         ('environment',['recentroles','recentrolesn']);          ('environment',['recentroles','recentrolesn']);
       my $brtext = 'Change '.$role.' Page Pref';
       my $brtitle;
       if ($env{'form.returnurl'} eq '/adm/roles') {
           $brtext = 'Configure Hotlist';
       } else {
           $brtitle = $brtext;
       }
     Apache::lonhtmlcommon::add_breadcrumb(      Apache::lonhtmlcommon::add_breadcrumb(
     { href => '/adm/preferences?action=changerolespref',      { href => '/adm/preferences?action=changerolespref',
                 text => 'Change '.$role.' Page Pref'});                  text => $brtext});
     $r->print(Apache::loncommon::start_page('Content Display Settings'));      $r->print(Apache::loncommon::start_page('Content Display Settings'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));      $r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle));
     my $hotlist_flag=$userenv{'recentroles'};      my $hotlist_flag=$userenv{'recentroles'};
     my $hotlist_n=$userenv{'recentrolesn'};      my $hotlist_n=$userenv{'recentrolesn'};
     my $checked;      my ($checkedon,$checkedoff);
     if ($hotlist_flag) {      if ($hotlist_flag) {
  $checked = 'checked="checked"';   $checkedon = 'checked="checked"';
       } else {
           $checkedoff = 'checked="checked"';
     }      }
           
     if (!$hotlist_n) { $hotlist_n=3; }      if (!$hotlist_n) { $hotlist_n=3; }
Line 376  sub rolesprefchanger { Line 337  sub rolesprefchanger {
     &Apache::loncommon::start_data_table().      &Apache::loncommon::start_data_table().
     &Apache::loncommon::start_data_table_header_row().      &Apache::loncommon::start_data_table_header_row().
     "<th>".&mt('Freeze '.$role)."</th>".      "<th>".&mt('Freeze '.$role)."</th>".
     "<th>".&mt($role)."</td>".      "<th>".&mt($role)."</th>".
     &Apache::loncommon::end_data_table_header_row().      &Apache::loncommon::end_data_table_header_row().
     "\n";      "\n";
  my $count;   my $count;
Line 399  sub rolesprefchanger { Line 360  sub rolesprefchanger {
         $roles_check_list .= "</table>\n";          $roles_check_list .= "</table>\n";
     }      }
   
       my $actionurl = '/adm/preferences';
       if ($env{'form.returnurl'} eq '/adm/roles') {
           $actionurl = '/adm/roles';
       }
       $r->print('<h3>'.&mt('Recent Roles Hotlist').'</h3>');
       unless ($checkedon) {
           $r->print(&mt('LON-CAPA users with several '.$lc_role.'s may wish to enable the Hotlist.').'<br />');
       }
     $r->print('      $r->print('
 <p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'  <form name="prefs" action="'.$actionurl.'" method="post">
 </p>  
 <form name="prefs" action="/adm/preferences" method="post">  
 <input type="hidden" name="action" value="verify_and_change_rolespref" />  <input type="hidden" name="action" value="verify_and_change_rolespref" />
 <br />'.  <input type="hidden" name="returnurl" value="'.$env{'form.returnurl'}.'" />
 '<h2>'.&mt('Recent '.$role.'s Hotlist').'</h2>'.  <div class="LC_left_float"><h4>'.&mt('Hotlist options').'</h4>
   <p>'.
   &mt('When enabled, the Hotlist keeps track of the last N '.$lc_role.'s visited.').'<br />'.
   &mt('Those N '.$lc_role.'s are then shown in a table at the top of the '.$lc_role.'s page.').'</p>'.
 &Apache::lonhtmlcommon::start_pick_box().  &Apache::lonhtmlcommon::start_pick_box().
 &Apache::lonhtmlcommon::row_title('<label for="Hotlist">'.&mt('Enable Recent '.$role.'s Hotlist').'</label>').  &Apache::lonhtmlcommon::row_title(&mt('Use Recent '.$role.'s Hotlist')).
 '<input id="Hotlist" type="checkbox"'.$checked.' name="recentroles" value="true" />'.  '<span class="LC_nobreak">
   <label><input id="Hotliston" type="radio" '.$checkedon.' name="recentroles" value="1" />'.&mt('Yes').'</label>'.
   ('&nbsp;'x2).
   '<label><input id="Hotlistoff" type="radio" '.$checkedoff.' name="recentroles" value="0" />'.&mt('No').'</label>
   </span>'.
 &Apache::lonhtmlcommon::row_closure().  &Apache::lonhtmlcommon::row_closure().
 &Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').  &Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').
 '<select name="recentrolesn" size="1" id ="NumberOfRoles">'.  '<select name="recentrolesn" size="1" id ="NumberOfRoles">'.
 $options.  $options.'
 '</select>'.  </select>'.
 &Apache::lonhtmlcommon::row_closure(1).  &Apache::lonhtmlcommon::row_closure(1).
 &Apache::lonhtmlcommon::end_pick_box().  &Apache::lonhtmlcommon::end_pick_box().'
 '<br/><h2>'.&mt('Freeze Roles').'</h2>'.  </div>');
 '<p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'      if ($roles_check_list) { 
           $r->print('<div class="LC_left_float">
   <h4>'.&mt('Freeze Roles').'</h4>
   <p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.
   &mt('Those '.$lc_role.'s marked frozen will not be removed from the list, even if not recently used.').'
 </p>  </p>
 '.$roles_check_list.'  '.$roles_check_list.'
 <br />  </div>');
        } else {
            $r->print('<br clear="all" />'.
                      &mt('Once the Hotlist contains recently visited '.$lc_role.'s you can return to this page to also set frozen roles.'));
        }
        $r->print('
   <br clear="all" />
 <input type="submit" value="'.&mt('Save').'" />  <input type="submit" value="'.&mt('Save').'" />
 </form>');  </form>');
 }  }
Line 511  sub verify_and_change_rolespref { Line 495  sub verify_and_change_rolespref {
         }          }
     }      }
     $message=&Apache::loncommon::confirmwrapper($message);      $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);      if ($env{'form.returnurl'} eq '/adm/roles') {
           return $message;
       } else {
           &print_main_menu($r, $message);
       }
 }  }
   
   
Line 594  sub verify_and_change_screenname { Line 582  sub verify_and_change_screenname {
 sub iconchanger {  sub iconchanger {
     my $r = shift;      my $r = shift;
     &Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
     { href => '/adm/preferences?action=changeicons',              {   href => '/adm/preferences?action=changeicons',
                 text => 'Change Main Menu'});                  text => 'Change Menu Display'});
     $r->print(Apache::loncommon::start_page('Page Display Settings'));      $r->print(Apache::loncommon::start_page('Page Display Settings'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));      $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display'));
   
     my $user       = $env{'user.name'};      my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};      my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get      my %userenv = &Apache::lonnet::get('environment',['icons']);
         ('environment',['icons']);  
     my $iconic='checked="checked"';      my $iconic='checked="checked"';
     my $classic='';      my ($classic,$onlyicon,$iconic_preview,$iconsonly_preview);
     my $onlyicon='';  
     if ($userenv{'icons'} eq 'classic') {      if ($userenv{'icons'} eq 'classic') {
        $classic='checked="checked"';          $iconic='';
        $iconic='';          $classic='<div class="LC_info">'.
                    &mt('Your current selection: "Use buttons and text" is deprecated - it is recommended that you change this to "Use icons and text".').'</div>';
     }      }
     if ($userenv{'icons'} eq 'iconsonly') {      if ($userenv{'icons'} eq 'iconsonly') {
        $onlyicon='checked="checked"';         $onlyicon='checked="checked"';
        $iconic='';         $iconic='';
     }      }
     my $useicons=&mt('Use icons and text');  
     my $usebuttons=&mt('Use buttons and text');  
     my $useicononly=&mt('Use icons only');  
     my $change=&mt('Save');      my $change=&mt('Save');
       my %lt = &icon_options();
       my ($inlinetools,$toolsorder) = &icon_previews();
       if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) {
           foreach my $tool (@{$toolsorder}) {
               my ($command,$row,$col,$img,$top,$bot,$act,$desc) = 
                   split(/\&/,$inlinetools->{$tool});
               $iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.('&nbsp;' x 2).'</span></a></li>';
               $iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" />&nbsp;</a></li>';
           }
       }
       $iconsonly_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
                            '<ul>'.
                            $iconsonly_preview.
                            '</ul></li></ul>';
       $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
                         '<ul>'.
                         $iconic_preview.
                         '</ul></li></ul>'; 
     $r->print(<<ENDSCREEN);      $r->print(<<ENDSCREEN);
   $classic
 <form name="prefs" action="/adm/preferences" method="post">  <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_icons" />  <input type="hidden" name="action" value="verify_and_change_icons" />
 <label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />  <label><input type="radio" name="menumode" value="iconic" $iconic /> $lt{'iconic'}</label>$iconic_preview<br />
 <label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />  <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $lt{'iconsonly'}</label>$iconsonly_preview<br />
 <label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />  
 <input type="submit" value="$change" />  <input type="submit" value="$change" />
 </form>  </form>
 ENDSCREEN  ENDSCREEN
Line 634  sub verify_and_change_icons { Line 636  sub verify_and_change_icons {
     my $user       = $env{'user.name'};      my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};      my $domain     = $env{'user.domain'};
     my $newicons   = $env{'form.menumode'};      my $newicons   = $env{'form.menumode'};
       my %lt = &icon_options();
       my $newchoice = $newicons;
       if ($lt{$newicons}) {
           $newchoice = $lt{$newicons};
       }
     &Apache::lonnet::put('environment',{'icons' => $newicons});      &Apache::lonnet::put('environment',{'icons' => $newicons});
     &Apache::lonnet::appenv({'environment.icons' => $newicons});      &Apache::lonnet::appenv({'environment.icons' => $newicons});
     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));      my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newchoice.'</tt>'));
     $message=&Apache::loncommon::confirmwrapper($message);      $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);      &print_main_menu($r, $message);
 }  }
   
   sub icon_options {
       return &Apache::lonlocal::texthash(
                                           iconic    => 'Use icons and text',
                                           iconsonly => 'Use icons only',
                                         );
   }
   
   sub icon_previews {
        my %icon_text = (
                         annotate => 'Notes',
                         wishlist => 'Stored Links',
                         catalog  => 'Info',
                         evaluate => 'Evaluate',
                         feedback => 'Communicate',
                         printout => 'Print',
                        );
       my %inlinetools = (
           printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
           wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository",
           evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",
           feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",
           annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",
           catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata",
       );
       my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
       return (\%inlinetools,\@toolsorder);
   }
   
 ################################################################  ################################################################
 #                     Clicker Subroutines                      #  #                     Clicker Subroutines                      #
 ################################################################  ################################################################
Line 711  sub domcoordchanger { Line 745  sub domcoordchanger {
     if ($userenv{'domcoord.author'} eq 'blocked') {      if ($userenv{'domcoord.author'} eq 'blocked') {
        $constchecked=' checked="checked"';         $constchecked=' checked="checked"';
     }      }
     my $text=&mt('By default, the Domain Coordinator can enter your construction space.');      my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');
     my $construction=&mt('Block access to construction space');      my $construction=&mt('Block access to Authoring Space');
     my $change=&mt('Save');      my $change=&mt('Save');
     $r->print(<<ENDSCREEN);      $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">  <form name="prefs" action="/adm/preferences" method="post">
Line 738  sub verify_and_change_domcoord { Line 772  sub verify_and_change_domcoord {
     } else {      } else {
         $status=&mt('off');          $status=&mt('off');
     }      }
     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));      my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to Authoring Space').'</i>','<tt>'.$status.'</tt>'));
     $message=&Apache::loncommon::confirmwrapper($message);      $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r,$message);      &print_main_menu($r,$message);
 }  }
Line 796  sub msgforwardchanger { Line 830  sub msgforwardchanger {
                                           foad  => 'Forward to account(s)',                                            foad  => 'Forward to account(s)',
                                           fwdm  => 'Forward messages to other account(s) in LON-CAPA',                                            fwdm  => 'Forward messages to other account(s) in LON-CAPA',
                                           noti  => 'E-mail notification of LON-CAPA messages',                                            noti  => 'E-mail notification of LON-CAPA messages',
                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',  
                                           mnot  => 'E-mail address(es) which should be notified about new LON-CAPA messages',                                            mnot  => 'E-mail address(es) which should be notified about new LON-CAPA messages',
                                           mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',  
                                           chg   => 'Save',                                            chg   => 'Save',
                                           email => 'The e-mail address entered in row ',                                            email => 'The e-mail address entered in row ',
                                           notv => 'is not a valid e-mail address',                                            notv => 'is not a valid e-mail address',
                                           toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one",                                             toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one", 
                                           prme => 'Back',                                            prme => 'Back',
                                         );                                          );
       $lt{'foad_exmpl'} = &mt('e.g. [_1]userA:domain1,userB:domain2,...[_2]','<tt>','</tt>');
       $lt{'mnot_exmpl'} = &mt('e.g. [_1]joe@doe.com[_2]','<tt>','</tt>');
     Apache::lonhtmlcommon::add_breadcrumb(      Apache::lonhtmlcommon::add_breadcrumb(
     { href => '/adm/preferences?action=changemsgforward',      { href => '/adm/preferences?action=changemsgforward',
  text => 'Messages & Notifications'});   text => 'Messages & Notifications'});
Line 908  ENDMSG Line 942  ENDMSG
                    '" onclick="javscript:delete_address('."'$num'".')" />'.                     '" onclick="javscript:delete_address('."'$num'".')" />'.
                    &mt('Delete').'</label></span></td>'.                     &mt('Delete').'</label></span></td>'.
                    '<td><input type="text" value="'.$item.'" name="address_'.                     '<td><input type="text" value="'.$item.'" name="address_'.
                    $num.'" onFocus="javascript:address_changes('."'$num'".                     $num.'" onfocus="javascript:address_changes('."'$num'".
                    ')" /></td><td>';                     ')" /></td><td>';
         my %chk;          my %chk;
         if (defined($allnot{$item}{'crit'})) {          if (defined($allnot{$item}{'crit'})) {
Line 957  ENDMSG Line 991  ENDMSG
                '<input type="checkbox" name="add_notify_'.$num.                 '<input type="checkbox" name="add_notify_'.$num.
                '" value="1" />'.&mt('Add new address').'</label></span></td>'.                 '" value="1" />'.&mt('Add new address').'</label></span></td>'.
                '<td><input type="text" value="" name="address_'.$num.                 '<td><input type="text" value="" name="address_'.$num.
                '" onFocus="javascript:new_address('."'$num'".')" /></td><td>';                 '" onfocus="javascript:new_address('."'$num'".')" /></td><td>';
     foreach my $type ('all','crit','reg') {      foreach my $type ('all','crit','reg') {
         $output .= '<span class="LC_nobreak"><label>'.          $output .= '<span class="LC_nobreak"><label>'.
                    '<input type="radio" name="notify_type_'.$num.                     '<input type="radio" name="notify_type_'.$num.
Line 1131  sub colorschanger { Line 1165  sub colorschanger {
     foreach my $item (sort(keys(%colortypes))) {      foreach my $item (sort(keys(%colortypes))) {
        my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);         my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
        $chtable.=&Apache::loncommon::start_data_table_row().         $chtable.=&Apache::loncommon::start_data_table_row().
    '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.     '<td>'.$colortypes{$item}.'<td><input name="'.$item.
         '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.          '" class="colorchooser"  size="10" value="'.$curcol.
         '" size="10" value="'.$curcol.  '" /></td>'.
 '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.  
 "','".$curcol."','"  
     .$item."','parmform.pres','psub'".');">'.&mt('Select').'</a></td>'.  
     &Apache::loncommon::end_data_table_row()."\n";      &Apache::loncommon::end_data_table_row()."\n";
     }      }
     my $end_data_table = &Apache::loncommon::end_data_table();      my $end_data_table = &Apache::loncommon::end_data_table();
Line 1144  sub colorschanger { Line 1175  sub colorschanger {
     my $savebutton = &mt('Save');      my $savebutton = &mt('Save');
     my $resetbutton = &mt('Reset All');      my $resetbutton = &mt('Reset All');
     my $resetbuttondesc = &mt('Reset All Colors to Default');      my $resetbuttondesc = &mt('Reset All Colors to Default');
       my $colorchooser=&Apache::lonhtmlcommon::color_picker();
       $r->print('<script type="text/javascript" language="JavaScript">
   ' . $colorchooser . '
   </script>
   ');
     $r->print(<<ENDCOL);      $r->print(<<ENDCOL);
 <script type="text/javascript" language="JavaScript">  
   
     function pclose() {  
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",  
                  "height=350,width=350,scrollbars=no,menubar=no");  
         parmwin.close();  
     }  
   
     $pjump_def  
   
     function psub() {  
         pclose();  
         if (document.parmform.pres_marker.value!='') {  
             if (document.parmform.pres_type.value!='') {  
                 eval('document.prefs.'+  
                      document.parmform.pres_marker.value+  
      '.value=document.parmform.pres_value.value;');  
     }  
         } else {  
             document.parmform.pres_value.value='';  
             document.parmform.pres_marker.value='';  
         }  
     }  
   
   <form name="parmform" action="">
 </script>  
 <form name="parmform">  
 <input type="hidden" name="pres_marker" />  <input type="hidden" name="pres_marker" />
 <input type="hidden" name="pres_type" />  <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />  <input type="hidden" name="pres_value" />
Line 1209  sub verify_and_change_colors { Line 1220  sub verify_and_change_colors {
     my $message='';      my $message='';
     foreach my $item (keys %colortypes) {      foreach my $item (keys %colortypes) {
         my $color=$env{'form.'.$item};          my $color=$env{'form.'.$item};
    if (!($color =~ /^#/)) {
       $color = '#' . $color;
    }
         my $entry='color.'.$function.'.'.$item;          my $entry='color.'.$function.'.'.$item;
  if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {   if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
     &Apache::lonnet::put('environment',{$entry => $color});      &Apache::lonnet::put('environment',{$entry => $color});
Line 1239  sub passwordchanger { Line 1253  sub passwordchanger {
     # This function is a bit of a mess....      # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)      # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');      $errormessage = ($errormessage || '');
     my ($user,$domain,$currentpass,$defdom);      my ($user,$domain,$currentpass);
     &Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
  { href => '/adm/preferences?action=changepass',   { href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});                    text => 'Change Password'});
Line 1254  sub passwordchanger { Line 1268  sub passwordchanger {
             $caller = 'preferences';              $caller = 'preferences';
         }          }
     } elsif ($caller eq 'reset_by_email') {      } elsif ($caller eq 'reset_by_email') {
             $defdom = $r->dir_config('lonDefDomain');  
             my %data = &Apache::lonnet::tmpget($mailtoken);              my %data = &Apache::lonnet::tmpget($mailtoken);
             if (keys(%data) == 0) {              if (keys(%data) == 0) {
                 $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'                  $r->print(
                              ,'<a href="/adm/resetpw">','</a>')                      '<p class="LC_warning">'
                      .&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
                          ,'<a href="/adm/resetpw">','</a>')
                      .'</p>'
                 );                  );
                 return;                  return;
             }              }
Line 1268  sub passwordchanger { Line 1284  sub passwordchanger {
                     $domain = $data{'domain'};                      $domain = $data{'domain'};
                     $currentpass = $data{'temppasswd'};                      $currentpass = $data{'temppasswd'};
                 } else {                  } else {
                     $r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');                      $r->print(
                           '<p class="LC_warning">'
                          .&mt('Sorry, the token generated when you requested'
                              .' a password reset has expired.')
                          .'</p>'
                       );
                     return;                      return;
                 }                  }
             } else {              } else {
                 $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');                  $r->print(
                       '<p class="LC_warning">'
                      .&mt('Sorry, the URL generated when you requested reset of'
                          .' your password contained incomplete information.')
                      .'</p>'
                   );
                 return;                  return;
             }              }
    } else {              if (&Apache::lonnet::domain($domain) eq '') {
         $r->print(&mt('Page requested in unexpected context').'<br />');                  $domain = $r->dir_config('lonDefDomain');
               }
       } else {
           $r->print(
               '<p class="LC_error">'
              .&mt('Page requested in unexpected context')
              .'</p>'
           );
         return;          return;
     }      }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);      my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
Line 1284  sub passwordchanger { Line 1317  sub passwordchanger {
     return if ($currentauth !~ /^(unix|internal):/);      return if ($currentauth !~ /^(unix|internal):/);
     #      #
     # Generate keys      # Generate keys
     my ($lkey_cpass ,$ukey_cpass ) = &des_keys();      my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys();
     my ($lkey_npass1,$ukey_npass1) = &des_keys();      my ($lkey_npass1,$ukey_npass1) = &Apache::loncommon::des_keys();
     my ($lkey_npass2,$ukey_npass2) = &des_keys();      my ($lkey_npass2,$ukey_npass2) = &Apache::loncommon::des_keys();
     # Store the keys in the log files      # Store the keys in the log files
     my $lonhost = $r->dir_config('lonHostID');      my $lonhost = $r->dir_config('lonHostID');
     my $logtoken=Apache::lonnet::reply('tmpput:'      my $logtoken=Apache::lonnet::reply('tmpput:'
Line 1319  $errormessage Line 1352  $errormessage
      crappy browser -->       crappy browser -->
 ENDFORM  ENDFORM
     $r->print(&server_form($logtoken,$caller,$mailtoken));      $r->print(&server_form($logtoken,$caller,$mailtoken));
     $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));      $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
   
     #      #
     return;      return;
Line 1379  sub client_form { Line 1412  sub client_form {
                 'changepass' => 'Save',                  'changepass' => 'Save',
     );      );
   
     my $output = '<form name="client">'      my $output = '<form name="client" action="">'
                 .&Apache::lonhtmlcommon::start_pick_box();                  .&Apache::lonhtmlcommon::start_pick_box();
     if ($caller eq 'reset_by_email') {      if ($caller eq 'reset_by_email') {
         $output .= &Apache::lonhtmlcommon::row_title(          $output .= &Apache::lonhtmlcommon::row_title(
Line 1410  sub client_form { Line 1443  sub client_form {
               .'<input type="password" name="newpass_2" size="10" />'                .'<input type="password" name="newpass_2" size="10" />'
               .&Apache::lonhtmlcommon::row_closure(1)                .&Apache::lonhtmlcommon::row_closure(1)
               .&Apache::lonhtmlcommon::end_pick_box();                .&Apache::lonhtmlcommon::end_pick_box();
     $output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onClick="send();" /></p>'      $output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onclick="send();" /></p>'
               .qq|                .qq|
 <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />  <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
 <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />  <input type="hidden" name="lkey_cpass"  value="$hexkey->{'lkey_cpass'}" />
Line 1525  ENDERROR Line 1558  ENDERROR
     }      }
     my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);      my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
     #       # 
     $currentpass = &des_decrypt($ckey ,$currentpass);      $currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
     $newpass1    = &des_decrypt($n1key,$newpass1);      $newpass1    = &Apache::loncommon::des_decrypt($n1key,$newpass1);
     $newpass2    = &des_decrypt($n2key,$newpass2);      $newpass2    = &Apache::loncommon::des_decrypt($n2key,$newpass2);
     #      #
     if ($caller eq 'reset_by_email') {      if ($caller eq 'reset_by_email') {
         my %data = &Apache::lonnet::tmpget($mailtoken);          my %data = &Apache::lonnet::tmpget($mailtoken);
Line 1548  ENDERROR Line 1581  ENDERROR
     }       } 
     if ($newpass1 ne $newpass2) {      if ($newpass1 ne $newpass2) {
  &passwordchanger($r,   &passwordchanger($r,
  '<span class="LC_error">'.   '<span class="LC_warning">'.
  &mt('The new passwords you entered do not match.').'  '.   &mt('The new passwords you entered do not match.').'  '.
  &mt('Please try again.').'</span>',$caller,$mailtoken);   &mt('Please try again.').'</span>',$caller,$mailtoken);
  return 1;   return 1;
     }      }
     if (length($newpass1) < 7) {      if (length($newpass1) < 7) {
  &passwordchanger($r,   &passwordchanger($r,
  '<span class="LC_error">'.   '<span class="LC_warning">'.
  &mt('Passwords must be a minimum of 7 characters long.').'  '.   &mt('Passwords must be a minimum of 7 characters long.').'  '.
  &mt('Please try again.').'</span>',$caller,$mailtoken);   &mt('Please try again.').'</span>',$caller,$mailtoken);
  return 1;   return 1;
Line 1568  ENDERROR Line 1601  ENDERROR
     }      }
     if ($badpassword) {      if ($badpassword) {
  # I can't figure out how to enter bad characters on my browser.   # I can't figure out how to enter bad characters on my browser.
  my $errormessage ='<span class="LC_error">'.   my $errormessage ='<span class="LC_warning">'.
            &mt('The password you entered contained illegal characters.').'<br />'.             &mt('The password you entered contained illegal characters.').'<br />'.
            &mt('Valid characters are').(<<"ENDERROR");             &mt('Valid characters are').(<<"ENDERROR");
 : space and <br />  : space and <br />
Line 1653  sub discussionchanger { Line 1686  sub discussionchanger {
         'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',          'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
         'prca' => 'Preferences can be set that determine',          'prca' => 'Preferences can be set that determine',
         'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',          'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
         'unwh' => 'Under what circumstances posts are identfied as "New"',          'unwh' => 'Under what circumstances posts are identified as "NEW"',
         'allposts' => 'All posts',          'allposts' => 'All posts',
         'unread' => 'New posts only',          'unread' => 'New posts only',
         'ondisp' => 'Once displayed',          'ondisp' => 'Once displayed',
         'onmark' => 'Once marked as read',          'onmark' => 'Once marked not NEW',
         'disa' => 'Posts displayed?',          'disa' => 'Posts displayed?',
         'npmr' => 'New posts cease to be identified as "New"?',          'npmr' => 'New posts cease to be identified as "NEW"?',
         'thde'  => 'The preferences you set here can be overridden within each individual discussion.',          'thde'  => 'The preferences you set here can be overridden within each individual discussion.',
         'chgt' => 'Change to '          'chgt' => 'Change to '
     );      );
Line 1740  sub verify_and_change_discussion { Line 1773  sub verify_and_change_discussion {
     if (defined($env{'form.discmark'}) ) {      if (defined($env{'form.discmark'}) ) {
         my $newmark = $env{'form.newmark'};          my $newmark = $env{'form.newmark'};
         if ($newmark eq 'ondisp') {          if ($newmark eq 'ondisp') {
             $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'<br />';              $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will cease to be identified as "NEW" after display.')).'<br />';
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});              &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});              &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {          } else {
             $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'<br />';              $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as not "NEW".')).'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);              &Apache::lonnet::del('environment',['discmarkread']);
             &Apache::lonnet::delenv('environment.discmarkread');              &Apache::lonnet::delenv('environment.discmarkread');
         }          }
Line 1975  my @menu= Line 2008  my @menu=
  url => '/adm/preferences?action=changerolespref',   url => '/adm/preferences?action=changerolespref',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
  icon => 'sctr.png',   icon => 'role_hotlist.png',
  linktitle => 'Configure the roles hotlist.'   linktitle => 'Configure the roles hotlist.'
     },      },
     { linktext => 'Math display settings',      { linktext => 'Math display settings',
  url => '/adm/preferences?action=changetexenginepref',   url => '/adm/preferences?action=changetexenginepref',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
  icon => 'stat.png',   icon => 'dismath.png',
  linktitle => 'Change how math is displayed.'   linktitle => 'Change how math is displayed.'
     },      },
  ]   ]
Line 1996  my @menu= Line 2029  my @menu=
  icon => 'preferences-desktop-theme.png',   icon => 'preferences-desktop-theme.png',
  linktitle => 'Change LON-CAPA default colors.'   linktitle => 'Change LON-CAPA default colors.'
     },      },
     { linktext => 'Menu Display',              {   linktext => 'Menu Display',
  url => '/adm/preferences?action=changeicons',                  url => '/adm/preferences?action=changeicons',
  permission => 'F',                  permission => 'F',
  #help => '',                  #help => '',
  icon => 'preferences-system-windows.png',                  icon => 'preferences-system-windows.png',
  linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'                  linktitle => 'Change whether the menus are displayed with icons or icons and text.'
     }              }
   
  ]   ]
     },      },
     { categorytitle=>'Messages &amp; Notifications',      { categorytitle=>'Messages &amp; Notifications',
Line 2019  my @menu= Line 2051  my @menu=
  url => '/adm/preferences?action=changediscussions',   url => '/adm/preferences?action=changediscussions',
  permission => 'F',   permission => 'F',
  #help => 'Change_Discussion_Display',   #help => 'Change_Discussion_Display',
  icon => 'mail-message-new.png',   icon => 'chat.png',
  linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'   linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
     },      },
  ]   ]
Line 2079  push(@{ $menu[4]->{items} }, { Line 2111  push(@{ $menu[4]->{items} }, {
  url => '/adm/preferences?action=changecourseinit',   url => '/adm/preferences?action=changecourseinit',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
  icon => 'edit-copy.png',   icon => 'course_ini.png',
  linktitle => 'Set the default page to be displayed when you select a course role.',   linktitle => 'Set the default page to be displayed when you select a course role.',
  });   });
   
Line 2121  sub handler { Line 2153  sub handler {
                                    ['action','wysiwyg','returnurl','refpage']);                                     ['action','wysiwyg','returnurl','refpage']);
     #      #
     Apache::lonhtmlcommon::clear_breadcrumbs();      Apache::lonhtmlcommon::clear_breadcrumbs();
       my ($brlink,$brtxt,$brhelp);
       if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {
           $brlink ='/adm/roles';
           $brtxt = 'User Roles';
       } else {
           $brlink ='/adm/preferences';
           $brtxt = 'Set User Preferences';
           $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';   
       }
     Apache::lonhtmlcommon::add_breadcrumb      Apache::lonhtmlcommon::add_breadcrumb
         ({href => '/adm/preferences',          ({href => $brlink,
           text => 'Set User Preferences',            text => $brtxt,
           help =>            help => $brhelp,});
           'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'});  
     if(!exists $env{'form.action'}) {      if(!exists $env{'form.action'}) {
     &print_main_menu($r);      &print_main_menu($r);
     }elsif($env{'form.action'} eq 'changepass'){      }elsif($env{'form.action'} eq 'changepass'){

Removed from v.1.186  
changed lines
  Added in v.1.212


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>