--- loncom/interface/loncommon.pm	2015/05/22 17:33:11	1.1075.2.95
+++ loncom/interface/loncommon.pm	2016/01/27 01:18:13	1.1075.2.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.95 2015/05/22 17:33:11 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.97 2016/01/27 01:18:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4632,9 +4632,9 @@ sub blocking_status {
 # build a link to a popup window containing the details
     my $querystring  = "?activity=$activity";
 # $uname and $udom decide whose portfolio the user is trying to look at
-    if ($activity eq 'port') {
-        $querystring .= "&udom=$udom"      if $udom;
-        $querystring .= "&uname=$uname"    if $uname;
+    if (($activity eq 'port') || ($activity eq 'passwd')) {
+        $querystring .= "&udom=$udom"      if ($udom =~ /^$match_domain$/);
+        $querystring .= "&uname=$uname"    if ($uname =~ /^$match_username$/);
     } elsif ($activity eq 'docs') {
         $querystring .= '&url='.&HTML::Entities::encode($url,'&"');
     }
@@ -4659,6 +4659,8 @@ END_MYBLOCK
         $class = '';
     } elsif ($activity eq 'printout') {
         $text = &mt('Printing Blocked');
+    } elsif ($activity eq 'passwd') {
+        $text = &mt('Password Changing Blocked');
     }
     $output .= <<"END_BLOCK";
 <div class='$class'>
@@ -14129,9 +14131,12 @@ sub check_clone {
                     $can_clone = 1;
                 } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
                     $can_clone = 1;
+                } elsif (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners)) {
+                    $can_clone = 1;
                 }
                 unless ($can_clone) {
-                    if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) && ($args->{'clonedomain'} eq  $args->{'course_domain'})) {
+                    if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) &&
+                        ($args->{'clonedomain'} eq  $args->{'course_domain'})) {
                         my (%gotdomdefaults,%gotcodedefaults);
                         foreach my $cloner (@cloners) {
                             if (($cloner ne '*') && ($cloner !~ /^\*\:$match_domain$/) &&
@@ -14162,24 +14167,23 @@ sub check_clone {
                             }
                         }
                     }
-                    unless ($can_clone) {
-                        my $ccrole = 'cc';
-                        if ($args->{'crstype'} eq 'Community') {
-                            $ccrole = 'co';
-                        }
-                        my %roleshash =
-                            &Apache::lonnet::get_my_roles($args->{'ccuname'},
-                                                          $args->{'ccdomain'},
-                                                          'userroles',['active'],[$ccrole],
-                                                          [$args->{'clonedomain'}]);
-                        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) ||
-                            (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
-                            $can_clone = 1;
-                        } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},
-                                                                  $args->{'ccuname'},$args->{'ccdomain'})) {
-                            $can_clone = 1;
-                        }
-                    }
+                }
+            }
+            unless ($can_clone) {
+                my $ccrole = 'cc';
+                if ($args->{'crstype'} eq 'Community') {
+                    $ccrole = 'co';
+                }
+                my %roleshash =
+                    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+                                                  $args->{'ccdomain'},
+                                                  'userroles',['active'],[$ccrole],
+                                                  [$args->{'clonedomain'}]);
+                if ($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) {
+                    $can_clone = 1;
+                } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},
+                                                          $args->{'ccuname'},$args->{'ccdomain'})) {
+                    $can_clone = 1;
                 }
             }
             unless ($can_clone) {