Diff for /loncom/interface/domainprefs.pm between versions 1.28 and 1.29

version 1.28, 2007/09/16 17:26:56 version 1.29, 2007/09/19 17:36:47
Line 157  sub handler { Line 157  sub handler {
         &print_header($r,$phase);          &print_header($r,$phase);
         if (keys(%domconfig) == 0) {          if (keys(%domconfig) == 0) {
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');              my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
             my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf');              my @ids=&Apache::lonnet::current_machine_ids();
             my $hostid = $perlvarref->{'lonHostID'};              if (!grep(/^\Q$primarylibserv\E$/,@ids)) {
             if ($hostid ne $primarylibserv) {  
                 my %designhash = &Apache::loncommon::get_domainconf($dom);                  my %designhash = &Apache::loncommon::get_domainconf($dom);
                 my @loginimages = ('img','logo','domlogo');                  my @loginimages = ('img','logo','domlogo');
                 my $custom_img_count = 0;                  my $custom_img_count = 0;
Line 175  sub handler { Line 174  sub handler {
                 }                  }
                 if ($custom_img_count > 0) {                  if ($custom_img_count > 0) {
                     my $switch_server = &check_switchserver($dom,$confname);                      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 Domain Coordinator 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));                      $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, (with a Domain Coordinator role selected in the domain) you will be able to update settings when logged in to any server in the LON-CAPA network.").'<br />'.
       &mt("However, you will still need to switch to the domain's primary library server to upload new images or logos.").'<br /><br />');
                       if ($switch_server) {
                          $r->print($switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
                       }
                     return OK;                      return OK;
                 }                  }
             }              }

Removed from v.1.28  
changed lines
  Added in v.1.29


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>