--- loncom/interface/domainprefs.pm	2007/06/01 01:14:51	1.18
+++ loncom/interface/domainprefs.pm	2007/06/07 23:36:32	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.18 2007/06/01 01:14:51 albertel Exp $
+# $Id: domainprefs.pm,v 1.22 2007/06/07 23:36:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -133,6 +133,31 @@ sub handler {
         my %helphash;   
         my $numprefs = @prefs;
         &print_header($r,$phase);
+        if (keys(%domconfig) == 0) {
+            my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
+            my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf');
+            my $hostid = $perlvarref->{'lonHostID'};
+            if ($hostid ne $primarylibserv) {
+                my %designhash = &Apache::loncommon::get_domainconf($dom);
+                my @loginimages = ('img','logo','domlogo');
+                my $custom_img_count = 0;
+                foreach my $img (@loginimages) {
+                    if ($designhash{$dom.'.login.'.$img} ne '') {
+                        $custom_img_count ++;
+                    }
+                }
+                foreach my $role (@roles) {
+                    if ($designhash{$dom.'.'.$role.'.img'} ne '') {
+                        $custom_img_count ++;
+                    }
+                }
+                if ($custom_img_count > 0) {
+                    my $switch_server = &check_switchserver($dom,$confname);
+                    $r->print(&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.&mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'<br /><br />'.&mt("Thereafter, you will be able to update settings from this screen when logged in to any server in the LON-CAPA network (with a DC role selected in the domain), although you will still need to switch to the domain's primary library server to upload new images or logos.").'<br /><br />'.$switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
+                    return OK;
+                }
+            }
+        }
         $r->print('<table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
         foreach my $item (@prefs) {
             if ($item->{'action'} eq 'login') {
@@ -173,9 +198,12 @@ sub print_config_box {
     $r->print('
          <table class="LC_nested_outer">
           <tr>
-           <th>'.&mt($item->{text}).'&nbsp;'.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
-          </tr>');
+           <th>'.&mt($item->{text}).'&nbsp;</th></tr>');
+# 
+# FIXME - put the help link back in when the help files exist
+#           <th>'.&mt($item->{text}).'&nbsp;'.
+#           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
+#          </tr>');
     if (($action eq 'autoupdate') || ($action eq 'rolecolors')) {
         my $colspan = ($action eq 'rolecolors')?' colspan="2"':'';
         $r->print('
@@ -853,10 +881,11 @@ sub print_autoupdate {
         if (keys(%{$usertypes}) > 0) {
             $othertitle = &mt('Other users');
         }
-        my @fields = ('lastname','firstname','middlename','gen','email','id');
+        my @fields = ('lastname','firstname','middlename','gen',
+                      'permanentemail','id');
         my %fieldtitles = &Apache::lonlocal::texthash (
                             id => 'Student/Employee ID',
-                            email => 'E-mail address',
+                            permanentemail => 'E-mail address',
                             lastname => 'Last Name',
                             firstname => 'First Name',
                             middlename => 'Middle Name',
@@ -1267,7 +1296,7 @@ sub check_dimensions {
             }
             chomp($imageinfo);
             my ($fullsize) = 
-                ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)\s+/);
+                ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)/);
             if ($fullsize) {
                 ($fullwidth,$fullheight) = split(/x/,$fullsize);
             }
@@ -1519,7 +1548,6 @@ sub check_switchserver {
     }
     my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-    $allowed=0;
     if (!$allowed) {
 	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
     }
@@ -1662,7 +1690,7 @@ sub modify_autoupdate {
     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
     my %fieldtitles = &Apache::lonlocal::texthash (
                         id => 'Student/Employee ID',
-                        email => 'E-mail address',
+                        permanentemail => 'E-mail address',
                         lastname => 'Last Name',
                         firstname => 'First Name',
                         middlename => 'Middle Name',