[BACK]Return to lond CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.374 and 1.377

version 1.374, 2007/05/31 05:17:48 version 1.377, 2007/08/02 01:31:48
Line 135  my @adderrors    = ("ok", Line 135  my @adderrors    = ("ok",
     "lcuseradd Unable to make www member of users's group",      "lcuseradd Unable to make www member of users's group",
     "lcuseradd Unable to su to root",      "lcuseradd Unable to su to root",
     "lcuseradd Unable to set password",      "lcuseradd Unable to set password",
     "lcuseradd Usrname has invalid characters",      "lcuseradd Username has invalid characters",
     "lcuseradd Password has an invalid character",      "lcuseradd Password has an invalid character",
     "lcuseradd User already exists",      "lcuseradd User already exists",
     "lcuseradd Could not add user.",      "lcuseradd Could not add user.",
Line 4640  sub inst_usertypes_handler { Line 4640  sub inst_usertypes_handler {
 }  }
 &register_handler("inst_usertypes", \&inst_usertypes_handler, 0, 1, 0);  &register_handler("inst_usertypes", \&inst_usertypes_handler, 0, 1, 0);
   
   sub inst_dirsrch_handler {
       my ($cmd, $tail, $client) = @_;
       my ($domain,$srchby,$srchterm,$srchtype) = split(/:/, $tail);
       $srchby = &unescape($srchby);
       $srchterm = &unescape($srchterm);
       my $userinput = $cmd.":".$tail; # For logging purposes.
       my (%instusers,%instids,$result,$res);
       eval {
           local($SIG{__DIE__})='DEFAULT';
           $result=&localenroll::get_userinfo($domain,undef,undef,\%instusers,\%instids,undef,$srchby,$srchterm,$srchtype);
       };
       if ($result eq 'ok') {
           if (keys(%instusers) > 0) {
               foreach my $key (keys(%instusers)) {
                   my $usrstr = &Apache::lonnet::hash2str(%{$instusers{$key}});
                   $res.=&escape($key).'='.&escape($usrstr).'&';
               }
           }
           $res=~s/\&$//;
       }
       &Reply($client, "$res\n", $userinput);
   }
   &register_handler("instdirsrch", \&inst_dirsrch_handler, 0, 1, 0);
   
 # mkpath makes all directories for a file, expects an absolute path with a  # mkpath makes all directories for a file, expects an absolute path with a
 # file or a trailing / if just a dir is passed  # file or a trailing / if just a dir is passed
 # returns 1 on success 0 on failure  # returns 1 on success 0 on failure
Line 5486  sub make_new_child { Line 5510  sub make_new_child {
 # ---------------- New known client connecting, could mean machine online again  # ---------------- New known client connecting, could mean machine online again
     if (&Apache::lonnet::get_host_ip($currenthostid) ne $clientip       if (&Apache::lonnet::get_host_ip($currenthostid) ne $clientip 
  && $clientip ne '127.0.0.1') {   && $clientip ne '127.0.0.1') {
  &Apache::lonnet::reconlonc();   &Apache::lonnet::reconlonc($clientname);
     }      }
     &logthis("<font color='green'>Established connection: $clientname</font>");      &logthis("<font color='green'>Established connection: $clientname</font>");
     &status('Will listen to '.$clientname);      &status('Will listen to '.$clientname);
Removed from v.1.374  
changed lines
  Added in v.1.377

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