--- loncom/interface/lonparmset.pm	2019/03/02 16:25:45	1.522.2.23.2.3
+++ loncom/interface/lonparmset.pm	2017/06/21 19:54:58	1.522.2.23.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.23.2.3 2019/03/02 16:25:45 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.23.4.1 2017/06/21 19:54:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -833,12 +833,8 @@ sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-        if ((&isdateparm($type)) || (&is_specialstring($type))) {
+    if (&isdateparm($type)) {
             $winvalue=$env{'form.recent_'.$type};
-        } elsif ($type eq 'string_yesno') {
-            if ($env{'form.recent_string'} =~ /^(yes|no)$/i) {
-                $winvalue=$env{'form.recent_string'};
-            }
         } else {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
@@ -871,14 +867,12 @@ sub page_js {
     $pjump_def
 
     function psub() {
-        var specstring = /^string_!(yesno|any)/i;
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
             typedef=document.parmform.pres_type.value.split('_');
            if (document.parmform.pres_type.value!='') {
-            if ((typedef[0]=='date') ||
-                (specstring.test(document.parmform.pres_type.value))) {
+            if (typedef[0]=='date') {
                 eval('document.parmform.recent_'+
                      document.parmform.pres_type.value+
              '.value=document.parmform.pres_value.value;');
@@ -928,72 +922,6 @@ function showHide_courseContent() {
 COURSECONTENTSCRIPT
 }
 
-sub validateparms_js {
-    return <<'ENDSCRIPT';
-
-function validateParms() {
-    var ipallowRegExp = /^setipallow_/;
-    var ipdenyRegExp = /^setipdeny_/;
-    var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
-    if ((document.parmform.elements.length != 'undefined')  && (document.parmform.elements.length) != 'null') {
-        if (document.parmform.elements.length) {
-            for (i=0; i<document.parmform.elements.length; i++) {
-                var name=document.parmform.elements[i].name;
-                if (ipallowRegExp.test(name)) {
-                    var identifier = name.replace(ipallowRegExp,'');
-                    var possallow = document.parmform.elements[i].value;
-                    possallow = possallow.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possallow)) {
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possallow = ','+possallow;
-                        }
-                        document.parmform.elements['set_'+identifier].value += possallow;
-                    }
-                } else if (ipdenyRegExp.test(name)) {
-                    var identifier = name.replace(ipdenyRegExp,'');
-                    var possdeny = document.parmform.elements[i].value;
-                    possdeny = possdeny.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possdeny)) {
-                        possdeny = '!'+possdeny;
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possdeny = ','+possdeny;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return true;
-}
-
-ENDSCRIPT
-}
-
-# Javascript initialization, for overview mode
-sub ipacc_boxes_js  {
-    my $remove = &mt('Remove');
-    return <<"END";
-\$(document).ready(function() {
-    var wrapper         = \$(".LC_string_ipacc_wrap");
-    var add_button      = \$(".LC_add_ipacc_button");
-    var ipaccRegExp     = /^LC_string_ipacc_/;
-
-    \$(add_button).click(function(e){
-        e.preventDefault();
-        var identifier = \$(this).closest("div").attr("id");
-        identifier = identifier.replace(ipaccRegExp,'');
-        \$(this).closest('div').find('.LC_string_ipacc_inner').append('<div><input type="text" name="setip'+identifier+'" /><a href="#" class="LC_remove_ipacc">$remove</a></div>');
-    });
-
-    \$(wrapper).delegate(".LC_remove_ipacc","click", function(e){
-        e.preventDefault(); \$(this).closest("div").remove();
-    })
-});
-
-
-END
-}
-
 sub done_proctor_js {
     return <<"END";
 function toggleSecret(form,radio,key) {
@@ -1387,14 +1315,6 @@ sub isdateparm {
     return (($type=~/^date/) && (!($type eq 'date_interval')));
 }
 
-# Determine if parameter type is specialized string type (i.e.,
-# not just string or string_yesno.
-
-sub is_specialstring {
-    my $type=shift;
-    return (($type=~/^string_/) && (($type ne 'string_yesno')));
-}
-
 #
 # parmmenu displays a list of the selected parameters.
 # It also offers a link to show/hide the complete parameter list
@@ -2274,6 +2194,7 @@ sub assessparms {
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
         my $now = time;
+
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name);
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
@@ -2365,14 +2286,11 @@ sub assessparms {
 
     &startpage($r,$pssymb);
 
-    foreach my $item ('tolerance','date_default','date_start','date_end',
-                      'date_interval','int','float','string','string_lenient',
-                      'string_examcode','string_deeplink','string_discussvote',
-                      'string_useslots','string_problemstatus','string_ip',
-                      'string_questiontype') {
+    foreach ('tolerance','date_default','date_start','date_end',
+        'date_interval','int','float','string') {
         $r->print('<input type="hidden" value="'.
-          &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
-          '" name="recent_'.$item.'" />');
+          &HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').
+          '" name="recent_'.$_.'" />');
     }
 
     # ----- Start Parameter Selection
@@ -2984,7 +2902,6 @@ sub storedata {
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
-        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny');
         my ($tuname,$tudom)=&extractuser($thiskey);
         my $tkey=$thiskey;
             if ($tuname) {
@@ -3397,68 +3314,6 @@ sub default_selector {
     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
 }
 
-sub string_ip_selector {
-    my ($thiskey, $showval, $readonly) = @_;
-    my %access = (
-                   allow => [],
-                   deny  => [],
-                 );
-    if ($showval ne '') {
-        my @current;
-        if ($showval =~ /,/) {
-            @current = split(/,/,$showval);
-        } else {
-            @current = ($showval);
-        }
-        foreach my $item (@current) {
-            if ($item =~ /^\!([\[\]a-zA-Z\.\d\*\-]+)$/) {
-                push(@{$access{'deny'}},$1);
-            } elsif ($item =~ /^([\[\]a-zA-Z\.\d\*\-]+)$/) {
-                push(@{$access{'allow'}},$item);
-            }
-        }
-    }
-    if (!@{$access{'allow'}}) {
-        @{$access{'allow'}} = ('');
-    }
-    if (!@{$access{'deny'}}) {
-        @{$access{'deny'}} = ('');
-    }
-    my ($disabled,$addmore);
-    if ($readonly) {
-        $disabled=' disabled="disabled"';
-    } else {
-        $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
-    }
-    my $output = '<input type="hidden" name="set_'.$thiskey.'" />
-<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
-    foreach my $acctype ('allow','deny') {
-        $output .= '
-<td valign="top">
-<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'.$acctype.'_'.$thiskey.'">
-  <div class="LC_string_ipacc_inner">'."\n";
-        my $num = 0;
-        foreach my $curr (@{$access{$acctype}}) {
-            $output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'"'.$disabled.' />';
-            if ($num > 0) {
-                $output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';
-            }
-            $output .= '</div>'."\n";
-            $num ++;
-        }
-        $output .= '
-  </div>'.$addmore.'
-</div>
-</td>';
-   }
-   $output .= '
-</tr>
-</table>'."\n";
-    return $output;
-}
-
-{
-
 my %strings =
     (
      'string_yesno'
@@ -3486,10 +3341,7 @@ my %strings =
              => [['yes','Yes'],
                  ['notended','Yes, unless discussion ended'],
                  ['no','No']],
-     'string_ip'
-             => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
-                 ['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']],
-    );
+     );
 
 sub standard_string_options {
     my ($string_type) = @_;
@@ -3530,10 +3382,6 @@ sub string_selector {
         }
     }
  
-    if ($thistype eq 'string_ip') {
-        return &string_ip_selector($thiskey,$showval,$readonly);
-    }
-
     my ($result,$disabled);
 
     if ($readonly) {
@@ -3587,55 +3435,6 @@ sub string_selector {
     return $result;
 }
 
-sub oldversion_warning {
-    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
-    my $desc;
-    my %stringtypes = (
-                        type         => 'string_questiontype',
-                        lenient      => 'string_lenient',
-                        retrypartial => 'string_yesno',
-                        discussvote  => 'string_discussvote',
-                        examcode     => 'string_examcode',
-                      );
-    if (exists($stringtypes{$name})) {
-        if ($name eq 'examcode') {
-            $desc = $value;
-        } elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
-            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
-                next unless (ref($possibilities) eq 'ARRAY');
-                my ($parmval, $description) = @{ $possibilities };
-                if ($parmval eq $value) {
-                    $desc = $description;
-                    last;
-                }
-            }
-        }
-    } elsif (($name eq 'printstartdate') || ($name eq 'printenddate')) {
-        my $now = time;
-        if ($value =~ /^\d+$/) {
-            if ($name eq 'printstartdate') {
-                if ($value > $now) {
-                    $desc = &Apache::lonlocal::locallocaltime($value);
-                }
-            } elsif ($name eq 'printenddate') {
-                if ($value < $now) {
-                    $desc = &Apache::lonlocal::locallocaltime($value);
-                }
-            }
-        }
-    }
-    my $standard_name = &standard_parameter_names($name);
-    return '<p class="LC_warning">'.
-           &mt('[_1] was [_2]not[_3] set to [_4].',
-               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
-           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
-           $cmajor.'.'.$cminor,$chostname,
-           $needsrelease).
-           '</p>';
-}
-
-}
-
 #
 # Shift all start and end dates by $shift
 #
@@ -5108,6 +4907,53 @@ sub parameter_releasecheck {
     return $needsnewer;
 }
 
+sub oldversion_warning {
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $desc;
+    my %stringtypes = (
+                        type         => 'string_questiontype',
+                        lenient      => 'string_lenient',
+                        retrypartial => 'string_yesno',
+                        discussvote  => 'string_discussvote',
+                        examcode     => 'string_examcode',
+                      );
+    if (exists($stringtypes{$name})) {
+        if ($name eq 'examcode') {
+            $desc = $value;
+        } elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
+                next unless (ref($possibilities) eq 'ARRAY');
+                my ($parmval, $description) = @{ $possibilities };
+                if ($parmval eq $value) {
+                    $desc = $description;
+                    last;
+                }
+            }
+        }
+    } elsif (($name eq 'printstartdate') || ($name eq 'printenddate')) {
+        my $now = time;
+        if ($value =~ /^\d+$/) {
+            if ($name eq 'printstartdate') {
+                if ($value > $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            } elsif ($name eq 'printenddate') {
+                if ($value < $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            }
+        }
+    }
+    my $standard_name = &standard_parameter_names($name);
+    return '<p class="LC_warning">'.
+           &mt('[_1] was [_2]not[_3] set to [_4].',
+               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+           $cmajor.'.'.$cminor,$chostname,
+           $needsrelease).
+           '</p>';
+}
+
 sub get_permission {
     my %permission;
     my $allowed = 0;