--- loncom/interface/domainprefs.pm	2017/10/17 14:08:48	1.160.6.84.2.6
+++ loncom/interface/domainprefs.pm	2017/11/16 23:33:05	1.160.6.84.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.84.2.6 2017/10/17 14:08:48 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.84.2.9 2017/11/16 23:33:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1546,7 +1546,8 @@ sub display_color_options {
                         if ($fullwidth ne '' && $fullheight ne '') {
                             if ($fullwidth > $width && $fullheight > $height) { 
                                 my $size = $width.'x'.$height;
-                                system("convert -sample $size $input $output");
+                                my @args = ('convert','-sample',$size,$input,$output);
+                                system({$args[0]} @args);
                                 $showfile = "/$imgdir/tn-".$filename;
                             }
                         }
@@ -5732,12 +5733,9 @@ sub print_selfcreation {
         my $onclick = "toggleDisplay(this.form,'emailoptions');";
         my $additional = '<div id="emailoptions" style="display: '.$display.'">';
         my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-        if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
-            $order = $domdefaults{'inststatusguest'};
-        }
         my (@ordered,%usertypeshash);
-        if (ref($order) eq 'ARRAY') {
-            @ordered = @{$order};
+        if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
+            @ordered = @{$domdefaults{'inststatusguest'}};
         }
         if (@ordered) {
             unless (grep(/^default$/,@ordered)) {
@@ -8376,14 +8374,14 @@ sub publishlogo {
     } else {
         my $source = $filepath.'/'.$file;
         my $logfile;
-        if (!open($logfile,">>$source".'.log')) {
+        if (!open($logfile,">>",$source.'.log')) {
             return (&mt('No write permission to Authoring Space'));
         }
         print $logfile
 "\n================= Publish ".localtime()." ================\n".
 $env{'user.name'}.':'.$env{'user.domain'}."\n";
 # Save the file
-        if (!open(FH,'>'.$source)) {
+        if (!open(FH,">",$source)) {
             &Apache::lonnet::logthis('Failed to create '.$source);
             return (&mt('Failed to create file'));
         }
@@ -8444,7 +8442,8 @@ $env{'user.name'}.':'.$env{'user.domain'
                 if ($fullwidth ne '' && $fullheight ne '') { 
                     if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
                         my $thumbsize = $thumbwidth.'x'.$thumbheight;
-                        system("convert -sample $thumbsize $inputfile $outfile");
+                        my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile);
+                        system({$args[0]} @args);
                         chmod(0660, $filepath.'/tn-'.$file);
                         if (-e $outfile) {
                             my $copyfile=$targetdir.'/tn-'.$file;
@@ -8523,7 +8522,7 @@ sub write_metadata {
     {
         print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
         my $mfh;
-        if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
+        if (open($mfh,">",$targetdir.'/'.$file.'.meta')) {
             foreach (sort(keys(%metadatafields))) {
                 unless ($_=~/\./) {
                     my $unikey=$_;
@@ -8557,7 +8556,7 @@ sub notifysubscribed {
         next unless (ref($targetsource) eq 'ARRAY');
         my ($target,$source)=@{$targetsource};
         if ($source ne '') {
-            if (open(my $logfh,'>>'.$source.'.log')) {
+            if (open(my $logfh,">>",$source.'.log')) {
                 print $logfh "\nCleanup phase: Notifications\n";
                 my @subscribed=&subscribed_hosts($target);
                 foreach my $subhost (@subscribed) {
@@ -8583,7 +8582,7 @@ sub notifysubscribed {
 sub subscribed_hosts {
     my ($target) = @_;
     my @subscribed;
-    if (open(my $fh,"<$target.subscription")) {
+    if (open(my $fh,"<","$target.subscription")) {
         while (my $subline=<$fh>) {
             if ($subline =~ /^($match_lonid):/) {
                 my $host = $1;
@@ -8782,16 +8781,20 @@ sub modify_quotas {
                                     #FIXME need to obsolete item in RES space
                                 } elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) {
                                     my ($cdom,$cnum) = split(/_/,$key);
-                                    my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
-                                                                                  $cdom,$cnum,$type,$configuserok,
-                                                                                  $switchserver,$author_ok);
-                                    if ($imgurl) {
-                                        $confhash{$type}{$key}{'image'} = $imgurl;
-                                        $changes{$type}{$key} = 1; 
-                                    }
-                                    if ($error) {
-                                        &Apache::lonnet::logthis($error);
-                                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                                    if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
+                                        $errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>';
+                                    } else { 
+                                        my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
+                                                                                      $cdom,$cnum,$type,$configuserok,
+                                                                                      $switchserver,$author_ok);
+                                        if ($imgurl) {
+                                            $confhash{$type}{$key}{'image'} = $imgurl;
+                                            $changes{$type}{$key} = 1; 
+                                        }
+                                        if ($error) {
+                                            &Apache::lonnet::logthis($error);
+                                            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                                        }
                                     } 
                                 } elsif ($domconfig{$action}{$type}{$key}{'image'}) {
                                     $confhash{$type}{$key}{'image'} = 
@@ -9325,7 +9328,7 @@ sub process_textbook_image {
         } elsif ($author_ok eq 'ok') {
             my ($result,$imageurl) =
                 &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "$type/$dom/$cnum/cover",$width,$height);
+                             "$type/$cdom/$cnum/cover",$width,$height);
             if ($result eq 'ok') {
                 $url = $imageurl;
             } else {
@@ -9471,6 +9474,7 @@ sub modify_ltitools {
         my $maxnum = $env{'form.ltitools_maxnum'};
         for (my $i=0; $i<=$maxnum; $i++) {
             my $itemid = $env{'form.ltitools_id_'.$i};
+            $itemid =~ s/\D+//g;
             if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
                 if ($deletions{$itemid}) {
                     if ($domconfig{$action}{$itemid}{'image'}) {