Diff for /loncom/interface/portfolio.pm between versions 1.55 and 1.60

version 1.55, 2004/11/09 21:51:14 version 1.60, 2004/12/04 02:15:42
Line 33  use Apache::lonlocal; Line 33  use Apache::lonlocal;
 # receives a file name and path stub from username/userfiles/portfolio/  # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath  # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {  sub make_anchor {
     my ($filename, $current_path) = @_;      my ($filename, $current_path, $current_mode, $field_name) = @_;
     my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'">'.$filename.'</a>';      my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
     return $anchor;      return $anchor;
 }  }
 my $dirptr=16384;  my $dirptr=16384;
Line 48  sub display_common { Line 48  sub display_common {
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         '<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="submit" name="storeupl" value="Upload" />'.          '<input type="submit" name="storeupl" value="Upload" />'.
         '</form>';          '</form>';
     $r->print($displayOut);      $r->print($displayOut);
Line 57  sub display_common { Line 58  sub display_common {
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         '<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="submit" name="createdir" value="'.&mt("Create Directory").'" />'.          '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
         '</form>';          '</form>';
     $r->print($displayOut);      $r->print($displayOut);
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
     $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');      $r->print('<font size="+2">'.&make_anchor('portfolio','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
     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].'/';
             $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');              $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
         }          }
     }      }
     $r->print('</font>');      $r->print('</font>');
     &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);      &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
     $r->print('<br /><form method=post action="/adm/portfolio">'.      $r->print('<br /><form method=post action="/adm/portfolio?mode='.$ENV{"form.mode"}.'&fieldname='.$ENV{"form.fieldname"}.'">'.
       &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',        &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
     'this.form.submit();'));      'this.form.submit();'));
     $r->print("</form>");      $r->print("</form>");
Line 121  sub display_directory { Line 123  sub display_directory {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
                 $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');                  $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
                 $r->print('<td>Go to ...</td>');                  $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>');                   $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
Line 157  sub display_file_select { Line 159  sub display_file_select {
     my ($r,$current_path,$is_empty,$dir_list)=@_;      my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;      my $display_out;
       my %checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
     if ($is_empty && ($current_path ne '/')) {      if ($is_empty && ($current_path ne '/')) {
         $display_out = '<form method="post" action="/adm/portfolio">'.          $display_out = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.          '<input type="hidden" name="action" value="deletedir" />'.
Line 186  sub display_file_select { Line 189  sub display_file_select {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
                 $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');                  $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
                 $r->print('<td>Go to ...</td>');                  $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>');                   $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
Line 203  sub display_file_select { Line 206  sub display_file_select {
         }          }
     }      }
     $r->print('</table>      $r->print('</table>
               <input type="hidden" name="continue" value="true">
               <input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">
               <input type="hidden" name="mode" value="selectfile">
               <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />              <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />              <input type="hidden" name="currentpath" value="'.$current_path.'" />
     </form>');      </form>');
Line 244  sub done { Line 251  sub done {
     return ('<h3><a href="/adm/portfolio?currentpath='.      return ('<h3><a href="/adm/portfolio?currentpath='.
     $ENV{'form.currentpath'}.      $ENV{'form.currentpath'}.
     '&fieldname='.$ENV{'form.fieldname'}.      '&fieldname='.$ENV{'form.fieldname'}.
       '&mode='.$ENV{'form.mode'}.
     '">'.&mt('Done').'</a></h3>');      '">'.&mt('Done').'</a></h3>');
 }  }
   
Line 251  sub delete { Line 259  sub delete {
     my ($r)=@_;      my ($r)=@_;
     my @check;      my @check;
     my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};      my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
     push @check, $file_name;      if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
     my %locked = &Apache::lonnet::get('file_permissions',\@check,  
                                         $ENV{'user.domain'},$ENV{'user.name'});  
     if (ref($locked{$file_name}) eq 'ARRAY') {  
         $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());          $r->print(&done());
     } else {      } else {
Line 314  sub delete_dir_confirmed { Line 319  sub delete_dir_confirmed {
   
 sub rename {  sub rename {
     my ($r)=@_;      my ($r)=@_;
     my @check;  
     my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};      my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
     push @check, $file_name;      if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
     my %locked = &Apache::lonnet::get('file_permissions',\@check,  
                                         $ENV{'user.domain'},$ENV{'user.name'});  
     if (ref($locked{$file_name}) eq 'ARRAY') {  
         $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());          $r->print(&done());
     } else {      } else {
Line 343  sub rename_confirmed { Line 344  sub rename_confirmed {
     my $result=      my $result=
  &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},   &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
             'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},              'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
             'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});              'portfolio'.$ENV{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An errror occured ('.$result.   $r->print('<font color="red"> An errror occured ('.$result.
   ') while trying to rename '.&display_file().' to '.    ') while trying to rename '.&display_file().' to '.
Line 353  sub rename_confirmed { Line 354  sub rename_confirmed {
 }  }
 sub select_files {  sub select_files {
     my ($r)=@_;      my ($r)=@_;
       if ($ENV{'form.continue'} eq 'true') {
           # here we update the selections for the currentpath
           # eventually, have to handle removing those not checked, but . . . 
           my @items=&Apache::loncommon::get_env_multiple('form.selectedfile');
           &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
       }
     my $java_script =(<<ENDSMP);      my $java_script =(<<ENDSMP);
         <script language='javascript'>          <script language='javascript'>
         function finishSelect() {          function finishSelect() {
Line 374  ENDSMP Line 381  ENDSMP
     $r->print($java_script);      $r->print($java_script);
     $r->print("<h1>Select portfolio files</h1>      $r->print("<h1>Select portfolio files</h1>
                 Check as many as you wish in response to the essay problem.<br />");                  Check as many as you wish in response to the essay problem.<br />");
       $r->print("<strong>Files selected:</strong><br />");
       foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) {
           $r->print($_."<br />");
       }
 }  }
 sub upload {  sub upload {
     my ($r)=@_;      my ($r)=@_;

Removed from v.1.55  
changed lines
  Added in v.1.60


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