--- loncom/interface/lonhtmlcommon.pm	2011/05/15 23:57:32	1.285.2.1
+++ loncom/interface/lonhtmlcommon.pm	2011/12/21 21:25:40	1.297
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.285.2.1 2011/05/15 23:57:32 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.297 2011/12/21 21:25:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,7 @@ use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
 use Apache::lonnet;
+use HTML::Entities();
 use LONCAPA;
 
 sub java_not_enabled {
@@ -71,7 +72,7 @@ sub java_not_enabled {
 sub coursepreflink {
    my ($text,$category)=@_;
    if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
-      return '<a href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'">'.$text.'</a>';
+      return '<a target="_top" href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
    } else {
       return '';
    }
@@ -83,6 +84,22 @@ sub raw_href_to_link {
    return $message;
 }
 
+sub entity_encode {
+    my ($text)=@_;
+    return &HTML::Entities::encode($text, '<>&"');
+}
+
+sub direct_parm_link {
+    my ($linktext,$symb,$filter,$part,$target)=@_;
+    $symb=&entity_encode($symb);
+    $filter=&entity_encode($filter);
+    $part=&entity_encode($part);
+    if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
+       return "<a target='_top' href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";
+    } else {
+       return $linktext;
+    }
+}
 ##############################################
 ##############################################
 
@@ -731,13 +748,12 @@ parameter setting wizard.
 sub pjump_javascript_definition {
     my $Str = <<END;
     function pjump(type,dis,value,marker,ret,call,hour,min,sec) {
-        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
+        openMyModal("/adm/rat/parameter.html?type="+escape(type)
                  +"&value="+escape(value)+"&marker="+escape(marker)
                  +"&return="+escape(ret)
                  +"&call="+escape(call)+"&name="+escape(dis)
                  +"&defhour="+escape(hour)+"&defmin="+escape(min)
-                 +"&defsec="+escape(sec),"LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
+                 +"&defsec="+escape(sec)+"&modal=1",350,350,'no');
     }
 END
     return $Str;
@@ -975,82 +991,23 @@ Returns: none
 ########################################################
 ########################################################
 
-my $uniq=0;
-sub get_uniq_name {
-    $uniq++;
-    return 'uniquename'.$uniq;
-}
 
 # Create progress
 sub Create_PrgWin {
-    my ($r, $title, $heading, $number_to_do,$type,$width,$formname,
-	$inputname)=@_;
-    if (!defined($type)) { $type='popup'; }
-    if (!defined($width)) { $width=55; }
+    my ($r,$number_to_do)=@_;
     my %prog_state;
-    $prog_state{'type'}=$type;
-    if ($type eq 'popup') {
-	$prog_state{'window'}='popwin';
-	my $start_page =
-	    &Apache::loncommon::start_page($title,undef,
-					   {'only_body' => 1,
-					    'bgcolor'   => '#88DDFF',
-					    'js_ready'  => 1});
-	my $end_page = &Apache::loncommon::end_page({'js_ready'  => 1});
-
-	#the whole function called through timeout is due to issues
-	#in mozilla Read BUG #2665 if you want to know the whole story
-	&r_print($r,&Apache::lonhtmlcommon::scripttag(
-        "var popwin;
-         function openpopwin () {
-         popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
-        "popwin.document.writeln(\'".$start_page.
-              "<h4>".&mt("$heading")."<\/h4>".
-              "<form action=\"\" name=\"popremain\" method=\"post\">".
-              '<input type="text" size="'.$width.'" name="remaining" value="'.
-	      &mt('Starting').'" /><\\/form>'.$end_page.
-              "\');".
-        "popwin.document.close();}".
-        "\nwindow.setTimeout(openpopwin,0)"
-    ));
-	$prog_state{'formname'}='popremain';
-	$prog_state{'inputname'}="remaining";
-    } elsif ($type eq 'inline') {
-	$prog_state{'window'}='window';
-	if (!$formname) {
-	    $prog_state{'formname'}=&get_uniq_name();
-	    &r_print($r,'<form action="" name="'.$prog_state{'formname'}.'">');
-	} else {
-	    $prog_state{'formname'}=$formname;
-	}
-	if (!$inputname) {
-	    $prog_state{'inputname'}=&get_uniq_name();
-	    &r_print($r,&mt("$heading [_1]",' <input type="text" name="'.$prog_state{'inputname'}.'" size="'.$width.'" />'));
-	} else {
-	    $prog_state{'inputname'}=$inputname;
-	    
-	}
-	if (!$formname) { &r_print($r,'</form>'); }
-	&Update_PrgWin($r,\%prog_state,&mt('Starting'));
-    }
-
     $prog_state{'done'}=0;
     $prog_state{'firststart'}=&Time::HiRes::time();
     $prog_state{'laststart'}=&Time::HiRes::time();
     $prog_state{'max'}=$number_to_do;
-    
+    &Apache::loncommon::LCprogressbar($r); 
     return %prog_state;
 }
 
 # update progress
 sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;
-    &r_print($r,&Apache::lonhtmlcommon::scripttag(
-        $$prog_state{'window'}.'.document.'.
-        $$prog_state{'formname'}.'.'.
-        $$prog_state{'inputname'}.'.value="'.
-        $displayString.'";'
-    ));
+    &Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString);
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
@@ -1096,38 +1053,21 @@ sub Increment_PrgWin {
             $min,
             $sec,
             $lasttime);
-
-    &r_print($r,&Apache::lonhtmlcommon::scripttag(
-        $$prog_state{'window'}.'.document.'.
-        $$prog_state{'formname'}.'.'.
-        $$prog_state{'inputname'}.'.value="'.$timeinfo.'";'
-    ));
+    my $percent=0;
+    if ($$prog_state{'max'}) {
+       $percent=int(100.*$current/$$prog_state{'max'});
+    }
+    &Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo);
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
 # close Progress Line
 sub Close_PrgWin {
     my ($r,$prog_state)=@_;
-    if ($$prog_state{'type'} eq 'popup') {
-        &r_print($r,&Apache::lonhtmlcommon::scripttag(
-            'popwin.close()'
-        ));
-    } elsif ($$prog_state{'type'} eq 'inline') {
-	&Update_PrgWin($r,$prog_state,&mt('Done'));
-    }
+    &Apache::loncommon::LCprogressbarClose($r);
     undef(%$prog_state);
 }
 
-sub r_print {
-    my ($r,$to_print)=@_;
-    if ($r) {
-	$r->print($to_print);
-	$r->rflush();
-    } else {
-	print($to_print);
-    }
-}
-
 # ------------------------------------------------------- Puts directory header
 
 sub crumbs {
@@ -1227,9 +1167,9 @@ sub htmlareaheaders {
 ENDEDITOR
 	}
     $s.=(<<ENDJQUERY);
-<script type="text/javascript" src="/adm/jQuery/js/jquery-1.3.2.min.js"></script>
-<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.7.2.custom.min.js"></script>
-<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.7.2.custom.css" />
+<script type="text/javascript" src="/adm/jQuery/js/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.8.16.custom.min.js"></script>
+<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.8.16.custom.css" />
 ENDJQUERY
 	return $s;
 }
@@ -1407,6 +1347,34 @@ sub htmlareabrowser {
     return 1;
 }
 
+#
+# Should the "return to content" link be shown?
+#
+
+sub show_return_link {
+
+    unless ($env{'request.course.id'}) { return 0; }
+    if ($env{'request.noversionuri'}=~m{^/priv/} ||
+        $env{'request.uri'}=~m{^/~}) { return 1; }
+
+    if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
+        || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
+
+        return if ($env{'form.register'});
+    }
+    return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
+             $env{'request.symb'} eq '')
+            ||
+            ($env{'request.noversionuri'}=~ m{^/cgi-bin/printout.pl})
+            ||
+            (($env{'request.noversionuri'}=~/^\/adm\//) &&
+             ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+             ($env{'request.noversionuri'}!~
+              m{^/adm/.*/(smppg|bulletinboard)($|\?)})
+           ));
+}
+
+
 ############################################################
 ############################################################
 
