--- loncom/interface/domainprefs.pm	2010/07/17 20:02:07	1.137
+++ loncom/interface/domainprefs.pm	2011/10/10 17:57:33	1.138.2.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.137 2010/07/17 20:02:07 raeburn Exp $
+# $Id: domainprefs.pm,v 1.138.2.11 2011/10/10 17:57:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -140,7 +140,7 @@ autolimit
 
 =over
  
-- course requests will be processed autoatically up to a limit of
+- course requests will be processed automatically up to a limit of
 N requests for the course type for the particular requestor.
 If N is undefined, there is no limit to the number of course requests
 which a course owner may submit and have processed automatically. 
@@ -171,6 +171,9 @@ use Locale::Language;
 use DateTime::TimeZone;
 use DateTime::Locale;
 
+my $registered_cleanup;
+my $modified_urls;
+
 sub handler {
     my $r=shift;
     if ($r->header_only) {
@@ -190,6 +193,10 @@ sub handler {
         "/adm/domainprefs:mau:0:0:Cannot modify domain settings";
         return HTTP_NOT_ACCEPTABLE;
     }
+
+    $registered_cleanup=0;
+    @{$modified_urls}=();
+
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['phase','actions']);
@@ -202,12 +209,12 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','helpsettings',
-                'coursedefaults','usersessions'],$dom);
+                'serverstatuses','requestcourses','coursedefaults',
+                'usersessions'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses','helpsettings',
+                       'requestcourses','coursecategories','serverstatuses',
                        'coursedefaults','usersessions');
     my %prefs = (
         'rolecolors' =>
@@ -230,7 +237,7 @@ sub handler {
                     },
 
         'defaults' => 
-                    { text => 'Default authentication/language/timezone',
+                    { text => 'Default authentication/language/timezone/portal',
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
                                   col2 => 'Value'}],
@@ -337,10 +344,10 @@ sub handler {
                              {col1 => 'Unauthenticated Help Settings',
                               col2 => ''}],
                  },
