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

Diff for /loncom/interface/loncreateuser.pm between versions 1.168 and 1.172

version 1.168, 2007/08/02 01:07:00 version 1.172, 2007/08/15 16:25:14
Line 216  sub print_username_entry_form { Line 216  sub print_username_entry_form {
        $jscript,{'add_entries' => \%loaditems,});         $jscript,{'add_entries' => \%loaditems,});
    &Apache::lonhtmlcommon::add_breadcrumb     &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.crtuser)",       ({href=>"javascript:backPage(document.crtuser)",
        text=>"User modify/custom role",         text=>"User modify/custom role edit",
        faq=>282,bug=>'Instructor Interface',});         faq=>282,bug=>'Instructor Interface',});
   
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');      my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
Line 329  $jsback Line 329  $jsback
 ENDSCRIPT  ENDSCRIPT
   
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
                                        'srch'           => "User Search to add/modify roles of",                                         'srch'           => "User Search to add/modify roles",
                                        'username'       => "username",                                         'username'       => "username",
                                        'domain'         => "domain",                                         'domain'         => "domain",
                                        'lastname'       => "last name",                                         'lastname'       => "last name",
Line 347  ENDSCRIPT Line 347  ENDSCRIPT
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));      $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
     $r->print("<b>$lt{'srch'}</b><br />");      $r->print("<b>$lt{'srch'}</b><br />");
     $r->print(&entry_form($srch->{'srchdomain'},$srch));      $r->print(&entry_form($srch->{'srchdomain'},$srch));
     $r->print('<h3>'.&mt('Select a user to add/modify roles of').'</h3>');      $r->print('<h3>'.&mt('Select a user to add/modify roles').'</h3>');
     $r->print('<form name="usersrchform" method="post">'.      $r->print('<form name="usersrchform" method="post">'.
               &Apache::loncommon::start_data_table()."\n".                &Apache::loncommon::start_data_table()."\n".
               &Apache::loncommon::start_data_table_header_row()."\n".                &Apache::loncommon::start_data_table_header_row()."\n".
Line 1136  ENDNOPRIV Line 1136  ENDNOPRIV
            <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />             <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />
              <a href=               <a href=
 "javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>  "javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
 <td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_ca" value="" />  <td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
 <a href=  <a href=
 "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".  "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
           &Apache::loncommon::end_data_table_row()."\n".            &Apache::loncommon::end_data_table_row()."\n".
Line 1144  ENDNOPRIV Line 1144  ENDNOPRIV
 '<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>  '<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
 <td>'.$lt{'caa'}.'</td>  <td>'.$lt{'caa'}.'</td>
 <td>'.$cudom.'_'.$cuname.'</td>  <td>'.$cudom.'_'.$cuname.'</td>
 <td><input type=hidden name="start_'.$cudom.'_'.$cuname.'_aa" value="" />  <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=  <a href=
 "javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>  "javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
 <td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_aa" value="" />  <td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=  <a href=
 "javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".  "javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
          &Apache::loncommon::end_data_table_row()."\n".           &Apache::loncommon::end_data_table_row()."\n".
Line 1179  ENDNOPRIV Line 1179  ENDNOPRIV
 '<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>  '<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
 <td>'.$plrole.'</td>  <td>'.$plrole.'</td>
 <td>'.$thisdomain.'</td>  <td>'.$thisdomain.'</td>
 <td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="" />  <td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
 <a href=  <a href=
 "javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>  "javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
 <td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value="" />  <td><input type="hidden" name="end_'.$thisdomain.'_'.$role.'" value="" />
 <a href=  <a href=
 "javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.  "javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
 &Apache::loncommon::end_data_table_row();  &Apache::loncommon::end_data_table_row();
Line 1537  END Line 1537  END
  if ($key=~/^form\.rev/) {   if ($key=~/^form\.rev/) {
     if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {      if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
 # Revoke standard role  # Revoke standard role
         $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.   my ($scope,$role) = ($1,$2);
                      &Apache::lonnet::revokerole($env{'form.ccdomain'},   my $result =
                      $env{'form.ccuname'},$1,$2).'</b><br />');      &Apache::lonnet::revokerole($env{'form.ccdomain'},
  if ($2 eq 'st') {   $env{'form.ccuname'},
     $1=~m{^/($match_domain)/($match_courseid)};   $scope,$role);
     my $cid=$1.'_'.$2;          $r->print(&mt('Revoking [_1] in [_2]: [_3]',
     my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};        $role,$scope,'<b>'.$result.'</b>').'<br />');
     my $result =    if ($role eq 'st') {
  &Apache::lonnet::cput('classlist',      my $result = &classlist_drop($scope,$env{'form.ccuname'},
       { $user => $now },   $env{'form.ccdomain'},$now);
       $env{'course.'.$cid.'.domain'},      $r->print($result);
       $env{'course.'.$cid.'.num'});  
     $r->print(&mt('Drop from classlist: [_1]',  
   '<b>'.$result.'</b>').'<br />');  
  }   }
     }       } 
     if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {      if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$ }s) {
 # Revoke custom role  # Revoke custom role
  $r->print(&mt('Revoking custom role:').   $r->print(&mt('Revoking custom role:').
                       ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.                        ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
Line 1564  END Line 1561  END
  } elsif ($key=~/^form\.del/) {   } elsif ($key=~/^form\.del/) {
     if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {      if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role  # Delete standard role
         $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.   my ($scope,$role) = ($1,$2);
                      &Apache::lonnet::assignrole($env{'form.ccdomain'},   my $result =
                      $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');      &Apache::lonnet::assignrole($env{'form.ccdomain'},
  if ($2 eq 'st') {   $env{'form.ccuname'},
     $1=~m{^/($match_domain)/($match_courseid)};   $scope,$role,$now,0,1);
     my $cid=$1.'_'.$2;          $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
     my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};        '<b>'.$result.'</b>').'<br />');
     my $result =    if ($role eq 'st') {
  &Apache::lonnet::cput('classlist',      my $result = &classlist_drop($scope,$env{'form.ccuname'},
       { $user => $now },   $env{'form.ccdomain'},$now);
       $env{'course.'.$cid.'.domain'},      $r->print($result);
       $env{'course.'.$cid.'.num'});  
     $r->print(&mt('Drop from classlist: [_1]',  
   '<b>'.$result.'</b>').'<br />');  
  }   }
             }              }
     if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {      if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);                  my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
 # Delete custom role  # Delete custom role
                 $r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]',                  $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
                       $rolename,$rnam,$rdom,$url).': <b>'.                        $rolename,$rnam,$rdom,$url).': <b>'.
                       &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},                        &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,                           $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
