[BACK]Return to lonchatfetch.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonchatfetch.pm between versions 1.39 and 1.40

version 1.39, 2013/07/22 18:06:51 version 1.40, 2021/11/30 15:55:37
Line 177  sub handler { Line 177  sub handler {
         $refresh_cmd .= "&group=$group";          $refresh_cmd .= "&group=$group";
     }      }
     my $headarg;      my $headarg;
     my ($blocked,$blocktext) = blockstatus();      my $clientip = &Apache::lonnet::get_requestor_ip($r);
       my ($blocked,$blocktext) = &blockstatus($clientip);
     if ($blocked) {      if ($blocked) {
         $newstuff = $blocktext;          $newstuff = $blocktext;
         $headarg =  {'only_body' => 1,};          $headarg =  {'only_body' => 1,};
Line 222  sub get_seeid_status { Line 223  sub get_seeid_status {
 }  }
   
 sub blockstatus {  sub blockstatus {
       my ($clientip) = @_;
     my ($blocked,$output);      my ($blocked,$output);
     my %setters;      my %setters;
     my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'chat');      my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
           &Apache::loncommon::blockcheck(\%setters,'chat',$clientip);
     if ($startblock && $endblock) {      if ($startblock && $endblock) {
         $blocked = 1;          $blocked = 1;
         my $endblocktime = &Apache::lonlocal::locallocaltime($endblock);          my $endblocktime = &Apache::lonlocal::locallocaltime($endblock);
Line 240  sub blockstatus { Line 243  sub blockstatus {
                 $output .= &mt('Block for [_1] starts: [_2], ends [_3], set by: [_4]',$courseinfo{'description'},$openblock,$closeblock,$fullname).'<br />';                  $output .= &mt('Block for [_1] starts: [_2], ends [_3], set by: [_4]',$courseinfo{'description'},$openblock,$closeblock,$fullname).'<br />';
             }              }
         }          }
       } elsif ($by_ip) {
           $blocked = 1;
           my $showdom = &Apache::lonnet::domain($blockdom);
           if ($showdom eq '') {
               $showdom = $blockdom;
           }
           $output = &mt('Chat Room is unavailable from your current IP address: [_1], '
                        .'because communication is blocked for certain IP address(es).'
                        ,$clientip).
                     '<br />'.
                     &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.'
                        ,$showdom);
     }      }
     return ($blocked,$output);      return ($blocked,$output);
 }  }
Removed from v.1.39  
changed lines
  Added in v.1.40

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