--- loncom/build/add_domain_coordinator_privilege.pl	2011/03/28 14:18:22	1.5
+++ loncom/build/add_domain_coordinator_privilege.pl	2015/02/22 19:31:38	1.9
@@ -14,7 +14,7 @@ exisiting user on a LON-CAPA system.
 # add_domain_coordinator_privilege.pl - Add domain coordinator to an
 #    exisiting user on a LON-CAPA system.
 #
-# $Id: add_domain_coordinator_privilege.pl,v 1.5 2011/03/28 14:18:22 raeburn Exp $
+# $Id: add_domain_coordinator_privilege.pl,v 1.9 2015/02/22 19:31:38 raeburn Exp $
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #
@@ -79,7 +79,7 @@ use LONCAPA;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
-&Apache::lonlocal::get_language_handle();
+use Storable qw(nfreeze);
 
 =pod
 
@@ -95,22 +95,33 @@ The second argument specifies the domain
 
 =cut
 
+my ($user,$add_domain)=(@ARGV);
+my $lang = &Apache::lonlocal::choose_language();
+&Apache::lonlocal::get_language_handle(undef,$lang);
+
+if ($< != 0) { # Am I root?
+   print(&mt('You must be root in order to assign domain coordinator roles.').
+         "\n");
+}
+
 # ----------------------------------------------- So, are we invoked correctly?
 # Two arguments or abort
 if (@ARGV!=2) {
-    die('usage: add_domain_coordinator_privilege.pl [USERNAME:DOMAIN] [NEWDOMAIN]'.
+    print(&mt('usage: [_1]','add_domain_coordinator_privilege.pl [USERNAME:DOMAIN] [NEWDOMAIN]').
 	"\n");
+    exit;
 }
-my ($user,$add_domain)=(@ARGV);
 my ($username,$domain)=split(':',$user);
 if (!grep(/^\Q$add_domain\E$/,&Apache::lonnet::current_machine_domains())) {
-    die('**** ERROR **** Domain '.$add_domain.' is unknown'."\n");
+    print(&mt('**** ERROR **** Domain [_1] is unknown.',$add_domain)."\n");
+    exit;
 }
 
 my $udpath=&propath($domain,$username);
 if (!-d $udpath) {
-    die ('**** ERROR **** '.$user.' is NOT already defined as a LON-CAPA '.
-	 'user.'."\n");
+    print(&mt('**** ERROR **** [_1] is NOT already defined as a LON-CAPA '.
+	 'user.',$user)."\n");
+    exit;
 }
 
 =pod
@@ -150,7 +161,8 @@ use GDBM_File; # A simple key-value pair
 
 my $rolesref=&LONCAPA::locking_hash_tie("$udpath/roles.db",&GDBM_WRCREAT());
 if (!$rolesref) {
-    die('unable to tie roles db: '."$udpath/roles.db");
+    print(&mt('unable to tie [_1]',"roles db: $udpath/roles.db")."\n");
+    exit;
 }
 my $status;
 my $now = time;
@@ -211,7 +223,8 @@ my $dompath = $perlvar{'lonUsersDir'}.'/
 my $domrolesref = &LONCAPA::locking_hash_tie("$dompath/nohist_domainroles.db",&GDBM_WRCREAT());
 
 if (!$domrolesref) {
-    die('unable to tie nohist_domainroles db: '."$dompath/nohist_domainroles.db");
+    print(&mt('unable to tie [_1]',"nohist_domainroles db: $dompath/nohist_domainroles.db")."\n");
+    exit;
 }
 
 # Store in nohist_domainroles.db
@@ -219,8 +232,37 @@ my $domkey=&LONCAPA::escape('dc:'.$usern
 $domrolesref->{$domkey}= &LONCAPA::escape('0:'.$now);
 &LONCAPA::locking_hash_untie($domrolesref);
 
- system('/bin/chown',"www:www","$dompath/nohist_domainroles.db"); # Must be writeable by httpd process.
- system('/bin/chown',"www:www","$dompath/nohist_domainroles.db.lock");
+system('/bin/chown',"www:www","$dompath/nohist_domainroles.db"); # Must be writeable by httpd process.
+system('/bin/chown',"www:www","$dompath/nohist_domainroles.db.lock");
+
+# Log with domainconfiguser in nohist_rolelog.db
+my $domconfiguser = $domain.'-domainconfig';
+my $subdir = $domconfiguser;
+$subdir =~ s/^(.)(.)(.).*$/$1\/$2\/$3/;
+
+my $rolelogref = &LONCAPA::locking_hash_tie("$dompath/$subdir/$domconfiguser/nohist_rolelog.db",&GDBM_WRCREAT());
+my $domlogkey = &LONCAPA::escape($now.'00000'.$$.'000000');
+my $storehash = {
+                   role    => 'dc',
+                   start   => $now,
+                   end     => 0,
+                   context => 'server',
+                };
+my $domlogvalue = {
+                    'exe_uname' => '',
+                    'exe_udom'  => $domain,
+                    'exe_time'  => $now,
+                    'exe_ip'    => '127.0.0.1',
+                    'delflag'   => '',
+                    'logentry'  => $storehash,
+                    'uname'     => $username,
+                    'udom'      => $domain,
+                 };
+$rolelogref->{$domlogkey}=&freeze_escape($domlogvalue);
+&LONCAPA::locking_hash_untie($rolelogref);
+
+ system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db"); # Must be writeable by httpd process.
+ system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db.lock");
 
 =pod
 
@@ -232,5 +274,16 @@ by going to http://MACHINENAME/adm/creat
 =cut
 
 # Output success message, and inform sysadmin about how to further proceed.
-print("$username is now a domain coordinator for $add_domain\n");
+print(&mt('[_1] is now a domain coordinator for [_2].',$username,$add_domain).
+      "\n");
+exit;
+
+sub freeze_escape {
+    my ($value)=@_;
+    if (ref($value)) {
+        $value=&nfreeze($value);
+        return '__FROZEN__'.&LONCAPA::escape($value);
+    }
+    return &LONCAPA::escape($value);
+}