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

Diff for /loncom/interface/loncreateuser.pm between versions 1.72 and 1.78

version 1.72, 2003/12/10 20:38:09 version 1.78, 2004/02/01 20:42:01
Line 124  sub print_username_entry_form { Line 124  sub print_username_entry_form {
     my @domains = &Apache::loncommon::get_domains();      my @domains = &Apache::loncommon::get_domains();
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');      my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
     my $bodytag =&Apache::loncommon::bodytag(      my $bodytag =&Apache::loncommon::bodytag(
                                   'Create Users, Change User Privileges');                                    'Create Users, Change User Privileges').
     &Apache::loncommon::help_open_faq(282).
     &Apache::loncommon::help_open_bug('Instructor Interface');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();      my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $sellink=&Apache::loncommon::selectstudent_link      my $sellink=&Apache::loncommon::selectstudent_link
                                         ('crtuser','ccuname','ccdomain');                                          ('crtuser','ccuname','ccdomain');
Line 140  sub print_username_entry_form { Line 142  sub print_username_entry_form {
                     'nr'   => "Name of Role",                      'nr'   => "Name of Role",
                     'cre'  => "Custom Role Editor"                      'cre'  => "Custom Role Editor"
        );         );
       my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
       my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");      $r->print(<<"ENDDOCUMENT");
 <html>  <html>
 <head>  <head>
Line 149  $selscript Line 153  $selscript
 $bodytag  $bodytag
 <form action="/adm/createuser" method="post" name="crtuser">  <form action="/adm/createuser" method="post" name="crtuser">
 <input type="hidden" name="phase" value="get_user_info">  <input type="hidden" name="phase" value="get_user_info">
 <h2>$lt{siur}</h2>  <h2>$lt{siur}$helpsiur</h2>
 <table>  <table>
 <tr><td>$lt{usr}:</td><td><input type="text" size="15" name="ccuname">  <tr><td>$lt{usr}:</td><td><input type="text" size="15" name="ccuname">
 </td><td rowspan="2">$sellink</td></tr><tr><td>  </td><td rowspan="2">$sellink</td></tr><tr><td>
Line 159  $lt{'dom'}:</td><td>$domform</td></tr> Line 163  $lt{'dom'}:</td><td>$domform</td></tr>
 </form>  </form>
 <form action="/adm/createuser" method="post" name="docustom">  <form action="/adm/createuser" method="post" name="docustom">
 <input type="hidden" name="phase" value="selected_custom_edit">  <input type="hidden" name="phase" value="selected_custom_edit">
 <h2>$lt{'ecrp'}</h2>  <h2>$lt{'ecrp'}$helpecpr</h2>
 $lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />  $lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
 <input name="customeditor" type="submit" value="$lt{'cre'}" />  <input name="customeditor" type="submit" value="$lt{'cre'}" />
 </body>  </body>
Line 259  ENDFORMINFO Line 263  ENDFORMINFO
                     'hs'   => "Home Server",                      'hs'   => "Home Server",
                     'lg'   => "Login Data"                      'lg'   => "Login Data"
        );         );
    my $genhelp=&Apache::loncommon::help_open_topic('Generation');
  $r->print(<<ENDNEWUSER);   $r->print(<<ENDNEWUSER);
 $dochead  $dochead
 <h1>$lt{'cnu'}</h1>  <h1>$lt{'cnu'}</h1>
Line 277  $loginscript Line 282  $loginscript
     <td><input type='text' name='cmiddle' size='15' /></td></tr>      <td><input type='text' name='cmiddle' size='15' /></td></tr>
 <tr><td>$lt{'ln'}   </td>  <tr><td>$lt{'ln'}   </td>
     <td><input type='text' name='clast'   size='15' /></td></tr>      <td><input type='text' name='clast'   size='15' /></td></tr>
 <tr><td>$lt{'gen'}  </td>  <tr><td>$lt{'gen'}$genhelp</td>
     <td><input type='text' name='cgen'    size='5'  /></td></tr>      <td><input type='text' name='cgen'    size='5'  /></td></tr>
 </table>  </table>
 $lt{'idsn'} <input type='text' name='cstid'   size='15' /></p>  $lt{'idsn'} <input type='text' name='cstid'   size='15' /></p>
 ${'hs'}: <select name="hserver" size="1"> $home_server_list </select>  $lt{'hs'}: <select name="hserver" size="1"> $home_server_list </select>
 <hr />  <hr />
 <h3>$lt{'lg'}</h3>  <h3>$lt{'lg'}</h3>
 <p>$generalrule </p>  <p>$generalrule </p>