@@ -1492,22 +1460,28 @@ returns: nothing
                 $last = $menulink;
             }
         }
-        my $links = join "", 
+        my $links;
+        if ((&show_return_link) && (!$CourseBreadcrumbs)) {
+           $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' />",
+                            { href => '/adm/flip?postdata=return:',
+                              title => &mt("Back to most recent content resource") });
+        }
+        $links.= join "", 
              map {
                  $faq  = $_->{'faq'}  if (exists($_->{'faq'}));
                  $bug  = $_->{'bug'}  if (exists($_->{'bug'}));
                  $help = $_->{'help'} if (exists($_->{'help'}));
 
-                 my $result = $_->{no_mt} ? $_->{text} : mt($_->{text});
+                 my $result = $_->{no_mt} ? $_->{text} : &mt($_->{text});
 
                  if ($_->{href}){
-                     $result = htmltag( 'a', $result, 
+                     $result = &htmltag( 'a', $result, 
                        { href   => $_->{href},
-                         title  => $_->{no_mt} ? $_->{title} : mt($_->{title}),
+                         title  => $_->{no_mt} ? $_->{title} : &mt($_->{title}),
                          target => $_->{target}, });
                  }
 
-                 $result = htmltag( 'li', "$result $crumbsymbol");
+                 $result = &htmltag( 'li', "$result $crumbsymbol");
              } @Crumbs;
 
         #should the last Element be translated?
@@ -1517,7 +1491,7 @@ returns: nothing
 
         # last breadcrumb is the first order heading of a page
         # for course breadcrumbs it's just bold
-        $links .= htmltag( 'li', htmltag($CourseBreadcrumbs ? 'b' : 'h1',
+        $links .= &htmltag( 'li', htmltag($CourseBreadcrumbs ? 'b' : 'h1',
                 $lasttext), {title => $lasttext});
 
         my $icons = '';
@@ -1540,23 +1514,23 @@ returns: nothing
 		
 
         unless ($CourseBreadcrumbs) {
-            $links = htmltag('ol',  $links, { id => "LC_MenuBreadcrumbs"   });
+            $links = &htmltag('ol',  $links, { id => "LC_MenuBreadcrumbs"   });
         } else {
-            $links = htmltag('ul',  $links, { class => "LC_CourseBreadcrumbs" });
+            $links = &htmltag('ul',  $links, { class => "LC_CourseBreadcrumbs" });
         }
 
         if ($component) {
-            $links = htmltag('span', 
+            $links = &htmltag('span', 
                              ( $no_mt ? $component : mt($component) ).
                              ( $icons ? $icons : '' ),
                              { class => 'LC_breadcrumbs_component' } )
                              .$links;
         }
         
-        render_tools(\$links);
-        $links = htmltag('div', $links, 
+        &render_tools(\$links);
+        $links = &htmltag('div', $links, 
                         { id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;
-        render_advtools(\$links);
+        &render_advtools(\$links);
 
         # Return the @Crumbs stack to what we started with
         push(@Crumbs,$last);
@@ -1611,9 +1585,7 @@ returns: nothing
         @html = grep {defined $_ && $_ ne ''} @html;
         for (@html) { 
             s/align="(right|left)"//; 
-            if (($category ne 'advtools') && ($category ne 'tools')) {
-                s/<span.*?\/span>//;
-            }
+#            s/<span.*?\/span>// if $category ne 'advtools'; 
         } 
 
         push @{$tools{$category}}, @html;
@@ -2287,6 +2259,251 @@ sub set_form_elements {
 }
 
 ##############################################
+##############################################
+
+sub file_submissionchk_js {
+    my ($turninpaths,$multiples) = @_;
+    my $overwritewarn = &mt('File(s) you uploaded for your submission will overwrite existing file(s) submitted for this item').'\\n'.
+                      &mt('Continue submission and overwrite the file(s)?');
+    my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
+                      &mt('Continue submission with these files removed?');
+    my ($turninpathtext,$multtext,$arrayindexofjs);
+    if (ref($turninpaths) eq 'HASH') {
+        foreach my $key (sort(keys(%{$turninpaths}))) {
+            $turninpathtext .= "    if (prefix == '$key') {\n".
+                               "        return '$turninpaths->{$key}';\n".
+                               "    }\n";
+        }
+    }
+    $turninpathtext .= "    return '';\n";
+    if (ref($multiples) eq 'HASH') {
+        foreach my $key (sort(keys(%{$multiples}))) {
+            $multtext .= "    if (prefix == '$key') {\n".
+                         "        return '$multiples->{$key}';\n".
+                         "    }\n";
+        }
+    }
+    $multtext .= "    return '';\n";
+
+    $arrayindexofjs = &Apache::loncommon::javascript_array_indexof();
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+
+function file_submission_check(formname,path,multiresp) {
+    var elemnum = formname.elements.length;
+    if (elemnum == 0) {
+        return true;
+    }
+    var alloverwrites = [];
+    var alldelconfirm = [];
+    var result = [];
+    var submitter;
+    var subprefix;
+    var allsub = getIndexByName(formname,'all_submit');
+    if (allsub == -1) {
+        var idx = getIndexByName(formname,'submitted');
+        if (idx != -1) {
+            var subval = String(formname.elements[idx].value);
+            submitter = subval.replace(/^part_/,'');
+            result = overwritten_check(formname,path,multiresp,submitter);
+            alloverwrites.push.apply(alloverwrites,result['overwrite']);
+            alldelconfirm.push.apply(alldelconfirm,result['delete']);
+        }
+    } else {
+        if (formname.elements[allsub].type == 'submit') {
+            var partsub = /^\\d+\\.\\d+_submit_.+\$/;
+            var allprefixes = [];
+            var allparts = [];
+            for (var i=0; i<formname.elements.length; i++) {
+                if (formname.elements[i].type == 'submit') {
+                    var elemname = formname.elements[i].name;
+                    var subname = String(elemname);
+                    var savesub = String(elemname);
+                    if (partsub.test(subname)) {
+                        var prefix = subname.replace(/_submit_.+\$/,'');
+                        if (allprefixes.indexOf(prefix) == -1) {
+                            allprefixes.push(prefix);
+                            allparts[prefix] = [];
+                        }
+                        var part = savesub.replace(/^\\d+\\.\\d+_submit_/,'');
+                        allparts[prefix].push(part);
+                    }
+                }
+            }
+            for (var k=0; k<allprefixes.length; k++) {
+                var idx = getIndexByName(formname,allprefixes[k]+'_submitted');
+                if (idx > -1) {
+                    if (formname.elements[idx].value != 'yes') {
+                        submitterval = formname.elements[idx].value;
+                        submitter = submitterval.replace(/^part_/,'');
+                        subprefix = allprefixes[k];
+                        result = overwritten_check(formname,path,multiresp,submitter,subprefix);
+                        alloverwrites.push.apply(alloverwrites,result['overwrite']);
+                        alldelconfirm.push.apply(alldelconfirm,result['delete']);
+                        break;
+                    }
+                }
+            }
+            if (submitter == '' || submitter == undefined) {
+                for (var m=0; m<allprefixes.length; m++) {
+                    for (var n=0; n<allparts[allprefixes[m]].length; n++) {
+                        var result = overwritten_check(formname,path,multiresp,allparts[allprefixes[m]][n],allprefixes[m]);
+                        alloverwrites.push.apply(alloverwrites,result['overwrite']);
+                        alldelconfirm.push.apply(alldelconfirm,result['delete']);
+                    }
+                }
+            }
+        }
+    }
+    if (alloverwrites.length > 0) {
+        if (!confirm("$overwritewarn")) {
+            for (var n=0; n<alloverwrites.length; n++) {
+                formname.elements[alloverwrites[n]].value = "";
+            }
+            return false;
+        }
+    }
+    if (alldelconfirm.length > 0) {
+        if (!confirm("$delfilewarn")) {
+            for (var p=0; p<alldelconfirm.length; p++) {
+                formname.elements[alldelconfirm[p]].checked = false;
+            }
+            return false;
+        }
+    }
+    return true;
+}
+
+function getIndexByName(formname,item) {
+    for (var i=0;i<formname.elements.length;i++) {
+        if (formname.elements[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+function overwritten_check(formname,path,multiresp,part,prefix) {
+    var result = [];
+    result['overwrite'] = [];
+    result['delete'] = [];
+    var elemnum = formname.elements.length;
+    if (elemnum == 0) {
+        return result;
+    }
+    var uploadstr;
+    var deletestr;
+    if ((prefix != undefined) && (prefix != '')) {
+        var prepend = prefix+'_';
+        uploadstr = new RegExp("^"+prepend+"HWFILE"+part+".+\$");
+        deletestr = new RegExp("^"+prepend+"HWFILE"+part+".+_\\\\d+_delete\$");
+        multiresp = check_for_multiples(prepend);
+        path = check_for_turninpath(prepend);
+    } else {
+        uploadstr = new RegExp("^HWFILE"+part+".+\$");
+        deletestr = new RegExp("^HWFILE"+part+".+_\\\\d+_delete\$");
+    }
+    var alluploads = [];
+    var allchecked = [];
+    var allskipdel = [];
+    var fnametrim = /[^\\/\\\\]+\$/;
+    for (var i=0; i<formname.elements.length; i++) {
+        var id = formname.elements[i].id;
+        if (id != '') {
+            if (uploadstr.test(id)) {
+                if (formname.elements[i].type == 'file') {
+                    alluploads.push(id);
+                } else {
+                    if (deletestr.test(id)) {
+                        if (formname.elements[i].type == 'checkbox') {
+                            if (formname.elements[i].checked) {
+                                allchecked.push(id);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    for (var j=0; j<alluploads.length; j++) {
+        var delstr = new RegExp("^"+alluploads[j]+"_\\\\d+_delete\$");
+        var delboxes = [];
+        for (var k=0; k<formname.elements.length; k++) {
+            var id = formname.elements[k].id;
+            if ((id != '') && (id != undefined)) {
+                if (delstr.test(id)) {
+                    if (formname.elements[k].type == 'checkbox') {
+                        delboxes.push(id);
+                    }
+                }
+            }
+        }
+        if (delboxes.length > 0) {
+            if ((formname.elements[alluploads[j]].value != undefined) &&
+                (formname.elements[alluploads[j]].value != '')) {
+                var filepath = formname.elements[alluploads[j]].value;
+                var newfilename = fnametrim.exec(filepath);
+                if (newfilename != null) {
+                    var filename = String(newfilename);
+                    var nospaces = filename.replace(/\\s+/g,'_');
+                    var nospecials = nospaces.replace(/[^\\/\\w\\.\\-]/g,'');
+                    var cleanfilename = nospecials.replace(/\\.(\\d+\\.)/g,"_\$1");
+                    if (cleanfilename != '') {
+                        var fullpath = path+"/"+cleanfilename;
+                        if (multiresp == 1) {
+                            var partid = String(alluploads[i]);
+                            var subdir = partid.replace(/^\\d*.?\\d*_?HWFILE/,'');
+                            if (subdir != "" && subdir != undefined) {
+                                fullpath = path+"/"+subdir+"/"+cleanfilename;
+                            }
+                        }
+                        for (var m=0; m<delboxes.length; m++) {
+                            if (fullpath == formname.elements[delboxes[m]].value) {
+                                if (formname.elements[delboxes[m]].checked) {
+                                    allskipdel.push(delboxes[m]);
+                                } else {
+                                    result['overwrite'].push(alluploads[j]);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if (allchecked.length > 0) {
+        if (allskipdel.length > 0) {
+            for (var n=0; n<allchecked.length; n++) {
+                if (allskipdel.indexOf(allchecked[n]) == -1) {
+                    result['delete'].push(allchecked[n]);
+                }
+            }
+        } else {
+            result['delete'].push.apply(result['delete'],allchecked);
+        }
+    }
+    return result;
+}
+
+function check_for_multiples(prefix) {
+$multtext
+}
+
+function check_for_turninpath(prefix) {
+$turninpathtext
+}
+
+// ]]>
+</script>
+
+$arrayindexofjs
+
+ENDSCRIPT
+}
+
+##############################################
 ##############################################
 
 # javascript_valid_email