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

Diff for /loncom/interface/lonaboutme.pm between versions 1.70.4.3 and 1.126

version 1.70.4.3, 2010/01/30 18:03:40 version 1.126, 2009/04/17 17:54:59
Line 1 Line 1
 # The LearningOnline Network  # The LearningOnline Network
 # "About Me" Personal Information  # Personal Information Page
 #  #
 # $Id$  # $Id$
 #  #
Line 30 Line 30
   
 =head1 NAME  =head1 NAME
   
 Apache::lonaboutme  pache::lonaboutme
   
 =head1 SYNOPSIS  =head1 SYNOPSIS
   
Line 72  described at http://www.lon-capa.org. Line 72  described at http://www.lon-capa.org.
   
 =cut  =cut
   
   
 package Apache::lonaboutme;  package Apache::lonaboutme;
   
 use strict;  use strict;
Line 83  use Apache::lonfeedback; Line 84  use Apache::lonfeedback;
 use Apache::lonrss();  use Apache::lonrss();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmsgdisplay();  use Apache::lonmsgdisplay();
   use Apache::lontemplate;
 use HTML::Entities();  use HTML::Entities();
   use Image::Magick;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 92  sub handler { Line 95  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
     my $target=$env{'form.grade_target'};      my $target=$env{'form.grade_target'};
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     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,$cdom,$cnum,undef,$action)=split(/\//,$r->uri);      my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri);
Line 115  sub handler { Line 118  sub handler {
             }              }
             if (!$candisplay) {              if (!$candisplay) {
                 if ($target eq 'tex') {                  if ($target eq 'tex') {
                     $r->print('\noindent{\large\textbf{'.&mt('No user home page available').'}}\\\\\\\\');                      $r->print('\noindent{\large\textbf{'.&mt('No user personal information page available').'}}\\\\\\\\');
                 } else {                  } else {
                     $r->print(&Apache::loncommon::start_page("Personal Information Page"));                      $r->print(&Apache::loncommon::start_page("Personal Information Page"));
                     $r->print('<h2>'.&mt('No personal information page available') .'</h2>'.                      $r->print('<h2>'.&mt('No user personal information page available') .'</h2>'.
                               &mt('This is a result of one of the following:').'<ul>'.                                &mt('This is a result of one of the following:').'<ul>'.
                               '<li>'.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'</li>'.                                '<li>'.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'</li>'.
                               '<li>'.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'</li>'.                                '<li>'.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'</li>'.
Line 141  sub handler { Line 144  sub handler {
     ['forceedit','forcestudent',      ['forceedit','forcestudent',
      'register','popup']);       'register','popup']);
   
 # ----------------------------------------------- Available Portfolio file display   # ----------------------------------------------- Available Portfolio file display
     if (($target ne 'tex') && ($action eq 'portfolio')) {      if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);          &display_portfolio_header($r,$is_course);
         if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) {          if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) {
Line 158  sub handler { Line 161  sub handler {
             } else {              } else {
                 $r->print($blocktext);                  $r->print($blocktext);
             }              }
             $r->print(&Apache::loncommon::end_page());  
             return OK;  
         }          }
           $r->print(&Apache::loncommon::end_page());
           return OK;
     }      }
   
     if ($is_course) {      if ($is_course) {
Line 191  sub handler { Line 194  sub handler {
     if ($forcestudent eq '') {      if ($forcestudent eq '') {
         $forceregister = $env{'form.register'};          $forceregister = $env{'form.register'};
     }      }
          
   #------------Get rights
    my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
       my $allowed=0;
     my $privleged=$allowed=(($env{'user.name'} eq $cnum) &&
          ($env{'user.domain'} eq $cdom));
       if ($forcestudent or $target eq 'tex') { $allowed=0; }
   
   
 # --------------------------------------- There is such a user, get environment  # --------------------------------------- There is such a user, get environment
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);  
     if ($target ne 'tex') {      if ($target ne 'tex') {
  my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);   my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
         my $args = {'function' => $forcestudent,          my $args = {'function' => $forcestudent,
Line 201  sub handler { Line 213  sub handler {
                     'force_register' => $forceregister};                      'force_register' => $forceregister};
         if ($env{'form.popup'}) {          if ($env{'form.popup'}) {
             $args->{'no_nav_bar'} = 1;              $args->{'no_nav_bar'} = 1;
         } else {  
     $args->{'bread_crumbs'} = [{href=>"/adm/$cdom/$cnum/aboutme",text=>"Personal Information Page"}];  
         }          }
  my $start_page =    $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information Page"}];
     &Apache::loncommon::start_page("Personal Information Page",$rss_link,$args);   my $start_page = &Apache::loncommon::start_page("Personal Data",$rss_link,$args);
  $r->print($start_page);   $r->print($start_page);
  $r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');      
     } else {          #Print Privacy Note
  $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');          if ($allowed) {
     }              $r->print('<div class="LC_info">'
     if ($courseenv{'nickname'}) {                      .'<b>'.&mt('Privacy Note:').'</b> '
        $r->print(                      .&mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.')
          '<h2>&quot;'.$courseenv{'nickname'}.                      .'</div>'
          '&quot;</h2>');             );
     }   }
     if ($target ne 'tex') {      
  $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.  #Print last modified
   '<p>'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));  
     } else {   my $lastmod;
  $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');          if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
           $lastmod=$syllabus{'uploaded.lastmodified'};
           $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
    $r->print('<div class="LC_info">');
     $r->print(&mt('Last updated').': '.$lastmod . '');
    $r->print('</div>');
     }      }
     my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);  }
     my $allowed=0;  #Print Help Text
    if ($target ne 'tex') {
    if($allowed){
    $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
    }
    }
   
   #----------------Print Functions
    if ($target ne 'tex'){
    $r->print(&Apache::lontemplate::start_functionslist());
         if($allowed){
    my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
                           $r->print(&Apache::lontemplate::item_functionslist(
                               '<a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'
                              .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
       }elsif($privleged){
    my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
                           $r->print(&Apache::lontemplate::item_functionslist(
                               '<a href="'.$r->uri.$query_string.'">'. &mt('Edit').'</a>'));
    }
                   $r->print(&Apache::lontemplate::item_functionslist(
                       &Apache::lontemplate::send_message($r,$cnum,$cdom)));
   
    if ($env{'request.course.id'} && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) && &in_course($cdom,$cnum)) {
    if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.
    $env{'request.course.sec'})) {
                               $r->print(&Apache::lontemplate::item_functionslist(
                                   &Apache::loncommon::track_student_link('View recent activity by this student',$cnum,$cdom)));
        }
                           if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||
                               &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.
                                                        $env{'request.course.sec'})) {
                               $r->print(&Apache::lontemplate::item_functionslist(
                                   &Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom)));
                           }
                           $r->print(&Apache::lontemplate::item_functionslist(
                               &Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom)));
    }
           $r->print(&Apache::lontemplate::end_functionslist());
    }
   #------Print Headtitle
     if ($target ne 'tex') {
    $r->print('<div class="LC_ContentBoxSpecial">');
    $r->print('<h2 class="LC_hcell">'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
    $r->print('<div class="LC_BoxPadding">' );
    if ($courseenv{'nickname'}) {
         $r->print('<h2>&quot;'.$courseenv{'nickname'}.'&quot;</h2>');
       }
    $r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
     }
    else {
    $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
    $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
    }
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
   
        my $privleged=$allowed=(($env{'user.name'} eq $cnum) &&   
        ($env{'user.domain'} eq $cdom));   my $query_string;
        if ($forcestudent or $target eq 'tex') { $allowed=0; }  
    
        if ($allowed) {  
            my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});  
    $r->print('<p class="LC_info"><b>'.&mt('Privacy Note:').'</b> '.  
      &mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.').  
      '</p>'.  
      &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.  
      &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');  
        } elsif ($privleged && $target ne 'tex') {  
            my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});  
    $r->print('<p><a href="'.$r->uri.$query_string.'"><font size="+1">'.  
      &mt('Edit').'</font></a></p>');  
        }  
       if (($env{'form.uploaddoc.filename'}) &&        if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {            ($env{'form.storeupl'}) && ($allowed)) {
    if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {     if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
Line 250  sub handler { Line 304  sub handler {
   &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});    &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
       }        }
       $syllabus{'uploaded.photourl'}=        $syllabus{'uploaded.photourl'}=
                  &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme');                   &Apache::lonnet::userphotoupload('uploaddoc','aboutme');
    }     }
           $syllabus{'uploaded.lastmodified'}=time;            $syllabus{'uploaded.lastmodified'}=time;
           &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