Line 1760  END Line 1754  END
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
 }  }
   
   sub classlist_drop {
       my ($scope,$uname,$udom,$now) = @_;
       my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
       my $cid=$cdom.'_'.$cnum;
       my $user = $uname.':'.$udom;
       if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
    my $result = 
       &Apache::lonnet::cput('classlist',
     { $user => $now },
     $env{'course.'.$cid.'.domain'},
     $env{'course.'.$cid.'.num'});
    return &mt('Drop from classlist: [_1]',
      '<b>'.$result.'</b>').'<br />';
       }
   }
   
   sub active_student_roles {
       my ($cnum,$cdom,$uname,$udom) = @_;
       my %roles = 
    &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
         ['future','active'],['st']);
       return exists($roles{"$cnum:$cdom:st"});
   }
   
 sub quota_admin {  sub quota_admin {
     my ($setquota,$changeHash) = @_;      my ($setquota,$changeHash) = @_;
     my $quotachanged;      my $quotachanged;
Line 2373  sub directorysrch_check { Line 2391  sub directorysrch_check {
                        uname     => 'username',                         uname     => 'username',
                        lastfirst => 'last name, first name',                         lastfirst => 'last name, first name',
                        lastname  => 'last name',                         lastname  => 'last name',
                        contains  => 'is contained in',                         contains  => 'contains',
                        exact     => 'as exact match to'                         exact     => 'as exact match to'
                    );                     );
     if ($can_search) {      if ($can_search) {
         if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') {          if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') {
             if (!grep(/^\Q$srch->{'srchby'}\E$/,@{$dom_inst_srch{'directorysrch'}{'searchby'}})) {              if (!grep(/^\Q$srch->{'srchby'}\E$/,@{$dom_inst_srch{'directorysrch'}{'searchby'}})) {
                 return &mt('Directory search in domain: [_1] is not available for searching by [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchby'}});                  return &mt('Directory search in domain: [_1] is not available for searching by "[_2]"',$srch->{'srchdomain'},$longtext{$srch->{'srchby'}});
             }              }
         } else {          } else {
             return &mt('Directory search in domain: [_1] is not available.', $srch->{'srchdomain'});              return &mt('Directory search in domain: [_1] is not available.', $srch->{'srchdomain'});
Line 2390  sub directorysrch_check { Line 2408  sub directorysrch_check {
             ($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) {              ($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) {
             return 'ok';              return 'ok';
         } else {              } else {    
             return &mt('Directory search in domain [_1] is not available for the requested search type: [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchtype'}});              return &mt('Directory search in domain [_1] is not available for the requested search type: "[_2]"',$srch->{'srchdomain'},$longtext{$srch->{'srchtype'}});
         }          }
     }      }
 }  }