-        'coursedefaults' => 
+        'coursedefaults' =>
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
-                  header => [{col1 => 'Setting',
+                  header => [{col1 => 'Defaults which can be overridden for each course by a DC',
                               col2 => 'Value',}],
                  },
         'privacy' => 
@@ -455,8 +462,6 @@ sub process_changes {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($dom,$action,%domconfig);
-    } elsif ($action eq 'helpsettings') {
-        $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursedefaults') {
         $output = &modify_coursedefaults($dom,%domconfig);
     } elsif ($action eq 'usersessions') {
@@ -514,7 +519,7 @@ sub print_config_box {
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'usersessions') {
-            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
+            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
         }
@@ -666,10 +671,8 @@ sub print_config_box {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
             $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'helpsettings') {
-            $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal);
-    	} elsif ($action eq 'coursedefaults') {
-            $output .= &print_coursedefaults($dom,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -863,7 +866,6 @@ sub print_login {
                                                   domlogo => 'Domain Logo',
                                                   login => 'Login box');
     my $itemcount = 1;
-    my ($css_class,$datatable);
     foreach my $item (@toggles) {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .=  
@@ -1883,24 +1885,23 @@ sub print_autocreate {
                   '<input type="radio" name="autocreate_xml"'.
                   $createon{'xml'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autocreate_xml"'.
-                  $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>';
+                  $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>'.
+                  '</td></tr><tr>'.
+                  '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="autocreate_req"'.
+                  $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autocreate_req"'.
+                  $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc);
     if ($numdc > 1) {
-        $datatable .= '</td><tr><td>'.
-                      &mt('XML files processed as: (choose Dom. Coord.)'). 
-                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>'.
-                      '<tr class="LC_odd_row">';
+        $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
+                      &mt('Course creation processed as: (choose Dom. Coord.)'). 
+                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
         $$rowtotal ++ ;
     } else {
-        $datatable .= '</td></tr><tr>';
+        $datatable .= $dctable.'</td></tr>';
     }
-    $datatable .= '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="autocreate_req"'.
-                  $createon{'req'}.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                  '<label><input type="radio" name="autocreate_req"'.
-                  $createoff{'req'}.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
     return $datatable;
 }
 
@@ -2240,28 +2241,60 @@ sub radiobutton_prefs {
 }
 
 sub print_coursedefaults {
-    my ($dom,$settings,$rowtotal) = @_;
+    my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable);
     my $itemcount = 1;
-    my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles);
-    %choices =
-        &Apache::lonlocal::texthash (
-            canuse_pdfforms => 'Course/Community users can create/upload PDF forms',
-    );
-    %defaultchecked = ('canuse_pdfforms' => 'off');
-    @toggles = ('canuse_pdfforms',);
-    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+    if ($position eq 'top') {
+        my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles);
+        %choices =
+            &Apache::lonlocal::texthash (
+                canuse_pdfforms => 'Course/Community users can create/upload PDF forms',
+        );
+        %defaultchecked = ('canuse_pdfforms' => 'off');
+        @toggles = ('canuse_pdfforms',);
+        ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
                                                  \%choices,$itemcount);
-    $$rowtotal += $itemcount;
+        $$rowtotal += $itemcount;
+    } else {
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        my %choices =
+            &Apache::lonlocal::texthash (
+                anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
+        );
+        my $currdefresponder;
+        if (ref($settings) eq 'HASH') {
+            $currdefresponder = $settings->{'anonsurvey_threshold'};
+        }
+        if (!$currdefresponder) {
+            $currdefresponder = 10;
+        } elsif ($currdefresponder < 1) {
+            $currdefresponder = 1;
+        }
+        $datatable .=
+               '<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices{'anonsurvey_threshold'}.
+                '</span></td>'.
+                '<td class="LC_right_item"><span class="LC_nobreak">'.
+                '<input type="text" name="anonsurvey_threshold"'.
+                ' value="'.$currdefresponder.'" size="5" /></span>'.
+                '</td></tr>';
+    }
     return $datatable;
 }
 
 sub print_usersessions {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checked,%choices);
