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

Diff for /loncom/interface/lonpreferences.pm between versions 1.151 and 1.155

version 1.151, 2009/04/17 11:12:57 version 1.155, 2009/04/29 16:57:29
Line 135  sub verify_and_change_wysiwyg { Line 135  sub verify_and_change_wysiwyg {
     my $newsetting=$env{'form.wysiwyg'};      my $newsetting=$env{'form.wysiwyg'};
     &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});      &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
     &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});      &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
 #   $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');      &print_main_menu($r,'<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Setting WYSIWYG editor to:').' '
     print_main_menu($r,'<p>'.&mt('Setting WYSIWYG editor to:').' '   .&mt($newsetting)).'</p>');
  .&mt($newsetting).'</p>');  
 }  }
   
 ################################################################  ################################################################
Line 187  sub verify_and_change_languages { Line 186  sub verify_and_change_languages {
     if ($newlanguage) {      if ($newlanguage) {
         &Apache::lonnet::put('environment',{'languages' => $newlanguage});          &Apache::lonnet::put('environment',{'languages' => $newlanguage});
         &Apache::lonnet::appenv({'environment.languages' => $newlanguage});          &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
         $message=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';          $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.');
     } else {      } else {
         &Apache::lonnet::del('environment',['languages']);          &Apache::lonnet::del('environment',['languages']);
         &Apache::lonnet::delenv('environment.languages');          &Apache::lonnet::delenv('environment.languages');
         $message=&mt('Reset preferred language.');          $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred language.'));
     }      }
     &Apache::loncommon::flush_langs_cache($user,$domain);      &Apache::loncommon::flush_langs_cache($user,$domain);
     print_main_menu($r, $message);      &print_main_menu($r, $message);
 #    $r->print(<<ENDVCSCREEN);  
 #$message  
 #ENDVCSCREEN  
 }  }
   
 ################################################################  ################################################################
Line 304  sub verify_and_change_texengine { Line 300  sub verify_and_change_texengine {
     if ($newtexengine) {      if ($newtexengine) {
         &Apache::lonnet::put('environment',{'texengine' => $newtexengine});          &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
         &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});          &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
         $message=&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.';          $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.');
     } else {      } else {
         &Apache::lonnet::del('environment',['texengine']);          &Apache::lonnet::del('environment',['texengine']);
         &Apache::lonnet::delenv('environment.texengine');          &Apache::lonnet::delenv('environment.texengine');
         $message=&mt('Reset preferred math display.');          $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred math display.'));
     }      }
       &print_main_menu($r, $message);
   
 #    $r->print(<<ENDVCSCREEN);  
 #$message  
 #ENDVCSCREEN  
     print_main_menu($r, $message);  
 }  }
   
 ################################################################  ################################################################
Line 482  sub verify_and_change_rolespref { Line 473  sub verify_and_change_rolespref {
 # Unset any roles that were previously frozen but aren't in list  # Unset any roles that were previously frozen but aren't in list
     foreach my $role_key (sort(keys(%recent_roles))) {      foreach my $role_key (sort(keys(%recent_roles))) {
         if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {          if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
     $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";      $message .= "<br />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key}))."\n";
     &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);      &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }          }
     }      }
Line 490  sub verify_and_change_rolespref { Line 481  sub verify_and_change_rolespref {
 # Freeze selected roles  # Freeze selected roles
     foreach my $role_key (@freeze_list) {      foreach my $role_key (@freeze_list) {
         if (!$frozen_roles{$role_key}) {          if (!$frozen_roles{$role_key}) {
              $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";               $message .= "<br />".
                &Apache::lonhtmlcommon::confirm_success(&mt('Freezing '.$role.': [_1]',$role_text{$role_key}))."\n";
              &Apache::lonhtmlcommon::store_recent('roles',               &Apache::lonhtmlcommon::store_recent('roles',
                                           $role_key,' ',1);                                            $role_key,' ',1);
         }          }
     }      }
     $message .= "<hr /><br />\n";      $message .= "<hr /><br />\n";
       &print_main_menu($r, $message);
 #    $r->print(<<ENDRPSCREEN);  
 #$message  
 #ENDRPSCREEN  
     print_main_menu($r, $message);  
 }  }
   
   
Line 553  sub verify_and_change_screenname { Line 541  sub verify_and_change_screenname {
     if ($newscreen) {      if ($newscreen) {
         &Apache::lonnet::put('environment',{'screenname' => $newscreen});          &Apache::lonnet::put('environment',{'screenname' => $newscreen});
         &Apache::lonnet::appenv({'environment.screenname' => $newscreen});          &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
         $message=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';          $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.');
     } else {      } else {
         &Apache::lonnet::del('environment',['screenname']);          &Apache::lonnet::del('environment',['screenname']);
         &Apache::lonnet::delenv('environment.screenname');          &Apache::lonnet::delenv('environment.screenname');
         $message=&mt('Reset screenname.');          $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset screenname.'));
     }      }
 # Nickname  # Nickname
     $message.='<br />';      $message.='<br />';
Line 566  sub verify_and_change_screenname { Line 554  sub verify_and_change_screenname {
     if ($newscreen) {      if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});          &Apache::lonnet::put('environment',{'nickname' => $newscreen});
         &Apache::lonnet::appenv({'environment.nickname' => $newscreen});          &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
         $message.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';          $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.');
     } else {      } else {
         &Apache::lonnet::del('environment',['nickname']);          &Apache::lonnet::del('environment',['nickname']);
         &Apache::lonnet::delenv('environment.nickname');          &Apache::lonnet::delenv('environment.nickname');
         $message.=&mt('Reset nickname.');          $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset nickname.'));
     }      }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);      &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
 #    $r->print(<<ENDVCSCREEN);      &print_main_menu($r, $message);
 #$message  
 #ENDVCSCREEN  
     print_main_menu($r, $message);  
 }  }
   
 ################################################################  ################################################################
