[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm

raeburn raeburn at source.lon-capa.org
Mon Dec 31 22:06:27 EST 2012


raeburn		Tue Jan  1 03:06:27 2013 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  - Checking for changes to roles or groups
    - For any changes show course, role, section, and or group information 
      in unabbreviated format.
    - For custom roles, only compare stored privileges with privileges in
      %env for active roles.
  
  
-------------- next part --------------
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.278 loncom/auth/lonroles.pm:1.279
--- loncom/auth/lonroles.pm:1.278	Thu Dec 27 18:31:09 2012
+++ loncom/auth/lonroles.pm	Tue Jan  1 03:06:27 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.278 2012/12/27 18:31:09 raeburn Exp $
+# $Id: lonroles.pm,v 1.279 2013/01/01 03:06:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,6 +138,7 @@
 use Apache::lonpageflip();
 use Apache::lonnavdisplay();
 use Apache::loncoursequeueadmin;
+use Apache::longroup;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
@@ -2176,21 +2177,23 @@
                             }
                         }
                     }
-                    $currpriv{sys} = $env{"user.priv.$rolekey./"};
-                    $currpriv{dom} = $env{"user.priv.$rolekey./$udom/"};
-                    $currpriv{crs} = $env{"user.priv.$rolekey.$where"};
-                    if (keys(%crprivs)) {
-                        if (($crprivs{$rest}{sys} ne $currpriv{sys}) ||
-                            ($crprivs{$rest}{dom} ne $currpriv{dom})
+                    my $status_in_env =
+                        &curr_role_status($currstart,$currend,$refresh,$update);
+                    if ($status_in_env eq 'active') {
+                        $currpriv{sys} = $env{"user.priv.$rolekey./"};
+                        $currpriv{dom} = $env{"user.priv.$rolekey./$udom/"};
+                        $currpriv{crs} = $env{"user.priv.$rolekey.$where"};
+                        if (keys(%crprivs)) {
+                            if (($crprivs{$rest}{sys} ne $currpriv{sys}) ||
+                                ($crprivs{$rest}{dom} ne $currpriv{dom})
  ||
-                            ($crprivs{$rest}{crs} ne $currpriv{crs})) {
-                            &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
-                            unless (grep(/^\Q$role\E$/, at changed_roles)) {
-                                push(@changed_roles,$role);
-                            }
-                            my $status_in_env =
-                                &curr_role_status($currstart,$currend,$refresh,$update);
-                            if ($status_in_env eq 'active') {
+                                ($crprivs{$rest}{crs} ne $currpriv{crs})) {
+                                &gather_roleprivs(\%allroles,\%allgroups,
+                                                  \%userroles,$where,$role,
+                                                  $tstart,$tend,$status_in_db);
+                                unless (grep(/^\Q$role\E$/, at changed_roles)) {
+                                    push(@changed_roles,$role);
+                                }
                                 $customprivchg{$rolekey} = $status_in_env;
                             }
                         }
@@ -2272,6 +2275,93 @@
         }
         $msg .= '<br />'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'</p>';
     }
+    &Apache::lonnet::set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles);
+    my ($curr_is_adv,$curr_role_adv,$curr_author,$curr_role_author);
+    $curr_author = $env{'user.author'};
+    if (($env{'request.role'} =~/^au/) || ($env{'request.role'} =~/^ca/) ||
+        ($env{'request.role'} =~/^aa/)) {
+        $curr_role_author=1;
+    }
+    $curr_is_adv = $env{'user.adv'};
+    $curr_role_adv = $env{'request.role.adv'};
+    if (keys(%userroles) > 0) {
+        foreach my $role (@changed_roles) {
+            unless(grep(/^\Q$role\E$/, at rolecodes)) {
+                push(@rolecodes,$role);
+            }
+        }
+        unless(grep(/^\Qcm\E$/, at rolecodes)) {
+            push(@rolecodes,'cm');
+        }
+        &Apache::lonnet::appenv(\%userroles,\@rolecodes);
+    }
+    my %newenv;
+    if (&Apache::lonnet::is_advanced_user($env{'user.domain'},$env{'user.name'})) {
+        unless ($curr_is_adv) {
+            $newenv{'user.adv'} = 1;
+        }
+    } elsif ($curr_is_adv && !$curr_role_adv) {
+        &Apache::lonnet::delenv('user.adv');
+    }
+    my %authorroleshash =
+        &Apache::lonnet::get_my_roles('','','userroles',['active'],['au','ca','aa']);
+    if (keys(%authorroleshash)) {
+        unless ($curr_author) {
+            $newenv{'user.author'} = 1;
+        }
+    } elsif ($curr_author && !$curr_role_author) {
+        &Apache::lonnet::delenv('user.author');
+    }
+    if ($env{'request.course.id'}) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my (@activecrsgroups,$crsgroupschanged);
+        if ($env{'request.course.groups'}) {
+            @activecrsgroups = split(/:/,$env{'request.course.groups'});
+            foreach my $item (keys(%deletedroles)) {
+                if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) {
+                    if (grep(/^\Q$1\E$/, at activecrsgroups)) {
+                        $crsgroupschanged = 1;
+                        last;
+                    }
+                }
+            }
+        }
+        unless ($crsgroupschanged) {
+            foreach my $item (keys(%newgroup)) {
+                if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) {
+                    if ($newgroup{$item} eq 'active') {
+                        $crsgroupschanged = 1;
+                        last;
+                    }
+                }
+            }
+        }
+        if ((ref($changed_groups{$env{'request.course.id'}}) eq 'HASH') ||
+            (ref($groupchange{"/$cdom/$cnum"}) eq 'HASH') ||
+            ($crsgroupschanged)) {
+            my %grouproles =  &Apache::lonnet::get_my_roles('','','userroles',
+                                                            ['active'],['gr'],[$cdom],1);
+            my @activegroups;
+            foreach my $item (keys(%grouproles)) {
+                next unless($item =~ /^\Q$cnum\E:\Q$cdom\E/);
+                my $group;
+                my ($crsn,$crsd,$role,$remainder) = split(/:/,$item,4);
+                if ($remainder =~ /:/) {
+                    (my $other,$group) = ($remainder =~ /^([\w:]+):([^:]+)$/);
+                } else {
+                    $group = $remainder;
+                }
+                if ($group ne '') {
+                    push(@activegroups,$group);
+                }
+            }
+            $newenv{'request.course.groups'} = join(':', at activegroups);
+        }
+    }
+    if (keys(%newenv)) {
+        &Apache::lonnet::appenv(\%newenv);
+    }
     if (!@changed_roles || !(keys(%changed_groups))) {
         my ($rolesmsg,$groupsmsg);
         if (!@changed_roles) {
@@ -2304,11 +2394,42 @@
     if (@changed_roles > 0) {
         if (keys(%newgroup) > 0) {
             my $groupmsg;
+            my (%curr_groups,%groupdescs,$currcrs);
             foreach my $item (sort(keys(%newgroup))) {
                 if (&is_active_course($item,$refresh,$update,\%roleshash)) {
-                    $groupmsg .= '<li>'.
-                                 &mt('[_1] with status: [_2].',
-                                 $item,$newgroup{$item}).'</li>';
+                    if ($item =~ m{^gr\./($match_domain/$match_courseid)/(\w+)$}) {
+                        my ($cdom,$cnum) = split(/\//,$1);
+                        my $group = $2;
+                        if ($currcrs ne $cdom.'_'.$cnum) {
+                            if ($currcrs) {
+                                $groupmsg .= '</ul><li>';
+                            }
+                            $groupmsg .= '<li><b>'.
+                                         $env{'course.'.$cdom.'_'.$cnum.'.description'}.'</b><ul>';
+                        }
+                        my ($cdom,$cnum) = split(/\//,$1);
+                        my $group = $2;
+                        my $groupdesc;
+                        unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') {
+                            %{$curr_groups{$cdom.'_'.$cnum}} = 
+                                &Apache::longroup::coursegroups($cdom,$cnum);
+                        }
+                        unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') &&
+                            ($groupdescs{$cdom.'_'.$cnum}{$group})) {
+
+                            my %groupinfo = 
+                                &Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group});
+                            $groupdescs{$cdom.'_'.$cnum}{$group} = 
+                                &unescape($groupinfo{'description'});
+                        }
+                        $groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group};
+                        $groupmsg .= '<li>'.
+                                     &mt('[_1] with status: [_2].',
+                                     '<b>'.$groupdesc.'</b>',$newgroup{$item}).'</li>';
+                    }
+                }
+                if ($groupmsg) {
+                    $groupmsg .= '</ul></li>';
                 }
             }
             if ($groupmsg) {
@@ -2321,9 +2442,10 @@
             $changemsg .= '<li>'.&mt('New roles').
                           '<ul>';
             foreach my $item (sort(keys(%newrole))) {
+                my $desc = &role_desc($item,$update,$refresh,$now);
                 $changemsg .= '<li>'.
                               &mt('[_1] with status: [_2].',
-                              $item,$newrole{$item}).'</li>';
+                              $desc,$newrole{$item}).'</li>';
             }
             $changemsg .= '</ul></li>';
         }
