Diff for /loncom/cgi/clusterstatus.pl between versions 1.26 and 1.27

version 1.26, 2008/12/25 01:56:03 version 1.27, 2009/01/15 22:34:18
Line 260  sub reroute { Line 260  sub reroute {
 sub allreroutes {  sub allreroutes {
     my $local=shift;      my $local=shift;
     &takeoffline($local);      &takeoffline($local);
     print(&Apache::lonlocal::mt('Reroute to:').' <font size="1">');      my $reroute;
     foreach my $remote (sort keys %hostname) {      foreach my $remote (sort(keys(%hostname))) {
  unless ($local eq $remote) {   unless ($local eq $remote) {
     &reroute($local,$remote);      $reroute .= &reroute($local,$remote);
  }   }
     }      }
     print('</font>');      if ($reroute) {
           print(&Apache::lonlocal::mt('Reroute to:').' <font size="1">'.$reroute.'</font>');
       }
 }  }
   
 # ========================================================= Produce a green bar  # ========================================================= Produce a green bar
Line 740  if ($Apache::lonnet::env{'request.role'} Line 742  if ($Apache::lonnet::env{'request.role'}
     %hostname = %allhostname;      %hostname = %allhostname;
     $scope = 'Cluster';      $scope = 'Cluster';
 } else {  } else {
       my $roledom = $env{'request.role.domain'}; 
       if ((!$roledom) || ($roledom eq 'public'))  {
           print &LONCAPA::lonauthcgi::unauthorized_msg('clusterstatus'); 
           exit;
       }
     undef(%hostname);      undef(%hostname);
     my @poss_domains = &Apache::lonnet::current_machine_domains();      my @poss_domains = &Apache::lonnet::current_machine_domains();
       if (!grep(/^\Q$roledom\E$/,@poss_domains)) {
           my $home = &Apache::lonnet::domain($roledom,'primary');
           print &LONCAPA::lonauthcgi::unauthorized_msg('clusterstatus');
           print '<br /><span class="LC_warning">'.&mt("You need to select a role in this server's domain ([_1]) to display domain status for this server and other servers in the domain.",$roledom).'</span><br />';
           if ($home) {
               print '<span class="LC_warning">'.&mt("Alternatively, you'll need to [_1]switch server[_2] to display domain status for servers in the domain of your current role ([_3]).",'<a href="/adm/switchserver?otherserver='.$home.'&role='.$env{'request.role'}.'">','</a>',$roledom).'/span>';
           }
           exit;
       }
     foreach my $host (keys(%allhostname)) {      foreach my $host (keys(%allhostname)) {
         if (grep(/^\Q$hostdom{$host}\E$/,@poss_domains)) {          if (grep(/^\Q$hostdom{$host}\E$/,@poss_domains)) {
             $hostname{$host} = $allhostname{$host};              $hostname{$host} = $allhostname{$host};

Removed from v.1.26  
changed lines
  Added in v.1.27


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>