--- loncom/interface/loncommon.pm 2019/05/02 23:09:38 1.1329
+++ loncom/interface/loncommon.pm 2020/03/15 23:04:15 1.1340
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1329 2019/05/02 23:09:38 raeburn Exp $
+# $Id: loncommon.pm,v 1.1340 2020/03/15 23:04:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,7 +80,6 @@ use Text::Aspell;
use Authen::Captcha;
use Captcha::reCAPTCHA;
use JSON::DWIW;
-use LWP::UserAgent;
use Crypt::DES;
use DynaLoader; # for Crypt::DES version
use MIME::Lite;
@@ -436,7 +435,7 @@ sub studentbrowser_javascript {
OFFLOAD
- }
}
}
}
@@ -8937,8 +9073,7 @@ sub modal_link {
$target_attr = 'target="'.$target.'"';
}
return <<"ENDLINK";
-
- $linktext
+$linktext
ENDLINK
}
@@ -18195,7 +18330,7 @@ sub shorten_symbs {
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);
- return if (($remprotocol eq '') || ($remhost eq ''));
+ return if (($remprotocol eq '') || ($remhost eq ''));
$remprotocol = lc($remprotocol);
$remhost = lc($remhost);
@@ -18203,7 +18338,7 @@ sub is_nonframeable {
if ($remprotocol eq 'https') {
$remport = 443;
}
- my ($result,$cached) = &Apache::lonnet::is_cached_new('exturlnoiframe',$remhost.':'.$remport);
+ my ($result,$cached) = &Apache::lonnet::is_cached_new('noiframe',$remhost.':'.$remport);
if ($cached) {
unless ($nocache) {
if ($result) {