Line 483  END Line 488  END
  $currentauth=~/^localauth:/   $currentauth=~/^localauth:/
  ) { # bad authentication scheme   ) { # bad authentication scheme
     if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {      if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
    my %lt=&Apache::lonlocal::texthash(
                                  'err'   => "ERROR",
          'uuas'  => "This user has an unrecognized authentication scheme",
                                  'sldb'  => "Please specify login data below",
                                  'ld'    => "Login Data"
      );
  $r->print(<<ENDBADAUTH);   $r->print(<<ENDBADAUTH);
 <hr />  <hr />
 <script type="text/javascript" language="Javascript">  <script type="text/javascript" language="Javascript">
 $loginscript  $loginscript
 </script>  </script>
 <font color='#ff0000'>ERROR:</font>  <font color='#ff0000'>$lt{'err'}:</font>
 This user has an unrecognized authentication scheme ($currentauth).  $lt{'uuas'} ($currentauth). $lt{'sldb'}.
 Please specify login data below.  <h3>$lt{'ld'}</h3>
 <h3>Login Data</h3>  
 <p>$generalrule</p>  <p>$generalrule</p>
 <p>$authformkrb</p>  <p>$authformkrb</p>
 <p>$authformint</p>  <p>$authformint</p>
Line 501  ENDBADAUTH Line 511  ENDBADAUTH
             } else {               } else { 
                 # This user is not allowed to modify the users                   # This user is not allowed to modify the users 
                 # authentication scheme, so just notify them of the problem                  # authentication scheme, so just notify them of the problem
    my %lt=&Apache::lonlocal::texthash(
                                  'err'   => "ERROR",
          'uuas'  => "This user has an unrecognized authentication scheme",
                                  'adcs'  => "Please alert a domain coordinator of this situation"
      );
  $r->print(<<ENDBADAUTH);   $r->print(<<ENDBADAUTH);
 <hr />  <hr />
 <script type="text/javascript" language="Javascript">  <script type="text/javascript" language="Javascript">
 $loginscript  $loginscript
 </script>  </script>
 <font color="#ff0000"> ERROR: </font>  <font color="#ff0000"> $lt{'err'}: </font>
 This user has an unrecognized authentication scheme ($currentauth).  $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 Please alert a domain coordinator of this situation.  
 <hr />  <hr />
 ENDBADAUTH  ENDBADAUTH
             }              }
Line 538  ENDBADAUTH Line 552  ENDBADAUTH
             $authformcurrent.=' <i>(will override current values)</i><br />';              $authformcurrent.=' <i>(will override current values)</i><br />';
             if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {              if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
  # Current user has login modification privileges   # Current user has login modification privileges
    my %lt=&Apache::lonlocal::texthash(
                                  'ccld'  => "Change Current Login Data",
          'enld'  => "Enter New Login Data"
      );
  $r->print(<<ENDOTHERAUTHS);   $r->print(<<ENDOTHERAUTHS);
 <hr />  <hr />
 <script type="text/javascript" language="Javascript">  <script type="text/javascript" language="Javascript">
 $loginscript  $loginscript
 </script>  </script>
 <h3>Change Current Login Data</h3>  <h3>$lt{'ccld'}</h3>
 <p>$generalrule</p>  <p>$generalrule</p>
 <p>$authformnop</p>  <p>$authformnop</p>
 <p>$authformcurrent</p>  <p>$authformcurrent</p>
 <h3>Enter New Login Data</h3>  <h3>$lt{'enld'}</h3>
 $authform_other  $authform_other
 ENDOTHERAUTHS  ENDOTHERAUTHS
             }              }
Line 575  ENDOTHERAUTHS Line 593  ENDOTHERAUTHS
        );         );
        $r->print(<<ENDCOAUTH);         $r->print(<<ENDCOAUTH);
 <h4>$lt{'cs'}</h4>  <h4>$lt{'cs'}</h4>
 <table border=2><tr><th>${'act'}</th><th>${'rol'}</th><th>${'ext'}</th>  <table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
 <th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>  <th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>
 <tr>  <tr>
 <td><input type=checkbox name="act_$cudom\_$cuname\_ca"></td>  <td><input type=checkbox name="act_$cudom\_$cuname\_ca"></td>