@@ -2332,7 +2454,8 @@
                           &mt('Custom roles with privilege changes').
                           '<ul>';
             foreach my $item (sort(keys(%customprivchg))) {
-                $changemsg .= '<li>'.$item.'</li>';
+                my $desc = &role_desc($item,$update,$refresh,$now);
+                $changemsg .= '<li>'.$desc.'</li>';
             }
             $changemsg .= '</ul></li>';
         }
@@ -2341,8 +2464,9 @@
                           &mt('Existing roles with status changes').'</li>'.
                           '<ul>';
             foreach my $item (sort(keys(%rolechange))) {
+                my $desc = &role_desc($item,$update,$refresh,$now);  
                 $changemsg .= '<li>'.
-                              &mt('[_1] status now: [_2].',$item,
+                              &mt('[_1] status now: [_2].',$desc,
                               $rolechange{$item}).'</li>';
             }
             $changemsg .= '</ul></li>';
@@ -2352,7 +2476,8 @@
                           &mt('Existing roles now expired').'</li>'.
                           '<ul>';
             foreach my $item (sort(keys(%deletedroles))) {
-                $changemsg .= '<li>'.$item.'</li>';
+                my $desc = &role_desc($item,$update,$refresh,$now);
+                $changemsg .= '<li>'.$desc.'</li>';
             }
             $changemsg .= '</ul></li>';
         }
