--- loncom/interface/loncommon.pm	2020/01/15 01:50:09	1.1075.2.141.2.1
+++ loncom/interface/loncommon.pm	2020/03/05 21:54:44	1.1075.2.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.141.2.1 2020/01/15 01:50:09 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.144 2020/03/05 21:54:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,8 +83,6 @@ use Crypt::DES;
 use DynaLoader; # for Crypt::DES version
 use File::Copy();
 use File::Path();
-use String::CRC32();
-use Short::URL();
 
 # ---------------------------------------------- Designs
 use vars qw(%defaultdesign);
@@ -430,7 +428,7 @@ sub studentbrowser_javascript {
 <script type="text/javascript" language="Javascript">
 // <![CDATA[
     var stdeditbrowser;
-    function openstdbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadvonly) {
+    function openstdbrowser(formname,uname,udom,clicker,roleflag,ignorefilter,courseadv) {
         var url = '/adm/pickstudent?';
         var filter;
 	if (!ignorefilter) {
@@ -445,7 +443,12 @@ sub studentbrowser_javascript {
                                     '&udomelement='+udom+
                                     '&clicker='+clicker;
 	if (roleflag) { url+="&roles=1"; }
-        if (courseadvonly) { url+="&courseadvonly=1"; }
+        if (courseadv == 'condition') {
+            if (document.getElementById('courseadv')) {
+                courseadv = document.getElementById('courseadv').value;
+            }
+        }
+        if ((courseadv == 'only') || (courseadv == 'none')) { url+="&courseadv="+courseadv; }
         var title = 'Student_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
@@ -477,7 +480,7 @@ ENDRESBRW
 }
 
 sub selectstudent_link {
-   my ($form,$unameele,$udomele,$courseadvonly,$clickerid)=@_;
+   my ($form,$unameele,$udomele,$courseadv,$clickerid)=@_;
    my $callargs = "'".&Apache::lonhtmlcommon::entity_encode($form)."','".
                       &Apache::lonhtmlcommon::entity_encode($unameele)."','".
                       &Apache::lonhtmlcommon::entity_encode($udomele)."'";
@@ -488,8 +491,12 @@ sub selectstudent_link {
 	   return '';
        }
        $callargs.=",'".&Apache::lonhtmlcommon::entity_encode($clickerid)."'";
-       if ($courseadvonly)  {
-           $callargs .= ",'',1,1";
+       if ($courseadv eq 'only') {
+           $callargs .= ",'',1,'$courseadv'";
+       } elsif ($courseadv eq 'none') {
+           $callargs .= ",'','','$courseadv'";
+       } elsif ($courseadv eq 'condition') {
+           $callargs .= ",'','','$courseadv'";
        }
        return '<span class="LC_nobreak">'.
               '<a href="javascript:openstdbrowser('.$callargs.');">'.
@@ -3233,7 +3240,7 @@ sub check_passwd_rules {
         $rulenames{'min'} = &mt('Minimum password length: [_1]',$min);
         $rulenames{'max'} = &mt('Maximum password length: [_1]',$max);
         $warning = &mt('Password did not satisfy the following:').'<ul>';
-        foreach my $rule ('min','max','uc','ls','num','spec') {
+        foreach my $rule ('min','max','uc','lc','num','spec') {
             if (grep(/^$rule$/,@brokerule)) {
                 $warning .= '<li>'.$rulenames{$rule}.'</li>';
             }
@@ -5028,38 +5035,23 @@ sub check_ip_acc {
     if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
         return 1;
     }
-    my $allowed;
-    my $ip=$ENV{'REMOTE_ADDR'} || $clientip || $env{'request.host'};
+    my $allowed=0;
+    my $ip;
+    if (($ENV{'REMOTE_ADDR'} eq '127.0.0.1') ||
+        ($ENV{'REMOTE_ADDR'} eq &Apache::lonnet::get_host_ip($Apache::lonnet::perlvar{'lonHostID'}))) {
+        $ip = $env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip;
+    } else {
+        $ip = $ENV{'REMOTE_ADDR'} || $env{'request.host'} || $clientip;
+    }
 
     my $name;
-    my %access = (
-                     allowfrom => 1,
-                     denyfrom  => 0,
-                 );
-    my @allows;
-    my @denies;
-    foreach my $item (split(',',$acc)) {
-        $item =~ s/^\s*//;
-        $item =~ s/\s*$//;
-        if ($item =~ /^\!(.+)$/) {
-            push(@denies,$1);
-        } else {
-            push(@allows,$item);
-        }
-    }
-    my $numdenies = scalar(@denies);
-    my $numallows = scalar(@allows);
-    my $count = 0;
-    foreach my $pattern (@denies,@allows) {
-        $count ++;
-        my $acctype = 'allowfrom';
-        if ($count <= $numdenies) {
-            $acctype = 'denyfrom';
-        }
+    foreach my $pattern (split(',',$acc)) {
+        $pattern =~ s/^\s*//;
+        $pattern =~ s/\s*$//;
         if ($pattern =~ /\*$/) {
             #35.8.*
             $pattern=~s/\*//;
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
         } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
             #35.8.3.[34-56]
             my $low=$2;
@@ -5067,7 +5059,7 @@ sub check_ip_acc {
             $pattern=$1;
             if ($ip =~ /^\Q$pattern\E/) {
                 my $last=(split(/\./,$ip))[3];
-                if ($last <=$high && $last >=$low) { $allowed=$access{$acctype}; }
+                if ($last <=$high && $last >=$low) { $allowed=1; }
             }
         } elsif ($pattern =~ /^\*/) {
             #*.msu.edu
@@ -5077,10 +5069,10 @@ sub check_ip_acc {
                 my $netaddr=inet_aton($ip);
                 ($name)=gethostbyaddr($netaddr,AF_INET);
             }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
         } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
             #127.0.0.1
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
         } else {
             #some.name.com
             if (!defined($name)) {
@@ -5088,16 +5080,9 @@ sub check_ip_acc {
                 my $netaddr=inet_aton($ip);
                 ($name)=gethostbyaddr($netaddr,AF_INET);
             }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
-        }
-        if ($allowed =~ /^(0|1)$/) { last; }
-    }
-    if ($allowed eq '') {
-        if ($numdenies && !$numallows) {
-            $allowed = 1;
-        } else {
-            $allowed = 0;
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
         }
+        if ($allowed) { last; }
     }
     return $allowed;
 }
@@ -8420,8 +8405,7 @@ sub modal_link {
         $target_attr = 'target="'.$target.'"';
     }
     return <<"ENDLINK";
-<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling','$transparency','$style'); return false;">
-           $linktext</a>
+<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling','$transparency','$style'); return false;">$linktext</a>
 ENDLINK
 }
 
@@ -17194,131 +17178,6 @@ sub des_decrypt {
     return $plaintext;
 }
 
-sub make_short_symbs {
-    my ($cdom,$cnum,$navmap) = @_;
-    return unless (ref($navmap));
-    my ($numnew,@errors);
-    my @toshorten = &Apache::loncommon::get_env_multiple('form.addtiny');
-    if (@toshorten) {
-        my (%maps,%resources,%titles);
-        &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles,
-                                                               'shorturls',$cdom,$cnum);
-        my %tocreate;
-        if (keys(%resources)) {
-            foreach my $item (sort {$a <=> $b} (@toshorten)) {
-                my $symb = $resources{$item};
-                if ($symb) {
-                    $tocreate{$cnum.'&'.$symb} = 1;
-                }
-            }
-        }
-        if (keys(%tocreate)) {
-            my %coursetiny = &Apache::lonnet::dump('tiny',$cdom,$cnum);
-            my $su = Short::URL->new(no_vowels => 1);
-            my $init = '';
-            my (%newunique,%addcourse,%courseonly,%failed);
-            # get lock on tiny db
-            my $now = time;
-            my $lockhash = {
-                                "lock\0$now" => $env{'user.name'}.
-                                                ':'.$env{'user.domain'},
-                            };
-            my $tries = 0;
-            my $gotlock = &Apache::lonnet::newput_dom('tiny',$lockhash,$cdom);
-            my ($code,$error);
-            while (($gotlock ne 'ok') && ($tries<3)) {
-                $tries ++;
-                sleep 1;
-                $gotlock = &Apache::lonnet::newput_dom('tiny',$lockhash,$cdom);
-            }
-            if ($gotlock eq 'ok') {
-                $init = &shorten_symbs($cdom,$init,$su,\%coursetiny,\%tocreate,\%newunique,
-                                       \%addcourse,\%courseonly,\%failed);
-                if (keys(%failed)) {
-                    my $numfailed = scalar(keys(%failed));
-                    push(@errors,&mt('error: could not obtain unique six character URL for [quant,_1,resource]',$numfailed));
-                }
-                if (keys(%newunique)) {
-                    my $putres = &Apache::lonnet::newput_dom('tiny',\%newunique,$cdom);
-                    if ($putres eq 'ok') {
-                        $numnew = scalar(keys(%newunique));
-                        my $newputres = &Apache::lonnet::newput('tiny',\%addcourse,$cdom,$cnum);
-                        unless ($newputres eq 'ok') {
-                            push(@errors,&mt('error: could not store course look-up of short URLs'));
-                        }
-                    } else {
-                        push(@errors,&mt('error: could not store unique six character URLs'));
-                    }
-                }
-            }
-        }
-    }
-    return ($numnew,\@errors);
-}
-
-sub shorten_symbs {
-    my ($cdom,$init,$su,$coursetiny,$tocreate,$newunique,$addcourse,$courseonly,$failed) = @_;
-    return unless ((ref($su)) && (ref($coursetiny) eq 'HASH') && (ref($tocreate) eq 'HASH') &&
-                   (ref($newunique) eq 'HASH') && (ref($addcourse) eq 'HASH') &&
-                   (ref($courseonly) eq 'HASH') && (ref($failed) eq 'HASH'));
-    my (%possibles,%collisions);
-    foreach my $key (keys(%{$tocreate})) {
-        my $num = String::CRC32::crc32($key);
-        my $tiny = $su->encode($num,$init);
-        if ($tiny) {
-            $possibles{$tiny} = $key;
-        }
-    }
-    if (!$init) {
-        $init = 1;
-    } else {
-        $init ++;
-    }
-    if (keys(%possibles)) {
-        my @posstiny = keys(%possibles);
-        my $configuname = &Apache::lonnet::get_domainconfiguser($cdom);
-        my %currtiny = &Apache::lonnet::get('tiny',\@posstiny,$cdom,$configuname);
-        if (keys(%currtiny)) {
-            foreach my $key (keys(%currtiny)) {
-                next if ($currtiny{$key} eq '');
-                if ($currtiny{$key} eq $possibles{$key}) {
-                    my ($tcnum,$tsymb) = split(/\&/,$currtiny{$key});
-                    unless (($coursetiny->{$tsymb} eq $key) || ($addcourse->{$tsymb} eq $key) || ($courseonly->{$tsymb} eq $key)) {
-                        $courseonly->{$tsymb} = $key;
-                    }
-                } else {
-                    $collisions{$possibles{$key}} = 1;
-                }
-                delete($possibles{$key});
-            }
-        }
-        foreach my $key (keys(%possibles)) {
-            $newunique->{$key} = $possibles{$key};
-            my ($tcnum,$tsymb) = split(/\&/,$possibles{$key});
-            unless (($coursetiny->{$tsymb} eq $key) || ($addcourse->{$tsymb} eq $key) || ($courseonly->{$tsymb} eq $key)) {
-                $addcourse->{$tsymb} = $key;
-            }
-        }
-    }
-    if (keys(%collisions)) {
-        if ($init <5) {
-            if (!$init) {
-                $init = 1;
-            } else {
-                $init ++;
-            }
-            $init = &shorten_symbs($cdom,$init,$su,$coursetiny,\%collisions,
-                                   $newunique,$addcourse,$courseonly,$failed);
-        } else {
-            foreach my $key (keys(%collisions)) {
-                $failed->{$key} = 1;
-                $failed->{$key} = 1;
-            }
-        }
-    }
-    return $init;
-}
-
 sub is_nonframeable {
     my ($url,$absolute,$hostname,$ip,$nocache) = @_;
     my ($remprotocol,$remhost) = ($url =~ m{^(https?)\://(([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,})}i);
@@ -17342,7 +17201,9 @@ sub is_nonframeable {
     }
     my $uselink;
     my $request = new HTTP::Request('HEAD',$url);
-    my $response = &LONCAPA::LWPReq::makerequest('',$request,'','',5);
+    my $ua = LWP::UserAgent->new;
+    $ua->timeout(5);
+    my $response=$ua->request($request);
     if ($response->is_success()) {
         my $secpolicy = lc($response->header('content-security-policy'));
         my $xframeop = lc($response->header('x-frame-options'));