--- loncom/interface/portfolio.pm	2004/10/18 20:37:30	1.49
+++ loncom/interface/portfolio.pm	2005/02/11 06:18:52	1.74
@@ -33,8 +33,8 @@ use Apache::lonlocal;
 # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
-    my ($filename, $current_path) = @_;
-    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'">'.$filename.'</a>';
+    my ($filename, $current_path, $current_mode, $field_name) = @_;
+    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
     return $anchor;
 }
 my $dirptr=16384;
@@ -44,8 +44,11 @@ sub display_common {
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     $r->print('<td bgcolor="#ccddaa" align="center">');
     my $displayOut = '<form method="post" enctype="multipart/form-data">';
-    $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
+    $displayOut .= '<input name="uploaddoc" type="file" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+        '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+        '<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" />'.
         '</form>';
     $r->print($displayOut);
@@ -53,23 +56,25 @@ sub display_common {
     $displayOut = '<form method="post">';
     $displayOut .= '<input name="newdir" type="input" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+        '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+        '<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").'" />'.
         '</form>';
     $r->print($displayOut);
     $r->print('</td></tr></table>');
     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){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @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>');
     &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
-    #Fixme -- remove from recent those paths that are deleted
-    $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',
 						    'this.form.submit();'));
     $r->print("</form>");
