[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.808 and 1.809

version 1.808, 2006/11/27 20:35:10 version 1.809, 2006/11/28 19:46:00
Line 3559  sub allowed { Line 3559  sub allowed {
     $uri=&deversion($uri);      $uri=&deversion($uri);
     my $orguri=$uri;      my $orguri=$uri;
     $uri=&declutter($uri);      $uri=&declutter($uri);
       
     if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; }      if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; }
 # Free bre access to adm and meta resources  # Free bre access to adm and meta resources
     if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$}))       if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$})) 
Line 4365  sub auto_validate_class_sec { Line 4365  sub auto_validate_class_sec {
 # ------------------------------------------------------- Course Group routines  # ------------------------------------------------------- Course Group routines
   
 sub get_coursegroups {  sub get_coursegroups {
     my ($cdom,$cnum,$group) = @_;      my ($cdom,$cnum,$group,$namespace) = @_;
     return(&dump('coursegroups',$cdom,$cnum,$group));      return(&dump($namespace,$cdom,$cnum,$group));
 }  
   
 sub get_deleted_groups {  
     my ($cdom,$cnum,$group) = @_;  
     return(&dump('deleted_groups',$cdom,$cnum,$group));  
 }  }
   
 sub modify_coursegroup {  sub modify_coursegroup {
Line 4379  sub modify_coursegroup { Line 4374  sub modify_coursegroup {
     return(&put('coursegroups',$groupsettings,$cdom,$cnum));      return(&put('coursegroups',$groupsettings,$cdom,$cnum));
 }  }
   
 sub delete_coursegroup {  sub toggle_coursegroup_status {
     my ($cdom,$cnum,$group) = @_;      my ($cdom,$cnum,$group,$action) = @_;
     my %curr_group = &get_coursegroups($cdom,$cnum,$group);      my ($from_namespace,$to_namespace);
       if ($action eq 'delete') {
           $from_namespace = 'coursegroups';
           $to_namespace = 'deleted_groups';
       } else {
           $from_namespace = 'deleted_groups';
           $to_namespace = 'coursegroups';
       }
       my %curr_group = &get_coursegroups($cdom,$cnum,$group,$from_namespace);
     if (my $tmp = &error(%curr_group)) {      if (my $tmp = &error(%curr_group)) {
         &Apache::lonnet::logthis('Error retrieving group: '.$tmp.' in '.$cnum.':'.$cdom);          &Apache::lonnet::logthis('Error retrieving group: '.$tmp.' in '.$cnum.':'.$cdom);
         return ('read error',$tmp);          return ('read error',$tmp);
     } else {      } else {
         my %savedsettings = %curr_group;           my %savedsettings = %curr_group; 
         my $result = &put('deleted_groups',\%savedsettings,$cdom,$cnum);          my $result = &put($to_namespace,\%savedsettings,$cdom,$cnum);
         my $deloutcome;          my $deloutcome;
         if ($result eq 'ok') {          if ($result eq 'ok') {
             $deloutcome = &del('coursegroups',[$group],$cdom,$cnum);              $deloutcome = &del($from_namespace,[$group],$cdom,$cnum);
         } else {          } else {
             return ('write error',$result);              return ('write error',$result);
         }          }
Line 7712  passed in @what from the requested user' Line 7715  passed in @what from the requested user'
   
 =item *  =item *
   
 allowed($priv,$uri) : check for a user privilege; returns codes for allowed  allowed($priv,$uri,$symb) : check for a user privilege; returns codes for allowed actions
 actions  
  F: full access   F: full access
  U,I,K: authentication modes (cxx only)   U,I,K: authentication modes (cxx only)
  '': forbidden   '': forbidden
Removed from v.1.808  
changed lines
  Added in v.1.809

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>