--- loncom/interface/loncommon.pm 2010/12/05 16:38:37 1.925.2.21 +++ 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.21 2010/12/05 16:38:37 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 # @@ -4581,7 +4581,7 @@ sub bodytag { my %cicourses; my $udom = $env{'user.domain'}; my %allnums = &get_faculty_cnums(); - if ($udom ne '' && ref($allnums{$udom} eq 'HASH') { + if (($udom ne '') && (ref($allnums{$udom}) eq 'HASH')) { foreach my $key (%{$allnums{$udom}}) { $cicourses{$udom.'_'.$key} = $allnums{$udom}->{$key}; } @@ -11021,15 +11021,15 @@ sub needs_gci_custom { my %allnums = &get_faculty_cnums(); my $cnums = $allnums{$udom}; return unless (ref($cnums) eq 'HASH'); - if ($env{'user.role.st./\Q$udom\E/'.$cnums->{'review'}}) { + if ($env{"user.role.st./$udom/$cnums->{'review'}"}) { my ($start,$end) = - split('.',$env{'user.role.st./\Q$udom\E/'.$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./\Q$udom\E/'.$cnums->{'review'}}) { + if ($env{"user.role.cc./$udom/$cnums->{'review'}"}) { my ($ccstart,$ccend) = - split('.',$env{'user.role.cc./\Q$udom\E/'.$cnums->{'review'}}); + split('.',$env{"user.role.cc./$udom/$cnums->{'review'}"}); if (((!$start) || ($start && $start <= $now)) && ((!$end) || ($end > $now))) { $custommenu = ''; @@ -11041,6 +11041,15 @@ 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; @@ -11064,12 +11073,10 @@ sub get_faculty_cnums { gci => { review => '9615072b469884921gcil1', submit => '1H96711d710194bfegcil1', - tutorial' => '5422913620b814c90gcil1', + tutorial => '5422913620b814c90gcil1', }, slci => { - review => '', - submit => '', - tutorial' => '', + review => '4V80581c93ffc4c38gcil1', } ); return %cnums;