--- loncom/auth/lonroles.pm	2005/04/07 06:56:21	1.118
+++ loncom/auth/lonroles.pm	2006/01/03 17:48:06	1.138.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.118 2005/04/07 06:56:21 albertel Exp $
+# $Id: lonroles.pm,v 1.138.2.1 2006/01/03 17:48:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonannounce;
 use Apache::lonlocal;
+use GDBM_File;
 
 sub redirect_user {
     my ($r,$title,$url,$msg,$launch_nav) = @_;
@@ -49,7 +50,8 @@ sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;
     if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavmaps::launch_win('now');
+	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
+						    ($url eq '/adm/whatsnew'));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -87,6 +89,9 @@ sub handler {
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
+        if ($env{'form.newrole'}) {
+            $env{'form.'.$env{'form.newrole'}}=1;
+	}
 	if ($env{'request.course.id'}) {
 	    my %temp=('logout_'.$env{'request.course.id'} => time);
 	    &Apache::lonnet::put('email_status',\%temp);
@@ -121,6 +126,11 @@ sub handler {
 		if ($tstatus eq 'is') {
 		    $where=~s/^\///;
 		    my ($cdom,$cnum,$csec)=split(/\//,$where);
+# check for course groups
+                    my %coursegroups = &Apache::lonnet::get_active_groups(
+                          $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
+                    my $cgrps = join(':',keys(%coursegroups));
+
 # store role if recent_role list being kept
                     if ($env{'environment.recentroles'}) {
 			&Apache::lonhtmlcommon::store_recent('roles',
@@ -222,19 +232,17 @@ ENDENTERKEY
 		    &Apache::lonnet::appenv(
 					   'request.role'        => $trolecode,
 					   'request.role.domain' => $cdom,
-					   'request.course.sec'  => $csec);
+					   'request.course.sec'  => $csec,
+                                           'request.course.groups' => $cgrps);
                     my $tadv=0;
 		    my $msg=&mt('Entering course ...');
 
-		    if (($cnum) && ($role ne 'ca')) {
+		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
 			if (($env{'form.orgurl'}) && 
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};
-			    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-				&Apache::lonnet::cleanenv();
-			    }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
 			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
 			    $r->internal_redirect($dest);
@@ -245,7 +253,7 @@ ENDENTERKEY
 				      "request.course.id"  => $cdom.'_'.$cnum);
 				$furl='/adm/roles?tryagain=1';
 				$msg=
-				    '<h1><font color=red>'.
+				    '<h1><font color="red">'.
 			 &mt('Could not initialize course at this time.').
 		    '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
 			    }
@@ -262,17 +270,24 @@ ENDENTERKEY
 			    if ($role eq 'cc' && $env{'course.' . $courseid . 
 							  '.course.helper.not.run'}) {
 				$furl = "/adm/helper/course.initialization.helper";
+				# Send the user to the course they selected
+			    } elsif (($env{'request.course.fn'}) 
+				     && ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres')))  {
+				$msg = &mt('Entering course ....');
+				&redirect_user($r,&mt('New in course'),
+					       '/adm/whatsnew',$msg,
+					       $env{'environment.remotenavmap'});
+				return OK;
 			    }
-                            # Send the user to the course they selected
-                            &redirect_user($r,&mt('Entering Course'),
+			    &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg,
 					   $env{'environment.remotenavmap'});
-                            return OK;
+			    return OK;
 			}
 		    }
                     #
                     # Send the user to the construction space they selected
-                    if ($role =~ /^(au|ca)$/) {
+                    if ($role =~ /^(au|ca|aa)$/) {
                         my $redirect_url = '/priv/';
                         if ($role eq 'au') {
                             $redirect_url.=$env{'user.name'};
@@ -306,6 +321,8 @@ ENDENTERKEY
 
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $bodytag=&Apache::loncommon::bodytag('User Roles');
+    my $standby=&mt('Role selected. Please stand by.');
+    $standby=~s/\n/\\n/g;
     my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'</td></td></tr></table>';
     $r->print(<<ENDHEADER);
 <html>
@@ -317,6 +334,20 @@ $helptag<br />
 <script>
 $swinfo
 window.focus();
+
+active=true;
+
+function enterrole (thisform,rolecode,buttonname) {
+    if (active) {
+	active=false;
+        document.title='$standby';
+        window.status='$standby';
+	thisform.newrole.value=rolecode;
+	thisform.submit();
+    } else {
+       alert('$standby');
+    }   
+}
 </script>
 ENDHEADER
 
@@ -338,14 +369,25 @@ ENDHEADER
 # --------------------------------------------------------------- Error Header?
     if ($error) {
 	$r->print("<h1>LON-CAPA Access Control</h1>");
-        $r->print("<hr><pre>Access  : ".
+        $r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
         $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
-        $r->print("Action  : $msg\n</pre><hr>");
+        $r->print("Action  : $msg\n</pre><hr />");
+	my $url=$fn;
+	my $last;
+	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+		&GDBM_READER(),0640)) {
+	    $last=$hash{'last_known'};
+	    untie(%hash);
+	}
+	if ($last) { $fn.='?symb='.&Apache::lonnet::escape($last); }
+
+	&Apache::londocs::changewarning($r,undef,'You have modified your course recently, [_1] may fix this access problem.',
+					&Apache::lonenc::check_encrypt($fn));
     } else {
         if ($env{'user.error.msg'}) {
 	    $r->print(
- '<h3><font color=red>'.
+ '<h3><font color="red">'.
  &mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');
 	}
     }
@@ -371,7 +413,7 @@ ENDHEADER
                       ($env{'user.name'},$env{'user.domain'})}.
 		      "<br />\n");
 	    $r->print(&mt(
-      "Author and Co-Author roles may not be available on servers other than your home server."));
+      "Author and Co-Author roles are not available on servers other than their respective home servers."));
         }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
@@ -379,6 +421,7 @@ ENDHEADER
         $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
         $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
         $r->print('<input type="hidden" name="selectrole" value="1" />');
+        $r->print('<input type="hidden" name="newrole" value="" />');
     }
     if ($env{'user.adv'}) {
 	$r->print(
@@ -399,7 +442,7 @@ ENDHEADER
         if ($envkey=~/^user\.role\./) {
             my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
             &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
-            next if (!defined($role) || $role eq '');
+            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
             $tremark='';
             $tpstart='&nbsp;';
             $tpend='&nbsp;';
@@ -444,7 +487,8 @@ ENDHEADER
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-                    $tremark.='<br>'.&mt('Defined by ').$rauthor.
+		    if ($tremark) { $tremark.='<br />'; }
+                    $tremark.=&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
                     $trole=$rrole;
                 } else {
@@ -455,18 +499,14 @@ ENDHEADER
                 my ($tdom,$trest,$tsection)=
                     split(/\//,Apache::lonnet::declutter($where));
                 # First, Co-Authorship roles
-                if ($role eq 'ca') {
+                if (($role eq 'ca') || ($role eq 'aa')) {
                     my $home = &Apache::lonnet::homeserver($trest,$tdom);
 		    my $allowed=0;
 		    my @ids=&Apache::lonnet::current_machine_ids();
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                         '/adm/login?domain='.$env{'user.domain'}.
-			  '&username='.$env{'user.name'}.
-                          '&firsturl=/priv/'.$trest.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -486,11 +526,7 @@ ENDHEADER
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                          '/adm/login?domain='.$env{'user.domain'}.
-			   '&username='.$env{'user.name'}.
-                           '&firsturl=/priv/'.$env{'user.name'}.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -502,9 +538,6 @@ ENDHEADER
 		    $sortkey=$role;
                 } elsif ($trest) {
                     $ttype='Course';
-                    if ($tsection) {
-                        $ttype.='<br>'.&mt('Section/Group').': '.$tsection;
-		    }
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
@@ -529,6 +562,10 @@ ENDHEADER
 			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
+                    if ($tsection) {
+                        $twhere.='<br />'.&mt('Section/Group').': '.$tsection;
+		    }
+
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype='Domain';
@@ -574,11 +611,10 @@ ENDHEADER
     }
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
-    $r->print('<th>'.&mt('User Role').'</th><th colspan=2>'.&mt('Extent').
-         '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
-	      &mt('Remarks and Calendar Announcements').'</th></tr>'."\n");
+    $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
+         '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");
     my $doheaders=-1;
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Domain','Construction Space','Course','System') {
 	my $haverole=0;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -595,6 +631,9 @@ ENDHEADER
 	foreach (sort(keys(%recent_roles))) {
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
+                if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
+		    $output .= &allcourses_row($1,'recent');
+                }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
                     $output.=&display_cc_role('user.role.'.$_);
@@ -602,8 +641,8 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='7'>".
-		      &mt('Recent Roles')."</td>");
+	    $r->print("<tr><td align='center' colspan='5'><font face='arial'>".
+		      &mt('Recent Roles')."</font></td>");
 	    $r->print($output);
 	    $r->print("</tr>");
             $doheaders ++;
@@ -614,22 +653,22 @@ ENDHEADER
         $r->print(&coursepick_jscript());
         $r->print(&Apache::loncommon::coursebrowser_javascript());
     }
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Construction Space','Domain','Course','System') {
 	my $output;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
 		$output.=$roletext{$sortrole{$which}};
                 if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
                     if ($dcroles{$1}) {
-                        $output .= &allcourses_row($1);
+                        $output .= &allcourses_row($1,'');
                     }
                 }
 	    }
 	}
 	if ($output) {
 	    if ($doheaders > 0) {
-		$r->print("<tr bgcolor='#BBffBB'>".
-			  "<td align='center' colspan='7'>".&mt($type)."</td></tr>");
+		$r->print("<tr>".
+			  "<td align='center' colspan='5'><font face='arial'>".&mt($type)."</font></td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -645,13 +684,13 @@ ENDHEADER
     }
     unless ($nochoose) {
 	if ($env{'request.role'} ne 'cm') {
-	    $r->print('<td><input type=submit value="'.
+	    $r->print('<td><input type="submit" value="'.
 		      &mt('Select').'" name="cm"></td>');
 	} else {
 	    $r->print('<td>&nbsp;</td>');
 	}
     }
-    $r->print('<td colspan=5><font color="'.$tfont.'">'.&mt('No role specified').
+    $r->print('<td colspan="3"><font color="'.$tfont.'">'.&mt('No role specified').
       '</font></td><td><font color="'.$tfont.'">'.$tremark.
       '&nbsp;</font></td></tr>'."\n");
 
@@ -661,7 +700,7 @@ ENDHEADER
     }
 # ------------------------------------------------------------ Privileges Info
     if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
-	$r->print('<hr><h2>Current Privileges</h2>');
+	$r->print('<hr /><h2>Current Privileges</h2>');
 
 	foreach $envkey (sort keys %env) {
 	    if ($envkey=~/^user\.priv\.$env{'request.role'}\./) {
@@ -751,41 +790,50 @@ sub role_status {
 sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
     my $roletext='<tr bgcolor="'.$tbg.'">';
+    my $is_dc=($trolecode =~ m/^dc\./);
+    my $rowspan=($is_dc) ? ''
+                         : ' rowspan="2" ';
+
     unless ($nochoose) {
+        my $buttonname=$trolecode;
+        $buttonname=~s/\W//g;
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td><a href="/adm/logout?handover='.
+                $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {
                 $roletext.=('<td>&nbsp;</td>');
             }
         } elsif ($tstatus eq 'is') {
-            $roletext.=('<td><input type=submit value="'.
-                        &mt('Select').'" name="'.
-                        $trolecode.'"></td>');
+            $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                        &mt('Select').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');"></td>';
         } elsif ($tryagain) {
             $roletext.=
-                '<td><input type=submit value="'.
-                &mt('Try Selecting Again').'" name="'.$trolecode.'"></td>';
+                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                &mt('Try Selecting Again').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');"></td>';
         } elsif ($advanced) {
             $roletext.=
-                '<td><input type=submit value="'.
-                &mt('Re-Initialize').'" name="'.$trolecode.'"></td>';
+                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Initialize').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');"></td>';
         } else {
-            $roletext.='<td>&nbsp;</td>';
+            $roletext.='<td'.$rowspan.'>&nbsp;</td>';
         }
     }
     $tremark.=&Apache::lonannounce::showday(time,1,
                  &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
 
-
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
-               '</font></td><td><font color="'.$tfont.'">'.$ttype.
-               '</font></td><td><font color="'.$tfont.'">'.$twhere.
+	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
                '</font></td><td><font color="'.$tfont.'">'.$tpend.
-               '</font></td><td><font color="'.$tfont.'">'.$tremark.
-               '&nbsp;</font></td></tr>'."\n";
+               '</font></td></tr>';
+    if (!$is_dc) {
+	$roletext.='<tr bgcolor="'.$tbg.'"><td colspan="4"><font color="'.$tfont.'">'.$tremark.
+	    '&nbsp;</font></td></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
+    }
     return $roletext;
 }
 
@@ -824,13 +872,13 @@ sub check_fordc {
 }
 
 sub courselink {
-    my ($dcdom) = @_;
+    my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
-                     ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom,$dcdom);
-    my $hiddenitems = '<input type="hidden" name="dcdomain_'.$dcdom.'" value="'.$dcdom.'" />'.
-                      '<input type="hidden" name="origdom_'.$dcdom.'" value="'.$dcdom.'" />'.
-                      '<input type="hidden" name="dccourse_'.$dcdom.'" value="" />'.
-                      '<input type="hidden" name="coursedesc_'.$dcdom.'" value="" />';
+                     ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);
+    my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
+                      '<input type="hidden" name="coursedesc'.$rowtype.'_'.$dcdom.'" value="" />';
     return $courseform.$hiddenitems;
 }
 
@@ -871,34 +919,26 @@ END
 }
 
 sub processpick {
-    my $dcdom = shift;
     my $process_pick = <<"END";
 <script>
 function process_pick(dom) {
-    var numbutton = getIndex(dom)
-    var pickedCourse = opener.document.rolechoice.dccourse_$dcdom.value
-    var pickedDomain = opener.document.rolechoice.dcdomain_$dcdom.value
-    if (opener.document.rolechoice.dcdomain_$dcdom.value == opener.document.rolechoice.origdom_$dcdom.value) {
+    var pickedCourse=opener.document.rolechoice.$env{'form.cnumelement'}.value;
+    var pickedDomain=opener.document.rolechoice.$env{'form.cdomelement'}.value;
+    var okDomain = 0;
+
+    if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            if (numbutton != -1) {
-                var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
-                opener.document.rolechoice.elements[numbutton+1].name = courseTarget
-                opener.document.rolechoice.submit()
-            }
+            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            opener.document.title='Role selected. Please stand by.';
+            opener.status='Role selected. Please stand by.';
+	    opener.document.rolechoice.newrole.value=courseTarget
+            opener.document.rolechoice.submit()
         }
+    } else {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
     }
 }
  
-function getIndex(dom) {
-    var callername = 'ccpick_'+dom
-    for (var i=0;i<opener.document.rolechoice.elements.length;i++) {
-        var elemname = opener.document.rolechoice.elements[i].name
-        if (elemname == callername) {
-            return i;
-        }
-    }
-    return -1;
-}
 </script>
 END
     return $process_pick;
@@ -935,22 +975,15 @@ sub display_cc_role {
 }
 
 sub allcourses_row {
-    my $dcdom = shift;
+    my ($dcdom,$rowtype) = @_;
     my $ccrole = Apache::lonnet::plaintext('cc');
-    my $selectlink = &courselink($dcdom);
+    my $selectlink = &courselink($dcdom,$rowtype);
     my $output = '<tr bgcolor="#77FF77">'.
-              '<td><input type="button" value="'.
-              &mt('Select').'" name="ccpick_'.$dcdom.'"'.
-              'onClick="verifyCoursePick(this)">'.
-              '<input type="hidden" name="pick_'.$dcdom.'" value="1"></td>'.
-              '<td><font color="#002200">'.
-              $ccrole.'</font></td><td>'.&mt('Course').'</td>'.
-              '<td><font color="#002200">'.&mt('All courses').':<b>&nbsp;'.
-              $selectlink.'</b>'.
-              '<br />'.&mt('Domain').':'.$dcdom.'</font>'.
-              '<td colspan="4"><font color="#002200">'.
-              &mt('Course Coordinator access to all courses in domain').
-              ': <b>'.$dcdom.'</b></font></td></tr>'."\n";
+	'<td colspan="5">'.
+	'<font color="#002200">'.$ccrole.'</font>'.
+	' <b>'.$selectlink.'</b>'.
+	' from '.&mt('Domain').' '.$dcdom.
+	'<tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
 }