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

Diff for /loncom/interface/loncoursegroups.pm between versions 1.23 and 1.27

version 1.23, 2006/05/26 11:10:13 version 1.27, 2006/06/28 16:00:05
Line 1 Line 1
   # The LearningOnline Network with CAPA
   #
   # $Id$
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
Line 32  use Apache::lonlocal; Line 35  use Apache::lonlocal;
 use Apache::lonnavmaps;  use Apache::lonnavmaps;
 use Apache::longroup;  use Apache::longroup;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
   
 sub handler {  sub handler {
     my ($r) = @_;      my ($r) = @_;
Line 235  END Line 240  END
                         $rowColor = $rowColor2;                          $rowColor = $rowColor2;
                     }                      }
                     my $description =                       my $description = 
                    &Apache::lonnet::unescape($grp_info{$group}{'description'});                     &unescape($grp_info{$group}{'description'});
                     my $creator = $grp_info{$group}{'creator'};                      my $creator = $grp_info{$group}{'creator'};
                     my $creation = $grp_info{$group}{'creation'};                      my $creation = $grp_info{$group}{'creation'};
                     my $modified = $grp_info{$group}{'modified'};                       my $modified = $grp_info{$group}{'modified'}; 
Line 300  END Line 305  END
                 foreach my $group (@coursegroups) {                  foreach my $group (@coursegroups) {
                     my %group_info =  &Apache::longroup::get_group_settings(                      my %group_info =  &Apache::longroup::get_group_settings(
                                         $curr_groups{$group});                                          $curr_groups{$group});
                     my $description = &Apache::lonnet::unescape(                      my $description = &unescape(
                                         $group_info{description});                                          $group_info{description});
                     my ($uname,$udom) = split(/:/,$group_info{creator});                      my ($uname,$udom) = split(/:/,$group_info{creator});
                     $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');                      $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
Line 416  sub group_administration { Line 421  sub group_administration {
  files      => {   files      => {
      rgf => 'Retrieve',       rgf => 'Retrieve',
      ugf => 'Upload',       ugf => 'Upload',
                mgf => 'Modify',
      dgf => 'Delete',       dgf => 'Delete',
                agf => 'Control Access',
  },   },
  roster     => {   roster     => {
      vgm => 'View',       vgm => 'View',
Line 867  sub retrieve_settings { Line 874  sub retrieve_settings {
     my %stored;      my %stored;
   
     $stored{'description'} =       $stored{'description'} = 
  &Apache::lonnet::unescape($groupinfo{'description'});   &unescape($groupinfo{'description'});
     $stored{'startdate'} = $groupinfo{'startdate'};      $stored{'startdate'} = $groupinfo{'startdate'};
     $stored{'enddate'} = $groupinfo{'enddate'};      $stored{'enddate'} = $groupinfo{'enddate'};
     if ($stored{'enddate'} == 0) {      if ($stored{'enddate'} == 0) {
Line 1081  sub group_members { Line 1088  sub group_members {
         $$group_info{'totalmembers'} = 'Unknown - an error occurred';          $$group_info{'totalmembers'} = 'Unknown - an error occurred';
         return $tmp;          return $tmp;
     }      }
     my $now = time;  
     my $totalmembers = 0;      my $totalmembers = 0;
     my $active = 0;      my $active = 0;
     my $previous = 0;      my $previous = 0;
Line 2861  sub write_group_data { Line 2867  sub write_group_data {
         $creation = $$stored{'creation'};          $creation = $$stored{'creation'};
         $creator = $$stored{'creator'};          $creator = $$stored{'creator'};
     }      }
     my $esc_description = &Apache::lonnet::escape($description);      my $esc_description = &escape($description);
     my @single_attributes = ('description','functions','startdate','enddate',      my @single_attributes = ('description','functions','startdate','enddate',
                              'creation','modified','creator','granularity',                               'creation','modified','creator','granularity',
                              'specificity','autoadd','autodrop');                               'specificity','autoadd','autodrop');
Line 2974  sub process_membership { Line 2980  sub process_membership {
                 }                  }
             } else {              } else {
                 if (@{$defprivs} > 0) {                  if (@{$defprivs} > 0) {
                     foreach my $priv (@{$defprivs}) {                      if (grep/^\Q$priv\E$/,@{$defprivs}) {
                         foreach my $user (sort(keys(%{$usertools}))) {                          foreach my $user (sort(keys(%{$usertools}))) {
                             if ($$usertools{$user}{$tool}) {                              if ($$usertools{$user}{$tool}) {
                                 $group_privs{$user} .= $priv.':';                                  $group_privs{$user} .= $priv.':';
Line 3450  sub date_setting_table { Line 3456  sub date_setting_table {
 sub create_homepage {  sub create_homepage {
     my ($cdom,$cnum,$name,$groupinfo,$tools) = @_;      my ($cdom,$cnum,$name,$groupinfo,$tools) = @_;
     my $functionality = join(',',@{$tools});      my $functionality = join(',',@{$tools});
     my $content = &Apache::lonnet::unescape($$groupinfo{description});      my $content = &unescape($$groupinfo{description});
     $content=~s/\s+$//s;      $content=~s/\s+$//s;
     $content=~s/^\s+//s;      $content=~s/^\s+//s;
     $content=~s/\<br\s*\/*\>$//s;      $content=~s/\<br\s*\/*\>$//s;
Removed from v.1.23  
changed lines
  Added in v.1.27

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