Line 274  sub handler { Line 328  sub handler {
            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);             &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
        }         }
   
   my $image;
 # ---------------------------------------------------------------- Get syllabus  # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {      if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        my $lastmod=$syllabus{'uploaded.lastmodified'};  
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));  
        $r->print(&mt('Last updated').': '.$lastmod);  
        if ($syllabus{'uploaded.photourl'}) {         if ($syllabus{'uploaded.photourl'}) {
    &Apache::lonnet::allowuploaded('/adm/aboutme',     &Apache::lonnet::allowuploaded('/adm/aboutme',
   $syllabus{'uploaded.photourl'});    $syllabus{'uploaded.photourl'});
    my $image=  
                qq{<img src="$syllabus{'uploaded.photourl'}" align="right" />};             #This call is to resize all "Personal Information" images in the LonCapa System. When its done, you can remove this line.
      &Apache::lonnet::resizeImage(&Apache::lonnet::filelocation('',$syllabus{'uploaded.photourl'}));
      #---End Resize---
   
      $image=qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'} " class="LC_AboutMe_Image" />};
   
    if ($target eq 'tex') {     if ($target eq 'tex') {
        $image=&Apache::lonxml::xmlparse($r,'tex',$image);         $image=&Apache::lonxml::xmlparse($r,'tex',$image);
    }     }
    $r->print($image);  
        }         }
   
        if ($allowed) {         if ($allowed) {
            $r->print(             $r->print(
  '<form method="post">  
                <input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />  
           </form>'.  
  '<form method="post" enctype="multipart/form-data">'.   '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.           '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<input type="file" name="uploaddoc" size="50" />'.           '<input type="file" name="uploaddoc" size="50" />'.
          '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.           '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
          '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.           '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
  '</form><form method="post">');   '</form>');
         if ($syllabus{'uploaded.photourl'}) {
        }                $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>')
        foreach my $field (sort(keys(%syllabusfields))) {            }
           if (($syllabus{$field}) || ($allowed)) {            $r->print('<p>');
               my $message=$syllabus{$field};  
       &Apache::lonfeedback::newline_to_br(\$message);  
               $message  
              =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;  
       if ($allowed) {  
   $message=&Apache::lonspeller::markeduptext($message);  
       }  
       $message=&Apache::lontexconvert::msgtexconverted($message);  
       if ($target ne 'tex') {  
   $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.  
                             $message.'</blockquote>');  
       } else {  
      $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.  
        &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');  
       }  
               if ($allowed) {  
                  $r->print('<br /><textarea cols="80" rows="6" name="'.$field.'">'.  
    &HTML::Entities::encode($syllabus{$field},'"&<>').  
            '</textarea><input type="submit" name="storesyl" value="'.  
    &mt('Save').'" />');  
       }  
   }  
        }         }
   
    if($allowed) {
    $r->print('<form method="post">');
    }
   
    if($target ne 'tex') #print Image
         {
    &Apache::lontemplate::start_ContentBox($r);
    &Apache::lontemplate::end_ContentBox($r);
    $r->print($image);
   
    }#End Print Image
   
    #Print Content eg. Contactinfo aboutme,...
    &Apache::lontemplate::print_aboutme_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
           #End Print Content
   
          if($target ne 'tex')#Begin Print RSS and portfiles
          {
    &print_portfiles_link($r,$is_course);
    if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){
    &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_ContentBoxSpecial');
    $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
    &Apache::lontemplate::print_end_template($r);
    }
   
          } #End  Print RSS and portfiles
   
   
        if ($allowed) {         if ($allowed) {
            if ($env{'form.popup'}) {             if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.                 $r->print('<input type="hidden" name="popup" value="'.
Line 335  sub handler { Line 397  sub handler {
    $r->print('</form>');     $r->print('</form>');
        }         }
        if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}         if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
     } else {      } else {
        $r->print('<p>'.&mt('No personal information provided').'.</p>');         $r->print('<p>'.&mt('No personal information provided').'.</p>');
     }      }    
   
     if ($target ne 'tex') {  
         &print_portfiles_link($r,$is_course);  
     }  
   
     if ($env{'request.course.id'}      if ($env{'request.course.id'}
  && &Apache::lonnet::allowed('srm',$env{'request.course.id'})   && &Apache::lonnet::allowed('srm',$env{'request.course.id'})
  && &in_course($cdom,$cnum)) {   && &in_course($cdom,$cnum)) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
     $r->print('<a name="coursecomment" />');     $r->print('<a name="coursecomment" />');
     $r->print('<hr /><h3>'.     &Apache::lontemplate::print_start_template($r,&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course'),'LC_ContentBoxSpecial');
       &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3><span class="LC_info">'.     $r->print('<span class="LC_info">');
       &mt('Shared by course faculty and staff').     $r->print(&mt('Shared by course faculty and staff').&Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"));
       &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").   $r->print('</span> <p>');
       '</span><br />');             &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
     &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);     $r->print('</p>');
     $r->print('<hr />');     &Apache::lontemplate::print_end_template($r);
     if (&Apache::lonnet::allowed('vsa',  
  $env{'request.course.id'}) ||  
  &Apache::lonnet::allowed('vsa',  
  $env{'request.course.id'}.'/'.  
  $env{'request.course.sec'})) {  
  $r->print(&Apache::loncommon::track_student_link  
   ('View recent activity by this student',  
    $cnum,$cdom).('&nbsp;'x2));  
     }  
     $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));  
  } else {   } else {
     $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');      $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\');
     &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);      &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
  }   }
     }      }
       $r->print('</div>');
       $r->print('</div>');
     if ($target ne 'tex') {      if ($target ne 'tex') {
         if ($env{'request.course.id'}) {  
             if (&Apache::lonnet::allowed('vgr', $env{'request.course.id'}) ||   
                 &Apache::lonnet::allowed('vgr', $env{'request.course.id'}.'/'.  
                                          $env{'request.course.sec'})) {  
                 $r->print('<hr />'.&Apache::loncommon::slot_reservations_link('Slot reservation history',$cnum,$cdom));  
             }  
         }  
         if ($env{'form.popup'}) {          if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');              $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
         }          }
Line 385  sub handler { Line 429  sub handler {
     } else {      } else {
  $r->print('\end{document}');   $r->print('\end{document}');
     }      }
   
   
   
     return OK;      return OK;
 }  }
   
