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

Diff for /loncom/interface/portfolio.pm between versions 1.156.2.2 and 1.181

version 1.156.2.2, 2006/08/18 20:55:44 version 1.181, 2007/06/11 20:56:38
Line 95  sub display_common { Line 95  sub display_common {
  'createdir_label' =>    'createdir_label' => 
  'Create subdirectory in current directory:');   'Create subdirectory in current directory:');
         my $escuri = &HTML::Entities::encode($r->uri,'&<>"');          my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
    my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
    my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
   
    # FIXME: This line should be deleted once Portfolio uses breadcrumbs
    $r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio'));
   
         $r->print(<<"TABLE");           $r->print(<<"TABLE"); 
 <table id="LC_portfolio_actions">  <table id="LC_portfolio_actions">
   <tr id="LC_portfolio_upload">    <tr id="LC_portfolio_upload">
Line 109  sub display_common { Line 115  sub display_common {
  <input type="hidden" name="action" value="$env{"form.action"}" />   <input type="hidden" name="action" value="$env{"form.action"}" />
  <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />   <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
  <input type="hidden" name="mode" value="$env{"form.mode"}" />   <input type="hidden" name="mode" value="$env{"form.mode"}" />
  <input type="submit" name="storeupl" value="$text{'upload'}" />   <input type="submit" name="storeupl" value="$text{'upload'}" />$help_fileupload
       </form>        </form>
     </td>      </td>
   </tr>    </tr>
Line 124  sub display_common { Line 130  sub display_common {
         <input type="hidden" name="action" value="$env{"form.action"}" />          <input type="hidden" name="action" value="$env{"form.action"}" />
         <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />          <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
         <input type="hidden" name="mode" value="$env{"form.mode"}" />          <input type="hidden" name="mode" value="$env{"form.mode"}" />
         <input type="submit" name="createdir" value="$text{'createdir'}" />          <input type="submit" name="createdir" value="$text{'createdir'}" />$help_createdir
       </form>        </form>
     </td>      </td>
   </tr>    </tr>
Line 141  TABLE Line 147  TABLE
     );      );
     $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');      $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
     if (@tree > 1){      if (@tree > 1){
         my $newCurrentPath = '';          my $newCurrentPath = '/';
         for (my $i = 1; $i< @tree; $i++){          for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';              $newCurrentPath .= $tree[$i].'/';
             my %anchor_fields = (              my %anchor_fields = (
                 'selectfile' => $tree[$i],                  'selectfile' => $tree[$i],
                 'currentpath' => '/',                  'currentpath' => $newCurrentPath,
                 'mode' => $env{"form.mode"},                  'mode' => $env{"form.mode"},
                 'fieldname' => $env{"form.fieldname"},                  'fieldname' => $env{"form.fieldname"},
                 'continue' => $env{"form.continue"}                  'continue' => $env{"form.continue"}
Line 155  TABLE Line 161  TABLE
         }          }
     }      }
     $r->print('</span>');      $r->print('</span>');
       $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
     &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);      &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
     $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"}.&group_args());      $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"}.&group_args());
     $r->print('">'.      $r->print('">'.
Line 191  sub display_directory_line { Line 198  sub display_directory_line {
         }          }
  if ($lock_info) {   if ($lock_info) {
     my %anchor_fields = ('lockinfo' => $fullpath);      my %anchor_fields = ('lockinfo' => $fullpath);
       if ($versions) { # hold the folder open
           my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
           $fname =~ s|^/||;
           $anchor_fields{'showversions'} = $fname.'.'.$extension;
       }
     $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);      $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
  }   }
  $r->print('<td colspan="2">'.$lock_info.'</td>');   $r->print('<td colspan="2">'.$lock_info.'</td>');
Line 231  sub display_directory { Line 243  sub display_directory {
                                                   $current_permissions,$group);                                                    $current_permissions,$group);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
     my $now = time;      my $now = time;
     if ($env{"form.mode"} eq 'selectfile'){      if ($env{"form.mode"} eq 'selectfile') {
  &select_files($r);   &select_files($r);
  $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});   $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
  $select_mode = 'true';   $select_mode = 'true';
Line 254  sub display_directory { Line 266  sub display_directory {
             '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');              '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {      } else {
         $r->print('<form method="post" action="'.$url.'">');          $r->print('<form method="post" action="'.$url.'">');
    $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
         'Using the portfolio file list'));
         $r->print('<table id="LC_browser">'.          $r->print('<table id="LC_browser">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');    '<tr><th colspan="2">Actions'.
     &Apache::loncommon::help_open_topic('Portfolio FileAction').
     '</th><th>&nbsp;</th><th>&nbsp;</th><th>Name'.
     &Apache::loncommon::help_open_topic('Portfolio OpenFile').
     '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.
     &Apache::loncommon::help_open_topic('Portfolio ShareFile').
     '</th></tr>');
     }      }
     $r->print("\n".&group_form_data()."\n");      $r->print("\n".&group_form_data()."\n");
   