@@ -2384,10 +2509,22 @@
                           &mt('Existing course/community groups with status changes').'</li>'.
                           '<ul>';
             foreach my $crs (sort(keys(%groupchange))) {
+                my $cid = $crs;
+                $cid=~s{^/}{};
+                $cid=~s{/}{_};
+                my $crsdesc = $env{'course.'.$cid.'.description'};
+                my $cdom = $env{'course.'.$cid.'.domain'};
+                my $cnum = $env{'course.'.$cid.'.num'};
+                my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+                my %groupdesc; 
                 if (ref($groupchange{$crs}) eq 'HASH') {
-                    $groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crs.'</b><ul>');
+                    $groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>');
                     foreach my $group (sort(keys(%{$groupchange{$crs}}))) {
-                        $groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$group.'</b>',$groupchange{$crs}{$group}).'</li>';
+                        unless ($groupdesc{$group}) {
+                            my %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group});
+                            $groupdesc{$group} =  &unescape($groupinfo{'description'});
+                        }
+                        $groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$groupdesc{$group}.'</b>',$groupchange{$crs}{$group}).'</li>';
                     }
                     $groupchgmsg .= '</ul></li>';
                 }
@@ -2403,94 +2540,61 @@
     if ($changemsg) {
         $msg .= '<ul>'.$changemsg.'</ul>';
     }
