--- loncom/interface/portfolio.pm	2010/11/11 23:58:05	1.230
+++ loncom/interface/portfolio.pm	2012/07/30 13:10:57	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.230 2010/11/11 23:58:05 raeburn Exp $
+# $Id: portfolio.pm,v 1.236 2012/07/30 13:10:57 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,6 +122,7 @@ END
                  .'<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="symb" value="'.$env{"form.symb"}.'" />'
                  .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
                  .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
                  .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'
@@ -139,6 +140,7 @@ END
                  .'<input name="newdir" type="text" />'.$groupitem
                  .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                  .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+                 .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
                  .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
                  .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
                  .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'
@@ -155,6 +157,7 @@ END
         'selectfile'    => $port_path,
         'currentpath'   => '/',
         'mode'          => $env{"form.mode"},
+        'symb'          => $env{"form.symb"},
         'fieldname'     => $env{"form.fieldname"},
         'continue'      => $env{"form.continue"}
     );
@@ -168,6 +171,7 @@ END
                 'selectfile' => $tree[$i],
                 'currentpath' => $newCurrentPath,
                 'mode' => $env{"form.mode"},
+                'symb' => $env{"form.symb"},
                 'fieldname' => $env{"form.fieldname"},
                 'continue' => $env{"form.continue"}
             );
@@ -177,7 +181,7 @@ END
     $r->print('</span>');
     $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
     &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"}.'&amp;symb='.$env{'form.symb'}.&group_args());
     $r->print('">'.
 	      &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
 						    'this.form.submit();'));
