--- loncom/build/add_domain_coordinator_privilege.pl	2007/06/26 19:39:25	1.1
+++ loncom/build/add_domain_coordinator_privilege.pl	2011/05/29 17:54:21	1.7
@@ -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.1 2007/06/26 19:39:25 albertel Exp $
+# $Id: add_domain_coordinator_privilege.pl,v 1.7 2011/05/29 17:54:21 raeburn Exp $
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #
@@ -79,7 +79,6 @@ use LONCAPA;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
-&Apache::lonlocal::get_language_handle();
 
 =pod
 
@@ -87,7 +86,7 @@ use Apache::lonlocal;
 
 There are no flags to this script.
 
-usage: add_domain_coordinator_privledge.pl [USERNAME:DOMAIN] [NEWDOMAIN]
+usage: add_domain_coordinator_privilege.pl [USERNAME:DOMAIN] [NEWDOMAIN]
 
 The first argument specifies the user name domain of an existing user.
 
@@ -95,22 +94,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,37 +160,52 @@ 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;
 if (exists($rolesref->{'/'.$add_domain.'/_dc'})) {
     my ($role,$end,$start) = split('_',$rolesref->{'/'.$add_domain.'/_dc'});
-    print(&mt("[_1] already has a dc priviledge for [_2].",
+    print(&mt("[_1] already has a dc privilege for [_2].",
 	      $user,$add_domain)."\n");
     if ($start) {
 	print(&mt("Start date: [_1]",&Apache::lonlocal::locallocaltime($start)).
 	      "\n");
 	if (!$end) {
 	    print(&mt("No planned end date.")."\n");
-	}
-	if ($start < time() && (!$end || $end > time())) {
-	    print(&mt("It is currently active."));
-	    exit(0);
+	} else {
+            print(&mt("End date: [_1]",&Apache::lonlocal::locallocaltime($end)).
+                  "\n");
+        }
+	if (($start <= $now) && (!$end || $end > $now)) {
+	    print(&mt("It is currently active.")."\n");
+	    $status = 'active';
 	}
     } elsif ($end) {
 	print(&mt("End date: [_1]",&Apache::lonlocal::locallocaltime($end)).
 	      "\n");
-	if ($end > time()) {
+	if ($end > $now) {
 	    print(&mt("It is currently active.")."\n");
-	    exit(0);
+	    $status = 'active';
 	}
     }
-    if (!$start and !$end) {
+    if ((!$start) && (!$end)) {
 	print(&mt("It is currently active.")."\n");
-	exit(0);
+	$status = 'active';
+    }
+    unless ($status eq 'active') {
+        print(&mt("It is currently not active. Proceeding to make role active now.")."\n");
     }
 }
 
-$rolesref->{'/'.$add_domain.'/_dc'}='dc'; # Set the domain coordinator role.
+if ($status eq 'active') {
+    &LONCAPA::locking_hash_untie($rolesref);
+    exit(0);
+}
+
+my $now = time;
+$rolesref->{'/'.$add_domain.'/_dc'}='dc_0_'.$now; # Set the domain coordinator role.
 open(OUT, ">$udpath/roles.hist"); # roles.hist is the synchronous plain text.
 foreach my $key (keys(%{$rolesref})) {
     print(OUT $key.' : '.$rolesref->{$key}."\n");
@@ -192,6 +217,23 @@ close(OUT);
 `chown www:www $udpath/roles.hist`; # Must be writeable by httpd process.
 `chown www:www $udpath/roles.db`; # Must be writeable by httpd process.
 
+my %perlvar = %{&LONCAPA::Configuration::read_conf('loncapa.conf')};
+my $dompath = $perlvar{'lonUsersDir'}.'/'.$domain;
+my $domrolesref = &LONCAPA::locking_hash_tie("$dompath/nohist_domainroles.db",&GDBM_WRCREAT());
+
+if (!$domrolesref) {
+    print(&mt('unable to tie [_1]',"nohist_domainroles db: $dompath/nohist_domainroles.db")."\n");
+    exit;
+}
+
+# Store in nohist_domainroles.db
+my $domkey=&LONCAPA::escape('dc:'.$username.':'.$domain.'::'.$domain.':');
+$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");
+
 =pod
 
 =item 2.
@@ -202,8 +244,7 @@ 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");
-my $hostname=`hostname`; chomp($hostname); # Read in hostname.
-print("http://$hostname/adm/createuser will allow you to further define".
-      " this user.\n"); # Output a suggested URL.
+print(&mt('[_1] is now a domain coordinator for [_2].',$username,$add_domain).
+      "\n");
+exit;