Line 595  ENDCOAUTH Line 613  ENDCOAUTH
 # Domain level  # Domain level
 #  #
     $r->print('<h4>'.&mt('Domain Level').'</h4>'.      $r->print('<h4>'.&mt('Domain Level').'</h4>'.
     '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.      '<table border=2><tr><th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.&mt('Extent').'</th>'.
     '<th>Start</th><th>End</th></tr>');      '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>');
     foreach ( sort( keys(%incdomains))) {      foreach ( sort( keys(%incdomains))) {
  my $thisdomain=$_;   my $thisdomain=$_;
         foreach ('dc','li','dg','au','sc') {          foreach ('dc','li','dg','au','sc') {
Line 637  sub update_user_data { Line 655  sub update_user_data {
     my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},      my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
                                           $ENV{'form.ccdomain'});                                            $ENV{'form.ccdomain'});
     # Error messages      # Error messages
     my $error     = '<font color="#ff0000">Error:</font>';      my $error     = '<font color="#ff0000">'.&mt('Error').':</font>';
     my $end       = '</body></html>';      my $end       = '</body></html>';
     # Print header      # Print header
     $r->print(<<ENDTHREEHEAD);      $r->print(<<ENDTHREEHEAD);
Line 655  ENDTHREEHEAD Line 673  ENDTHREEHEAD
     $r->print(&Apache::loncommon::bodytag($title));      $r->print(&Apache::loncommon::bodytag($title));
     # Check Inputs      # Check Inputs
     if (! $ENV{'form.ccuname'} ) {      if (! $ENV{'form.ccuname'} ) {
  $r->print($error.'No login name specified.'.$end);   $r->print($error.&mt('No login name specified').'.'.$end);
  return;   return;
     }      }
     if (  $ENV{'form.ccuname'}  =~/\W/) {      if (  $ENV{'form.ccuname'}  =~/\W/) {
  $r->print($error.'Invalid login name.  '.   $r->print($error.&mt('Invalid login name').'.  '.
   'Only letters, numbers, and underscores are valid.'.    &mt('Only letters, numbers, and underscores are valid').'.'.
   $end);    $end);
  return;   return;
     }      }
     if (! $ENV{'form.ccdomain'}       ) {      if (! $ENV{'form.ccdomain'}       ) {
  $r->print($error.'No domain specified.'.$end);   $r->print($error.&mt('No domain specified').'.'.$end);
  return;   return;
     }      }
     if (  $ENV{'form.ccdomain'} =~/\W/) {      if (  $ENV{'form.ccdomain'} =~/\W/) {
  $r->print($error.'Invalid domain name.  '.   $r->print($error.&mt ('Invalid domain name').'.  '.
   'Only letters, numbers, and underscores are valid.'.    &mt('Only letters, numbers, and underscores are valid').'.'.
   $end);    $end);
  return;   return;
     }      }
     if (! exists($ENV{'form.makeuser'})) {      if (! exists($ENV{'form.makeuser'})) {
         # Modifying an existing user, so check the validity of the name          # Modifying an existing user, so check the validity of the name
         if ($uhome eq 'no_host') {          if ($uhome eq 'no_host') {
             $r->print($error.'Unable to determine home server for '.              $r->print($error.&mt('Unable to determine home server for ').
                       $ENV{'form.ccuname'}.' in domain '.                        $ENV{'form.ccuname'}.&mt(' in domain ').
                       $ENV{'form.ccdomain'}.'.');                        $ENV{'form.ccdomain'}.'.');
             return;              return;
         }          }
Line 707  ENDTHREEHEAD Line 725  ENDTHREEHEAD
         # If they are creating a new user but have not specified login          # If they are creating a new user but have not specified login
         # information this will be caught below.          # information this will be caught below.
     } else {      } else {
     $r->print($error.'Invalid login mode or password'.$end);          $r->print($error.&mt('Invalid login mode or password').$end);    
     return;      return;
     }      }
     if ($ENV{'form.makeuser'}) {      if ($ENV{'form.makeuser'}) {
         # Create a new user          # Create a new user
    my %lt=&Apache::lonlocal::texthash(
                       'cru'  => "Creating user",                    
                       'id'   => "in domain"
      );
  $r->print(<<ENDNEWUSERHEAD);   $r->print(<<ENDNEWUSERHEAD);
 <h3>Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h3>  <h3>$lt{'cru'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h3>
 ENDNEWUSERHEAD  ENDNEWUSERHEAD
         # Check for the authentication mode and password          # Check for the authentication mode and password
         if (! $amode || ! $genpwd) {          if (! $amode || ! $genpwd) {
     $r->print($error.'Invalid login mode or password'.$end);          $r->print($error.&mt('Invalid login mode or password').$end);    
     return;      return;
  }   }
         # Determine desired host          # Determine desired host
Line 728  ENDNEWUSERHEAD Line 750  ENDNEWUSERHEAD
             my %home_servers = &Apache::loncommon::get_library_servers              my %home_servers = &Apache::loncommon::get_library_servers
                 ($ENV{'form.ccdomain'});                    ($ENV{'form.ccdomain'});  
             if (! exists($home_servers{$desiredhost})) {              if (! exists($home_servers{$desiredhost})) {
                 $r->print($error.'Invalid home server specified');                  $r->print($error.&mt('Invalid home server specified'));
                 return;                  return;
             }              }
         }          }
Line 739  ENDNEWUSERHEAD Line 761  ENDNEWUSERHEAD
              $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'},               $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'},
              undef,$desiredhost               undef,$desiredhost
      );       );
  $r->print('Generating user: '.$result);   $r->print(&mt('Generating user').': '.$result);
         my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},          my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},
                                                $ENV{'form.ccdomain'});                                                 $ENV{'form.ccdomain'});
         $r->print('<br />Home server: '.$home.' '.          $r->print('<br />'.&mt('Home server').': '.$home.' '.
                   $Apache::lonnet::libserv{$home});                    $Apache::lonnet::libserv{$home});
     } elsif (($ENV{'form.login'} ne 'nochange') &&      } elsif (($ENV{'form.login'} ne 'nochange') &&
              ($ENV{'form.login'} ne ''        )) {               ($ENV{'form.login'} ne ''        )) {
  # Modify user privileges   # Modify user privileges
       my %lt=&Apache::lonlocal::texthash(
                       'usr'  => "User",                    
                       'id'   => "in domain"
          );
  $r->print(<<ENDMODIFYUSERHEAD);   $r->print(<<ENDMODIFYUSERHEAD);
 <h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>  <h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
 ENDMODIFYUSERHEAD  ENDMODIFYUSERHEAD
         if (! $amode || ! $genpwd) {          if (! $amode || ! $genpwd) {
     $r->print($error.'Invalid login mode or password'.$end);          $r->print($error.'Invalid login mode or password'.$end);    
Line 760  ENDMODIFYUSERHEAD Line 786  ENDMODIFYUSERHEAD
                       &Apache::lonnet::modifyuserauth(                        &Apache::lonnet::modifyuserauth(
        $ENV{'form.ccdomain'},$ENV{'form.ccuname'},         $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                        $amode,$genpwd));                         $amode,$genpwd));
             $r->print('<br>Home server: '.&Apache::lonnet::homeserver              $r->print('<br>'.&mt('Home server').': '.&Apache::lonnet::homeserver
   ($ENV{'form.ccuname'},$ENV{'form.ccdomain'}));    ($ENV{'form.ccuname'},$ENV{'form.ccdomain'}));
  } else {   } else {
     # Okay, this is a non-fatal error.      # Okay, this is a non-fatal error.
     $r->print($error.'You do not have the authority to modify '.      $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.');    
       'this users authentification information.');      
  }   }
     }      }
     ##      ##
