--- rat/lonpage.pm	2010/07/30 22:40:53	1.94.2.1
+++ rat/lonpage.pm	2013/01/15 14:14:31	1.100
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.94.2.1 2010/07/30 22:40:53 raeburn Exp $
+# $Id: lonpage.pm,v 1.100 2013/01/15 14:14:31 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,6 +214,10 @@ sub handler {
                   my $lcm=1;
                   my $contents=0;
                   my $nforms=0;
+                  my $nuploads=0;
+                  my %turninpaths;
+                  my %multiresps;
+                  my $turninparent;
                   
                   my %ssibody=();
                   my %ssibgcolor=();
@@ -223,6 +227,7 @@ sub handler {
                   my %ssialink=();
      
                   my %cellemb=();
+                  my %cellexternal=();
 
                   my $allscript='';
                   my $allmeta='';
@@ -240,13 +245,20 @@ sub handler {
                       $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
                       foreach (@colcont) {
                           my $src=$hash{'src_'.$_};
-			  my ($extension)=($src=~/\.(\w+)$/);
+                          my ($extension)=($src=~/\.(\w+)$/);
+			  $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
 			  if ($hash{'encrypted_'.$_}) {
 			      $src=&Apache::lonenc::encrypted($src);
 			  }
                           $cellemb{$_}=
 			      &Apache::loncommon::fileembstyle($extension);
-                          if ($cellemb{$_} eq 'ssi') {
+                          if ($cellexternal{$_}) {
+                              unless (($target eq 'tex') || ($target eq 'tex_answer')) {
+                                  $ssibody{$_} = <<ENDEXT;
+<iframe src="$src" width="100%">No iframe support!</iframe>
+ENDEXT
+                              }
+                          } elsif ($cellemb{$_} eq 'ssi') {
 # --------------------------------------------------------- This is an SSI cell
 			      my ($mapid,$resid)=split(/\./,$_);
 			      my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
@@ -352,8 +364,23 @@ sub handler {
 				  $nforms++;
                                   $output=~s/\<form[^\>]*\>//gsi;
                                   $output=~s/\<\/form[^\>]*\>//gsi;
+                                  if ($output=~/\<input[^\>]+name\s*=\s*[\'\"]*HWFILE/) {
+                                      $nuploads++;
+                                  }
                                   $output=~
 				      s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
+                                  if ($nuploads) {
+                                      $output=~
+                                          s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi;
+                                       ($turninpaths{$prefix},$multiresps{$prefix}) = 
+                                           &Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'});
+                                       if ($turninparent eq '') {
+                                           $turninparent = $turninpaths{$prefix};
+                                           $turninparent =~ s{(/[^/]+)$}{}; 
+                                       }
+                                  }
+                                  $output=~
+                                      s/\<((?:input|select)[^\>]+\Qjavascript:setSubmittedPart\E)\(\s*[\'\"]([^\'\"]+)[\'\"]*\s*\)/\<$1('$2','$prefix')/gsi;
                               }
                               $thisdir=~s/\/[^\/]*$//;
 			      foreach (@rlinks) {
@@ -401,15 +428,27 @@ sub handler {
 				  $allscript.
 				  "\n</script>\n";
 			  }
+                          if (($nforms) && ($nuploads)) {
+                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
+                          }
 # ------------------------------------------------------------------ Start body
 			  $r->print(&Apache::loncommon::start_page(undef,$allscript,
 								   {'force_register' => 1,
 								    'bgcolor'        => '#ffffff',}));
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
-			      $r->print('<form name="lonhomework" method="post"  enctype="multipart/form-data" action="'.
+			      my $fmtag = '<form name="lonhomework" method="post"  enctype="multipart/form-data"';
+                              if ($nuploads) {
+                                  my $multi;
+                                  if ($nuploads > 1) {
+                                      $multi = 1;
+                                  }
+                                  $fmtag .= 'onsubmit="return file_submission_check(this,'."'$turninparent','$multi'".');"';
+                              }
+                              $fmtag .= ' action="'.
 					&Apache::lonenc::check_encrypt($requrl)
-					.'">');
+					.'">';
+                              $r->print($fmtag);
 			  }
 		      } elsif (($target eq 'tex') || ($target eq 'tex_answer')) {
 			  #  I think this is not needed as the header
@@ -446,7 +485,7 @@ sub handler {
 			    unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
-                              if ($cellemb{$rid} eq 'ssi') {
+                              if (($cellemb{$rid} eq 'ssi') || ($cellexternal{$rid})) {
 				  unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				      if ($ssibgcolor{$rid}) {
 					  $r->print(' bgcolor="'.
@@ -468,7 +507,10 @@ sub handler {
 				      }             
 				      $r->print('>');
 				  }
-                                  $r->print($ssibody{$rid});	
+                                  unless (($cellexternal{$rid}) && 
+                                          ($target eq 'tex') && ($target eq 'tex_answer')) {
+                                      $r->print($ssibody{$rid});
+                                  }
 				  unless (($target eq 'tex') || ($target eq 'tex_answer')) {
 				      $r->print('</font>');
                                   }
@@ -553,10 +595,6 @@ sub handler {
 sub get_buttons {
     my ($hash,$rid) = @_;
 
-    # which icons do we use?
-    my $extension='png';
-    if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
-
     my $metainfo = '';
     my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
     my ($mapid,$resid)=split(/\./,$rid);
@@ -568,20 +606,28 @@ sub get_buttons {
 	$esrc=&Apache::lonenc::encrypted($esrc);
     }
     if ($hash->{'src_'.$rid} !~ m-^/uploaded/-
+        && $hash->{'src_'.$rid} !~ m{^https?://}
 	&& !$env{'request.enc'}
 	&& ($env{'request.role.adv'}
 	    || !$hash->{'encrypted_'.$rid})) { 
 	$metainfo .='<a name="'.&escape($symb).'" />'.
 	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
-	    '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+            '<img src="/res/adm/pages/catalog.png" class="LC_icon"'.
+            ' alt="'.&mt('Show Metadata').'"'.
+            ' title="'.&mt('Show Metadata').'" />'.
+	    '</a>';
+    }
+    if (($hash->{'src_'.$rid} !~ m{^/uploaded/}) &&
+        ($hash->{'src_'.$rid} !~ m{^https?://})) {
+        $metainfo .= '<a href="/adm/evaluate?postdata='.
+	    &escape($esrc).
+	    '" target="LONcatInfo">'.
+            '<img src="/res/adm/pages/eval.png" class="LC_icon"'.
+            ' alt="'.&mt('Provide my evaluation of this resource').'"'.
+            ' title="'.&mt('Provide my evaluation of this resource').'" />'.
 	    '</a>';
     }
-    $metainfo .= '<a href="/adm/evaluate?postdata='.
-	&escape($esrc).
-	'" target="LONcatInfo">'.
-	'<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
-	'</a>';
-    if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+    if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
 	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
@@ -589,12 +635,16 @@ sub get_buttons {
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=submission" target="LONcatInfo">'.
 		'&command=submission">'.
-		'<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
+                '<img src="/adm/lonMisc/subm_button.png" class="LC_icon"'.
+                ' alt="'.&mt('View Submissions for a Student or a Group of Students').'"'.
+                ' title="'.&mt('View Submissions for a Student or a Group of Students').'" />'.
 		'</a>'.
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
-		'<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+                '<img src="/res/adm/pages/pgrd.png" class="LC_icon"'.
+                ' alt="'.&mt('Content Grades').'"'.
+                ' title="'.&mt('Content Grades').'" />'.
 		'</a>';
 	}
 	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
@@ -602,7 +652,9 @@ sub get_buttons {
 		'<a href="/adm/parmset?symb='.&escape($symb).
 #               '" target="LONcatInfo">'.
 		'" >'.
-		'<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+                '<img src="/adm/lonMisc/pprm_button.png" class="LC_icon"'.
+                ' alt="'.&mt('Content Settings').'"'.
+                ' title="'.&mt('Content Settings').'" />'.
 		'</a>';
 	}
     }