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

Diff for /loncom/interface/lonsimplepage.pm between versions 1.50 and 1.51

version 1.50, 2007/05/02 01:33:49 version 1.51, 2007/07/13 00:29:21
Line 41  use Apache::longroup; Line 41  use Apache::longroup;
 use HTML::Entities();  use HTML::Entities();
 use LONCAPA;  use LONCAPA;
   
   sub get_db_name {
       my ($url) = @_;
       my ($udom,$uname,$marker)=(split(m{/},$url))[2,3,4];
       my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
       my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
   
       my $db_name;
   
       if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) {
    $marker =~ s/\W//g;
    $db_name = 'grppage_'.$marker;
       } else {
    $marker=~s/\D//g;
           $db_name = 'smppage_'.$marker;
       }
       return if (!defined($marker));
   
       return $db_name;
   }
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
Line 51  sub handler { Line 71  sub handler {
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));   $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     }       } 
     my (undef,undef,$udom,$uname,$marker)=split(/\//,$r->uri);  
 # Is this even in a course?  # Is this even in a course?
     unless ($env{'request.course.id'}) {      unless ($env{'request.course.id'}) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
Line 62  sub handler { Line 82  sub handler {
  return OK;   return OK;
     }      }
   
       my $db_name = &get_db_name($r->uri);
   
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my ($namespace,$group,$group_desc,$group_home_view,$group_home_edit,      my ($group,$group_desc,$group_home_view,$group_home_edit,
         $group_view_perm,$group_edit_perm);          $group_view_perm,$group_edit_perm);
     my %curr_group = ();      my %curr_group = ();
     my %groupinfo = ();      my %groupinfo = ();
     if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) {      if ($db_name =~ /^grppage_/) {
         $marker =~ s/\W//g;          my ($group)=(split(m{/},$r->uri))[4];  
         $group = $marker;   $group =~ s/\W//g;
         my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group);          my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group);
         if (!%curr_groups) {          if (!%curr_groups) {
     &Apache::loncommon::simple_error_page($r,'','Invalid group name');      &Apache::loncommon::simple_error_page($r,'','Invalid group name');
Line 79  sub handler { Line 101  sub handler {
         %groupinfo =           %groupinfo = 
     &Apache::longroup::get_group_settings($curr_groups{$group});      &Apache::longroup::get_group_settings($curr_groups{$group});
         $group_desc = &unescape($groupinfo{'description'});          $group_desc = &unescape($groupinfo{'description'});
         $namespace = 'grppage_'.$group;  
     } else {  
         $marker=~s/\D//g;  
         $namespace = 'smppage_'.$marker;  
     }      }
   
     if (!$marker) {      if (!$db_name) {
  &Apache::loncommon::simple_error_page($r,'','Invalid call');   &Apache::loncommon::simple_error_page($r,'','Invalid call');
  return OK;   return OK;
     }      }
Line 115  sub handler { Line 133  sub handler {
         $refarg = '&ref='.$env{'form.ref'};          $refarg = '&ref='.$env{'form.ref'};
     }      }
         
     my %syllabus=&Apache::lonnet::dump($namespace,$dom,$crs);      my %syllabus=&Apache::lonnet::dump($db_name,$dom,$crs);
                 
 # --------------------------------------- There is such a user, get environment  # --------------------------------------- There is such a user, get environment
   
Line 230  sub handler { Line 248  sub handler {
             }              }
  }   }
  $syllabus{'uploaded.lastmodified'}=time;   $syllabus{'uploaded.lastmodified'}=time;
  &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs);   &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }      }
     if (($allowed) && ($env{'form.storesyl'})) {      if (($allowed) && ($env{'form.storesyl'})) {
  foreach my $syl_field (keys(%syllabusfields)) {   foreach my $syl_field (keys(%syllabusfields)) {
Line 243  sub handler { Line 261  sub handler {
     $syllabus{$syl_field}=$field;      $syllabus{$syl_field}=$field;
  }   }
  $syllabus{'uploaded.lastmodified'}=time;   $syllabus{'uploaded.lastmodified'}=time;
  &Apache::lonnet::put($namespace,\%syllabus,$dom,$crs);   &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
     }      }
   
 # ---------------------------------------------------------------- Get syllabus  # ---------------------------------------------------------------- Get syllabus
Removed from v.1.50  
changed lines
  Added in v.1.51

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