[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonpreferences.pm

raeburn raeburn@source.lon-capa.org
Thu, 21 May 2009 16:00:49 -0000


raeburn		Thu May 21 16:00:49 2009 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonpreferences.pm 
  Log:
  - Some items missed in backports to create 1.125.4.1.
  
  
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.125.4.1 loncom/interface/lonpreferences.pm:1.125.4.2
--- loncom/interface/lonpreferences.pm:1.125.4.1	Wed May 20 15:05:19 2009
+++ loncom/interface/lonpreferences.pm	Thu May 21 16:00:49 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.4.1 2009/05/20 15:05:19 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.4.2 2009/05/21 16:00:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -687,6 +687,12 @@
     if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
     &Apache::lonnet::put('environment',\%domcoord);
     &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
+    my $status='';
+    if ($domcoord{'domcoord.author'} eq 'blocked') {
+        $status=&mt('on');
+    } else {
+        $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>'));
     $message=&Apache::loncommon::confirmwrapper($message);
     $r->print(<<ENDVCSCREEN);
@@ -1509,6 +1515,7 @@
     my $result = &Apache::lonnet::changepass
 	($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
     # Inform the user the password has (not?) been changed
+    my $message;
     if ($result =~ /^ok$/) {
         $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));
         if ($caller eq 'reset_by_email') {
@@ -1742,7 +1749,7 @@
                         $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }
     }
-    $message = &Apache::lonhtmlcommon::confirm_success($message)
+    $message = &Apache::lonhtmlcommon::confirm_success($message);
     $r->print(<<ENDVCSCREEN);
 $message
 ENDVCSCREEN