[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm

raeburn lon-capa-cvs-allow@mail.lon-capa.org
Thu, 07 Jun 2007 23:19:43 -0000


raeburn		Thu Jun  7 19:19:43 2007 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Display message and switch server link if there are still custom logos/image stored in the old format (in /adm/lonDomLogos).
  - Remove trailing space regexp applied to output from ImageMagick identify call. Although Image Magick on Fedora has a space after the pixel values, Image Magick shipped with SLES9 does not.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.20 loncom/interface/domainprefs.pm:1.21
--- loncom/interface/domainprefs.pm:1.20	Mon Jun  4 10:14:27 2007
+++ loncom/interface/domainprefs.pm	Thu Jun  7 19:19:42 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.20 2007/06/04 14:14:27 raeburn Exp $
+# $Id: domainprefs.pm,v 1.21 2007/06/07 23:19:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -133,6 +133,31 @@
         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') {
@@ -1268,7 +1293,7 @@
             }
             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);
             }