+    my (%by_ip,%by_location,@intdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
+    if (keys(%by_location) == 0) {
+        if ($position eq 'top') {
+            $datatable .= '<tr'.$css_class.'><td colspan="2">'.
+                          &mt('Nothing to set here, as the cluster to which this domain belongs only contains this institution.');
+        }
+    }
     my %lt = &usersession_titles();
     my $itemcount = 1;
-    my $numinrow = 6;
+    my $numinrow = 5;
     my $prefix;
     my @types;
     if ($position eq 'top') {
@@ -2270,10 +2303,10 @@ sub print_usersessions {
     } else {
         $prefix = 'remote';
         @types = ('version','excludedomain','includedomain');
-    } 
+    }
     my (%current,%checkedon,%checkedoff);
     my @lcversions = &Apache::lonnet::all_loncaparevs();
-    my @alldoms = sort(&Apache::lonnet::all_domains());
+    my @locations = sort(keys(%by_location));
     foreach my $type (@types) {
         $checkedon{$type} = '';
         $checkedoff{$type} = ' checked="checked"';
@@ -2295,6 +2328,7 @@ sub print_usersessions {
         }
     }
     foreach my $type (@types) {
+        next if ($type ne 'version' && !@locations);
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
         $datatable .= '<tr'.$css_class.'>
                        <td><span class="LC_nobreak">'.$lt{$type}.'</span><br />
@@ -2322,12 +2356,21 @@ sub print_usersessions {
                          "\n".
                          '</div><div><table>';
             my $rem;
-            for (my $i=0; $i<@alldoms; $i++) {
-                next if ($alldoms[$i] eq $dom);
-                my $checkedtype;
-                if (ref($current{$type}) eq 'ARRAY') {
-                    if (grep(/^\Q$alldoms[$i]\E$/,@{$current{$type}})) {
-                        $checkedtype = ' checked="checked"';
+            for (my $i=0; $i<@locations; $i++) {
+                my ($showloc,$value,$checkedtype);
+                if (ref($by_location{$locations[$i]}) eq 'ARRAY') {
+                    my $ip = $by_location{$locations[$i]}->[0];
+                    if (ref($by_ip{$ip}) eq 'ARRAY') {
+                        $value = join(':',@{$by_ip{$ip}});
+                        $showloc = join(', ',@{$by_ip{$ip}});
+                        if (ref($current{$type}) eq 'ARRAY') {
+                            foreach my $loc (@{$by_ip{$ip}}) {  
+                                if (grep(/^\Q$loc\E$/,@{$current{$type}})) {
+                                    $checkedtype = ' checked="checked"';
+                                    last;
+                                }
+                            }
+                        }
                     }
                 }
                 $rem = $i%($numinrow);
@@ -2340,10 +2383,10 @@ sub print_usersessions {
                 $datatable .= '<td class="LC_left_item">'.
                               '<span class="LC_nobreak"><label>'.
                               '<input type="checkbox" name="'.$prefix.'_'.$type.
-                              '" value="'.$alldoms[$i].'"'.$checkedtype.' />'.$alldoms[$i].
+                              '" value="'.$value.'"'.$checkedtype.' />'.$showloc.
                               '</label></span></td>';
             }
-            $rem = @alldoms%($numinrow);
+            $rem = @locations%($numinrow);
             my $colsleft = $numinrow - $rem;
             if ($colsleft > 1 ) {
                 $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
@@ -2360,6 +2403,54 @@ sub print_usersessions {
     return $datatable;
 }
 
+sub build_location_hashes {
+    my ($intdoms,$by_ip,$by_location) = @_;
+    return unless((ref($intdoms) eq 'ARRAY') && (ref($by_ip) eq 'HASH') &&
+                  (ref($by_location) eq 'HASH')); 
+    my %iphost = &Apache::lonnet::get_iphost();
+    my $primary_id = &Apache::lonnet::domain($env{'request.role.domain'},'primary');
+    my $primary_ip = &Apache::lonnet::get_host_ip($primary_id);
+    if (ref($iphost{$primary_ip}) eq 'ARRAY') {
+        foreach my $id (@{$iphost{$primary_ip}}) {
+            my $intdom = &Apache::lonnet::internet_dom($id);
+            unless(grep(/^\Q$intdom\E$/,@{$intdoms})) {
+                push(@{$intdoms},$intdom);
+            }
+        }
+    }
+    foreach my $ip (keys(%iphost)) {
+        if (ref($iphost{$ip}) eq 'ARRAY') {
+            foreach my $id (@{$iphost{$ip}}) {
+                my $location = &Apache::lonnet::internet_dom($id);
+                if ($location) {
+                    next if (grep(/^\Q$location\E$/,@{$intdoms}));
+                    if (ref($by_ip->{$ip}) eq 'ARRAY') {
+                        unless(grep(/^\Q$location\E$/,@{$by_ip->{$ip}})) {
+                            push(@{$by_ip->{$ip}},$location);
+                        }
+                    } else {
+                        $by_ip->{$ip} = [$location];
+                    }
+                }
+            }
+        }
+    }
+    foreach my $ip (sort(keys(%{$by_ip}))) {
+        if (ref($by_ip->{$ip}) eq 'ARRAY') {
+            @{$by_ip->{$ip}} = sort(@{$by_ip->{$ip}});
+            my $first = $by_ip->{$ip}->[0];
+            if (ref($by_location->{$first}) eq 'ARRAY') {
+                unless (grep(/^\Q$ip\E$/,@{$by_location->{$first}})) {
+                    push(@{$by_location->{$first}},$ip);
+                }
+            } else {
+                $by_location->{$first} = [$ip];
+            }
+        }
+    }
+    return;
+}
+
 sub contact_titles {
     my %titles = &Apache::lonlocal::texthash (
                    'supportemail' => 'Support E-mail address',
@@ -2731,9 +2822,9 @@ sub print_usermodification {
 sub print_defaults {
     my ($dom,$rowtotal) = @_;
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
-                 'datelocale_def');
+                 'datelocale_def','portal_def');
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my $titles = &defaults_titles();
+    my $titles = &defaults_titles($dom);
     my $rownum = 0;
     my ($datatable,$css_class);
     foreach my $item (@items) {
@@ -2770,8 +2861,12 @@ sub print_defaults {
             my $includeempty = 1;
             $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
         } else {
+            my $size;
+            if ($item eq 'portal_def') {
+                $size = ' size="25"';
+            }
             $datatable .= '<input type="text" name="'.$item.'" value="'.
-                          $domdefaults{$item}.'" />';
+                          $domdefaults{$item}.'"'.$size.' />';
         }
         $datatable .= '</td></tr>';
         $rownum ++;
@@ -2781,13 +2876,25 @@ sub print_defaults {
 }
 
 sub defaults_titles {
+    my ($dom) = @_;
     my %titles = &Apache::lonlocal::texthash (
                    'auth_def'      => 'Default authentication type',
                    'auth_arg_def'  => 'Default authentication argument',
                    'lang_def'      => 'Default language',
                    'timezone_def'  => 'Default timezone',
                    'datelocale_def' => 'Default locale for dates',
+                   'portal_def'     => 'Portal/Default URL',
                  );
+    if ($dom) {
+        my $uprimary_id = &Apache::lonnet::domain($dom,'primary');
+        my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
+        my $protocol = $Apache::lonnet::protocol{$uprimary_id};
+        $protocol = 'http' if ($protocol ne 'https');
+        if ($uint_dom) {
+            $titles{'portal_def'} .= ' '.&mt('(for example: [_1])',$protocol.'://loncapa.'.
+                                         $uint_dom);
+        }
+    }
     return (\%titles);
 }
 
@@ -4375,8 +4482,15 @@ $env{'user.name'}.':'.$env{'user.domain'
             if (copy($source,$copyfile)) {
                 print $logfile "\nCopied original source to ".$copyfile."\n";
                 $output = 'ok';
-                &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile);
                 $logourl = '/res/'.$dom.'/'.$confname.'/'.$fname;
+                push(@{$modified_urls},[$copyfile,$source]);
+                my $metaoutput =
+                    &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile);
+                unless ($registered_cleanup) {
+                    my $handlers = $r->get_handlers('PerlCleanupHandler');
+                    $r->set_handlers('PerlCleanupHandler' => [\&notifysubscribed,@{$handlers}]);
+                    $registered_cleanup=1;
+                }
             } else {
                 print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
                 $output = &mt('Failed to copy file to RES space').", $!";
@@ -4394,8 +4508,15 @@ $env{'user.name'}.':'.$env{'user.domain'
                             my $copyfile=$targetdir.'/tn-'.$file;
                             if (copy($outfile,$copyfile)) {
                                 print $logfile "\nCopied source to ".$copyfile."\n";
-                                &write_metadata($dom,$confname,$formname,
-                                                $targetdir,'tn-'.$file,$logfile);
+                                my $thumb_metaoutput =
+                                    &write_metadata($dom,$confname,$formname,
+                                                    $targetdir,'tn-'.$file,$logfile);
+                                push(@{$modified_urls},[$copyfile,$outfile]);
+                                unless ($registered_cleanup) {
+                                    my $handlers = $r->get_handlers('PerlCleanupHandler');
+                                    $r->set_handlers('PerlCleanupHandler' => [\&notifysubscribed,@{$handlers}]);
+                                    $registered_cleanup=1;
+                                }
                             } else {
                                 print $logfile "\nUnable to write ".$copyfile.
                                                ':'.$!."\n";
@@ -4460,30 +4581,79 @@ sub write_metadata {
     {
         print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
         my $mfh;
-        unless (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
+        if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
+            foreach (sort keys %metadatafields) {
+                unless ($_=~/\./) {
+                    my $unikey=$_;
+                    $unikey=~/^([A-Za-z]+)/;
+                    my $tag=$1;
+                    $tag=~tr/A-Z/a-z/;
+                    print $mfh "\n\<$tag";
+                    foreach (split(/\,/,$metadatakeys{$unikey})) {
+                        my $value=$metadatafields{$unikey.'.'.$_};
+                        $value=~s/\"/\'\'/g;
+                        print $mfh ' '.$_.'="'.$value.'"';
+                    }
+                    print $mfh '>'.
+                        &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
+                            .'</'.$tag.'>';
+                }
+            }
+            $output = 'ok';
+            print $logfile "\nWrote metadata";
+            close($mfh);
+        } else {
+            print $logfile "\nFailed to open metadata file";
             $output = &mt('Could not write metadata');
         }
-        foreach (sort keys %metadatafields) {
-            unless ($_=~/\./) {
-                my $unikey=$_;
-                $unikey=~/^([A-Za-z]+)/;
-                my $tag=$1;
-                $tag=~tr/A-Z/a-z/;
-                print $mfh "\n\<$tag";
-                foreach (split(/\,/,$metadatakeys{$unikey})) {
-                    my $value=$metadatafields{$unikey.'.'.$_};
-                    $value=~s/\"/\'\'/g;
-                    print $mfh ' '.$_.'="'.$value.'"';
-                }
-                print $mfh '>'.
-                    &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
-                        .'</'.$tag.'>';
-            }
-        }
-        $output = 'ok';
-        print $logfile "\nWrote metadata";
-        close($mfh);
     }
+    return $output;
+}
+
+sub notifysubscribed {
+    foreach my $targetsource (@{$modified_urls}){
+        next unless (ref($targetsource) eq 'ARRAY');
+        my ($target,$source)=@{$targetsource};
+        if ($source ne '') {
+            if (open(my $logfh,'>>'.$source.'.log')) {
+                print $logfh "\nCleanup phase: Notifications\n";
+                my @subscribed=&subscribed_hosts($target);
+                foreach my $subhost (@subscribed) {
+                    print $logfh "\nNotifying host ".$subhost.':';
+                    my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+                    print $logfh $reply;
+                }
+                my @subscribedmeta=&subscribed_hosts("$target.meta");
+                foreach my $subhost (@subscribedmeta) {
+                    print $logfh "\nNotifying host for metadata only ".$subhost.':';
+                    my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
+                                                        $subhost);
+                    print $logfh $reply;
+                }
+                print $logfh "\n============ Done ============\n";
+                close(logfh);
+            }
+        }
+    }
+    return OK;
+}
+
+sub subscribed_hosts {
+    my ($target) = @_;
+    my @subscribed;
+    if (open(my $fh,"<$target.subscription")) {
+        while (my $subline=<$fh>) {
+            if ($subline =~ /^($match_lonid):/) {
+                my $host = $1;
+                if ($host ne $Apache::lonnet::perlvar{'lonHostID'}) {
+                    unless (grep(/^\Q$host\E$/,@subscribed)) {
+                        push(@subscribed,$host);
+                    }
+                }
+            }
+        }
+    }
+    return @subscribed;
 }
 
 sub check_switchserver {
@@ -4553,12 +4723,12 @@ sub modify_quotas {
                     $changes{'notify'}{'approval'} = 1;
                 }
             } else {
-                if ($domconfig{$action}{'notify'}{'approval'}) {
+                if ($confhash{'notify'}{'approval'}) {
                     $changes{'notify'}{'approval'} = 1;
                 }
             }
         } else {
-            if ($domconfig{$action}{'notify'}{'approval'}) {
+            if ($confhash{'notify'}{'approval'}) {
                 $changes{'notify'}{'approval'} = 1;
             }
         }
@@ -4879,7 +5049,7 @@ sub modify_autoupdate {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                       );
-    my $othertitle = &mt('All users');
+    $othertitle = &mt('All users');
     if (keys(%{$usertypes}) >  0) {
         $othertitle = &mt('Other users');
     }
@@ -5923,7 +6093,7 @@ sub modify_defaults {
     my ($dom,$r) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def');
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
         $newvalues{$item} = $env{'form.'.$item};
@@ -5959,6 +6129,12 @@ sub modify_defaults {
                     push(@errors,$item);
                 }
             }
+        } elsif ($item eq 'portal_def') {
+            if ($newvalues{$item} ne '') {
+                unless ($newvalues{$item} =~ /^https?\:\/\/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])\/?$/) {
+                    push(@errors,$item);
+                }
+            }
         }
         if (grep(/^\Q$item\E$/,@errors)) {
             $newvalues{$item} = $domdefaults{$item};
@@ -6375,7 +6551,6 @@ sub modify_serverstatuses {
     my %serverstatushash =  (
                                 serverstatuses => \%newserverstatus,
                             );
-    my %changes;
     foreach my $type (@pages) {
         foreach my $setting ('namedusers','machines') {
             my (@current,@new);
@@ -6576,7 +6751,7 @@ sub modify_coursedefaults {
     my ($resulttext,$errors,%changes,%defaultshash);
     my %defaultchecked = ('canuse_pdfforms' => 'off');
     my @offon = ('off','on');
-    my @toggles = ('canuse_pdfforms');
+    my @toggles = ();
 
     $defaultshash{'coursedefaults'} = {};
 
@@ -6605,6 +6780,18 @@ sub modify_coursedefaults {
             }
             $defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item};
         }
+        my $currdefresponder = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
+        my $newdefresponder = $env{'form.anonsurvey_threshold'};
+        $newdefresponder =~ s/\D//g;
+        if ($newdefresponder eq '' || $newdefresponder < 1) {
+            $newdefresponder = 1;
+        }
+        $defaultshash{'coursedefaults'}{'anonsurvey_threshold'} = $newdefresponder;
+        if ($currdefresponder ne $newdefresponder) {
+            unless ($currdefresponder eq '' && $newdefresponder == 10) {
+                $changes{'anonsurvey_threshold'} = 1;
+            }
+        }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
@@ -6624,6 +6811,8 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
                     }
+                } elsif ($item eq 'anonsurvey_threshold') {
+                        $resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
                 }
             }
             $resulttext .= '</ul>';
@@ -6642,12 +6831,16 @@ sub modify_usersessions {
     my @types = ('version','excludedomain','includedomain');
     my @prefixes = ('remote','hosted');
     my @lcversions = &Apache::lonnet::all_loncaparevs();
+    my (%by_ip,%by_location,@intdoms);
+    &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
+    my @locations = sort(keys(%by_location));
     my (%defaultshash,%changes);
     foreach my $prefix (@prefixes) {
         $defaultshash{'usersessions'}{$prefix} = {};
     }
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my $resulttext;
+    my %iphost = &Apache::lonnet::get_iphost();
     foreach my $prefix (@prefixes) {
         foreach my $type (@types) {
             my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'};
@@ -6694,8 +6887,17 @@ sub modify_usersessions {
                 my @vals = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$type);
                 my @okvals;
                 foreach my $val (@vals) {
-                    if (&Apache::lonnet::domain($val) ne '') {
-                        push(@okvals,$val);
+                    if ($val =~ /:/) {
+                        my @items = split(/:/,$val);
+                        foreach my $item (@items) {
+                            if (ref($by_location{$item}) eq 'ARRAY') {
+                                push(@okvals,$item);
+                            }
+                        }
+                    } else {
+                        if (ref($by_location{$val}) eq 'ARRAY') {
+                            push(@okvals,$val);
+                        }
                     }
                 }
                 @okvals = sort(@okvals);
@@ -6942,8 +7144,8 @@ sub usersession_titles {
 
                remote => 'Hosting of sessions for users in this domain on servers in other domains',
                version => 'LON-CAPA version requirement',
-               excludedomain => 'Specific domains excluded',
-               includedomain => 'Specific domains included',
+               excludedomain => 'Allow all, but exclude specific domains',
+               includedomain => 'Deny all, but include specific domains',
            );
 }