--- loncom/interface/loncommon.pm	2010/11/09 00:08:06	1.925.2.17
+++ loncom/interface/loncommon.pm	2010/12/07 04:33:49	1.925.2.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.925.2.17 2010/11/09 00:08:06 raeburn Exp $
+# $Id: loncommon.pm,v 1.925.2.26 2010/12/07 04:33:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1980,7 +1980,7 @@ sub select_dom_form {
             if ($dom ne '') {
                 my $domdesc;
                 if ($name eq 'srchdomain') {
-                    if ($dom eq 'gci') {
+                    if ($dom =~ /^\w+ci$/) {
                         $domdesc = 'Faculty';
                     } else {
                         $domdesc = 'Students';
@@ -4463,6 +4463,11 @@ sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
         $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
 
+    my $public;
+    if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+        || ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
+        $public = 1;
+    }
     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
 
     $function = &get_users_function() if (!$function);
@@ -4528,7 +4533,7 @@ sub bodytag {
     } 
 
     my $name = &plainname($env{'user.name'},$env{'user.domain'});
-    if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+    if ($public) {
 	undef($role);
     } else {
 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
@@ -4549,7 +4554,7 @@ sub bodytag {
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
-    if ($env{'environment.remote'} eq 'off') {
+    if ($env{'environment.remote'} ne 'on') {
         # No Remote
         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
             return $bodytag; 
@@ -4564,7 +4569,7 @@ sub bodytag {
         my $role_selector;
         if (($custommenu) && !($env{'form.context'} eq 'requestcrs') && 
             ($env{'request.course.id'}) && 
-            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest')) {
+            ($env{'course.'.$env{'request.course.id'}.'.domain'} =~ /^\w+citest$/)) {
             $role_selector = &Apache::lonmenu::roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
                         $env{'course.' . $env{'request.course.id'} . '.num'}  );
@@ -4573,14 +4578,17 @@ sub bodytag {
             }
         }
         my $cid = $env{'request.course.id'};
-        my %gcicourses = (
-                           gci_9615072b469884921gcil1 => 'review',
-                           gci_1H96711d710194bfegcil1 => 'submit',
-                           gci_5422913620b814c90gcil1 => 'tutorial',
-                         );
-        if (($custommenu && $cid && !$gcicourses{$cid}) && 
+        my %cicourses;
+        my $udom = $env{'user.domain'};
+        my %allnums = &get_faculty_cnums();
+        if (($udom ne '') && (ref($allnums{$udom}) eq 'HASH')) {
+             foreach my $key (%{$allnums{$udom}}) {
+                 $cicourses{$udom.'_'.$key} = $allnums{$udom}->{$key};
+             }
+        }
+        if (($custommenu && $cid && !$cicourses{$cid}) && 
              !($env{'form.context'} eq 'requestcrs') ||
-             ($env{'user.domain'} eq 'gcitest')) {
+             ($env{'user.domain'} =~ /^\w+citest$/)) {
             my $role = 'st';
             if ($custommenu) {
                 $role = 'cc';
@@ -4602,7 +4610,7 @@ sub bodytag {
                     $current = $role.'./'.$env{'course.'.$cid.'.domain'}.
                                '/'.$env{'course.'.$cid.'.num'};
                 }
-                $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses,$formname);
+                $switcher_js = &gcitest_switcher_js($current,$numcourses,$formname);
                 if ($switcher_js) {  
                     $switcher_js= <<"ENDSCRIPT";
 <script type="text/javascript">
@@ -4638,7 +4646,7 @@ ENDSCRIPT
             return $bodytag;
         }
 
-        if ($cid && $gcicourses{$cid} eq 'tutorial') {
+        if ($cid && $cicourses{$cid} eq 'tutorial') {
             $bodytag .= '<div class="LC_page_header">';
         }
  
@@ -4653,14 +4661,14 @@ ENDSCRIPT
             $dc_info = &dc_courseid_toggle($dc_info);
         }
         $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
-        if ($cid && $gcicourses{$cid} eq 'tutorial') {
+        if ($cid && $cicourses{$cid} eq 'tutorial') {
             $bodytag .= '</div>';
         }
 
         #don't show menus for public users
-        if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
+        if(!$public){
             if (($custommenu) && 
-                ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
+                ($env{'request.role'} !~ m{^st\./(\w+)citest/$match_courseid})) {
                 $bodytag .= &Apache::lonmenu::gci_secondary_menu();
             } elsif ($env{'request.role'} ne 'cm' || &check_for_gci_dc()) {    
                 $bodytag .= Apache::lonmenu::secondary_menu();
@@ -6181,11 +6189,6 @@ ol.LC_primary_menu {
   margin: 0.2em 0 0 0;
 }
 
-span.LC_new_message{
-  font-weight:bold;
-  color: darkred;
-}
-
 ol#LC_PathBreadcrumbs {
   margin: 0;
 }
@@ -6206,6 +6209,11 @@ ol.LC_primary_menu a {
   text-decoration: none;
 }
 
+ol.LC_primary_menu a.LC_new_message {
+  font-weight:bold;
+  color: darkred;
+}
+
 ul#LC_secondary_menu {
   clear: both;
   color: $fontmenu;
@@ -6570,7 +6578,7 @@ a#LC_content_toolbar_changefolder_toggle
 }
 
 a#LC_content_toolbar_management {
-  background-image:url(/res/adm/pages/conf.png);
+  background-image:url(/res/adm/pages/navtomenu.png);
 }
 
 ul#LC_toolbar li a:hover {
@@ -11005,22 +11013,23 @@ sub clean_symb {
 sub needs_gci_custom {
     my $custommenu;
     my $numdc = &check_for_gci_dc();
+    my $udom = $env{'user.domain'};
+    return if ($udom eq '');
     unless ($numdc) {
         my $then=$env{'user.login.time'};
         my $now = time;
-        my %cnums = (
-                        review => '9615072b469884921gcil1',
-                        submit => '1H96711d710194bfegcil1',
-                    );
-        if ($env{'user.role.st./gci/'.$cnums{'review'}}) {
+        my %allnums = &get_faculty_cnums();
+        my $cnums = $allnums{$udom};
+        return unless (ref($cnums) eq 'HASH');
+        if ($env{"user.role.st./$udom/$cnums->{'review'}"}) {
             my ($start,$end) =
-                split('.',$env{'user.role.st./gci/'.$cnums{'review'}});
+                split('.',$env{"user.role.st./$udom/$cnums->{'review'}"});
             if (((!$start) || ($start && $start <= $now)) &&
                 ((!$end) || ($end > $now))) {
                 $custommenu = 1;
-                if ($env{'user.role.cc./gci/'.$cnums{'review'}}) {
+                if ($env{"user.role.cc./$udom/$cnums->{'review'}"}) {
                     my ($ccstart,$ccend) =
-                        split('.',$env{'user.role.cc./gci/'.$cnums{'review'}});
+                        split('.',$env{"user.role.cc./$udom/$cnums->{'review'}"});
                     if (((!$start) || ($start && $start <= $now)) &&
                             ((!$end) || ($end > $now))) {
                         $custommenu = '';
@@ -11032,10 +11041,20 @@ sub needs_gci_custom {
     return $custommenu;
 }
 
+sub ci_tabs {
+    my ($domain) = @_;
+    my %tabs = (
+                 gci  => ['review','submit','managetest','tutorial'],
+                 slci => ['review'],
+               );
+    return $tabs{$domain};
+}
+
 sub check_for_gci_dc {
     my $then=$env{'user.login.time'};
     my $numdc = 0;
-    foreach my $dom ('gci','gcitest') {
+    my @doms = &Apache::lonnet::current_machine_domains();
+    foreach my $dom (@doms) {
         if ($env{'user.role.dc./'.$dom.'/'}) {
             my $livedc = 1;
             my ($tstart,$tend)=split(/\./,$env{'user.role.dc./'.$dom.'/'});
@@ -11049,10 +11068,24 @@ sub check_for_gci_dc {
     return $numdc;
 }
 
+sub get_faculty_cnums {
+    my %cnums = (
+         gci => { 
+                    review => '9615072b469884921gcil1',
+                    submit => '1H96711d710194bfegcil1',
+                    tutorial => '5422913620b814c90gcil1',
+                },
+         slci => {
+                    review => '4V80581c93ffc4c38gcil1',
+                 }
+    );
+    return %cnums;
+}
+
 sub existing_gcitest_courses {
     my ($role) = @_;
     my %courses;
-    my $cdom = 'gcitest';
+    my $cdom = $env{'user.domain'}.'test';
     my $now = time;
     foreach my $envkey (keys(%env)) {
         my $cnum;
@@ -11145,7 +11178,14 @@ ENDJS
     return $output;
 }
 
-
+sub get_citest_map {
+    my ($cdom) = @_;
+    my %questionnaires = (
+                           gcitest  => 'default_1261144274.sequence',
+                           slcitest => 'default_1261144274.sequence',
+                         );
+    return $questionnaires{$cdom};
+}
 
 =pod