Diff for /loncom/lond between versions 1.581 and 1.582

version 1.581, 2024/06/22 14:29:36 version 1.582, 2024/12/27 01:04:00
Line 6150  sub enrollment_enabled_handler { Line 6150  sub enrollment_enabled_handler {
     my ($cmd, $tail, $client) = @_;      my ($cmd, $tail, $client) = @_;
     my $userinput = $cmd.":".$tail; # For logging purposes.      my $userinput = $cmd.":".$tail; # For logging purposes.
   
       
     my ($cdom) = split(/:/, $tail, 2);   # Domain we're asking about.      my ($cdom) = split(/:/, $tail, 2);   # Domain we're asking about.
       my $outcome;
     my $outcome  = &localenroll::run($cdom);      eval {
           local($SIG{__DIE__})='DEFAULT';
           $outcome = &localenroll::run($cdom);
       };
     &Reply($client, \$outcome, $userinput);      &Reply($client, \$outcome, $userinput);
   
     return 1;      return 1;
 }  }
 &register_handler("autorun", \&enrollment_enabled_handler, 0, 1, 0);  &register_handler("autorun", \&enrollment_enabled_handler, 0, 1, 0);
Line 6188  sub validate_instcode_handler { Line 6189  sub validate_instcode_handler {
     my ($dom,$instcode,$owner) = split(/:/, $tail);      my ($dom,$instcode,$owner) = split(/:/, $tail);
     $instcode = &unescape($instcode);      $instcode = &unescape($instcode);
     $owner = &unescape($owner);      $owner = &unescape($owner);
     my ($outcome,$description,$credits) =       my ($outcome,$description,$credits);
         &localenroll::validate_instcode($dom,$instcode,$owner);      eval {
           local($SIG{__DIE__})='DEFAULT';
           ($outcome,$description,$credits) =
               &localenroll::validate_instcode($dom,$instcode,$owner);
       };
     my $result = &escape($outcome).'&'.&escape($description).'&'.      my $result = &escape($outcome).'&'.&escape($description).'&'.
                  &escape($credits);                   &escape($credits);
     &Reply($client, \$result, $userinput);      &Reply($client, \$result, $userinput);
Line 6223  sub validate_instcrosslist_handler  { Line 6228  sub validate_instcrosslist_handler  {
     $instcode = &unescape($instcode);      $instcode = &unescape($instcode);
     $inst_xlist = &unescape($inst_xlist);      $inst_xlist = &unescape($inst_xlist);
     $coowner = &unescape($coowner);      $coowner = &unescape($coowner);
     my $outcome = &localenroll::validate_crosslist_access($dom,$instcode,      my $outcome;
                                                           $inst_xlist,$coowner);      eval {
     &Reply($client, \$outcome, $userinput);          local($SIG{__DIE__})='DEFAULT';
           $outcome = &localenroll::validate_crosslist_access($dom,$instcode,
                                                              $inst_xlist,$coowner);
       };
   
       &Reply($client, \$outcome, $userinput);
     return 1;      return 1;
 }  }
 &register_handler("autovalidateinstcrosslist", \&validate_instcrosslist_handler, 0, 1, 0);  &register_handler("autovalidateinstcrosslist", \&validate_instcrosslist_handler, 0, 1, 0);
Line 6249  sub get_sections_handler { Line 6258  sub get_sections_handler {
     my $userinput = "$cmd:$tail";      my $userinput = "$cmd:$tail";
   
     my ($coursecode, $cdom) = split(/:/, $tail);      my ($coursecode, $cdom) = split(/:/, $tail);
     my @secs = &localenroll::get_sections($coursecode,$cdom);      my $seclist;
     my $seclist = &escape(join(':',@secs));      eval {
           local($SIG{__DIE__})='DEFAULT';
           my @secs = &localenroll::get_sections($coursecode,$cdom);
           $seclist = &escape(join(':',@secs));
       };
     &Reply($client, \$seclist, $userinput);      &Reply($client, \$seclist, $userinput);
       
   
     return 1;      return 1;
 }  }
 &register_handler("autogetsections", \&get_sections_handler, 0, 1, 0);  &register_handler("autogetsections", \&get_sections_handler, 0, 1, 0);
Line 6274  sub get_sections_handler { Line 6284  sub get_sections_handler {
 # Returns:  # Returns:
 #   1        - Processing should continue.  #   1        - Processing should continue.
 #  #
   
 sub validate_course_owner_handler {  sub validate_course_owner_handler {
     my ($cmd, $tail, $client)  = @_;      my ($cmd, $tail, $client)  = @_;
     my $userinput = "$cmd:$tail";      my $userinput = "$cmd:$tail";
Line 6281  sub validate_course_owner_handler { Line 6292  sub validate_course_owner_handler {
           
     $owner = &unescape($owner);      $owner = &unescape($owner);
     $coowners = &unescape($coowners);      $coowners = &unescape($coowners);
     my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom,$coowners);      my $outcome;
       eval {
           local($SIG{__DIE__})='DEFAULT';
           $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom,$coowners);
       };
     &Reply($client, \$outcome, $userinput);      &Reply($client, \$outcome, $userinput);
   
   
   
     return 1;      return 1;
 }  }
 &register_handler("autonewcourse", \&validate_course_owner_handler, 0, 1, 0);  &register_handler("autonewcourse", \&validate_course_owner_handler, 0, 1, 0);
Line 6311  sub validate_course_section_handler { Line 6323  sub validate_course_section_handler {
     my ($cmd, $tail, $client) = @_;      my ($cmd, $tail, $client) = @_;
     my $userinput = "$cmd:$tail";      my $userinput = "$cmd:$tail";
     my ($inst_course_id, $cdom) = split(/:/, $tail);      my ($inst_course_id, $cdom) = split(/:/, $tail);
       my $outcome;
     my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);      eval {
           local($SIG{__DIE__})='DEFAULT';
           $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);
       };
     &Reply($client, \$outcome, $userinput);      &Reply($client, \$outcome, $userinput);
   
   
     return 1;      return 1;
 }  }
 &register_handler("autovalidatecourse", \&validate_course_section_handler, 0, 1, 0);  &register_handler("autovalidatecourse", \&validate_course_section_handler, 0, 1, 0);
Line 6349  sub validate_class_access_handler { Line 6362  sub validate_class_access_handler {
  $outcome=&localenroll::check_section($inst_class,$owners,$cdom);   $outcome=&localenroll::check_section($inst_class,$owners,$cdom);
     };      };
     &Reply($client,\$outcome, $userinput);      &Reply($client,\$outcome, $userinput);
   
     return 1;      return 1;
 }  }
 &register_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0);  &register_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0);