Line 584  sub verify_and_change_screenname { Line 569  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 Main Menu'});
     $r->print(Apache::loncommon::start_page('Page Display Settings'));      $r->print(Apache::loncommon::start_page('Page Display Settings'));
Line 628  sub verify_and_change_icons { Line 613  sub verify_and_change_icons {
   
     &Apache::lonnet::put('environment',{'icons' => $newicons});      &Apache::lonnet::put('environment',{'icons' => $newicons});
     &Apache::lonnet::appenv({'environment.icons' => $newicons});      &Apache::lonnet::appenv({'environment.icons' => $newicons});
 #    $r->print(&mt('Set menu mode to [_1].',$newicons));      &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Set menu mode to [_1].',$newicons)));
     print_main_menu($r, &mt('Set menu mode to [_1].',$newicons));  
 }  }
   
 ################################################################  ################################################################
Line 638  sub verify_and_change_icons { Line 622  sub verify_and_change_icons {
   
 sub clickerchanger {  sub clickerchanger {
     my $r = shift;      my $r = shift;
     Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
     { href => '/adm/preferences?action=changeclicker',      { href => '/adm/preferences?action=changeclicker',
                 text => 'Register Clicker'});                  text => 'Register Clicker'});
     $r->print(Apache::loncommon::start_page('Other'));      $r->print(Apache::loncommon::start_page('Other'));
Line 677  sub verify_and_change_clicker { Line 661  sub verify_and_change_clicker {
     $newclickers=~s/\,$//;      $newclickers=~s/\,$//;
     &Apache::lonnet::put('environment',{'clickers' => $newclickers});      &Apache::lonnet::put('environment',{'clickers' => $newclickers});
     &Apache::lonnet::appenv({'environment.clickers' => $newclickers});      &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
 #    $r->print(&mt('Registering clickers: [_1]',$newclickers));      &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers)));
     print_main_menu($r, &mt('Registering clickers: [_1]',$newclickers));  
 }  }
   
 ################################################################  ################################################################
Line 687  sub verify_and_change_clicker { Line 670  sub verify_and_change_clicker {
   
 sub domcoordchanger {  sub domcoordchanger {
     my $r = shift;      my $r = shift;
     Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
     { href => '/adm/preferences?action=changedomcoord',      { href => '/adm/preferences?action=changedomcoord',
                 text => 'Restrict Domain Coordinator Access'});                  text => 'Restrict Domain Coordinator Access'});
     $r->print(Apache::loncommon::start_page('Restrict Domain Coordinator Access'));      $r->print(Apache::loncommon::start_page('Restrict Domain Coordinator Access'));
Line 721  sub verify_and_change_domcoord { Line 704  sub verify_and_change_domcoord {
     if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }      if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
     &Apache::lonnet::put('environment',\%domcoord);      &Apache::lonnet::put('environment',\%domcoord);
     &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});      &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
 #    $r->print(&mt('Registering Domain Coordinator access restrictions.'));      &print_main_menu($r,&Apache::lonhtmlcommon::confirm_success(&mt('Registering Domain Coordinator access restrictions.')));
     print_main_menu($r, &mt('Registering Domain Coordinator access restrictions.'));  
 }  }
   
 #################################################################  #################################################################
Line 1184  sub verify_and_change_colors { Line 1166  sub verify_and_change_colors {
  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});
     &Apache::lonnet::appenv({'environment.'.$entry => $color});      &Apache::lonnet::appenv({'environment.'.$entry => $color});
     $message.=&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>.<br />';      $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>').'<br />';
  } else {   } else {
     &Apache::lonnet::del('environment',[$entry]);      &Apache::lonnet::del('environment',[$entry]);
     &Apache::lonnet::delenv('environment.'.$entry);      &Apache::lonnet::delenv('environment.'.$entry);
     $message.=&mt('Reset '.$colortypes{$item}.'.').'<br />';      $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset '.$colortypes{$item}.'.')).'<br />';
  }   }
     }      }
     my $now = time;      my $now = time;
     &Apache::lonnet::put('environment',{'color.timestamp' => $now});      &Apache::lonnet::put('environment',{'color.timestamp' => $now});
     &Apache::lonnet::appenv({'environment.color.timestamp' => $now});      &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
   
     print_main_menu($r, $message);      &print_main_menu($r, $message);
 #    $r->print(<<ENDVCCOL);  
 #$message  
 #<form name="client" action="/adm/preferences" method="post">  
 #<input type="hidden" name="action" value="changecolors" />  
 #</form>  
 #ENDVCCOL  
 }  }
   
 ######################################################  ######################################################
