--- loncom/homework/lonhomework.pm	2008/05/19 20:38:04	1.292
+++ loncom/homework/lonhomework.pm	2009/03/26 12:03:45	1.307
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.292 2008/05/19 20:38:04 www Exp $
+# $Id: lonhomework.pm,v 1.307 2009/03/26 12:03:45 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,7 +173,7 @@ sub setup_vars {
 sub createmenu {
     my ($which,$request)=@_;
     if ($which eq 'grade') {
-	$request->print('<script language="JavaScript"> 
+	$request->print('<script type="text/javascript" language="JavaScript"> 
           hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
                  "height=350,width=150,menubar=no");
           </script>');
@@ -209,58 +209,6 @@ sub proctor_checked_in {
     return 0;
 }
 
-sub check_ip_acc {
-    my ($acc)=@_;
-    &Apache::lonxml::debug("acc is $acc");
-    if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { 
-	return 1;
-    }
-    my $allowed=0;
-    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
-
-    my $name;
-    foreach my $pattern (split(',',$acc)) {
-	$pattern =~ s/^\s*//;
-	$pattern =~ s/\s*$//;
-	if ($pattern =~ /\*$/) {
-	    #35.8.*
-	    $pattern=~s/\*//;
-	    if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-	} elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {    
-	    #35.8.3.[34-56]
-	    my $low=$2;
-	    my $high=$3;
-	    $pattern=$1;
-	    if ($ip =~ /^\Q$pattern\E/) { 
-		my $last=(split(/\./,$ip))[3];
-		if ($last <=$high && $last >=$low) { $allowed=1; }
-	    }
-	} elsif ($pattern =~ /^\*/) {
-	    #*.msu.edu
-	    $pattern=~s/\*//;
-	    if (!defined($name)) {
-		use Socket;
-		my $netaddr=inet_aton($ip);
-		($name)=gethostbyaddr($netaddr,AF_INET);
-	    }
-	    if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
-	} elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
-	    #127.0.0.1
-	    if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-	} else {
-	    #some.name.com
-	    if (!defined($name)) {
-		use Socket;
-		my $netaddr=inet_aton($ip);
-		($name)=gethostbyaddr($netaddr,AF_INET);
-	    }
-	    if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
-	}
-	if ($allowed) { last; }
-    }
-    return $allowed;
-}
-
 sub check_slot_access {
     my ($id,$type)=@_;
 
@@ -307,7 +255,7 @@ sub check_slot_access {
 	&Apache::lonhomework::showhash(%slot);
 	if ($slot{'starttime'} < time &&
 	    $slot{'endtime'} > time &&
-	    &check_ip_acc($slot{'ip'})) {
+	    &Apache::loncommon::check_ip_acc($slot{'ip'})) {
 	    &Apache::lonxml::debug("$slot is good");
 	    $slotstatus='NEEDS_CHECKIN';
 	    $returned_slot=\%slot;
@@ -421,7 +369,7 @@ sub check_access {
     #if ($env{'request.state'} ne "construct" && $symb ne '') {
     if ($env{'request.state'} ne "construct") {
         my $idacc = &Apache::lonnet::EXT("resource.$id.acc");
-	my $allowed=&check_ip_acc($idacc);
+	my $allowed=&Apache::loncommon::check_ip_acc($idacc);
 	if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
 	    $status='INVALID_ACCESS';
 	    $date=&mt("can not be accessed from your location.");
@@ -854,12 +802,18 @@ sub analyze {
 		$request->print('</table>');
 	    }
 	} else {
-	    $request->print('<p>'.&mt('Response').' '.$part.' '.
-			    &mt('is not analyzable at this time').'</p>');
+            $request->print('<p class="LC_warning">'
+                           .&mt('Response [_1] is not analyzable at this time.',$part)
+			   .'</p>'
+            );
 	}
     }
     if (scalar(keys(%allparts)) == 0 ) {
-	$request->print('<p>'.&mt('Found no analyzable responses in this problem, currently only Numerical, Formula and String response styles are supported.').'</p>');
+        $request->print('<p class="LC_warning">'
+                       .&mt('Found no analyzable responses in this problem.'
+                           .' Currently only Numerical, Formula and String response styles are supported.')
+                       .'</p>'
+        );
     }
     &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);
@@ -907,8 +861,12 @@ sub editxmlmode {
     my $result;
     my $problem=&Apache::lonnet::getfile($file);
     if ($problem eq -1) {
-	&Apache::lonxml::error("<b> ".&mt('Unable to find').
-			       " <i>$file</i></b>");
+	&Apache::lonxml::error(
+            '<b> '
+           .&mt('Unable to find [_1]',
+                '<span class="LC_filename">'.$file.'</span>')
+           .'</b>');
+
 	$problem='';
     }
     if (defined($env{'form.editxmltext'}) || defined($env{'form.Undo'})) {
@@ -923,20 +881,17 @@ sub editxmlmode {
 	&renderpage($request,$file);
     } else {
 	my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
-	my $xml_help = '<table><tr><td>'.
-	    &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
-						    "Problem Editing Help").
-						    '</td><td>'.
-       &Apache::loncommon::help_open_menu(undef,undef,5,'Authoring').
-                '</td></tr></table>';
 	if ($cols > 80) { $cols = 80; }
 	if ($cols < 70) { $cols = 70; }
 	if ($rows < 20) { $rows = 20; }
 	my $js =
 	    &Apache::edit::js_change_detection(). 
 	    &Apache::loncommon::resize_textarea_js().
-            &Apache::structuretags::setmode_javascript();
+            &Apache::structuretags::setmode_javascript().
+            &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
 	my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
+	my $dragmath_button = 
+            &Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
 	my $start_page = 
 	    &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
 					   {'no_auto_mt_title' => 1,
@@ -954,15 +909,17 @@ sub editxmlmode {
               <table class="LC_edit_problem_header_title"><tr><td>
                '.&mt('Problem Editing').&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').'
                 </td><td align="right">
-                  '.&Apache::loncommon::helpLatexCheatsheet().'
+                  '.&Apache::loncommon::helpLatexCheatsheet('Problem_LON-CAPA_Functions','Script Functions').'
                 </td></tr>
               </table>
               <div class="LC_edit_problem_discards">
                 <input type="hidden" name="problemmode" value="editxml" />
+
                 <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
                 'onclick="javascript:setmode(this.form,'."'discard'".')" />
                 <input type="button" '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'edit'".')').'name="submitmode" accesskey="e" value="'.&mt('Edit').'" />
                 <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
+                '.$dragmath_button.'
               </div>
               <div class="LC_edit_problem_saves">
                 <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save').'"  />
@@ -1016,7 +973,7 @@ sub renderpage {
 	    my $filename=(split('/',$file))[-1];
 	    my $error =
 		"<b> ".&mt('Unable to find [_1]',
-			   ' <span class="LC_filename">'.$filename.'</span>')
+			   '<span class="LC_filename">'.$filename.'</span>')
 		."</b>";
 	    $result.=
 		&Apache::loncommon::simple_error_page($request,'Not available',
@@ -1102,12 +1059,12 @@ sub get_template_list {
 	next if ($file->[1] !~ /\S/);
         if ($file->[2] ne $currentcategory) {
            $currentcategory=$file->[2];
-           $count++;
            if ((!$seconddiv) && ($count >= $midpoint)) {
                $result .= '</div>'."\n".'<div class="LC_left_float">'."\n";
                $seconddiv = 1;
            }
            $result.='<h3>'.$currentcategory.'</h3>';
+           $count++;
         }
 	$result .=
 	    '<label><input type="radio" name="template" value="'.$file->[0].'" />'.
@@ -1162,7 +1119,7 @@ $start_page
 <h1>".&mt("Creating a new $extension resource.")."</h1>
 $errormsg
 ".&mt("The requested file [_1] currently does not exist.",
-      "<tt>$shownurl</tt>")."
+      '<span class="LC_filename">'.$shownurl.'</span>')."
 <p>
 <b>
 ".&mt("To create a new $extension, select a template from the".
@@ -1187,7 +1144,7 @@ sub update_construct_style {
 	&& !defined($env{'form.newrandomization'})) {
 	if ((!$env{'form.style_file'} && $env{'construct.style'})
 	    ||$env{'form.clear_style_file'}) {
-	    &Apache::lonnet::delenv('construct\\.style');
+	    &Apache::lonnet::delenv('construct.style');
 	} elsif ($env{'form.style_file'} 
 	    && $env{'construct.style'} ne $env{'form.style_file'}) {
 	    &Apache::lonnet::appenv({'construct.style' =>