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

[raeburn]

raeburn		Thu Dec 20 13:15:37 2012 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - If domainconfig user doesn't exist when "Set domain configuration" is
    displayed, attempt to create that user, or offer a switchserver link. 
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.179 loncom/interface/domainprefs.pm:1.180
--- loncom/interface/domainprefs.pm:1.179	Thu Dec 20 02:43:28 2012
+++ loncom/interface/domainprefs.pm	Thu Dec 20 13:15:36 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.179 2012/12/20 02:43:28 raeburn Exp $
+# $Id: domainprefs.pm,v 1.180 2012/12/20 13:15:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -431,6 +431,31 @@
         }
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);
     } else {
+# check if domconfig user exists for the domain.
+        my $servadm = $r->dir_config('lonAdmEMail');
+        my ($configuserok,$author_ok,$switchserver) =
+            &config_check($dom,$confname,$servadm);
+        unless ($configuserok eq 'ok') {
+            &Apache::lonconfigsettings::print_header($r,$phase,$context).
+            &mt('The domain configuration user "[_1]" has yet to be created.',
+                $confname).
+            '<br />';
+            if ($switchserver) {
+                &mt('Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.').
+                '<br />'.
+                &mt('However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.').
+                '<br />'.
+                &mt('The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.',$confname).
+                '<br />'.
+                &mt("To do that now, use the following link: [_1],$switchserver);
+            } else {
+                &mt('To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.').
+                '<br />'.
+                &mt('Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain');
+            }
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
         if (keys(%domconfig) == 0) {
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
             my @ids=&Apache::lonnet::current_machine_ids();
@@ -5670,7 +5695,7 @@
     my @ids=&Apache::lonnet::current_machine_ids();
     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
     if (!$allowed) {
-	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
+	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>';
     }
     return $switchserver;
 }