Line 289  sub display_directory { Line 309  sub display_directory {
        my $version_flag;         my $version_flag;
        my $show_versions;         my $show_versions;
     my $fullpath =  &prepend_group($current_path.$filename);      my $fullpath =  &prepend_group($current_path.$filename);
        if ($env{'form.showversions'} eq $filename) {         if ($env{'form.showversions'} =~ /$filename/) {
            $show_versions = 'true';             $show_versions = 'true';
        }         }
        if (exists($versioned{$fullpath})) {         if (exists($versioned{$fullpath})) {
Line 299  sub display_directory { Line 319  sub display_directory {
                'currentpath' => $current_path,                 'currentpath' => $current_path,
            );             );
            if ($show_versions) {             if ($show_versions) {
                  # Must preserve other possible showversion files
                  my $version_remainder = $env{'form.showversions'};
                  $version_remainder =~ s/$filename//g;                
                  $anchor_fields{'showversions'} = $version_remainder;
                     $version_flag = &make_anchor('portfolio',\%anchor_fields,                      $version_flag = &make_anchor('portfolio',\%anchor_fields,
                         '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');                          '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
            } else {             } else {
                $anchor_fields{'showversions'} = $filename;                 # allow multiple files to show versioned
                  $anchor_fields{'showversions'} = $env{'form.showversions'}.','.$filename;
                     $version_flag = &make_anchor('portfolio',\%anchor_fields,                      $version_flag = &make_anchor('portfolio',\%anchor_fields,
                         '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');                          '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                 }                  }
Line 358  sub display_directory { Line 383  sub display_directory {
                                 currentpath => $current_path                                  currentpath => $current_path
                             );                              );
                             $line .= &make_anchor($url,\%anchor_fields,'Rename');                              $line .= &make_anchor($url,\%anchor_fields,'Rename');
                             $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);                              $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
                             # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';                              # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
Line 426  sub display_directory { Line 451  sub display_directory {
         $r->print('</table>');          $r->print('</table>');
         if ($can_delete) {          if ($can_delete) {
             $r->print('              $r->print('
         <input type="submit" name="doit" value="Delete Checked Files" />          <input type="submit" name="doit" value="Delete Checked Files" />'.
    &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
         <input type="hidden" name="action" value="delete" />          <input type="hidden" name="action" value="delete" />
         <input type="hidden" name="currentpath" value="'.$current_path.'" />          <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>'          </form>'
Line 496  sub done { Line 522  sub done {
         $message='Done';          $message='Done';
     }      }
     my %anchor_fields = (      my %anchor_fields = (
           'showversions' => $env{'form.showversions'},
         'currentpath' => $env{'form.currentpath'},          'currentpath' => $env{'form.currentpath'},
         'fieldname' => $env{'form.fieldname'},          'fieldname' => $env{'form.fieldname'},
         'mode'      => $env{'form.mode'}          'mode'      => $env{'form.mode'}
Line 512  sub delete { Line 539  sub delete {
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {      if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be deleted.<br />");          $r->print("The file is locked and cannot be deleted.<br />");
         $r->print(&done('Back',$url));          $r->print(&done('Back',$url));
     } else {      } else {
         if (scalar(@files)) {          if (scalar(@files)) {
Line 527  sub delete { Line 554  sub delete {
 }   } 
   
 sub delete_confirmed {  sub delete_confirmed {
     my ($r,$url)=@_;      my ($r,$url,$group)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;      my $result;
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
       my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                           $uname);
     foreach my $delete_file (@files) {      foreach my $delete_file (@files) {
         $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.          $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
        $env{'form.currentpath'}.         $env{'form.currentpath'}.
        $delete_file);         $delete_file);
         if ($result ne 'ok') {          if ($result ne 'ok') {
  $r->print('<span class="LC_error"> An error occured ('.$result.      $r->print('<span class="LC_error">'.
   ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');                       &mt('An error occured ([_1]) while trying to delete 
                            [_2].',$result,&display_file(undef, $delete_file)).
                         '</span><br /><br />');
           } else {
               $r->print(&mt('File: [_1] deleted.',
                             &display_file(undef,$delete_file)));
               my $file_name = $env{'form.currentpath'}.$delete_file;
               $file_name = &prepend_group($file_name);
               my %access_controls = 
                       &Apache::lonnet::get_access_controls($current_permissions,
                                                            $group,$file_name);
               if (keys(%access_controls) > 0) {
                   my %changes; 
                   foreach my $key (keys(%{$access_controls{$file_name}})) {
                       $changes{'delete'}{$key} = 1;
                   }
                   if (keys(%changes) > 0) {
                       my ($outcome,$deloutcome,$new_values,$translation) =
                       &Apache::lonnet::modify_access_controls($file_name,\%changes,
                                                               $udom,$uname);
                       if ($outcome ne 'ok') {
                              $r->print('<br />'.&mt("An error occured ([_1]) while ".
                                  "trying to delete access controls for the file.",$outcome).
                                  '</span><br /><br />');
                       } else {
                           if ($deloutcome eq 'ok') {
                               $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');
                           } else {
                               $r->print('<span class="LC_error">'.'<br />'.
                                  &mt("An error occured ([_1]) while ".
                                      "trying to delete access controls for the file.",$deloutcome).
                                      '</span><br /><br />');
                           }
                       }
                   }
               }
         }          }
     }      }
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
Line 586  sub rename { Line 650  sub rename {
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {      if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be renamed.<br />");          $r->print("The file is locked and cannot be renamed.<br />");
         $r->print(&done(undef,$url));          $r->print(&done(undef,$url));
     } else {      } else {
         &open_form($r,$url);          &open_form($r,$url);
Line 597  sub rename { Line 661  sub rename {
 }  }
   
 sub rename_confirmed {  sub rename_confirmed {
     my ($r,$url)=@_;      my ($r,$url,$group)=@_;
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});      my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
Line 608  sub rename_confirmed { Line 672  sub rename_confirmed {
  $r->print(&done(undef,$url));   $r->print(&done(undef,$url));
  return;   return;
     }       } 
       my $chg_access;
     my $result=      my $result=
  &Apache::lonnet::renameuserfile($uname,$udom,   &Apache::lonnet::renameuserfile($uname,$udom,
             $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},              $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
             $port_path.$env{'form.currentpath'}.$filenewname);              $port_path.$env{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {      if ($result eq 'ok') {
           $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
       } else {      
  $r->print('<span class="LC_error">'.   $r->print('<span class="LC_error">'.
   &mt('An errror occured ([_1]) while trying to rename [_2]'    &mt('An error occured ([_1]) while trying to rename [_2]'
       .' to [_3]',$result,&display_file(),        .' to [_3]',$result,&display_file(),
       &display_file('',$filenewname)).'</span><br />');        &display_file('',$filenewname)).'</span><br />');
           return;
     }      }
     if ($filenewname ne $env{'form.filenewname'}) {      if ($filenewname ne $env{'form.filenewname'}) {
         $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",          $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",
       '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',        '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
       '<strong>'.&display_file('',$filenewname).'</strong>'));        '<strong>'.&display_file('',$filenewname).'</strong>'));
     }      }
       $r->print($chg_access);
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
 }  }
   
   sub access_for_renamed {
       my ($filenewname,$group,$udom,$uname) = @_;
       my $oldfile = $env{'form.currentpath'}.$env{'form.selectfile'};
       $oldfile = &prepend_group($oldfile);
       my $newfile = $env{'form.currentpath'}.$filenewname;
       $newfile = &prepend_group($newfile);
       my $current_permissions =
    &Apache::lonnet::get_portfile_permissions($udom,$uname);
       my %access_controls =
    &Apache::lonnet::get_access_controls($current_permissions,
        $group,$oldfile);
       my $chg_text;
       if (keys(%access_controls) > 0) {
           my %change_old;
           my %change_new;
           foreach my $key (keys(%{$access_controls{$oldfile}})) {
               $change_old{'delete'}{$key} = 1;
               $change_new{'activate'}{$key} = $access_controls{$oldfile}{$key};
           }
           my ($outcome,$deloutcome,$new_values,$translation) =
               &Apache::lonnet::modify_access_controls($oldfile,\%change_old,
       $udom,$uname);
           if ($outcome ne 'ok') {
               $chg_text ='<br /><br />'.&mt("An error occured ([_1]) while ".
                   "trying to delete access control records for the old name.",$outcome).
                   '</span><br />';
           } else {
               if ($deloutcome ne 'ok') {
                   $chg_text = '<br /><br /><span class="LC_error"><br />'.
       &mt("An error occured ([_1]) while ".
    "trying to delete access control records for the old name.",$deloutcome).
    '</span><br />';
               }
           }
           ($outcome,$deloutcome,$new_values,$translation) =
               &Apache::lonnet::modify_access_controls($newfile,\%change_new,
                                                       $udom,$uname);
           if ($outcome ne 'ok') {
               $chg_text .= '<br /><br />'.
    &mt("An error occured ([_1]) while ".
                   "trying to update access control records for the new name.",$outcome).
                   '</span><br />';
           }
           if ($chg_text eq '') {
               $chg_text = '<br /><br />'.&mt('Access controls updated to reflect the name change.');
           }
       }
       return $chg_text;
   }
   
 sub display_access {  sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path) = @_;      my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};      my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
Line 635  sub display_access { Line 754  sub display_access {
                                                                         $uname);                                                                          $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);      my $aclcount = keys(%access_controls);
     my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';      my ($header,$info);
     my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public or  passphrase-protected.');      if ($action eq 'chgaccess') {
     $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');          $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');          $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
 #    $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />';          $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
 #    $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';          $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
 #    $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');          $info .= '</li><li>'.&explain_conditionals();
     $info .= '</li></ul>';          $info .= '</li></ul>'.
     if ($group eq '') {                    &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
         $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />"));          if ($group eq '') {
               $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");
           } else {
               $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");
           }
           $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />";
           if ($group ne '') {
               $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';
           }
       } else {
           $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.
                     &explain_conditionals().'<br />';
     }      }
       
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
         &access_setting_table($r,$access_controls{$file_name});   $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));
    $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));
    $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));
           &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
                                 $action);
         my $button_text = {          my $button_text = {
                         'continue' => &mt('Proceed'),                          'continue' => &mt('Proceed'),
                         'cancel' => &mt('Back to directory listing'),                          'cancel' => &mt('Back to directory listing'),
Line 665  sub display_access { Line 798  sub display_access {
     }      }
 }  }
   
   sub explain_conditionals {
       return
           &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'."\n".
           &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'<br />'."\n".
           &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
   }
   
 sub view_access_settings {  sub view_access_settings {
     my ($r,$url,$access_controls,$aclcount) = @_;      my ($r,$url,$access_controls,$aclcount) = @_;
     my ($showstart,$showend);      my ($showstart,$showend);
Line 703  sub build_access_summary { Line 843  sub build_access_summary {
                       domains => 'Conditional: domain-based',                        domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',                        users => 'Conditional: user-based',
                       course => 'Conditional: course-based',                        course => 'Conditional: course-based',
                       group => 'Conditional: group-based',  
                      );                       );
     my @allscopes = ('public','guest','domains','users','course','group');      my @allscopes = ('public','guest','domains','users','course');
     foreach my $scope (@allscopes) {      foreach my $scope (@allscopes) {
         if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {          if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
             next;              next;
Line 728  sub build_access_summary { Line 867  sub build_access_summary {
                 }                  }
             }              }
             $r->print('<td>'.&mt($scope_desc{$scope}));              $r->print('<td>'.&mt($scope_desc{$scope}));
             if (($scope eq 'course') || ($scope eq 'group')) {              if ($scope eq 'course') {
                 if ($chg ne 'delete') {                  if ($chg ne 'delete') {
                     my $cid = $content->{'domain'}.'_'.$content->{'number'};                      my $cid = $content->{'domain'}.'_'.$content->{'number'};
                     my %course_description = &Apache::lonnet::coursedescription($cid);                      my %course_description = &Apache::lonnet::coursedescription($cid);
Line 740  sub build_access_summary { Line 879  sub build_access_summary {
             if ($chg ne 'delete') {              if ($chg ne 'delete') {
                 if ($scope eq 'guest') {                  if ($scope eq 'guest') {
                     $r->print(&mt('Passphrase').': '.$content->{'password'});                      $r->print(&mt('Passphrase').': '.$content->{'password'});
                 } elsif ($scope eq 'course' || $scope eq 'group') {                  } elsif ($scope eq 'course') {
                     $r->print('<table><tr>');                      $r->print('<table width="100%"><tr>');
                     $r->print('<th>'.&mt('Roles').'</th><th>'.                      $r->print('<th>'.&mt('Roles').'</th><th>'.
                           &mt('Access').'</th><th>'.                            &mt('Access').'</th><th>'.
                                           &mt('Sections').'</th>');                                            &mt('Sections').'</th>');
                     if ($scope eq 'course') {                      $r->print('<th>'.&mt('Groups').'</th>');
                         $r->print('<th>'.&mt('Groups').'</th>');  
                     } else {  
                         $r->print('<th>'.&mt('Teams').'</th>');  
                     }  
                     $r->print('</tr>');                      $r->print('</tr>');
                     foreach my $id (sort(keys(%{$content->{'roles'}}))) {                      foreach my $id (sort(keys(%{$content->{'roles'}}))) {
                         $r->print('<tr>');                          $r->print('<tr>');
Line 773  sub build_access_summary { Line 908  sub build_access_summary {
                             } else {                              } else {
                                 $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));                                  $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
                             }                              }
                             $r->print('</tr>');                              $r->print('</td>');
                         }                          }
  $r->print("</table>");   $r->print('</tr>');
                     }                      }
     $r->print("</tr></table>");      $r->print('</table>');
                 } elsif ($scope eq 'domains') {                  } elsif ($scope eq 'domains') {
                     $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));                      $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
                 } elsif ($scope eq 'users') {                  } elsif ($scope eq 'users') {
Line 879  sub update_access { Line 1014  sub update_access {
         } else {          } else {
             if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {              if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
                 $errors .= '<span class="LC_error">'.                  $errors .= '<span class="LC_error">'.
     &mt('A problem occurred storing access control settings: [_1]',$outcome).      &mt('A problem occurred saving access control settings: [_1]',$outcome).
     '</span>';      '</span>';
             }              }
         }          }
Line 891  sub update_access { Line 1026  sub update_access {
     my $totalnew = 0;      my $totalnew = 0;
     my $status = 'new';      my $status = 'new';
     my ($firstitem,$lastitem);      my ($firstitem,$lastitem);
     foreach my $newitem ('course','group','domains','users') {      foreach my $newitem ('course','domains','users') {
         $allnew += $env{'form.new'.$newitem};          $allnew += $env{'form.new'.$newitem};
     }      }
     if ($allnew > 0) {      if ($allnew > 0) {
         my $now = time;          my $now = time;
         my $then = $now + (60*60*24*180); # six months approx.          my $then = $now + (60*60*24*180); # six months approx.
         &open_form($r,$url);          &open_form($r,$url);
         foreach my $newitem ('course','group','domains','users') {          foreach my $newitem ('course','domains','users') {
             if ($env{'form.new'.$newitem} > 0) {              if ($env{'form.new'.$newitem} > 0) {
                 $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');                  $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
                 $firstitem = $totalnew;                  $firstitem = $totalnew;
Line 937  sub build_access_record { Line 1072  sub build_access_record {
   
     if ($scope eq 'guest') {      if ($scope eq 'guest') {
         $record->{'password'} = $env{'form.password'};          $record->{'password'} = $env{'form.password'};
     } elsif (($scope eq 'course') || ($scope eq 'group')) {      } elsif ($scope eq 'course') {
         $record->{'domain'} = $env{'form.crsdom_'.$num};          $record->{'domain'} = $env{'form.crsdom_'.$num};
  $record->{'number'} = $env{'form.crsnum_'.$num};   $record->{'number'} = $env{'form.crsnum_'.$num};
         my @role_ids;          my @role_ids;
Line 1019  sub sort_users { Line 1154  sub sort_users {
 }  }
   
 sub access_setting_table {  sub access_setting_table {
     my ($r,$access_controls) = @_;      my ($r,$url,$filename,$access_controls,$action) = @_;
     my ($public,$publictext);      my ($public,$publictext);
     $publictext = &mt('Off');      $publictext ='Off';
     my ($guest,$guesttext);      my ($guest,$guesttext);
     $guesttext = &mt('Off');      $guesttext = 'Off';
     my @courses = ();      my @courses = ();
     my @groups = ();  
     my @domains = ();      my @domains = ();
     my @users = ();      my @users = ();
     my $now = time;      my $now = time;
     my $then = $now + (60*60*24*180); # six months approx.      my $then = $now + (60*60*24*180); # six months approx.
     my ($num,$scope,$publicnum,$guestnum);      my ($num,$scope,$publicnum,$guestnum);
     my (%acl_count,%end,%start);      my (%acl_count,%end,%start,%conditionals);
     foreach my $key (sort(keys(%{$access_controls}))) {      foreach my $key (sort(keys(%{$access_controls}))) {
         ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);          ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);
         if ($scope eq 'public') {          if ($scope eq 'public') {
Line 1042  sub access_setting_table { Line 1176  sub access_setting_table {
             $guest=$key;              $guest=$key;
             $guestnum = $num;                $guestnum = $num;  
             $guesttext = &acl_status($start{$key},$end{$key},$now);              $guesttext = &acl_status($start{$key},$end{$key},$now);
         } elsif ($scope eq 'course') {          } else {
             push(@courses,$key);              $conditionals{$scope}{$key} = $$access_controls{$key};
         } elsif ($scope eq 'group') {              if ($scope eq 'course') {
             push(@groups,$key);                  push(@courses,$key);
         } elsif ($scope eq 'domains') {              } elsif ($scope eq 'domains') {
             push(@domains,$key);                  push(@domains,$key);
         } elsif ($scope eq 'users') {              } elsif ($scope eq 'users') {
             push(@users,$key);                  push(@users,$key);
               }
         }          }
         $acl_count{$scope} ++;          $acl_count{$scope} ++;
     }      }
     $r->print('<table border="0"><tr><td valign="top">');      $r->print('<table border="0"><tr><td valign="top">');
     $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');      if ($action eq 'chgaccess') {
           &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start,
                              \%end,$public,$publicnum,$publictext,$guest,$guestnum,
                              $guesttext,$access_controls,%conditionals);
       } else {
           &condition_setting($r,$access_controls,$now,$then,\%acl_count,
                              \@domains,\@users,\@courses);
       }
       $r->print('</td></tr></table>');
   }
   
   sub standard_settings {
       my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
         $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
       $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
Line 1062  sub access_setting_table { Line 1211  sub access_setting_table {
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
     if ($public) {      if ($public) {
         $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.          $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.
                   &dateboxes($publicnum,$start{$public},$end{$public}).'</td>');               &dateboxes($publicnum,$start->{$public},$end->{$public}).'</td>');
     } else {      } else {
         $r->print('<td>'.&actionbox('new','0','public').'</td><td>'.          $r->print('<td>'.&actionbox('new','0','public').'</td><td>'.
                   &dateboxes('0',$now,$then).'</td>');                    &dateboxes('0',$now,$then).'</td>');
Line 1070  sub access_setting_table { Line 1219  sub access_setting_table {
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
     $r->print('</td><td width="40">&nbsp;</td><td valign="top">');      $r->print('</td><td width="40">&nbsp;</td><td valign="top">');
     $r->print('<h3>'.&mt('Passphrase-protected access:').' '.$guesttext.'</h3>');      $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
Line 1081  sub access_setting_table { Line 1230  sub access_setting_table {
     if ($guest) {      if ($guest) {
         $passwd = $$access_controls{$guest}{'password'};          $passwd = $$access_controls{$guest}{'password'};
         $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'.          $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'.
                   &dateboxes($guestnum,$start{$guest},$end{$guest}).'</td>');                &dateboxes($guestnum,$start->{$guest},$end->{$guest}).'</td>');
     } else {      } else {
         $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'.          $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'.
                   &dateboxes('1',$now,$then).'</td>');                    &dateboxes('1',$now,$then).'</td>');
Line 1090  sub access_setting_table { Line 1239  sub access_setting_table {
               $passwd.'" /></td>');                $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
 #    $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');      $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr>'.
 #    &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);                '<tr><td colspan="3">');
 #    $r->print('</td><td>&nbsp;</td><td valign="top">');      my $numconditionals = 0;
 #    &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);      my $conditionstext;
 #    $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');      my %cond_status;
 #    if (@courses > 0 || @groups > 0) {      foreach my $scope ('domains','users','course') {
 #        $r->print('<td colspan="3" valign="top">');          $numconditionals += $acl_count->{$scope}; 
 #    } else {          if ($acl_count->{$scope} > 0) {
 #        $r->print('<td valign="top">');              if ($conditionstext ne 'Active') { 
 #    }                  foreach my $key (keys(%{$conditionals{$scope}})) {
 #    &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);                      $conditionstext = &acl_status($start->{$key},$end->{$key},$now);
 #    $r->print('</td>');                      if ($conditionstext eq 'Active') {
 #    if (@courses > 0 || @groups > 0) {                         last;
 #        $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');                      }
 #    } else {                  }
 #        $r->print('<td>&nbsp;</td><td valign="top">');              }
 #    }          }
 #    &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);      }
       if ($conditionstext eq '') {
           $conditionstext = 'Off';
       }
       my %anchor_fields = (
               'access' => $env{'form.selectfile'},
               'action' => 'chgconditions',
               'currentpath' => $env{'form.currentpath'},
           );
       $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>');
       if ($numconditionals > 0) {
           my $count = 1;
           my $chg = 'none';
           $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).'<br /><br />');
           $r->print(&Apache::loncommon::start_data_table());
           $r->print(&Apache::loncommon::start_data_table_header_row());
           $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
                     '</th><th>'.&mt('Additional information').'</th>');
           $r->print(&Apache::loncommon::end_data_table_header_row());
           &build_access_summary($r,$count,$chg,%conditionals);
           $r->print(&Apache::loncommon::end_data_table());
       } else {
           $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
       }
   }
   
   sub condition_setting {
       my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
       $r->print('<tr><td valign="top">');
       &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then);
       $r->print('</td><td>&nbsp;</td><td valign="top">');
       &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then);
       $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
       if ($acl_count->{course} > 0) {
           $r->print('<td colspan="3" valign="top">');
       } else {
           $r->print('<td valign="top">');
       }
       &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then);
       $r->print('</td>');
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   
 sub acl_status {  sub acl_status {
     my ($start,$end,$now) = @_;      my ($start,$end,$now) = @_;
     if ($start > $now) {      if ($start > $now) {
         return &mt('Inactive');          return 'Inactive';
     }      }
     if ($end && $end<$now) {      if ($end && $end<$now) {
         return &mt('Inactive');          return 'Inactive';
     }      }
     return &mt('Active');      return 'Active';
 }  }
   
 sub access_element {  sub access_element {
Line 1154  sub display_access_row { Line 1342  sub display_access_row {
         $r->print(&Apache::loncommon::start_data_table_header_row());          $r->print(&Apache::loncommon::start_data_table_header_row());
         $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.          $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
               &mt('Dates available').'</th>');                &mt('Dates available').'</th>');
         if (($type eq 'course') || ($type eq 'group')) {          if ($type eq 'course' && $status eq 'old') {
             $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).              $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
                       '</th>');                        '</th>');
             $colspan ++;              $colspan ++;
         } elsif ($type eq 'domains') {          } elsif ($type eq 'domains') {
             @all_doms = &Apache::loncommon::get_domains();              @all_doms = sort(&Apache::lonnet::all_domains());
         }          }
         $r->print(&Apache::loncommon::end_data_table_header_row());          $r->print(&Apache::loncommon::end_data_table_header_row());
         foreach my $key (@{$items}) {          foreach my $key (@{$items}) {
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
             if (($type eq 'course') || ($type eq 'group')) {              if ($type eq 'course') {
                 &course_row($r,$status,$type,$key,$access_controls,$now,$then);                  &course_row($r,$status,$type,$key,$access_controls,$now,$then);
             } elsif ($type eq 'domains') {              } elsif ($type eq 'domains') {
                 &domains_row($r,$status,$key,\@all_doms,$access_controls,$now,                  &domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
Line 1191  sub display_access_row { Line 1379  sub display_access_row {
 sub course_js {  sub course_js {
     return qq|      return qq|
 <script type="text/javascript">  <script type="text/javascript">
 function setRoleOptions(caller,num,cdom,cnum,type) {  function setRoleOptions(num,roleid,cdom,cnum,type) {
     addIndexnum = getCallerIndex(caller);      updateIndexNum = getIndexByValue('update',num);
     updateIndexnum = getIndex('update',num);      var addItem = 'add_role_'+num;
     if (caller.checked) {      var addIndexNum = getIndexByName(addItem);
         document.portform.elements[updateIndexnum].checked = true;      if (document.portform.elements[addItem].checked) {
         var url = '/adm/portfolio?action=rolepicker&setroles='+addIndexnum+'&cnum='+cnum+'&cdom='+cdom+'&type='+type;          document.portform.elements[updateIndexNum].checked = true;
           var url = '/adm/portfolio?action=rolepicker&setroles='+num+'_'+roleid+'&cnum='+cnum+'&cdom='+cdom+'&type='+type;
         var title = 'Roles_Chooser';          var title = 'Roles_Chooser';
         var options = 'scrollbars=1,resizable=1,menubar=0';          var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';          options += ',width=700,height=600';
         rolebrowser = open(url,title,options,'1');          rolebrowser = open(url,title,options,'1');
         rolebrowser.focus();          rolebrowser.focus();
     } else {      } else {
         for (var j=0;j<5;j++) {          addArray = new Array ('role','access','section','group');
             document.portform.elements[addIndexnum+j].value = '';          for (var j=0;j<addArray.length;j++) {
               var itemIndex = getIndexByName(addArray[j]+'_'+num+'_'+roleid);
               document.portform.elements[itemIndex].value = '';
         }          }
     }      }
 }  }
   
 function getCallerIndex(caller) {  function getIndexByName(item) {
     for (var i=0;i<document.portform.elements.length;i++) {      for (var i=0;i<document.portform.elements.length;i++) {
         if (document.portform.elements[i] == caller) {          if (document.portform.elements[i].name == item) {
             return i;              return i;
         }          }
     }      }
     return -1;      return -1;
 }  }
   
 function getIndex(name,value) {  function getIndexByValue(name,value) {
     for (var i=0;i<document.portform.elements.length;i++) {      for (var i=0;i<document.portform.elements.length;i++) {
         if (document.portform.elements[i].name == name && document.portform.elements[i].value == value) {          if (document.portform.elements[i].name == name && document.portform.elements[i].value == value) {
             return i;              return i;
Line 1241  sub course_row { Line 1432  sub course_row {
     }      }
     my $js = &Apache::loncommon::coursebrowser_javascript($defdom)      my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
  .&course_js();   .&course_js();
     my $crsgrptext = 'Groups';  
     if ($type eq 'group') {  
         $crsgrptext = 'Teams';  
     }  
     my $uctype = $type;      my $uctype = $type;
     $uctype =~ s/^(\w)/uc($1)/e;      $uctype =~ s/^(\w)/uc($1)/e;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
Line 1255  sub course_row { Line 1442  sub course_row {
         my %course_description = &Apache::lonnet::coursedescription($cid);          my %course_description = &Apache::lonnet::coursedescription($cid);
         $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');          $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
     } elsif ($status eq 'new') {      } elsif ($status eq 'new') {
         $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,undef,undef,$uctype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');          $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
     }      }
     $r->print('<td>'.&dateboxes($num,$start,$end).'</td>');      $r->print('<td>'.&dateboxes($num,$start,$end));
     $r->print('<td><table><tr>');      my $newrole_id = 1;
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'.  
               &mt('Access').'</th><th>'.&mt('Sections').'</th><th>'.  
               &mt($crsgrptext).'</th></tr>');  
     if ($status eq 'old') {      if ($status eq 'old') {
           $r->print('</td><td>');
         my $max_id = 0;          my $max_id = 0;
         foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {          if (keys(%{$content->{'roles'}}) > 0) {
             if ($role_id > $max_id) {              $r->print('<table><tr><th>'.&mt('Action').'</th>'.
                 $max_id = $role_id;                        '<th>'.&mt('Roles').'</th>'.
             }                        '<th>'.&mt('Access').'</th>'.
             $max_id ++;                        '<th>'.&mt('Sections').'</th>'.
             my $role_selects = &role_selectors($num,$role_id,$status,$type,$content,'display');                        '<th>'.&mt('Groups').'</th></tr>');
             $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');              foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
         }                  if ($role_id > $max_id) {
         $r->print('</table><br />'.&mt('Add a roles-based condition').'&nbsp;<input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content->{'domain'}','$content->{'number'}','$uctype'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');                      $max_id = $role_id;
     } elsif ($status eq 'new') {                  }
         my $role_id = 1;                  $max_id ++;
         my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');                  my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
         $r->print('<tr><td><input type="checkbox" name="add_role_'.$num.'" value="'.$role_id.'" checked="checked" />'.&mt('Add').'<input type="hidden" name="grplist_'.$num.'_'.$role_id.'" /></td>'.$role_selects);                  $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
         $r->print('</tr></table></td>');              }
               $r->print('</table>');
           }
           $r->print('<br />'.&mt('Add a roles-based condition').
                     '&nbsp;<input type="checkbox" name ="add_role_'.
                     $num.'" onClick="javascript:setRoleOptions('."'$num',
                     '$max_id','$content->{'domain'}','$content->{'number'}',
                     '$uctype'".')" value="" />');
           $newrole_id = $max_id;
       } else {
           $r->print('<input type="hidden" name ="add_role_'.$num.'" value="" />');
     }      }
       $r->print(&add_course_role($num,$newrole_id));
       $r->print('</td>');
     return;      return;
 }  }
   
   sub add_course_role {
       my ($num,$max_id) = @_;
       my $output;
       $output .='<input type="hidden" name="role_'.$num.'_'.$max_id.'" />'.
                 '<input type="hidden" name="access_'.$num.'_'.$max_id.'" />'.
                 '<input type="hidden" name="section_'.$num.'_'.$max_id.'" />'.
                 '<input type="hidden" name="group_'.$num.'_'.$max_id.'" />';
       return $output;
   }
   
 sub domains_row {  sub domains_row {
     my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;      my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
Line 1331  sub actionbox { Line 1538  sub actionbox {
     my ($status,$num,$scope) = @_;      my ($status,$num,$scope) = @_;
     my $output = '<span style="white-space: nowrap"><label>';      my $output = '<span style="white-space: nowrap"><label>';
     if ($status eq 'new') {      if ($status eq 'new') {
         $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.          my $checkstate;
           if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
               $checkstate = 'checked="checked"';
           }
           $output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
                      $checkstate.'  />'.
         &mt('Activate');          &mt('Activate');
     } else {      } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.          $output .= '<input type="checkbox" name="delete" value="'.$num.
Line 1379  sub set_identifiers { Line 1591  sub set_identifiers {
 }   } 
   
 sub role_selectors {  sub role_selectors {
     my ($num,$role_id,$status,$type,$content,$caller) = @_;      my ($num,$role_id,$type,$content,$caller) = @_;
     my ($output,$cdom,$cnum,$longid);      my ($output,$cdom,$cnum,$longid);
     if ($caller eq 'display') {      if ($caller eq 'display') {
         $longid = '_'.$num.'_'.$role_id;          $longid = '_'.$num.'_'.$role_id;
         if ($status eq 'new') {          $cdom = $$content{'domain'};
             foreach my $item ('role','access','section','group') {          $cnum = $$content{'number'};
                 $output .= '<td><select name="'.$item.$longid.'">'.  
                            '<option value="">'.&mt('Pick [_1] first',$type).  
                            '</option></select></td>';  
             }  
             return $output;  
         } else {  
             $cdom = $$content{'domain'};  
             $cnum = $$content{'number'};  
         }  
     } elsif ($caller eq 'rolepicker') {      } elsif ($caller eq 'rolepicker') {
          $cdom = $env{'form.cdom'};           $cdom = $env{'form.cdom'};
          $cnum = $env{'form.cnum'};           $cnum = $env{'form.cnum'};
Line 1431  sub role_selectors { Line 1634  sub role_selectors {
                     'role' => $allroles,                      'role' => $allroles,
                     'access' => \@allaccesses,                      'access' => \@allaccesses,
                     'section' => $sections,                      'section' => $sections,
                     'group' => $groups,                       'group' => $groups,
                    );                     );
     foreach my $item ('role','access','section','group') {      foreach my $item ('role','access','section','group') {
         $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n";          $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n";
Line 1455  sub role_selectors { Line 1658  sub role_selectors {
   
 sub role_options_window {  sub role_options_window {
     my ($r) = @_;      my ($r) = @_;
     my $cdom = $env{'form.cdom'};  
     my $cnum = $env{'form.cnum'};  
     my $type = $env{'form.type'};      my $type = $env{'form.type'};
     my $addindex = $env{'form.setroles'};      my $rolenum = $env{'form.setroles'};
     my $grouptitle = 'Groups';      my ($num,$role_id) = ($rolenum =~ /^([\d_]+)_(\d+)$/);
     if ($type eq 'Group') {      my $role_elements;
          $grouptitle = 'Teams';      foreach my $item ('role','access','section','group') {
     }           $role_elements .= "'".$item.'_'.$rolenum."',";
     my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker');      }
       $role_elements =~ s/,$//; 
       my $role_selects = &role_selectors($num,$role_id,$type,undef,
                                          'rolepicker');
     $r->print(<<"END_SCRIPT");      $r->print(<<"END_SCRIPT");
 <script type="text/javascript">  <script type="text/javascript">
 function setRoles() {  function setRoles() {
     var addidx = $addindex+1;      var role_elements = new Array($role_elements);
     for (var i=0; i<4; i++) {      for (var i=0; i<role_elements.length; i++) {
         var copylist = '';          var copylist = '';
         for (var j=0; j<document.rolepicker.elements[i].length; j++) {          for (var j=0; j<document.rolepicker.elements[i].length; j++) {
             if (document.rolepicker.elements[i].options[j].selected) {              if (document.rolepicker.elements[i].options[j].selected) {
Line 1476  function setRoles() { Line 1680  function setRoles() {
             }              }
         }          }
         copylist = copylist.substr(0,copylist.length-1);          copylist = copylist.substr(0,copylist.length-1);
         opener.document.portform.elements[addidx+i].value = copylist;          var openerItem = getIndexByName(role_elements[i]);
           opener.document.portform.elements[openerItem].value = copylist; 
     }      }
       var roleAdder = getIndexByName('add_role_$num');
       opener.document.portform.elements[roleAdder].value = '$role_id';
     self.close();      self.close();
 }  }
   
   function getIndexByName(item) {
       for (var i=0;i<opener.document.portform.elements.length;i++) {
           if (opener.document.portform.elements[i].name == item) {
               return i;
           }
       }
       return -1;
   }
   
 </script>  </script>
 END_SCRIPT  END_SCRIPT
     $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));      $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
     $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt($grouptitle).'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');      $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
     return;      return;
 }  }
   
Line 1533  ENDSMP Line 1750  ENDSMP
     }      }
 }  }
   
 sub upload {  
     my ($r,$url,$group)=@_;  
     my $fname=$env{'form.uploaddoc.filename'};  
     my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)  
     my $disk_quota = 20000; # expressed in k  
     if (defined($group)) {  
         my $grp_quota = &get_group_quota($group); # quota expressed in k   
         if ($grp_quota ne '') {  
             $disk_quota = $grp_quota;  
         } else {  
             $disk_quota = 0;  
         }  
     }  
     $fname=&Apache::lonnet::clean_filename($fname);  
   
     my $portfolio_root=&get_portfolio_root();  sub check_for_upload {
     my ($uname,$udom) = &get_name_dom();      my ($path,$fname,$group,$element) = @_;
       my $disk_quota = &get_quota($group);
       my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
   
       my $portfolio_root = &get_portfolio_root();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
       my ($uname,$udom) = &get_name_dom();
     # Fixme --- Move the checking for existing file to LOND error return      # Fixme --- Move the checking for existing file to LOND error return
     my @dir_list=&get_dir_list($portfolio_root);      my @dir_list=&get_dir_list($portfolio_root,$path);
     my $found_file = 0;      my $found_file = 0;
     my $locked_file = 0;      my $locked_file = 0;
     foreach my $line (@dir_list) {      foreach my $line (@dir_list) {
         my ($file_name)=split(/\&/,$line,2);          my ($file_name)=split(/\&/,$line,2);
         if ($file_name eq $fname){          if ($file_name eq $fname){
             $file_name = $env{'form.currentpath'}.$file_name;              $file_name = $path.$file_name;
             $file_name = &prepend_group($file_name);              $file_name = &prepend_group($file_name);
             $found_file = 1;              $found_file = 1;
             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {              if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
Line 1567  sub upload { Line 1775  sub upload {
         }          }
     }      }
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);      my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
   
     if (($current_disk_usage + $filesize) > $disk_quota){      if (($current_disk_usage + $filesize) > $disk_quota){
         $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.          my $msg = '<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');      '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.';
         $r->print(&done('Back',$url));   return ('will_exceed_quota',$msg);
     }       } elsif ($found_file) {
     elsif ($found_file){          if ($locked_file) {
         if ($locked_file){              my $msg = '<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$path.'</strong></span>'.
             $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.';
                   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');      return ('file_locked',$msg);
             $r->print(&done('Back',$url));         } else {
         } else {                 my $msg = '<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$path.'</strong></span>'.
             $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.   '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$path;
                   '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});      return ('file_exists',$msg);
             $r->print(&done('Back',$url));   }
         }      }
     } else {  }
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',  
          $port_path.$env{'form.currentpath'});  sub upload {
         if ($result !~ m|^/uploaded/|) {      my ($r,$url,$group)=@_;
             $r->print('<span class="LC_error">'.'An errror occured ('.$result.      my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
               ') while trying to upload '.&display_file().'</span><br />');  
     $r->print(&done('Back',$url));      my ($state,$msg) = &check_for_upload($env{'form.currentpath'},
         } else {   $fname,$group,'uploaddoc');
             $r->print(&done(undef,$url));  
         }      if ($state eq 'will_exceed_quota'
    || $state eq 'file_locked'
    || $state eq 'file_exists' ) {
    $r->print($msg.&done('Back',$url));
    return;
       }
   
       my $port_path = &get_port_path();
       my (%allfiles,%codebase,$mode);
       if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
    $mode = 'parse';
   
       }
       my $result=
    &Apache::lonnet::userfileupload('uploaddoc','',
    $port_path.$env{'form.currentpath'},
    $mode,\%allfiles,\%codebase);
       if ($result !~ m|^/uploaded/|) {
    $r->print('<span class="LC_error">'.'An error occured ('.$result.
     ') while trying to upload '.&display_file().'</span><br />');
    $r->print(&done('Back',$url));
       } else {
    if (%allfiles) {
       my $state = <<STATE;
       <input type="hidden" name="action"      value="upload_embedded" />
       <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
       <input type="hidden" name="fieldname"   value="$env{'form.fieldname'}" />
       <input type="hidden" name="mode"        value="$env{'form.mode'}" />
   STATE
       $r->print("<p>Completed upload of the file. This file contained references to other files. You can upload these now: </p>");
       $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
         {'error_on_invalid_names'   => 1,
          'ignore_remote_references' => 1,}));
       $r->print('<p>Or '.&done('Return to directory listing',$url).'</p>');
    } else {
       $r->print(&done(undef,$url));
    }
     }      }
 }  }
   
   sub upload_embedded {
       my ($r,$url,$group)=@_;
       for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
    next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
   
    $env{'form.embedded_orig_'.$i} = 
       &unescape($env{'form.embedded_orig_'.$i});
    my ($path,$fname) = 
       ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
    $path = $env{'form.currentpath'}.$path;
    $fname = &Apache::lonnet::clean_filename($fname);
   
    my ($state,$msg) = &check_for_upload($path,$fname,$group,
        'embedded_item_'.$i);
   
    if ($state eq 'will_exceed_quota'
       || $state eq 'file_locked'
       || $state eq 'file_exists' ) {
       $r->print($msg);
       next;
    }
   
    my $port_path = &get_port_path();
    my $src_path = $env{'form.embedded_orig_'.$i};
    $env{'form.embedded_item_'.$i.'.filename'}=$fname;
   
    my $result=
       &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
       $port_path.$path);
    if ($result !~ m|^/uploaded/|) {
       $r->print('<span class="LC_error">'.'An error occured ('.$result.
         ') while trying to upload '.&display_file($path,$fname).'</span><br />');
       next;
    } else {
       $r->print("<p> Uploaded ".
         &display_file($port_path.$path,$fname).'</p>');
    }
       }
       $r->print(&done(undef,$url));
   }
   
 sub lock_info {  sub lock_info {
     my ($r,$url,$group) = @_;      my ($r,$url,$group) = @_;
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
Line 1667  sub createdir { Line 1953  sub createdir {
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,          my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
          $port_path.$env{'form.currentpath'}.$newdir);           $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {          if ($result ne 'ok') {
        $r->print('<span class="LC_error">'.'An errror occured ('.$result.         $r->print('<span class="LC_error">'.'An error occured ('.$result.
           ') while trying to create a new directory '.&display_file().'</span><br />');            ') while trying to create a new directory '.&display_file().'</span><br />');
         }          }
     }      }
Line 1678  sub createdir { Line 1964  sub createdir {
 }  }
   
 sub get_portfolio_root {  sub get_portfolio_root {
     my ($udom,$uname) = @_;      my ($udom,$uname,$group) = @_;
     if (!(defined($udom)) || !(defined($uname))) {      if (!(defined($udom)) || !(defined($uname))) {
         ($uname,$udom) = &get_name_dom();          ($uname,$udom) = &get_name_dom();
     }      }
     my $path;      my $path = '/userfiles/portfolio';
     if (defined($env{'form.group'})) {      if (!defined($group)) { 
         $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';          if (defined($env{'form.group'})) {
     } else {              $group = $env{'form.group'};      
         $path = '/userfiles/portfolio';          }
     }      }
       if (defined($group)) {
           $path = '/userfiles/groups/'.$group.'/portfolio';
       } 
     return (&Apache::loncommon::propath($udom,$uname).$path);      return (&Apache::loncommon::propath($udom,$uname).$path);
 }  }
   
Line 1709  sub get_group_quota { Line 1998  sub get_group_quota {
 }   } 
   
 sub get_dir_list {  sub get_dir_list {
     my ($portfolio_root) = @_;      my ($portfolio_root,$path) = @_;
       $path ||= $env{'form.currentpath'};
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     return &Apache::lonnet::dirlist($env{'form.currentpath'},      return &Apache::lonnet::dirlist($path,$udom,$uname,$portfolio_root);
                                           $udom,$uname,$portfolio_root);  
 }  }
   
 sub get_name_dom {  sub get_name_dom {
Line 1808  sub coursegrp_portfolio_header { Line 2097  sub coursegrp_portfolio_header {
     return $output;      return $output;
 }  }
   
   sub get_quota {
       my ($group) = @_;
       my $disk_quota;
       if (defined($group)) {
           my $grp_quota = &get_group_quota($group); # quota expressed in k
           if ($grp_quota ne '') {
               $disk_quota = $grp_quota;
           } else {
               $disk_quota = 0;
           }
       } else {
           $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
                                       $env{'user.domain'}); #expressed in Mb
           $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
       }
       return $disk_quota;
   }
   
 sub handler {  sub handler {
     # this handles file management      # this handles file management
Line 1904  sub handler { Line 2210  sub handler {
         $r->print(&Apache::loncommon::start_page($title));          $r->print(&Apache::loncommon::start_page($title));
     }      }
     $r->rflush();      $r->rflush();
       my ($blocked,$blocktext) = 
           &Apache::loncommon::blocking_status('port',$uname,$udom);
       if ($blocked) {
            $r->print($blocktext);
            $r->print(&Apache::loncommon::end_page());
            return OK;
       }
  if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){   if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
        $r->print('<span class="LC_error">'.         $r->print('<span class="LC_error">'.
       'No file was selected to upload.'.        'No file was selected to upload.'.
Line 1926  sub handler { Line 2239  sub handler {
         } else {          } else {
             &missing_priv($r,$url,'upload');              &missing_priv($r,$url,'upload');
         }          }
       } elsif ($env{'form.action'} eq 'upload_embedded') {
    if ($can_upload) {
       &upload_embedded($r,$url,$group);
           } else {
               &missing_priv($r,$url,'upload');
           }
     } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
         if ($can_delete) {          if ($can_delete) {
     &delete_confirmed($r,$url);      &delete_confirmed($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'delete');              &missing_priv($r,$url,'delete');
         }          }
Line 1952  sub handler { Line 2271  sub handler {
         }          }
     } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
         if ($can_modify) {          if ($can_modify) {
     &rename_confirmed($r,$url);      &rename_confirmed($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'rename');              &missing_priv($r,$url,'rename');
         }          }
Line 1966  sub handler { Line 2285  sub handler {
         }          }
     } elsif ($env{'form.access'}) {      } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};          $env{'form.selectfile'} = $env{'form.access'};
         $env{'form.action'} = 'chgaccess';          if (!defined($env{'form.action'})) { 
         &display_access($r,$url,$group,$can_setacl,$port_path);              $env{'form.action'} = 'chgaccess';
     } elsif ($env{'form.action'} eq 'chgaccess') {          }
           &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'});
       } elsif (($env{'form.action'} eq 'chgaccess') || 
                ($env{'form.action'} eq 'chgconditions')) {
         if ($can_setacl) {          if ($can_setacl) {
             &update_access($r,$url,$group,$port_path);              &update_access($r,$url,$group,$port_path);
         } else {          } else {
Removed from v.1.156.2.2  
changed lines
  Added in v.1.181

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