@@ -379,22 +383,24 @@ sub display_directory {
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;
     my %versioned;
-    foreach my $dir_line (sort 
-		      { 
-			  my ($afile)=split('&',$a,2);
-			  my ($bfile)=split('&',$b,2);
-			  return (lc($afile) cmp lc($bfile));
-		      } (@$dir_list)) {
-    	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
-    	$filename =~ s/\s+$//;
-    	my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
-    	if ($version) {
-	    my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
-    	    push(@{ $versioned{$fullpath} },
-		 [$filename,$dom,$testdir,$size,$mtime,$obs,]);
-    	} else {
-    	    push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
-    	}
+    if (ref($dir_list) eq 'ARRAY') { 
+        foreach my $dir_line (sort 
+		          { 
+			      my ($afile)=split('&',$a,2);
+			      my ($bfile)=split('&',$b,2);
+			      return (lc($afile) cmp lc($bfile));
+		          } (@{$dir_list})) {
+    	    my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
+    	    $filename =~ s/\s+$//;
+    	    my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
+    	    if ($version) {
+	        my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
+    	        push(@{ $versioned{$fullpath} },
+		     [$filename,$dom,$testdir,$size,$mtime,$obs,]);
+    	    } else {
+    	        push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
+    	    }
+        }
     }
     my $zerobyte;
     foreach my $dir_line (@dir_lines) {
@@ -445,6 +451,7 @@ sub display_directory {
                     'selectfile'    => $filename.'/',
                     'currentpath'   => $current_path.$filename.'/',
                     'mode'          => $env{"form.mode"},
+                    'symb'          => $env{"form.symb"},
                     'fieldname'     => $env{"form.fieldname"},
                     'continue'      => $env{"form.continue"}
                 );  
@@ -552,6 +559,7 @@ sub display_directory {
         $r->print('
             <input type="hidden" name="continue" value="true" />
             <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
+            <input type="hidden" name="symb" value="'.$env{'form.symb'}.'" />
             <input type="hidden" name="mode" value="selectfile" />
             <p>
             <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
@@ -639,6 +647,7 @@ sub done {
         'showversions' => $env{'form.showversions'},
         'currentpath' => $env{'form.currentpath'},
         'fieldname' => $env{'form.fieldname'},
+        'symb'      => $env{'form.symb'},
         'mode'      => $env{'form.mode'}
     );
     my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';
@@ -972,11 +981,11 @@ sub build_access_summary {
                 $showstart = &mt('Deleted');
                 $showend = $showstart;
             } else {
-                $showstart = localtime($start);
+                $showstart = &Apache::lonlocal::locallocaltime($start);
                 if ($end == 0) {
                     $showend = &mt('No end date');
                 } else {
-                    $showend = localtime($end);
+                    $showend = &Apache::lonlocal::locallocaltime($end);
                 }
             }
             $r->print('<td>'.&mt($scope_desc{$scope}));
@@ -1964,7 +1973,7 @@ sub upload {
 	return;
     }
 
-    my (%allfiles,%codebase,$mode);
+    my (%allfiles,%codebase,$mode,$mimetype);
     if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
         if ($env{'form.parserflag'}) {
 	    $mode = 'parse';
@@ -1974,10 +1983,12 @@ sub upload {
     if ($state eq 'existingfile') {
         $context = $state;
     }
+    my $subdir = $port_path.$env{'form.currentpath'};
+    $subdir =~ s{(/)$}{};
     my ($result,$timestamp) =
-	&Apache::lonnet::userfileupload($formname,$context,
-					$port_path.$env{'form.currentpath'},
-					$mode,\%allfiles,\%codebase);
+	&Apache::lonnet::userfileupload($formname,$context,$subdir,
+					$mode,\%allfiles,\%codebase,undef,undef,
+                                        undef,undef,undef,undef,\$mimetype);
     if ($state eq 'existingfile') {
         my $group_elem;
         my $rootdir = $r->dir_config('lonDaemons').'/tmp/overwrites';
@@ -2063,14 +2074,20 @@ END
                   ,$result,&display_file(undef,$fname)).'</span><br />');
 	$r->print(&done('Back',$url));
     } else {
-	if (%allfiles) {
-            if (!&suppress_embed_prompt()) {
-                &print_dependency_form($r,$url,\%allfiles,\%codebase);
+        if (!&suppress_embed_prompt()) {
+            if ($mimetype eq 'text/html') {
+	        if (keys(%allfiles) > 0) {
+                    &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+                    return;
+	        } else {
+                    $r->print('<p>'.&mt('Completed upload of the file.').'<br />'.
+                              &mt('No embedded items identified.').'</p>');
+                }
             }
-	} else {
-	    $r->print(&done(undef,$url));
-	}
+        }
+	$r->print(&done(undef,$url));
     }
+    return;
 }
 
 sub hidden_elems {
@@ -2080,6 +2097,7 @@ sub hidden_elems {
     }
     return <<END;
 <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+<input type="hidden" name="symb" value="$env{'form.symb'}" />
 <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
 <input type="hidden" name="mode" value="$env{'form.mode'}" />
 <input type="hidden" name="showversions" value="$env{'form.showversions'}" />
@@ -2088,25 +2106,28 @@ END
 }
 
 sub print_dependency_form {
-    my ($r,$url,$allfiles,$codebase) = @_;
-    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
-    if ($env{'form.group'} ne '') {
-        $state .= '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'."\n";
-    }
-    my $embedded = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase,
+    my ($r,$url,$allfiles,$codebase,$result) = @_;
+    my $container = &HTML::Entities::encode($result,'<>"&');
+    my $state = &embedded_form_elems($container);
+    my ($embedded,$num,$pathchg) = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase,
                                   {'error_on_invalid_names'   => 1,
                                    'ignore_remote_references' => 1,});
     if ($embedded) {
-        $r->print('<h2>'.&mt("Reference Warning").'</h2>'.
-                  '<p>'.&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.").'</p>'.
-                  '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
-                  $embedded.
-                  '<p>Or '.&done('Return to directory',$url).'</p>');
+        if ($num || $pathchg) {
+            $r->print('<h3>'.&mt("Reference Warning").'</h3>');
+        } else {
+            $r->print('<h3>'.&mt("Reference Information").'</h3>');
+        }
+        if ($num) {
+            $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.").'</p>'.
+                      '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
+                       $embedded.
+                       '<p>'.&mt('or').'</p>'.&done('Return to directory',$url));
+        } else {
+            $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files.").'</p>'.
+                      $embedded.
+                      '<p>'.&done('Return to directory',$url).'</p>');
+        }
     } else {
         $r->print(&done(undef,$url));
     }
@@ -2118,7 +2139,7 @@ sub overwrite {
     my $formname = 'existingfile';
     my $port_path = &get_port_path();
     my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
-    my (%allfiles,%codebase,$mode);
+    my (%allfiles,%codebase,$mode,$mimetype);
     unless (&suppress_embed_prompt()) {
         if ($env{'form.parserflag'}) {
             if ($fname =~ /\.s?html?$/i) {
@@ -2134,24 +2155,29 @@ sub overwrite {
         return;
     }
     $env{'form.'.$formname.'.filename'} = $fname;
+    my $subdir = $port_path.$env{'form.currentpath'};
+    $subdir =~ s{(/)$}{};
     my $result=
-        &Apache::lonnet::userfileupload($formname,'overwrite',
-                                        $port_path.$env{'form.currentpath'},
-                                        $mode,\%allfiles,\%codebase);
+        &Apache::lonnet::userfileupload($formname,'overwrite',$subdir,$mode,
+                                        \%allfiles,\%codebase,undef,undef,undef,
+                                        undef,undef,undef,\$mimetype);
     if ($result !~ m|^/uploaded/|) {
         $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].'
                   ,$result,&display_file(undef,$fname)).'</span><br />');
         $r->print(&after_overwrite(&mt('Back'),$url));
     } else {
-        if (%allfiles) {
-            if (!&suppress_embed_prompt()) {
-                &print_dependency_form($r,$url,\%allfiles,\%codebase);
-            } else {
-                $r->print(&after_overwrite(undef,$url));
+        if ($mode eq 'parse') {
+            if ($mimetype eq 'text/html') {
+                if (keys(%allfiles) > 0) {
+                    &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+                    return;
+                } else {
+                    $r->print('<p>'.&mt('Overwriting completed.').'<br />'.
+                              &mt('No embedded items identified.').'</p>');
+                }
             }
-        } else {
-            $r->print(&after_overwrite(undef,$url));
         }
+        $r->print(&after_overwrite(undef,$url));
     }
     return;
 }
@@ -2233,12 +2259,14 @@ sub createdir {
 	    return;
     }
     my $portfolio_root = &get_portfolio_root(); 
-    my @dir_list=&get_dir_list($portfolio_root,undef,$group);
+    my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);
     my $found_file = 0;
-    foreach my $line (@dir_list) {
-        my ($filename)=split(/\&/,$line,2);
-        if ($filename eq $newdir){
-            $found_file = 1;
+    if (ref($dirlistref) eq 'ARRAY') {
+        foreach my $line (@{$dirlistref}) {
+            my ($filename)=split(/\&/,$line,2);
+            if ($filename eq $newdir){
+                $found_file = 1;
+            }
         }
     }
     if ($found_file){
@@ -2427,6 +2455,20 @@ sub suppress_embed_prompt {
     return $suppress_prompt;
 }
 
+sub embedded_form_elems {
+    my ($container) = @_;
+    my $state = <<STATE;
+    <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+    <input type="hidden" name="symb" value="$env{'form.symb'}" />
+    <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+    <input type="hidden" name="mode" value="$env{'form.mode'}" />
+    <input type="hidden" name="container" value="$container" />
+STATE
+    if ($env{'form.group'} ne '') {
+        $state .= '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'."\n";
+    }
+    return $state;
+}
 
 sub handler {
     # this handles file management
@@ -2434,7 +2476,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',
 	  'fieldname','mode','rename','continue','group','access','setnum',
-          'cnum','cdom','type','setroles','showversions','ref']);
+          'cnum','cdom','type','setroles','showversions','ref','symb']);
     my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;
@@ -2537,12 +2579,42 @@ sub handler {
         }
     }
     $r->rflush();
+    # Check if access to portfolio is blocked by one or more blocking events in courses.
     my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('port',$uname,$udom);
     if ($blocked) {
-         $r->print($blocktext);
-         $r->print(&Apache::loncommon::end_page());
-         return OK;
+        my $evade_block;
+        # If portfolio display is in a window popped up from a "Select Portfolio Files"
+        # link in a .task resource, check if access to the task included proctor validation
+        # of check-in to a slot limited by IP.
+        # If so, and the slot is between its open and close dates, override the block. 
+        if ($env{'request.course.id'} && $env{'form.symb'}) {
+            (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+            if ($res =~ /\.task$/i) {
+                my %history =
+                    &Apache::lonnet::restore($env{'form.symb'},$env{'request.course.id'},
+                                             $env{'user.domain'},$env{'user.name'});
+                my $version = $history{'resource.0.version'};
+                if ($history{'resource.'.$version.'.0.checkedin'}) {
+                    if ($history{'resource.'.$version.'.0.checkedin.slot'}) {
+                        my %slot = &Apache::lonnet::get_slot($history{'resource.'.$version.'.0.checkedin.slot'});
+                        if ($slot{'ip'}) {
+                            if (&Apache::loncommon::check_ip_acc($slot{'ip'})) {
+                                my $now = time;
+                                if (($slot{'slottime'} < $now) && ($slot{'endtime'} > $now)) {
+                                    $evade_block = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        unless ($evade_block) {
+            $r->print($blocktext);
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
     }
     if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
    	$r->print('<span class="LC_error">');
@@ -2573,10 +2645,23 @@ sub handler {
             my $getpropath = 1;
             my $current_disk_usage = 
                 &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-	    $r->print(
+            my $container = &HTML::Entities::encode($env{'form.container'},'<>&"');
+            my $state = &embedded_form_elems($container).
+                        '<input type="hidden" name="action" value="modify_orightml" />';
+	    my ($result,$flag) =
                 &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
-                    $group,$portfolio_root,$group,$disk_quota,$current_disk_usage));
-            $r->print(&done(undef,$url));
+                    $group,$portfolio_root,$group,$disk_quota,$current_disk_usage,$state,$url);
+            $r->print($result.&done('Return to directory',$url));
+        } else {
+            &missing_priv($r,$url,'upload');
+        }
+    } elsif ($env{'form.action'} eq 'modify_orightml') {
+        if ($can_upload) {
+            my $result = 
+                &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,
+                                                     $portfolio_root,$group);
+            $r->print($result.
+                      &done('Return to directory',$url));
         } else {
             &missing_priv($r,$url,'upload');
         }
@@ -2651,8 +2736,9 @@ sub handler {
                 my $formname = 'existingfile';
                 my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
                 $env{'form.'.$formname.'.filename'} = $fname;
-                &Apache::lonnet::userfileupload($formname,'canceloverwrite',
-                                                $port_path.$env{'form.currentpath'});
+                my $subdir = $port_path.$env{'form.currentpath'};
+                $subdir =~ s{(/)$}{};
+                &Apache::lonnet::userfileupload($formname,'canceloverwrite',$subdir);
             }
         }
 	my $current_path='/';
@@ -2663,8 +2749,9 @@ sub handler {
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
         }
-        my @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
-	if ($dir_list[0] eq 'no_such_dir'){
+        my ($dirlistref,$listerror) =
+            &get_dir_list($portfolio_root,$current_path,$group);
+	if ($listerror 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
@@ -2679,13 +2766,22 @@ sub handler {
 		$current_path = '/'; # force it back to the root        
 	    }
 	    # now grab the directory list again, for the first time
-            @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
+            ($dirlistref,$listerror) =
+                &get_dir_list($portfolio_root,$current_path,$group);
         }
 	# need to know if directory is empty so it can be removed if desired
-	my $is_empty=(@dir_list == 2);
-	&display_common($r,$url,$current_path,$is_empty,\@dir_list,
+        my $is_empty;
+        if ($listerror eq 'empty') {
+            $is_empty = 1;
+        } elsif (ref($dirlistref) eq 'ARRAY') {
+            if ((scalar(@{$dirlistref}) == 2) && ($dirlistref->[0] =~ /^\.+\&/)
+                && ($dirlistref->[1] =~ /^\.+\&/))  {
+                $is_empty = 1;
+            }
+        }
+	&display_common($r,$url,$current_path,$is_empty,$dirlistref,
 			$can_upload,$group);
-        &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
+        &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);
     }
     $r->print(&Apache::loncommon::end_page());