--- loncom/interface/lonpreferences.pm	2009/12/02 18:33:27	1.179
+++ loncom/interface/lonpreferences.pm	2010/09/19 14:00:49	1.179.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.179 2009/12/02 18:33:27 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.179.2.3 2010/09/19 14:00:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -995,14 +995,19 @@ 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') {
+            if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
                $newscreen.=$msuser.':'.$msdomain.',';
-	   } else {
+           } else {
                $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
            }
         }
@@ -1845,23 +1850,8 @@ if (&Apache::lonnet::usertools_access($u
 }
 my @menu=
     ({	categorytitle=>'Personal Data',
-	items =>[
-	    {	linktext => 'Personal Information Page',
-		url => $aboutmeurl,
-		permission => $permissions{'aboutme'},
-		#help => 'Prefs_About_Me',
-		icon => 'system-users.png',
-		linktitle => 'Edit information about yourself that should be displayed on your public profile.'
-	    },
-	    {	linktext => 'Screen Name',
-		url => '/adm/preferences?action=changescreenname',
-		permission => 'F',
-		#help => 'Prefs_Screen_Name_Nickname',
-		icon => 'preferences-desktop-font.png',
-		linktitle => 'Change the name that is displayed in your posts.'
-	    },
-		]
-    },
+        items =>[]
+     },
     {	categorytitle=>'Page Display Settings',
 	items =>[
 	    {	linktext => 'Color Scheme',
@@ -1871,25 +1861,10 @@ my @menu=
 		icon => 'preferences-desktop-theme.png',
 		linktitle => 'Change LON-CAPA default colors.'
 	    },
-	    {	linktext => 'Menu Display',
-		url => '/adm/preferences?action=changeicons',
-		permission => 'F',
-		#help => '',
-		icon => 'preferences-system-windows.png',
-		linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
-	    }
-
 		]
     },
     {	categorytitle=>'Content Display Settings',
 	items =>[
-	    {	linktext => 'Language',
-		url => '/adm/preferences?action=changelanguages',
-		permission => 'F',
-		#help => 'Prefs_Language',
-		icon => 'preferences-desktop-locale.png',
-		linktitle => 'Choose the default language for this user.'
-	    },
 	    {	linktext => 'WYSIWYG Editor',
 		url => '/adm/preferences?action=changewysiwyg',
 		permission => 'F',
@@ -1897,13 +1872,6 @@ my @menu=
 		icon => 'edit-select-all.png',
 		linktitle => 'Enable or disable the WYSIWYG-Editor.'
 	    },
-	    {	linktext => $role.' Page',
-		url => '/adm/preferences?action=changerolespref',
-		permission => 'F',
-		#help => '',
-		icon => 'sctr.png',
-		linktitle => 'Configure the roles hotlist.'
-	    },
 	    {	linktext => 'Math display settings',
 		url => '/adm/preferences?action=changetexenginepref',
 		permission => 'F',
@@ -1922,28 +1890,36 @@ my @menu=
 		icon => 'mail-reply-all.png',
 		linktitle => 'Change messageforwarding or notifications settings.'
 	    },
-	    {	linktext => 'Discussion Display',
-		url => '/adm/preferences?action=changediscussions',
-		permission => 'F',
-		#help => 'Change_Discussion_Display',
-		icon => 'mail-message-new.png',
-		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
-	    },
 		]
     },
     {	categorytitle=>'Other',
-	items =>[
-	    {	linktext => 'Register Response Devices (&quot;Clickers&quot;)',
-		url => '/adm/preferences?action=changeclicker',
-		permission => 'F',
-		#help => '',
-		icon => 'network-workgroup.png',
-		linktitle => 'Register your clicker.'
-	    },
-		]
+	items =>[]
     },
     );
 
+    if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                          $env{'user.domain'},'aboutme')) {
+        push(@{ $menu[0]->{items} },
+                {   linktext   => 'Personal Information Page',
+                    url        => $aboutmeurl,
+                    permission => $permissions{'aboutme'},
+                    #help      => 'Prefs_About_Me',
+                    icon       => 'system-users.png',
+                    linktitle  => 'Edit information about yourself that should be displayed on your public profile.'
+                });
+    }
+
+    unless ($env{'user.domain'} eq 'gcitest') {
+        push(@{ $menu[0]->{items} },
+            {   linktext => 'Screen Name',
+                url => '/adm/preferences?action=changescreenname',
+                permission => 'F',
+                #help => 'Prefs_Screen_Name_Nickname',
+                icon => 'preferences-desktop-font.png',
+                linktitle => 'Change the name that is displayed in your posts.'
+            });
+    }
+
     if ($currentauth =~ /^(unix|internal):/) {
 push(@{ $menu[0]->{items} }, {
 	linktext => 'Password',
@@ -1954,25 +1930,29 @@ push(@{ $menu[0]->{items} }, {
 	linktitle => 'Change your password.',
 	});
     }
-    if ($env{'environment.remote'} eq 'off') {
-push(@{ $menu[1]->{items} }, {
-	linktext => 'Launch Remote Control',
-	url => '/adm/remote?url=/adm/preferences&amp;action=launch',
-	permission => 'F',
-	#help => '',
-	icon => 'remotecontrol.png',
-	linktitle => 'Launch the remote control for LON-CAPA.',
-	});
-    }else{
-push(@{ $menu[1]->{items} }, {
-	linktext => 'Collapse Remote Control',
-	url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
-	permission => 'F',
-	#help => '',
-	icon => 'remotecontrol.png',
-	linktitle => 'Collapse the remote control for LON-CAPA.',
-	});
+
+    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) {
+        push(@{ $menu[1]->{items} },
+          {   linktext => 'Menu Display',
+              url => '/adm/preferences?action=changeicons',
+              permission => 'F',
+              #help => '',
+              icon => 'preferences-system-windows.png',
+              linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
+          });
+    }
+
+    unless ($env{'user.domain'} eq 'gcitest') {
+        push(@{ $menu[3]->{items} },
+            {   linktext => 'Discussion Display',
+                url => '/adm/preferences?action=changediscussions',
+                permission => 'F',
+                #help => 'Change_Discussion_Display',
+                icon => 'mail-message-new.png',
+                linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
+            });
     }
+
     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
     if (keys(%author_roles) > 0) {
 push(@{ $menu[4]->{items} }, {
@@ -1985,9 +1965,10 @@ push(@{ $menu[4]->{items} }, {
 	});
     }
 
-    if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
-	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
-				    .$env{'request.course.sec'})) {
+    unless ((&Apache::loncommon::needs_gci_custom()) || ($env{'user.domain'} eq 'gcitest')) { 
+        if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+	    || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+	   			        .$env{'request.course.sec'})) {
 push(@{ $menu[4]->{items} }, {
 	linktext => 'Course Initialization',
 	url => '/adm/preferences?action=changecourseinit',
@@ -1997,6 +1978,7 @@ push(@{ $menu[4]->{items} }, {
 	linktitle => 'Set the default page to be displayed when you select a course role.',
 	});
 
+        }
     }
     if (&can_toggle_debug()) {
 push(@{ $menu[4]->{items} }, {
@@ -2007,7 +1989,7 @@ push(@{ $menu[4]->{items} }, {
 	icon => 'blog.png',
 	linktitle => 'Toggle Debug Messages.',
 	});
-    }   
+    }
 
     $r->print(&Apache::loncommon::start_page('My Space'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Preferences'));