--- loncom/interface/loncommon.pm	2006/12/04 22:03:15	1.485
+++ loncom/interface/loncommon.pm	2006/12/08 20:09:29	1.489
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.485 2006/12/04 22:03:15 albertel Exp $
+# $Id: loncommon.pm,v 1.489 2006/12/08 20:09:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2936,9 +2936,12 @@ sub blockcheck {
                                                        $tdom,$spec,$trest,$area);
                 }
                 my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
-		$no_userblock = &Apache::lonnet::allowed('evb',undef,undef,
-							 $checkrole);
-		last if $no_userblock;
+                if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
+                    if ($1) {
+                        $no_userblock = 1;
+                        last;
+                    }
+                }
              } else {
                 if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
                     $no_ownblock = 1;
@@ -3500,6 +3503,7 @@ sub standard_css {
     my $mail_other           = '#99BBBB';
     my $mail_other_hover     = '#669999';
     my $table_header         = '#DDDDDD';
+    my $feedback_link_bg     = '#BBBBBB';
 
     my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
 	                                              : '0px 3px 0px 4px';
@@ -4031,6 +4035,13 @@ table.LC_descriptive_input td.LC_descrip
   text-align: right;
   font-weight: bold;
 }
+table.LC_feedback_link {
+    background: $feedback_link_bg;
+}
+span.LC_feedback_link {
+    background: $feedback_link_bg;
+    font-size: larger;
+}
 
 END
 }
@@ -6286,9 +6297,11 @@ sub construct_course {
 # if specified, key authority is not course, but user
 # only active if keyaccess is yes
     if ($args->{'keyauth'}) {
-	$args->{'keyauth'}=~s/[^\w\@]//g;
-	if ($args->{'keyauth'}) {
-	    $cenv{'keyauth'}=$args->{'keyauth'};
+	my ($user,$domain) = split(':',$args->{'keyauth'});
+	$user = &LONCAPA::clean_username($user);
+	$domain = &LONCAPA::clean_username($domain);
+	if ($user ne '' && $domain ne '') {
+	    $cenv{'keyauth'}=$user.':'.$domain;
 	}
     }