--- loncom/interface/portfolio.pm	2005/04/07 06:56:23	1.82
+++ loncom/interface/portfolio.pm	2005/09/09 19:12:29	1.88
@@ -34,43 +34,62 @@ use Apache::lonnet;
 # 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, $current_mode, $field_name) = @_;
-    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
+    my ($filename, $current_path, $current_mode, $field_name, $continue_select) = @_;
+    if ($continue_select ne 'true') {$continue_select = 'false'};
+    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name.'">'.$filename.'</a>';
     return $anchor;
 }
 my $dirptr=16384;
 sub display_common {
     my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    $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 .= '<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);
-    $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
-    $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 %text=&Apache::lonlocal::texthash('upload' => 'Upload',
+					 'upload_label' =>  
+					 'Upload file to current directory:',
+					 'createdir' => 'Create Subdirectory',
+					 'createdir_label' => 
+					 'Create subdirectory in current directory:');
+    $r->print(<<"TABLE"); 
+<table border="0" cellspacing="2" cellpadding="2">
+  <form method="post" enctype="multipart/form-data">
+    <tr valign="middle">
+      <td bgcolor="#ccddaa" align="right">
+        $text{'upload_label'}
+      </td>
+      <td bgcolor="#ccddaa" align="left">
+        <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="$text{'upload'}" />
+      </td>
+    </tr>
+  </form>
+  <form method="post">
+    <tr>
+      <td bgcolor="#ccddaa" align="right">
+        $text{'createdir_label'}
+      </td>
+      <td bgcolor="#ccddaa" align="left">
+        <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="$text{'createdir'}" />
+      </td>
+    </tr>
+  </form>
+</table>
+TABLE
     my @tree = split (/\//,$current_path);
-    $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"}).'/');
+    $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}).'/');
+            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');
         }
     }
     $r->print('</font>');
@@ -124,7 +143,7 @@ sub display_directory {
     	#$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 '..') && ($filename !~ /\.meta$/ )) {
+    	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(.*)\.(.*)/)) {
             if ($dirptr&$testdir) {
                 if ($select_mode eq 'true'){
                     $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
@@ -132,12 +151,12 @@ sub display_directory {
                     $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.'/',$env{'form.mode'},$env{"form.fieldname"}).'</td>'); 
+                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>'); 
                 $r->print('</tr>'); 
             } else {
                 $r->print('<tr bgcolor="#CCCCFF">');
                 if ($select_mode eq 'true'){
-                    $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
+                    $r->print('<td><input type="checkbox" name="checkfile" value="'.$filename.'"'); 
                     if ($$checked_files{$filename} eq 'selected') {
                         $r->print("CHECKED");
                     }
@@ -351,13 +370,13 @@ sub select_files {
     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);
+        my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
+        if (scalar(@items)){
+             &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'});
-        }
+            &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;
@@ -386,10 +405,13 @@ ENDSMP
 ENDSMP
     $r->print($javascript);
     $r->print("<h1>Select portfolio files</h1>
-                Check as many as you wish in response to the essay problem.<br />");
-    $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 />");
+                Check as many as you wish in response to the problem.<br />");
+    my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+    if (@otherfiles) {
+	$r->print("<strong>Files selected from other directories:</strong><br />");
+	foreach my $file (@otherfiles) {
+	    $r->print($file."<br />");
+	}
     }
 }
 sub upload {
@@ -417,8 +439,8 @@ sub upload {
         }
     }
     my $current_disk_usage = &Apache::lonnet::diskusage($env{'user.domain'}, $env{'user.name'},$portfolio_root);
-    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.'.
+    if (($current_disk_usage + $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.');
         $r->print(&done('Back'));
     } 
@@ -446,7 +468,23 @@ sub upload {
 }
 sub lock_info {
     my ($r) = @_;
-    $r->print("lock info here");
+    my %current_permissions = &Apache::lonnet::dump('file_permissions',$env{'user.domain'},$env{'user.name'});
+    my $file_name = $env{'form.lockinfo'};
+    foreach my $key(keys(%current_permissions)) {
+        if ($file_name eq $key) {
+            foreach my $array_item (@{$current_permissions{$key}}) {
+                if (ref($array_item)) {
+                    $r->print('<strong>'.$key.'</strong> was submitted in response to problem: <strong>'.
+                            &Apache::lonnet::gettitle($$array_item[0]).'</strong><br />');
+                    my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
+                    $r->print('In the course: <strong>'.$course_description{'description'}.'</strong><br />');
+                    # $r->print('the third is '.$$array_item[2].'<br>');
+                    # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
+                }
+            }
+        }    
+    }
+    $r->print(&done('Back'));
     return 'ok';
 }
 sub createdir {
@@ -497,7 +535,7 @@ sub handler {
 							'/userfiles/portfolio';
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath','meta','lockinfo',
-					     'currentfile','action','fieldname','mode','rename']);
+					     'currentfile','action','fieldname','mode','rename','continue']);
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -512,7 +550,7 @@ sub handler {
         $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
     }
     $r->rflush();
-	if (($env{'form.storeupl'} eq 'Upload') & (!$env{'form.uploaddoc.filename'})){
+	if (($env{'form.storeupl'}) & (!$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>');