-    &Apache::lonnet::set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles);
-    my ($curr_is_adv,$curr_role_adv,$curr_author,$curr_role_author);
-    $curr_author = $env{'user.author'};
-    if (($env{'request.role'} =~/^au/) || ($env{'request.role'} =~/^ca/) ||
-        ($env{'request.role'} =~/^aa/)) {
-        $curr_role_author=1;
-    }
-    $curr_is_adv = $env{'user.adv'};
-    $curr_role_adv = $env{'request.role.adv'};
-    if (keys(%userroles) > 0) {
-        foreach my $role (@changed_roles) {
-            unless(grep(/^\Q$role\E$/, at rolecodes)) {
-                push(@rolecodes,$role);
+    return $msg;
+}
+
+sub role_desc {
+    my ($item,$update,$refresh,$now) = @_;
+    my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$twhere,
+        $trole,$tremark);
+    &Apache::lonnet::role_status('user.role.'.$item,$update,$refresh,                                      $now,\$role,\$where, \$trolecode,
+                                 \$tstatus,\$tstart,\$tend);
+    if ($role =~ /^cr\//) {
+        my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
+        $tremark = &mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
+    }
+    $trole=Apache::lonnet::plaintext($role);
+    my ($tdom,$trest,$tsection)=
+        split(/\//,Apache::lonnet::declutter($where));
+    if (($role eq 'ca') || ($role eq 'aa')) {
+        my $home = &Apache::lonnet::homeserver($trest,$tdom);
+        $home = &Apache::lonnet::hostname($home);
+        $twhere=&mt('User').': '.$trest.'  '.&mt('Domain').
+                ': '.$tdom.'  '.&mt('Server').': '.$home;
+    } elsif ($role eq 'au') {
+        my $home = &Apache::lonnet::homeserver
+                       ($env{'user.name'},$env{'user.domain'});
+        $home = &Apache::lonnet::hostname($home);
+        $twhere=&mt('Domain').': '.$tdom.'  '.&mt('Server').
+                        ': '.$home;
+    } elsif ($trest) {
+        my $tcourseid=$tdom.'_'.$trest;
+        my $crstype = &Apache::loncommon::course_type($tcourseid);
+        $trole = &Apache::lonnet::plaintext($role,$crstype,$tcourseid);
+        if ($env{'course.'.$tcourseid.'.description'}) {
+            $twhere=$env{'course.'.$tcourseid.'.description'};
+        } else {
+            my %newhash=&Apache::lonnet::coursedescription($tcourseid);
+            if (%newhash) {
+                $twhere=$newhash{'description'};
+            } else {
+                $twhere=&mt('Currently not available');
             }
         }
-        unless(grep(/^\Qcm\E$/, at rolecodes)) {
-            push(@rolecodes,'cm');
+        if ($tsection) {
+            $twhere.= '  '.&mt('Section').': '.$tsection;
         }
-        &Apache::lonnet::appenv(\%userroles,\@rolecodes);
-    }
-    my %newenv;
-    if (&Apache::lonnet::is_advanced_user($env{'user.domain'},$env{'user.name'})) {
-        unless ($curr_is_adv) {
-            $newenv{'user.adv'} = 1;
+        if ($role ne 'st') {
+            $twhere.= '  '.&mt('Domain').': '.$tdom;
         }
-    } elsif ($curr_is_adv && !$curr_role_adv) {
-        &Apache::lonnet::delenv('user.adv');
+    } elsif ($tdom) {
+        $twhere = &mt('Domain').': '.$tdom;
     }
-    my %authorroleshash =
-        &Apache::lonnet::get_my_roles('','','userroles',['active'],['au','ca','aa']);
-    if (keys(%authorroleshash)) {
-        unless ($curr_author) {
-            $newenv{'user.author'} = 1;
-        }
-    } elsif ($curr_author && !$curr_role_author) {
-        &Apache::lonnet::delenv('user.author');
+    my $output = "$trole -- $twhere";
+    if ($tremark) {
+        $output .= '<br />'.$tremark;
     }
-    if ($env{'request.course.id'}) {
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my (@activecrsgroups,$crsgroupschanged);
-        if ($env{'request.course.groups'}) {
-            @activecrsgroups = split(/:/,$env{'request.course.groups'});
-            foreach my $item (keys(%deletedroles)) {
-                if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) {
-                    if (grep(/^\Q$1\E$/, at activecrsgroups)) {
-                        $crsgroupschanged = 1;
-                        last;
-                    }
-                }
-            }
-        }
-        unless ($crsgroupschanged) {
-            foreach my $item (keys(%newgroup)) {
-                if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) {
-                    if ($newgroup{$item} eq 'active') {
-                        $crsgroupschanged = 1;
-                        last;
-                    }
-                }
-            }
-        }
-        if ((ref($changed_groups{$env{'request.course.id'}}) eq 'HASH') ||
-            (ref($groupchange{"/$cdom/$cnum"}) eq 'HASH') ||
-            ($crsgroupschanged)) {
-            my %grouproles =  &Apache::lonnet::get_my_roles('','','userroles',
-                                                            ['active'],['gr'],[$cdom],1);
-            my @activegroups;
-            foreach my $item (keys(%grouproles)) {
-                next unless($item =~ /^\Q$cnum\E:\Q$cdom\E/);
-                my $group;
-                my ($crsn,$crsd,$role,$remainder) = split(/:/,$item,4);
-                if ($remainder =~ /:/) {
-                    (my $other,$group) = ($remainder =~ /^([\w:]+):([^:]+)$/);
-                } else {
-                    $group = $remainder;
-                }
-                if ($group ne '') {
-                    push(@activegroups,$group);
-                }
-            }
-            $newenv{'request.course.groups'} = join(':', at activegroups);
-        }
-    }
-    if (keys(%newenv)) {
-        &Apache::lonnet::appenv(\%newenv);
-    }
-    return $msg;
+    return $output;
 }
 
 sub curr_role_status {
@@ -2555,19 +2659,15 @@
 sub get_roles_functions {
     my ($rolescount) = @_;
     my @links;
-    if ($env{'user.adv'}) {
-        if ($env{'form.display'} eq 'showall') {
-            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]);
-        } else {
-            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]);
-        }
-    }
     push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]);
     if ($env{'environment.canrequest.author'}) {
         unless (&Apache::loncoursequeueadmin::is_active_author()) {
             push(@links,["javascript:rolesView('requestauthor');",'list-add-22x22',&mt('Request author role')]);
         }
     }
+    if (($rolescount > 3) || ($env{'environment.recentroles'})) {
+        push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]);
+    }
     if (&Apache::lonmenu::check_for_rcrs()) {
         push(@links,['/adm/requestcourse','rcrs-22x22',&mt('Request course')]);
     }
@@ -2576,8 +2676,12 @@
     } else {
         push(@links,["javascript:rolesView('queued');",'selfenrl-queue-22x22',&mt('Show queued')]);
     }
-    if (($rolescount > 3) || ($env{'environment.recentroles'})) {
-        push(@links,['/adm/preferences?action=changerolespref&returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]);
+    if ($env{'user.adv'}) {
+        if ($env{'form.display'} eq 'showall') {
+            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]);
+        } else {
+            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]);
+        }
     }
     
     my $funcs = &Apache::lonhtmlcommon::start_funclist();


More information about the LON-CAPA-cvs mailing list