Line 433  sub print_portfiles_link { Line 480  sub print_portfiles_link {
     my $query_string = &build_query_string();      my $query_string = &build_query_string();
     my $output;      my $output;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
         vpfi => 'Viewable portfolio files',          'vpfi' => 'Viewable portfolio files',
         vgpf => 'Viewable group portfolio files',          'vgpf' => 'Viewable group portfolio files',
         difl => 'Display file listing',          'difl' => 'Display file listing',
     );                           );
     if ($filecounts->{'both'} > 0) {      if ($filecounts->{'both'} > 0) {
         $output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';   $output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
    $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4><div class="LC_BoxPadding">';
   
    #$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.          $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
                    $query_string.'">'.$lt{'difl'}.                     $query_string.'">'.$lt{'difl'}.
                    '</a><br /><br />';                     '</a><br /><br />';
Line 462  sub print_portfiles_link { Line 512  sub print_portfiles_link {
     $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';      $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }          }
         $output .= '</ul>';          $output .= '</ul>';
    $output .='</p>';
    $output .='</div></div>';
     }      }
     $r->print($output);      $r->print($output);
     return;      return;
Line 470  sub print_portfiles_link { Line 522  sub print_portfiles_link {
 sub build_query_string {  sub build_query_string {
     my ($new_items) = @_;      my ($new_items) = @_;
     my $query_string;      my $query_string;
     my @formelements = ('register');       my @formelements = ('register');
     my $new = 0;      my $new = 0;
     if (ref($new_items) eq 'HASH') {      if (ref($new_items) eq 'HASH') {
         $new = 1;          $new = 1;
         if (!defined($new_items->{'forceedit'}) &&           if (!defined($new_items->{'forceedit'}) &&
             !defined($new_items->{'forcestudent'})) {              !defined($new_items->{'forcestudent'})) {
             push(@formelements,('forceedit','forcestudent'));              push(@formelements,('forceedit','forcestudent'));
         }          }
Line 507  sub display_portfolio_header { Line 559  sub display_portfolio_header {
   
     my $output;      my $output;
     if ($is_course) {      if ($is_course) {
         $output =           $output =
             &Apache::loncommon::start_page('Viewable group portfolio files',undef,              &Apache::loncommon::start_page('Viewable group portfolio files',undef,
                                             {'function' => $forcestudent,                                              {'function' => $forcestudent,
                                              'domain'   => $cdom,});                                               'domain'   => $cdom,});
Line 519  sub display_portfolio_header { Line 571  sub display_portfolio_header {
                                              'domain'   => $cdom,});                                               'domain'   => $cdom,});
         if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {          if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) {
             &Apache::lonhtmlcommon::add_breadcrumb              &Apache::lonhtmlcommon::add_breadcrumb
                 ({href  => "/adm/$cdom/$cnum/aboutme".$query_string,                  ({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
                   text  => &mt('Personal information Page - [_1]',$name),                    text=>&mt('Personal Information Page - [_1]',$name),
                   title => &mt('Go to personal information page for [_1]',$name)},                 {href=>"/adm/$cdom/$cnum/aboutme/portfolio",                    title=>&mt('Go to personal information page for [_1]', $name)},
                   text  => &mt('Viewable files - [_1]',$name),   {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
                   title => &mt('Viewable portfolio files for [_1]',$name)}                    text=>&mt('Viewable files - [_1]', $name),
                     title=>&mt('Viewable portfolio files for [_1]', $name)}
             );              );
             $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.'));              $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.'));
         }          }
Line 537  sub display_portfolio_files { Line 590  sub display_portfolio_files {
     my ($r,$is_course) = @_;      my ($r,$is_course) = @_;
     my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);      my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
          withoutpass => 'passphrase not required',          'withoutpass' => 'passphrase not required',
  withpass    => 'passphrase protected',          'withpass'    => 'passphrase protected',
  both        => 'all access types ',          'both'        => 'all access types ',
     );      );
   
     my $portaccess = 'withoutpass';      my $portaccess = 'withoutpass';
Line 587  sub portfolio_files { Line 640  sub portfolio_files {
                      };                       };
     my $current_permissions =      my $current_permissions =
  &Apache::lonnet::get_portfile_permissions($cdom,$cnum);   &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
     my %access_controls =       my %access_controls =
  &Apache::lonnet::get_access_controls($current_permissions);   &Apache::lonnet::get_access_controls($current_permissions);
     my $portaccess;      my $portaccess;
     if ($mode eq 'showlink') {      if ($mode eq 'showlink') {
Line 604  sub portfolio_files { Line 657  sub portfolio_files {
         my %files_by_group;          my %files_by_group;
         foreach my $filename (sort(keys(%access_controls))) {          foreach my $filename (sort(keys(%access_controls))) {
             my ($group,$path) = split('/',$filename,2);              my ($group,$path) = split('/',$filename,2);
             $files_by_group{$group}{$path} = $access_controls{$filename};               $files_by_group{$group}{$path} = $access_controls{$filename};
         }          }
         foreach my $group (sort(keys(%files_by_group))) {          foreach my $group (sort(keys(%files_by_group))) {
             my %fileshash;              my %fileshash;
Line 628  sub portfolio_files { Line 681  sub portfolio_files {
         } else {          } else {
             my $access_text;              my $access_text;
             if (ref($lt) eq 'HASH') {              if (ref($lt) eq 'HASH') {
                 $access_text = $lt->{$portaccess};                     $access_text = $lt->{$portaccess};
             }              }
             $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text));              $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text));
         }          }
Line 636  sub portfolio_files { Line 689  sub portfolio_files {
     return $filecounts;      return $filecounts;
 }  }
   
 {   {
     my $count=0;      my $count=0;
     sub portfolio_table_start {      sub portfolio_table_start {
  $count=0;   $count=0;
Line 725  sub parse_directory { Line 778  sub parse_directory {
             $output .= &parse_directory($r,$depth,$currhash->{$item},              $output .= &parse_directory($r,$depth,$currhash->{$item},
  $path.'/'.$item,$is_course,$group);   $path.'/'.$item,$is_course,$group);
         } else {          } else {
     my $file_name;       my $file_name;
     if ($currhash->{$item} =~ m|/([^/]+)$|) {      if ($currhash->{$item} =~ m|/([^/]+)$|) {
  $file_name = $1;   $file_name = $1;
     } else {      } else {
Line 736  sub parse_directory { Line 789  sub parse_directory {
             if ($is_course) {              if ($is_course) {
                 $url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group.                  $url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group.
                        '/portfolio/'.$currhash->{$item};                         '/portfolio/'.$currhash->{$item};
             } else {               } else {
         $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.          $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'.
        $currhash->{$item};         $currhash->{$item};
             }              }
Line 777  sub aboutme_access { Line 830  sub aboutme_access {
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (($cdom eq '') || ($cnum eq '')) {      if (($cdom eq '') || ($cnum eq '')) {
         my %coursehash = &Apache::lonnet::coursedescription($env{'request.course.id'});          my %coursehash = &coursedescription($env{'request.course.id'});
         $cdom = $coursehash{'domain'};          $cdom = $coursehash{'domain'};
         $cnum = $coursehash{'cnum'};          $cnum = $coursehash{'cnum'};
     }      }
     if ((&Apache::lonnet::allowed('srm',$privcheck)) ||       if ((&Apache::lonnet::allowed('srm',$privcheck)) ||
         (&Apache::lonnet::allowed('dff',$privcheck))) {          (&Apache::lonnet::allowed('dff',$privcheck))) {
         if (&in_course($uname,$udom,$cnum,$cdom)) {          if (&in_course($uname,$udom,$cnum,$cdom)) {
             return 1;              return 1;
Removed from v.1.70.4.3  
changed lines
  Added in v.1.126

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