Line 1213  sub passwordchanger { Line 1189  sub passwordchanger {
     # 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,$defdom);
     Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
  { href => '/adm/preferences?action=changepass',   { href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});                    text => 'Change Password'});
     unless ($caller eq 'reset_by_email') {      unless ($caller eq 'reset_by_email') {
Line 1230  sub passwordchanger { Line 1206  sub passwordchanger {
             $defdom = $r->dir_config('lonDefDomain');              $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 <a href="/adm/resetpw">new request</a> 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(&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>')
                   );
                 return;                  return;
             }              }
             if (defined($data{time})) {              if (defined($data{time})) {
Line 1555  ENDERROR Line 1533  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 = &mt('The password for [_1] was successfully changed.',$user);          $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for [_1] was successfully changed.',$user));
         if ($caller eq 'reset_by_email') {          if ($caller eq 'reset_by_email') {
             $r->print($message.'<br />');              $r->print($message.'<br />');
         } else {          } else {
             &print_main_menu($r, $message);              &print_main_menu($r, $message);
         }          }
 # $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");  
     } else {      } else {
  # error error: run in circles, scream and shout   # error error: run in circles, scream and shout
         $message = &mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.');          $message = &Apache::lonhtmlcommon::confirm_success(
             &mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.'),1);
         unless ($caller eq 'reset_by_email') {          unless ($caller eq 'reset_by_email') {
             &print_main_menu($r, $message);              &print_main_menu($r, $message);
         }          }
 #        $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".  
 #                  &mt('Please make sure your old password was entered correctly.'));  
         return 1;          return 1;
     }      }
     return;      return;
Line 1699  sub verify_and_change_discussion { Line 1675  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.=&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 be 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.=&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 read by the reader.')).'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);              &Apache::lonnet::del('environment',['discmarkread']);
             &Apache::lonnet::delenv('environment.discmarkread');              &Apache::lonnet::delenv('environment.discmarkread');
         }          }
     }      }
 #    $r->print(<<ENDVCSCREEN);      &print_main_menu($r, $message);
 #$message  
 #ENDVCSCREEN  
     print_main_menu($r, $message);  
 }  }
   
 ################################################################  ################################################################
Line 1719  sub verify_and_change_discussion { Line 1692  sub verify_and_change_discussion {
 ################################################################  ################################################################
 sub coursedisplaychanger {  sub coursedisplaychanger {
     my $r = shift;      my $r = shift;
     Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
     { href => '/adm/preferences?action=changecourseinit',      { href => '/adm/preferences?action=changecourseinit',
                 text => 'Change Course Init. Pref.'});                  text => 'Change Course Init. Pref.'});
     $r->print(Apache::loncommon::start_page('Change Course Initialization Preference'));      $r->print(Apache::loncommon::start_page('Change Course Initialization Preference'));
Line 1798  sub verify_and_change_coursepage { Line 1771  sub verify_and_change_coursepage {
                         $refpage.'">'.$lt{'dasp'}.'</a></font>';                          $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }          }
     }      }
 #    $r->print(<<ENDVCSCREEN);      &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
 #$message  
 #<br /><br />  
 #ENDVCSCREEN  
     print_main_menu($r, $message);  
 }  }
   
 sub print_main_menu {  sub print_main_menu {
Line 1891  my @menu= Line 1860  my @menu=
     },      },
     { categorytitle=>'Message Management',      { categorytitle=>'Message Management',
  items =>[   items =>[
     { linktext => 'Messages & Notifications',      { linktext => 'Messages &amp; Notifications',
  url => '/adm/preferences?action=changemsgforward',   url => '/adm/preferences?action=changemsgforward',
  permission => 'F',   permission => 'F',
  #help => 'Prefs_Messages',   #help => 'Prefs_Messages',
Line 1909  my @menu= Line 1878  my @menu=
     },      },
     { categorytitle=>'Other',      { categorytitle=>'Other',
  items =>[   items =>[
     { linktext => 'Register Response Devices ("Clickers")',      { linktext => 'Register Response Devices (&quot;Clickers&quot;)',
  url => '/adm/preferences?action=changeclicker',   url => '/adm/preferences?action=changeclicker',
  permission => 'F',   permission => 'F',
  #help => '',   #help => '',
Line 2075  sub handler { Line 2044  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();          &toggle_debug();
     print_main_menu($r);   &print_main_menu($r);
     }      }
   
     return OK;      return OK;
Line 2357  sub handler2 { Line 2326  sub handler2 {
                        }));                         }));
     }      }
   
     if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {      if (($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/)
        && ($env{'user.domain'} =~/^(msu|gerd)$/)){
         push (@Options,({ action => 'debugtoggle',          push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',                            printmenu => 'yes',
                           subroutine => \&toggle_debug,                            subroutine => \&toggle_debug,
Removed from v.1.151  
changed lines
  Added in v.1.155

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