Line 2469  sub crumb_utilities { Line 2487  sub crumb_utilities {
     my %elements = (      my %elements = (
        crtuser => {         crtuser => {
            srchterm => 'text',             srchterm => 'text',
            srchin => 'radio',             srchin => 'selectbox',
            srchby => 'selectbox',             srchby => 'selectbox',
            srchtype => 'selectbox',             srchtype => 'selectbox',
            srchdomain => 'selectbox',             srchdomain => 'selectbox',
Line 2554  sub course_level_table { Line 2572  sub course_level_table {
     $table .= '<td>&nbsp</td>';      $table .= '<td>&nbsp</td>';
                 }                  }
  $table .= <<ENDTIMEENTRY;   $table .= <<ENDTIMEENTRY;
 <td><input type=hidden name="start_$protectedcourse\_$role" value='' />  <td><input type="hidden" name="start_$protectedcourse\_$role" value='' />
 <a href=  <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>  "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>
 <td><input type=hidden name="end_$protectedcourse\_$role" value='' />  <td><input type="hidden" name="end_$protectedcourse\_$role" value='' />
 <a href=  <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>  "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY  ENDTIMEENTRY
Line 2590  ENDTIMEENTRY Line 2608  ENDTIMEENTRY
                      'name="sec_'.$customrole.'" /></td>';                       'name="sec_'.$customrole.'" /></td>';
                 }                  }
                 $table .= <<ENDENTRY;                  $table .= <<ENDENTRY;
 <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')">$lt{'ssd'}</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')">$lt{'sed'}</a></td>  "javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDENTRY  ENDENTRY
Line 2685  sub course_level_dc { Line 2703  sub course_level_dc {
                      '<input type="hidden" name="groups" value="" /></td>'.                       '<input type="hidden" name="groups" value="" /></td>'.
                      '</tr></table></td>';                       '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;      $otheritems .= <<ENDTIMEENTRY;
 <td><input type=hidden name="start" value='' />  <td><input type="hidden" name="start" value='' />
 <a href=  <a href=
 "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>  "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
 <td><input type=hidden name="end" value='' />  <td><input type="hidden" name="end" value='' />
 <a href=  <a href=
 "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>  "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY  ENDTIMEENTRY
Removed from v.1.168  
changed lines
  Added in v.1.172

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