@@ -78,6 +83,7 @@ sub display_directory {
     my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;
+    my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'});
     if ($is_empty && ($current_path ne '/')) {
         $display_out = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.
@@ -90,8 +96,9 @@ sub display_directory {
 	return;
     }
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
-            '<tr><th>Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+            '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+    $r->print('<form method="post" action="/adm/portfolio">');
     foreach my $line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
@@ -103,24 +110,20 @@ sub display_directory {
     	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     	if (($filename ne '.') && ($filename ne '..')) {
             if ($dirptr&$testdir) {
-                $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+                $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></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>'); 
             } else {
                 $r->print('<tr bgcolor="#CCCCFF">');
-                $r->print('<td>
-                    <form method="post" action="/adm/portfolio">
-                    <select name="action">
-                        <option value=""></option>
-                        <option value="delete">'.&mt("Delete").'</option>
-                        <option value="rename">'.&mt("Rename").'</option>
-                    </select>
-                    <input type="submit" name="doit" value="Go" />
-                    <input type="hidden" name="selectfile" value="'.$filename.'" />
-                    <input type="hidden" name="currentpath" value="'.$current_path.'" />
-                    </form>
-                    </td>');
+                if (exists $locked_files{$current_path.$filename}){
+                    $r->print('<td colspan="2">Locked</td>');
+                } else {
+                    $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
+                        <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a></td>
+                        <td><a href="/adm/portfolio'.$current_path.$filename.'.meta">Meta</a>
+                        </td>');
+                }
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.
 			    $filename.'</a></td>'); 
@@ -135,12 +138,17 @@ sub display_directory {
 #   $r->print(&display_directory($current_path, $currentFile, @dir_list));
 #    $r->print('</td>><td>');
 #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
-    $r->print('</table></form>');
+    $r->print('</table>
+    <input type="submit" name="doit" value="Delete Checked Files" />
+    <input type="hidden" name="action" value="delete" />
+    <input type="hidden" name="currentpath" value="'.$current_path.'" />
+    </form>');
 }
 sub display_file_select {
     my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;
+    my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
     if ($is_empty && ($current_path ne '/')) {
         $display_out = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.
@@ -166,17 +174,20 @@ sub display_file_select {
     	#$strip holds directory/file name
     	#$dom 
     	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+    	$filename =~ s/\s+$//;
     	if (($filename ne '.') && ($filename ne '..')) {
             if ($dirptr&$testdir) {
                 $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></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>'); 
             } else {
                 $r->print('<tr bgcolor="#CCCCFF">');
-                $r->print('<td>
-                        <input type="checkbox" name="selectedfile" value="'.$filename.'" >
-                    </td>');
+                $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
+                if ($$checked_files{$filename} eq 'selected') {
+                    $r->print("CHECKED");
+                }
+                $r->print('></td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.
 			    $filename.'</a></td>'); 
@@ -187,6 +198,10 @@ sub display_file_select {
         }
     }
     $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="hidden" name="currentpath" value="'.$current_path.'" />
     </form>');
@@ -194,12 +209,15 @@ sub display_file_select {
 
 sub open_form {
     my ($r)=@_;
+    my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     $r->print('<form method="post" action="/adm/portfolio">');
     $r->print('<input type="hidden" name="action" value="'.
 	      $ENV{'form.action'}.'" />');
     $r->print('<input type="hidden" name="confirmed" value="1" />');
-    $r->print('<input type="hidden" name="selectfile" value="'.
-	      $ENV{'form.selectfile'}.'" />');
+    foreach (@files) {
+        $r->print('<input type="hidden" name="selectfile" value="'.
+	      $_.'" />');
+    }
     $r->print('<input type="hidden" name="currentpath" value="'.
 	      $ENV{'form.currentpath'}.'" />');
 }
@@ -219,32 +237,63 @@ sub close_form {
 
 sub display_file {
     my ($path,$filename)=@_;
+    my $display_file_text;
     if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
-    if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
-    return '<tt>'.$path.$filename.'</tt>';
+    if (!defined($filename)) { 
+        $filename=$ENV{'form.selectfile'};
+        $display_file_text = '<tt>'.$path.$filename.'</tt>';
+    } elsif (ref($filename) eq "ARRAY") {
+        foreach (@$filename) {
+            $display_file_text .= '<tt>'.$path.$_.'</tt><br />';
+        }
+    } elsif (ref($filename) eq "SCALAR") {
+        $display_file_text = '<tt>'.$path.$filename.'</tt>';        
+    }
+    return $display_file_text;
 }
 
 sub done {
     return ('<h3><a href="/adm/portfolio?currentpath='.
-	    $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');
+	    $ENV{'form.currentpath'}.
+	    '&fieldname='.$ENV{'form.fieldname'}.
+	    '&mode='.$ENV{'form.mode'}.
+	    '">'.&mt('Done').'</a></h3>');
 }
 
 sub delete {
     my ($r)=@_;
-    &open_form($r);
-    $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
-    &close_form($r);
+    my @check;
+    my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+    my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+
+    if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+        $r->print ("The file is locked and cannot be deleted.<br />");
+        $r->print(&done());
+    } else {
+        if (scalar(@files)) {
+            &open_form($r);
+            $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
+            &close_form($r);
+        } else {
+            $r->print("No file was checked to delete.<br />");
+            $r->print(&done());
+        }
+    }
 } 
 
 sub delete_confirmed {
     my ($r)=@_;
-    my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
+    my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+    my $result;
+    foreach my $delete_file (@files) {
+        $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
 					       $ENV{'user.domain'},'portfolio'.
 					       $ENV{'form.currentpath'}.
-					       $ENV{'form.selectfile'});
-    if ($result ne 'ok') {
+					       $delete_file);
+        if ($result ne 'ok') {
 	$r->print('<font color="red"> An error occured ('.$result.
-		  ') while trying to delete '.&display_file().'</font><br />');
+		  ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');
+        }
     }
     $r->print(&done());
 }
@@ -286,10 +335,16 @@ sub delete_dir_confirmed {
 
 sub rename {
     my ($r)=@_;
-    &open_form($r);
-    $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
-               <input name="filenewname" type="input" size="50" />?</p>');
-    &close_form($r);
+    my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'};
+    if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
+        $r->print ("The file is locked and cannot be renamed.<br />");
+        $r->print(&done());
+    } else {
+        &open_form($r);
+        $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
+                   <input name="filenewname" type="input" size="50" />?</p>');
+        &close_form($r);
+    }
 }
 
 sub rename_confirmed {
@@ -305,72 +360,62 @@ sub rename_confirmed {
     my $result=
 	&Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
             'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
-            'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});
+            'portfolio'.$ENV{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {
 	$r->print('<font color="red"> An errror occured ('.$result.
 		  ') while trying to rename '.&display_file().' to '.
 		  &display_file(undef,$filenewname).'</font><br />');
     }
+    if ($filenewname ne $ENV{'form.filenewname'}) {
+        $r->print("The new file name was changed from:<br /><strong>".$ENV{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
+    }
     $r->print(&done());
 }
 sub select_files {
     my ($r)=@_;
-    my $java_script =(<<ENDSMP);
+    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.selectfile');
+        &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
+    } else {
+        if ($ENV{'form.currentpath'} eq '/') {
+            #empty the file for a fresh start
+            # &Apache::lonnet::clear_selected_files($ENV{'user.name'});
+        }
+    }
+    my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
+    my $java_files = join ",", @files;
+    if ($java_files) {
+        $java_files.=',';
+    }
+    my $javascript =(<<ENDSMP);
         <script language='javascript'>
         function finishSelect() {
-            fileList = "";
+ENDSMP
+    $javascript .= 'fileList = "'.$java_files.'";';
+    $javascript .= (<<ENDSMP);
             for (i=0;i<document.forms.checkselect.length;i++) { 
                 if (document.forms.checkselect[i].checked){
-                    fileList = fileList + document.forms.checkselect[i].value + "," ;
+                    fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
                 }
             }
             opener.document.forms.lonhomework.
 ENDSMP
-    $java_script .= $ENV{'form.fieldname'};
-    $java_script .= (<<ENDSMP);
+    $javascript .= $ENV{'form.fieldname'};
+    $javascript .= (<<ENDSMP);
         .value=fileList;
             self.close();
         }
         </script>
 ENDSMP
-    $r->print($java_script);
+    $r->print($javascript);
     $r->print("<h1>Select portfolio files</h1>
                 Check as many as you wish in response to the essay problem.<br />");
-    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
-						 $ENV{'user.name'}).
-						'/userfiles/portfolio';
-    my $current_path='/';
-    if ($ENV{'form.currentpath'}) {
-	$current_path = $ENV{'form.currentpath'};
-    }
-    my @dir_list=&Apache::lonnet::dirlist($current_path,
-				    $ENV{'user.domain'},
-				    $ENV{'user.name'},$portfolio_root);
-    if ($dir_list[0] eq 'no_such_dir'){
-	# two main reasons for this:
-        #    1) never been here, so directory structure not created,
-	#    2) back-button navigation after deleting a directory
-        if ($current_path eq '/'){
-	        &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
-					       $ENV{'user.domain'},'portfolio');
-	} else {
-                # some directory that snuck in get rid of the directory
-                # from the recent pulldown, just in case
-	&Apache::lonhtmlcommon::remove_recent('portfolio',
-					      [$current_path]);
-	$current_path = '/'; # force it back to the root        
-	}
-	    # now grab the directory list again, for the first time
-	    @dir_list=&Apache::lonnet::dirlist($current_path,
-					    $ENV{'user.domain'},
-					    $ENV{'user.name'},$portfolio_root);
+    $r->print("<strong>Files selected from other directories:</strong><br />");
+    foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) {
+        $r->print($_."<br />");
     }
-    # need to know if directory is empty so it can be removed if desired
-    my $is_empty=(@dir_list == 2);
-    &display_common($r,$current_path,$is_empty,\@dir_list);
-    &display_file_select($r,$current_path,$is_empty,\@dir_list);
-    $r->print("</body>\n</html>\n");
-    return OK;
 }
 sub upload {
     my ($r)=@_;
@@ -393,7 +438,7 @@ sub upload {
         }
     }
     my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
-    if (($current_disk_usage + $filesize) > $disk_quota){
+    if ((($current_disk_usage/1000) + $filesize) > $disk_quota){
         $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
     } 
@@ -445,6 +490,9 @@ sub createdir {
 	    	      ') while trying to create a new directory '.&display_file().'</font><br />');
         }
     }
+    if ($newdir ne $ENV{'form.newdir'}) {
+        $r->print("The new directory name was changed from:<br /><strong>".$ENV{'form.newdir'}."</strong> to <strong>$newdir </strong>");  
+    }
     $r->print(&done());
 }
 
@@ -454,27 +502,38 @@ sub handler {
     my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
 							 $ENV{'user.name'}).
 							'/userfiles/portfolio';
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['selectfile','currentpath','meta',
+					     'currentfile','action','fieldname','mode','rename']);
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     # Give the LON-CAPA page header
     $r->print('<html><head><title>'.
               &mt('Portfolio Manager').
-              "</title></head>\n".
-              &Apache::loncommon::bodytag('Portfolio Manager'));
+              "</title></head>\n");
+    if ($ENV{"form.mode"} eq 'selectfile'){
+        $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));
+    } else {
+        $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
+    }
     $r->rflush();
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['selectfile','currentpath',
-					     'currentfile','action','fieldname']);
 	if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
    	    $r->print('<font color="red"> No file was selected to upload.'.
    	            'To upload a file, click <strong>Browse...</strong>'.
    	            ', select a file, then click <strong>Upload</strong>,</font>');
 	}
+    if ($ENV{'form.meta'}) {
+        &open_form($r);
+#        $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'}));
+        $r->print('Edit the meta data<br />');
+        &close_form($r);
+    }
+    if ($ENV{'form.store'}) {
+    }
+
     if ($ENV{'form.uploaddoc.filename'}) {
 	&upload($r);
-    } elsif ($ENV{'form.action'} eq 'selectfile') {
-        &select_files($r);
     } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
 	&delete_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'delete') {
@@ -485,7 +544,9 @@ sub handler {
 	&delete_dir($r);
     } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
 	&rename_confirmed($r);
-    } elsif ($ENV{'form.action'} eq 'rename') {
+    } elsif ($ENV{'form.rename'}) {
+        $ENV{'form.selectfile'} = $ENV{'form.rename'};
+        $ENV{'form.action'} = 'rename';
 	&rename($r);
     } elsif ($ENV{'form.createdir'}) {
 	&createdir($r);
@@ -519,7 +580,12 @@ sub handler {
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
 	&display_common($r,$current_path,$is_empty,\@dir_list);
-	&display_directory($r,$current_path,$is_empty,\@dir_list);
+	if ($ENV{"form.mode"} eq 'selectfile'){
+	    &select_files($r);
+            &display_file_select($r,$current_path,$is_empty,\@dir_list);
+	} else {
+	    &display_directory($r,$current_path,$is_empty,\@dir_list);
+	}
 	$r->print("</body>\n</html>\n");
 	return OK;
     }