Line 799  ENDMODIFYUSERHEAD Line 824  ENDMODIFYUSERHEAD
                  $ENV{'form.ccdomain'},$ENV{'form.ccuname'});                   $ENV{'form.ccdomain'},$ENV{'form.ccuname'});
             if ($putresult eq 'ok') {              if ($putresult eq 'ok') {
             # Tell the user we changed the name              # Tell the user we changed the name
    my %lt=&Apache::lonlocal::texthash(
                                'uic'  => "User Information Changed",             
                                'frst' => "first",
                                'mddl' => "middle",
                                'lst'  => "last",
        'gen'  => "generation",
                                'prvs' => "Previous",
                                'chto' => "Changed To"
      );
                 $r->print(<<"END");                  $r->print(<<"END");
 <table border="2">  <table border="2">
 <caption>User Information Changed</caption>  <caption>$lt{'uic'}</caption>
 <tr><th>&nbsp;</th>  <tr><th>&nbsp;</th>
     <th>first</th>      <th>$lt{'frst'}</th>
     <th>middle</th>      <th>$lt{'mddl'}</th>
     <th>last</th>      <th>$lt{'lst'}</th>
     <th>generation</th></tr>      <th>$lt{'gen'}</th></tr>
 <tr><td>Previous</td>  <tr><td>$lt{'prvs'}</td>
     <td>$userenv{'firstname'}  </td>      <td>$userenv{'firstname'}  </td>
     <td>$userenv{'middlename'} </td>      <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>      <td>$userenv{'lastname'}   </td>
     <td>$userenv{'generation'} </td></tr>      <td>$userenv{'generation'} </td></tr>
 <tr><td>Changed To</td>  <tr><td>$lt{'chto'}</td>
     <td>$ENV{'form.cfirstname'}  </td>      <td>$ENV{'form.cfirstname'}  </td>
     <td>$ENV{'form.cmiddlename'} </td>      <td>$ENV{'form.cmiddlename'} </td>
     <td>$ENV{'form.clastname'}   </td>      <td>$ENV{'form.clastname'}   </td>
Line 820  ENDMODIFYUSERHEAD Line 854  ENDMODIFYUSERHEAD
 </table>  </table>
 END  END
             } else { # error occurred              } else { # error occurred
                 $r->print("<h2>Unable to successfully change environment for ".                  $r->print("<h2>".&mt('Unable to successfully change environment for')." ".
                       $ENV{'form.ccuname'}." in domain ".                        $ENV{'form.ccuname'}." ".&mt('in domain')." ".
                       $ENV{'form.ccdomain'}."</h2>");                        $ENV{'form.ccdomain'}."</h2>");
             }              }
         }  else { # End of if ($ENV ... ) logic          }  else { # End of if ($ENV ... ) logic
             # They did not want to change the users name but we can              # They did not want to change the users name but we can
             # still tell them what the name is              # still tell them what the name is
       my %lt=&Apache::lonlocal::texthash(
                              'usr'  => "User",                    
                              'id'   => "in domain",
                              'gen'  => "Generation"
          );
                 $r->print(<<"END");                  $r->print(<<"END");
 <h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>  <h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
 <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>  <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
 <h4>Generation: $userenv{'generation'}</h4>  <h4>$lt{'gen'}: $userenv{'generation'}</h4>
 END  END
         }          }
     }      }
     ##      ##
     my $now=time;      my $now=time;
     $r->print('<h3>Modifying Roles</h3>');      $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
     foreach (keys (%ENV)) {      foreach (keys (%ENV)) {
  next if (! $ENV{$_});   next if (! $ENV{$_});
  # Revoke roles   # Revoke roles
  if ($_=~/^form\.rev/) {   if ($_=~/^form\.rev/) {
     if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {      if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
 # Revoke standard role  # Revoke standard role
         $r->print('Revoking '.$2.' in '.$1.': <b>'.          $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
                      &Apache::lonnet::revokerole($ENV{'form.ccdomain'},                       &Apache::lonnet::revokerole($ENV{'form.ccdomain'},
                      $ENV{'form.ccuname'},$1,$2).'</b><br>');                       $ENV{'form.ccuname'},$1,$2).'</b><br>');
  if ($2 eq 'st') {   if ($2 eq 'st') {
     $1=~/^\/(\w+)\/(\w+)/;      $1=~/^\/(\w+)\/(\w+)/;
     my $cid=$1.'_'.$2;      my $cid=$1.'_'.$2;
     $r->print('Drop from classlist: <b>'.      $r->print(&mt('Drop from classlist').': <b>'.
  &Apache::lonnet::critical('put:'.   &Apache::lonnet::critical('put:'.
                              $ENV{'course.'.$cid.'.domain'}.':'.                               $ENV{'course.'.$cid.'.domain'}.':'.
                      $ENV{'course.'.$cid.'.num'}.':classlist:'.                       $ENV{'course.'.$cid.'.num'}.':classlist:'.
Line 861  END Line 900  END
     }       } 
     if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {      if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
 # Revoke custom role  # Revoke custom role
  $r->print(   $r->print(&mt('Revoking custom role').
                 'Revoking custom role '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.                        ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
 &Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'},                        &Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'},
   $ENV{'form.ccuname'},$1,$2,$3,$4).    $ENV{'form.ccuname'},$1,$2,$3,$4).
  '</b><br>');   '</b><br>');
     }      }
  } elsif ($_=~/^form\.del/) {   } elsif ($_=~/^form\.del/) {
     if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {      if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
         $r->print('Deleting '.$2.' in '.$1.': '.          $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
                      &Apache::lonnet::assignrole($ENV{'form.ccdomain'},                       &Apache::lonnet::assignrole($ENV{'form.ccdomain'},
                      $ENV{'form.ccuname'},$1,$2,$now,0,1).'<br>');                       $ENV{'form.ccuname'},$1,$2,$now,0,1).'<br>');
  if ($2 eq 'st') {   if ($2 eq 'st') {
     $1=~/^\/(\w+)\/(\w+)/;      $1=~/^\/(\w+)\/(\w+)/;
     my $cid=$1.'_'.$2;      my $cid=$1.'_'.$2;
     $r->print('Drop from classlist: <b>'.      $r->print(&mt('Drop from classlist').': <b>'.
  &Apache::lonnet::critical('put:'.   &Apache::lonnet::critical('put:'.
                              $ENV{'course.'.$cid.'.domain'}.':'.                               $ENV{'course.'.$cid.'.domain'}.':'.
                      $ENV{'course.'.$cid.'.num'}.':classlist:'.                       $ENV{'course.'.$cid.'.num'}.':classlist:'.
Line 902  END Line 941  END
       $ENV{'form.end_'.$full} :        $ENV{'form.end_'.$full} :
       0 );        0 );
   
     $r->print('Assigning custom role "'.$5.'" by '.$4.'@'.$3.' in '.$url.      $r->print(&mt('Assigning custom role').' "'.$5.'" by '.$4.'@'.$3.' in '.$url.
                          ($start?', starting '.localtime($start):'').                           ($start?', '.&mt('starting').' '.localtime($start):'').
                          ($end?', ending '.localtime($end):'').': <b>'.                           ($end?', ending '.localtime($end):'').': <b>'.
       &Apache::lonnet::assigncustomrole(        &Apache::lonnet::assigncustomrole(
  $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$3,$4,$5,$end,$start).   $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$3,$4,$5,$end,$start).
Line 923  END Line 962  END
     $url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};      $url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};
  }   }
  # Assign the role and report it   # Assign the role and report it
  $r->print('Assigning '.$3.' in '.$url.   $r->print(&mt('Assigning').' '.$3.' in '.$url.
                          ($start?', starting '.localtime($start):'').                           ($start?', '.&mt('starting').' '.localtime($start):'').
                          ($end?', ending '.localtime($end):'').': <b>'.                           ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
                           &Apache::lonnet::assignrole(                            &Apache::lonnet::assignrole(
                               $ENV{'form.ccdomain'},$ENV{'form.ccuname'},                                $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                               $url,$3,$end,$start).                                $url,$3,$end,$start).
Line 934  END Line 973  END
  if ($3 eq 'st') {   if ($3 eq 'st') {
     $url=~/^\/(\w+)\/(\w+)/;      $url=~/^\/(\w+)\/(\w+)/;
     my $cid=$1.'_'.$2;      my $cid=$1.'_'.$2;
     $r->print('Add to classlist: <b>'.      $r->print(&mt('Add to classlist').': <b>'.
       &Apache::lonnet::critical(        &Apache::lonnet::critical(
   'put:'.$ENV{'course.'.$cid.'.domain'}.':'.    'put:'.$ENV{'course.'.$cid.'.domain'}.':'.
                            $ENV{'course.'.$cid.'.num'}.':classlist:'.                             $ENV{'course.'.$cid.'.num'}.':classlist:'.
Line 956  END Line 995  END
       0 );        0 );
  my $url='/'.$1.'/';   my $url='/'.$1.'/';
  # Assign the role and report it.   # Assign the role and report it.
  $r->print('Assigning '.$2.' in '.$url.': '.   $r->print(&mt('Assigning').' '.$2.' in '.$url.': '.
                          ($start?', starting '.localtime($start):'').                           ($start?', '.&mt('starting').' '.localtime($start):'').
                          ($end?', ending '.localtime($end):'').': <b>'.                           ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
                           &Apache::lonnet::assignrole(                            &Apache::lonnet::assignrole(
                               $ENV{'form.ccdomain'},$ENV{'form.ccuname'},                                $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                               $url,$2,$end,$start)                                $url,$2,$end,$start)
   .'</b><br>');    .'</b><br>');
     } else {      } else {
  $r->print('<p>ERROR: Unknown command <tt>'.$_.'</tt></p><br>');   $r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br>');
             }              }
  }    } 
     } # End of foreach (keys(%ENV))      } # End of foreach (keys(%ENV))
   # Flush the course logs so reverse user roles immediately updated
       &Apache::lonnet::flushcourselogs();
     $r->print('</body></html>');      $r->print('</body></html>');
 }  }
   
Line 997  sub custom_role_editor { Line 1038  sub custom_role_editor {
  &Apache::lonnet::get('roles',["rolesdef_$rolename"]);   &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
 # ------------------------------------------------------- Does this role exist?  # ------------------------------------------------------- Does this role exist?
     if (($rdummy ne 'con_lost') && ($roledef ne '')) {      if (($rdummy ne 'con_lost') && ($roledef ne '')) {
  $r->print('Existing Role "');   $r->print(&mt('Existing Role').' "');
 # ------------------------------------------------- Get current role privileges  # ------------------------------------------------- Get current role privileges
  ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);   ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
     } else {      } else {
  $r->print('New Role "');   $r->print(&mt('New Role').' "');
  $roledef='';   $roledef='';
     }      }
     $r->print($rolename.'"</h2>');      $r->print($rolename.'"</h2>');
Line 1040  sub custom_role_editor { Line 1081  sub custom_role_editor {
  }   }
  $full{$priv}=1;   $full{$priv}=1;
     }      }
       my %lt=&Apache::lonlocal::texthash(
       'prv'  => "Privilege",
       'crl'  => "Course Level",
                       'dml'  => "Domain Level",
                       'ssl'  => "System Level"
          );
     $r->print(<<ENDCCF);      $r->print(<<ENDCCF);
 <form method="post">  <form method="post">
 <input type="hidden" name="phase" value="set_custom_roles" />  <input type="hidden" name="phase" value="set_custom_roles" />
 <input type="hidden" name="rolename" value="$rolename" />  <input type="hidden" name="rolename" value="$rolename" />
 <table border="2">  <table border="2">
 <tr><th>Privilege</th><th>Course Level</th><th>Domain Level</th>  <tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
 <th>System Level</th></tr>  <th>$lt{'ssl'}</th></tr>
 ENDCCF  ENDCCF
     foreach (sort keys %full) {      foreach (sort keys %full) {
  $r->print('<tr><td>'.&Apache::lonnet::plaintext($_).'</td><td>'.   $r->print('<tr><td>'.&Apache::lonnet::plaintext($_).'</td><td>'.
Line 1062  ENDCCF Line 1108  ENDCCF
     '</td></tr>');      '</td></tr>');
     }      }
     $r->print(      $r->print(
    '<table><input type="submit" value="Define Role" /></form></body></html>');     '<table><input type="submit" value="'.&mt('Define Role').'" /></form></body></html>');
 }  }
   
 # ---------------------------------------------------------- Call to definerole  # ---------------------------------------------------------- Call to definerole
Line 1084  sub set_custom_role { Line 1130  sub set_custom_role {
  &Apache::lonnet::get('roles',["rolesdef_$rolename"]);   &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
 # ------------------------------------------------------- Does this role exist?  # ------------------------------------------------------- Does this role exist?
     if (($rdummy ne 'con_lost') && ($roledef ne '')) {      if (($rdummy ne 'con_lost') && ($roledef ne '')) {
  $r->print('Existing Role "');   $r->print(&mt('Existing Role').' "');
     } else {      } else {
  $r->print('New Role "');   $r->print(&mt('New Role').' "');
  $roledef='';   $roledef='';
     }      }
     $r->print($rolename.'"</h2>');      $r->print($rolename.'"</h2>');
Line 1123  sub set_custom_role { Line 1169  sub set_custom_role {
     if ($ENV{'request.course.id'}) {      if ($ENV{'request.course.id'}) {
         my $url='/'.$ENV{'request.course.id'};          my $url='/'.$ENV{'request.course.id'};
         $url=~s/\_/\//g;          $url=~s/\_/\//g;
  $r->print('<br />Assigning Role to Self: '.   $r->print('<br />'.&mt('Assigning Role to Self').': '.
       &Apache::lonnet::assigncustomrole($ENV{'user.domain'},        &Apache::lonnet::assigncustomrole($ENV{'user.domain'},
  $ENV{'user.name'},   $ENV{'user.name'},
  $url,   $url,
Line 1208  ENDSECTION Line 1254  ENDSECTION
 <td>&nbsp</td>   <td>&nbsp</td> 
 ENDSECTION  ENDSECTION
                 }                  }
    my %lt=&Apache::lonlocal::texthash(
                                  'ssd'  => "Set Start Date",
                                  'sed'  => "Set End Date"
      );
  $table .= <<ENDTIMEENTRY;   $table .= <<ENDTIMEENTRY;
 <td><input type=hidden name="start_$protectedcourse\_$_" value=''>  <td><input type=hidden name="start_$protectedcourse\_$_" value=''>
 <a href=  <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td>  "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>
 <td><input type=hidden name="end_$protectedcourse\_$_" value=''>  <td><input type=hidden name="end_$protectedcourse\_$_" value=''>
 <a href=  <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td>  "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY  ENDTIMEENTRY
                 $table.= "</tr>\n";                  $table.= "</tr>\n";
             }              }
Line 1224  ENDTIMEENTRY Line 1274  ENDTIMEENTRY
  my $plrole=$_;   my $plrole=$_;
                 my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}.                  my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}.
     '_'.$ENV{'user.name'}.'_'.$plrole;      '_'.$ENV{'user.name'}.'_'.$plrole;
    my %lt=&Apache::lonlocal::texthash(
                                  'ssd'  => "Set Start Date",
                                  'sed'  => "Set End Date"
      );
  $table .= <<ENDENTRY;   $table .= <<ENDENTRY;
 <tr bgcolor="#$bgcol">  <tr bgcolor="#$bgcol">
 <td><input type="checkbox" name="act_$customrole"></td>  <td><input type="checkbox" name="act_$customrole"></td>
Line 1232  ENDTIMEENTRY Line 1286  ENDTIMEENTRY
 <td><input type="text" size="5" name="sec_$customrole"></td>  <td><input type="text" size="5" name="sec_$customrole"></td>
 <td><input type=hidden name="start_$customrole" value=''>  <td><input type=hidden name="start_$customrole" value=''>
 <a href=  <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">Set Start Date</a></td>  "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
 <td><input type=hidden name="end_$customrole" value=''>  <td><input type=hidden name="end_$customrole" value=''>
 <a href=  <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">Set End Date</a></td></tr>  "javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td></tr>
 ENDENTRY  ENDENTRY
            }             }
  }   }
     }      }
     return '' if ($table eq ''); # return nothing if there is nothing       return '' if ($table eq ''); # return nothing if there is nothing 
                                  # in the table                                   # in the table
       my %lt=&Apache::lonlocal::texthash(
       'crl'  => "Course Level",
                       'act'  => "Activate",
                       'rol'  => "Role",
                       'ext'  => "Extent",
                       'grs'  => "Group/Section",
                       'sta'  => "Start",
                       'end'  => "End"
          );
     my $result = <<ENDTABLE;      my $result = <<ENDTABLE;
 <h4>Course Level</h4>  <h4>$lt{'crl'}</h4>
 <table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>  <table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
 <th>Group/Section</th><th>Start</th><th>End</th></tr>  <th>$lt{'grs'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>
 $table  $table
 </table>  </table>
 ENDTABLE  ENDTABLE
Removed from v.1.72  
changed lines
  Added in v.1.78

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