--- loncom/interface/lonpreferences.pm	2010/01/05 22:54:46	1.179.2.2
+++ loncom/interface/lonpreferences.pm	2010/12/05 22:00:00	1.179.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.179.2.2 2010/01/05 22:54:46 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.179.2.5 2010/12/05 22:00:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -995,16 +995,21 @@ sub verify_and_change_msgforward {
     my $domain     = $env{'user.domain'};
     my $newscreen  = '';
     my $message='';
-    foreach (split(/\,/,$env{'form.msgforward'})) {
-	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
+    foreach my $recip (split(/\,/,$env{'form.msgforward'})) {
+        my ($msuser,$msdomain);
+        if ($recip =~ /:/) {
+            ($msuser,$msdomain)=split(':',$recip);
+        } else {
+            ($msuser,$msdomain)=split(/\@/,$recip);
+        }
         $msuser = &LONCAPA::clean_username($msuser);
         $msdomain = &LONCAPA::clean_domain($msdomain);
         if (($msuser) && ($msdomain)) {
-	    if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
-               $newscreen.=$msuser.':'.$msdomain.',';
-	   } else {
-               $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
-           }
+            if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
+                $newscreen.=$msuser.':'.$msdomain.',';
+            } else {
+                $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
+            }
         }
     }
     $newscreen=~s/\,$//;
@@ -1378,7 +1383,7 @@ sub client_form {
                   .&Apache::lonhtmlcommon::row_closure()
                   .&Apache::lonhtmlcommon::row_title(
                        '<label for="uname">'.$lt{'username'}.'</label>')
-                  .'<input type="text" name="uname" size="15" />'
+                  .'<input type="text" name="uname" size="30" />'
                   .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
                   .&Apache::lonhtmlcommon::row_closure()
                   .&Apache::lonhtmlcommon::row_title(
@@ -1904,7 +1909,7 @@ my @menu=
                 });
     }
 
-    unless ($env{'user.domain'} eq 'gcitest') {
+    unless ($env{'user.domain'} =~ /^\w+citest$/) {
         push(@{ $menu[0]->{items} },
             {   linktext => 'Screen Name',
                 url => '/adm/preferences?action=changescreenname',
@@ -1926,7 +1931,7 @@ push(@{ $menu[0]->{items} }, {
 	});
     }
 
-    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) {
+    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} =~ /^\w+citest$/)) {
         push(@{ $menu[1]->{items} },
           {   linktext => 'Menu Display',
               url => '/adm/preferences?action=changeicons',
@@ -1937,7 +1942,7 @@ push(@{ $menu[0]->{items} }, {
           });
     }
 
-    unless ($env{'user.domain'} eq 'gcitest') {
+    unless ($env{'user.domain'} =~ /^\w+citest$/) {
         push(@{ $menu[3]->{items} },
             {   linktext => 'Discussion Display',
                 url => '/adm/preferences?action=changediscussions',
@@ -1960,7 +1965,7 @@ push(@{ $menu[4]->{items} }, {
 	});
     }
 
-    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) { 
+    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} =~ /^\w+citest/)) { 
         if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
 	    || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
 	   			        .$env{'request.course.sec'})) {