[BACK]Return to lonpreferences.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.167 and 1.174

version 1.167, 2009/07/09 19:28:36 version 1.174, 2009/10/08 22:37:33
Line 42  use Apache::loncommon(); Line 42  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use LONCAPA::lonauthcgi();
 use LONCAPA();  use LONCAPA();
   
 #  #
Line 217  sub texenginechanger { Line 218  sub texenginechanger {
      'tth' => 'tth (TeX to HTML)',       'tth' => 'tth (TeX to HTML)',
      #'ttm' => 'TeX to MathML',       #'ttm' => 'TeX to MathML',
      'jsMath' => 'jsMath',       'jsMath' => 'jsMath',
      'mimetex' => 'mimetex (Convert to Images)'       'mimetex' => 'mimetex (Convert to Images)',
                        'raw' => 'Raw (Screen Reader)'
                      );                       );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',      my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
      %mathchoices);       %mathchoices);
Line 1337  sub jscript_send { Line 1339  sub jscript_send {
                    this.document.client.elements.uname.value;                     this.document.client.elements.uname.value;
         this.document.pserver.elements.udom.value =          this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;                     this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
           this.document.pserver.elements.email.value =
                      this.document.client.elements.email.value;
 |;  |;
     }      }
     $ output .= qq|      $ output .= qq|
Line 1355  sub client_form { Line 1359  sub client_form {
                 'currentpass' => 'Current Password',                  'currentpass' => 'Current Password',
                 'newpass' => 'New Password',                  'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',                  'confirmpass' => 'Confirm Password',
                 'changepass' => 'Save');                  'changepass' => 'Save',
       );
   
     my $output = '<form name="client">'      my $output = '<form name="client">'
                 .&Apache::lonhtmlcommon::start_pick_box();                  .&Apache::lonhtmlcommon::start_pick_box();
Line 1420  sub server_form { Line 1425  sub server_form {
 <input type="hidden" name="token"   value="$mailtoken" />  <input type="hidden" name="token"   value="$mailtoken" />
 <input type="hidden" name="uname"   value="" />  <input type="hidden" name="uname"   value="" />
 <input type="hidden" name="udom"   value="" />  <input type="hidden" name="udom"   value="" />
   <input type="hidden" name="email"   value="" />
   
 |;  |;
     }      }
Line 1564  ENDERROR Line 1570  ENDERROR
     # Inform the user the password has (not?) been changed      # Inform the user the password has (not?) been changed
     my $message;      my $message;
     if ($result =~ /^ok$/) {      if ($result =~ /^ok$/) {
         $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));          $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
         if ($caller eq 'reset_by_email') {          if ($caller eq 'reset_by_email') {
             $r->print($message.'<br />');              $r->print($message.'<br />');
         } else {          } else {
Line 1572  ENDERROR Line 1578  ENDERROR
         }          }
     } else {      } else {
  # error error: run in circles, scream and shout   # error error: run in circles, scream and shout
         $message = &Apache::lonhtmlcommon::confirm_success(          if ($caller eq 'reset_by_email') {
           &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);              if (!$result) {
         unless ($caller eq 'reset_by_email') {                  return 1;
               } else {
                   return $result;
               }
           } else {
               $message = &Apache::lonhtmlcommon::confirm_success(
                   &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
             $message=&Apache::loncommon::confirmwrapper($message);              $message=&Apache::loncommon::confirmwrapper($message);
             &print_main_menu($r, $message);              &print_main_menu($r, $message);
         }          }
         return 1;  
     }      }
     return;      return;
 }  }
Line 1606  sub discussionchanger { Line 1617  sub discussionchanger {
         }          }
     }      }
     if (defined($userenv{'discmarkread'})) {      if (defined($userenv{'discmarkread'})) {
         unless ($userenv{'discdisplay'} eq '') {           unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};              $discmark = $userenv{'discmarkread'};
         }          }
     }      }
Line 1650  sub discussionchanger { Line 1661  sub discussionchanger {
         $currmark = $lt{'ondisp'};          $currmark = $lt{'ondisp'};
         $newmark = 'onmark';          $newmark = 'onmark';
     }      }
       
     $r->print(<<"END");      $r->print(<<"END");
 <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_discussion" />  <input type="hidden" name="action" value="verify_and_change_discussion" />
Line 1699  sub verify_and_change_discussion { Line 1710  sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {      if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};          my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {          if ($newdisp eq 'unread') {
             $message .=&mt('In discussions: only new posts will be displayed.').'<br />';              $message .=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
             &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});              &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
             &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});              &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
         } else {          } else {
             $message .= &mt('In discussions: all posts will be displayed.').'<br />';              $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
             &Apache::lonnet::del('environment',['discdisplay']);              &Apache::lonnet::del('environment',['discdisplay']);
             &Apache::lonnet::delenv('environment.discdisplay');              &Apache::lonnet::delenv('environment.discdisplay');
         }          }
Line 1942  push(@{ $menu[1]->{items} }, { Line 1953  push(@{ $menu[1]->{items} }, {
  url => '/adm/remote?url=/adm/preferences&amp;action=launch',   url => '/adm/remote?url=/adm/preferences&amp;action=launch',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
  icon => 'network-wireless.png',   icon => 'remotecontrol.png',
  linktitle => 'Launch the remote control for LON-CAPA.',   linktitle => 'Launch the remote control for LON-CAPA.',
  });   });
     }else{      }else{
Line 1951  push(@{ $menu[1]->{items} }, { Line 1962  push(@{ $menu[1]->{items} }, {
  url => '/adm/remote?url=/adm/preferences&amp;action=collapse',   url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
  icon => 'network-wireless.png',   icon => 'remotecontrol.png',
  linktitle => 'Collapse the remote control for LON-CAPA.',   linktitle => 'Collapse the remote control for LON-CAPA.',
  });   });
     }      }
Line 1980  push(@{ $menu[4]->{items} }, { Line 1991  push(@{ $menu[4]->{items} }, {
  });   });
   
     }      }
     if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {      if (&can_toggle_debug()) {
 push(@{ $menu[4]->{items} }, {  push(@{ $menu[4]->{items} }, {
  linktext => 'Toggle Debug Messages (Current:'.$env{'user.debug'}.')',   linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
  url => '/adm/preferences?action=debugtoggle',   url => '/adm/preferences?action=debugtoggle',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
Line 2081  sub handler { Line 2092  sub handler {
     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){      }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
         &verify_and_change_coursepage($r);          &verify_and_change_coursepage($r);
     }elsif($env{'form.action'} eq 'debugtoggle'){      }elsif($env{'form.action'} eq 'debugtoggle'){
         &toggle_debug();          if (&can_toggle_debug()) {
               &toggle_debug();
           }
  &print_main_menu($r);   &print_main_menu($r);
     }      }
   
Line 2104  sub toggle_debug { Line 2117  sub toggle_debug {
     }      }
 }  }
   
   sub can_toggle_debug {
       my $can_toggle = 0;
       my $page = 'toggledebug';
       if (&LONCAPA::lonauthcgi::can_view($page)) {
           $can_toggle = 1;
       } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
           $can_toggle = 1;
       }
       return $can_toggle;
   }
   
 1;  1;
 __END__  __END__
Removed from v.1.167  
changed lines
  Added in v.1.174

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