Line 6482  sub create_auto_enroll_password_handler Line 6494  sub create_auto_enroll_password_handler
     my ($authparam, $cdom) = split(/:/, $userinput);      my ($authparam, $cdom) = split(/:/, $userinput);
   
     my ($create_passwd,$authchk);      my ($create_passwd,$authchk);
     ($authparam,      eval {
      $create_passwd,          local($SIG{__DIE__})='DEFAULT';
      $authchk) = &localenroll::create_password($authparam,$cdom);          ($authparam,$create_passwd,$create_passwd,$authchk) = 
               &localenroll::create_password($authparam,$cdom);
       };
     &Reply($client, &escape($authparam.':'.$create_passwd.':'.$authchk)."\n",      &Reply($client, &escape($authparam.':'.$create_passwd.':'.$authchk)."\n",
    $userinput);     $userinput);
   
Line 6721  sub get_institutional_code_format_handle Line 6734  sub get_institutional_code_format_handle
  my ($key,$value) = split/=/,$_;   my ($key,$value) = split/=/,$_;
  $instcodes{&unescape($key)} = &unescape($value);   $instcodes{&unescape($key)} = &unescape($value);
     }      }
     my $formatreply = &localenroll::instcode_format($cdom,      my $formatreply; 
     \%instcodes,      eval {
     \%codes,          local($SIG{__DIE__})='DEFAULT';
     \@codetitles,          $formatreply = &localenroll::instcode_format($cdom,
     \%cat_titles,         \%instcodes,
     \%cat_order);       \%codes,
        \@codetitles,
        \%cat_titles,
        \%cat_order);
       };
     if ($formatreply eq 'ok') {      if ($formatreply eq 'ok') {
  my $codes_str = &Apache::lonnet::hash2str(%codes);   my $codes_str = &Apache::lonnet::hash2str(%codes);
  my $codetitles_str = &Apache::lonnet::array2str(@codetitles);   my $codetitles_str = &Apache::lonnet::array2str(@codetitles);
Line 6786  sub get_possible_instcodes_handler { Line 6803  sub get_possible_instcodes_handler {
     my $reply;      my $reply;
     my $cdom = $tail;      my $cdom = $tail;
     my (@codetitles,%cat_titles,%cat_order,@code_order);      my (@codetitles,%cat_titles,%cat_order,@code_order);
     my $formatreply = &localenroll::possible_instcodes($cdom,      my $formatreply;
                                                        \@codetitles,      eval {
                                                        \%cat_titles,          local($SIG{__DIE__})='DEFAULT';
                                                        \%cat_order,          $formatreply = &localenroll::possible_instcodes($cdom,
                                                        \@code_order);                                                          \@codetitles,
                                                           \%cat_titles,
                                                           \%cat_order,
                                                           \@code_order);
       };
     if ($formatreply eq 'ok') {      if ($formatreply eq 'ok') {
         my $result = join('&',map {&escape($_);} (@codetitles)).':';          my $result = join('&',map {&escape($_);} (@codetitles)).':';
         $result .= join('&',map {&escape($_);} (@code_order)).':';          $result .= join('&',map {&escape($_);} (@code_order)).':';

Removed from v.1.581  
changed lines
  Added in v.1.582


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