--- loncom/interface/lonaboutme.pm	2008/12/02 23:35:21	1.76
+++ loncom/interface/lonaboutme.pm	2009/02/12 21:15:47	1.92
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.76 2008/12/02 23:35:21 harmsja Exp $
+# $Id: lonaboutme.pm,v 1.92 2009/02/12 21:15:47 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,6 +86,7 @@ use Apache::lonlocal;
 use Apache::lonmsgdisplay();
 use Apache::lontemplate;
 use HTML::Entities();
+use Image::Magick;
 
 sub handler {
     my $r = shift;
@@ -108,6 +109,30 @@ sub handler {
         $is_course = &Apache::lonnet::is_course($cdom,$cnum);
     }
 
+    my $candisplay = 1;
+    if (!$is_course) {
+        if ($action ne 'portfolio') {
+            $candisplay = &Apache::lonnet::usertools_access($cnum,$cdom,'aboutme');
+            if ((!$candisplay) && ($env{'request.course.id'})) {
+                $candisplay = &aboutme_access($cnum,$cdom);
+            }
+            if (!$candisplay) {
+                if ($target eq 'tex') {
+                    $r->print('\noindent{\large\textbf{'.&mt('No user home page available').'}}\\\\\\\\');
+                } else {
+                    $r->print(&Apache::loncommon::start_page("Personal Information"));
+                    $r->print('<h2>'.&mt('No user home page available') .'</h2>'.
+                              &mt('This is a result of one of the following:').'<ul>'.
+                              '<li>'.&mt('The administrator of this domain has disabled home page functionality for this specific user.').'</li>'.
+                              '<li>'.&mt('The domain has been configured to disable, by default, home page functionality for all users in the domain.').'</li>'.
+                              '</ul>');
+                    $r->print(&Apache::loncommon::end_page());
+                }
+                return OK;
+            }
+        }
+    }
+
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_contactinfo'   => 'Contact Information',
@@ -122,12 +147,20 @@ sub handler {
 # ----------------------------------------------- Available Portfolio file display 
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($r,$is_course);
-        my ($blocked,$blocktext) = 
-           &Apache::loncommon::blocking_status('port',$cnum,$cdom);
-        if (!$blocked) {
-            &display_portfolio_files($r,$is_course);
+        if ((!$is_course) && (!&Apache::lonnet::usertools_access($cnum,$cdom,'portfolio'))) {
+            $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
+                      &mt('This is a result of one of the following:').'<ul>'.
+                      '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
+                      '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
+                      '</ul>');
         } else {
-            $r->print($blocktext);
+            my ($blocked,$blocktext) = 
+                &Apache::loncommon::blocking_status('port',$cnum,$cdom);
+            if (!$blocked) {
+                &display_portfolio_files($r,$is_course);
+            } else {
+                $r->print($blocktext);
+            }
         }
         $r->print(&Apache::loncommon::end_page());
         return OK;
@@ -135,13 +168,16 @@ sub handler {
 
     if ($is_course) {
         if ($target ne 'tex') {
+	    my $brcrum = [{href=>"/adm/navmaps",text=>"Navigate Course Contents"},
+			  {href=>"/adm/aboutme",text=>"Course Information"}];
             my $start_page =
                 &Apache::loncommon::start_page(
                     "Course Information",
                      undef,
                      {'function' => $env{'forcestudent'},
                       'domain'   => $cdom,
-                      'force_register' => $env{'forceregister'},});
+                      'force_register' => $env{'forceregister'},
+                      'bread_crumbs' => $brcrum});
             $r->print($start_page);
             $r->print('<h2>'.&mt('Group files').'</h2>');
             &print_portfiles_link($r,$is_course);
@@ -169,6 +205,7 @@ sub handler {
         if ($env{'form.popup'}) {
             $args->{'no_nav_bar'} = 1;
         }
+	$args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information"}];
 	my $start_page = 
 	    &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
 	$r->print($start_page);
@@ -194,16 +231,16 @@ sub handler {
        my $privleged=$allowed=(($env{'user.name'} eq $cnum) && 
 			       ($env{'user.domain'} eq $cdom));
        if ($forcestudent or $target eq 'tex') { $allowed=0; }
- 
+	my $query_string; 
        if ($allowed) {
-           my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
+           $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
 	   $r->print('<p><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>');
+		     '</p><p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
+                     &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>'.
+		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p>');
        } elsif ($privleged && $target ne 'tex') {
-           my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
+           $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
 	   $r->print('<p><a href="'.$r->uri.$query_string.'">'.
 		     &mt('Edit').'</a></p>');
        }
@@ -214,7 +251,7 @@ sub handler {
 		  &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
 	      }
 	      $syllabus{'uploaded.photourl'}=
-                 &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme');
+                 &Apache::lonnet::userphotoupload('uploaddoc','aboutme');
  	  }
           $syllabus{'uploaded.lastmodified'}=time;
           &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
@@ -244,13 +281,18 @@ my $image;
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
-       # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos
+	 $r->print('<br />'.&mt('Last updated').': '.$lastmod);
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   $image=
-               qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
+	
+           #This call is to resize all "about me" 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'}" />};
+	   
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
@@ -258,35 +300,46 @@ my $image;
        }
        if ($allowed) {
            $r->print(
-	 '<form method="post">
-               <input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />
-          </form>'.
 	 '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<input type="file" name="uploaddoc" size="50" />'.
          '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
          '<input type="hidden" name="popup" value="'.$env{'form.popup'}.'" />'.
-	 '</form><form method="post">');
+	 '</form><form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" /> </form>
+');
 
        }
+
+	if($allowed) {
+		$r->print('<form method="post">');
+	}
+
+	&Apache::lontemplate::start_columnSection($r);
 	&Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
        if($target ne 'tex')
        {
-		
-		  &print_portfiles_link($r,$is_course);
-		$r->print('<div class="ContentBox">');
-		$r->print($image); 
-		$r->print('</div>');
-      		 $r->print('</div>');
-			$r->print('<p>');
-        
-
-	$r->print('Kontakt');
-	$r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
-
-
+		&Apache::lontemplate::start_ContentBox($r);
+		$r->print($image);
+		&Apache::lontemplate::send_message($r,$cnum,$cdom);
+		&Apache::lontemplate::end_ContentBox($r);
+		&Apache::lontemplate::end_columnSection($r);
+
+		&Apache::lontemplate::start_columnSection($r);
+		&Apache::lontemplate::start_ContentBox($r);
+		&print_portfiles_link($r,$is_course);
+		if(&Apache::lonrss::advertisefeeds($cnum,$cdom) ne ''){
+			$r->print('<div class="LC_ContentBoxSpecial">');
+			$r->print('<h4 class="LC_hcell">'.'RSS Feeds and Blogs'.'</h4>');
+			$r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom));
+			$r->print('</div>');
+		}
+		&Apache::lontemplate::end_ContentBox($r);
+		&Apache::lontemplate::end_columnSection($r);
+		if($allowed){
+			$r->print('<p><a href="'.$r->uri.$query_string.'">'.&mt('Show Public View').'</a>'.
+                        	&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+		}
        }
-
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -296,6 +349,7 @@ my $image;
        }
        if ($target ne 'tex') {$r->print('<br />');} else {$r->print('\\\\');}
     } else {
+	 &Apache::lontemplate::send_message($r,$cnum,$cdom);
        $r->print('<p>'.&mt('No personal information provided').'.</p>');
     }
 
@@ -325,7 +379,7 @@ my $image;
 			  ('View recent activity by this student',
 			   $cnum,$cdom).('&nbsp;'x2));
 	    }
-	    $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
+	    $r->print(&Apache::loncommon::noteswrapper(&mt('Add Records'),$cnum,$cdom));
 	} 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').'\\\\\\\\');
 	    &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom);
@@ -335,8 +389,6 @@ my $image;
         if ($env{'form.popup'}) {
             $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a>');
         }
-	$r->print('<br />'.&mt('Last updated').': '.$lastmod);
-
 	$r->print(&Apache::loncommon::end_page());
     } else {
 	$r->print('\end{document}');
@@ -397,7 +449,7 @@ sub print_portfiles_link {
                          difl => 'Display file listing',
              );                     
     if ($filecounts->{'both'} > 0) {
-	$output = '<div class="ContentBoxSpecial"><h4 class="hcell">';
+	$output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
 	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         
 	#$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
@@ -425,6 +477,7 @@ sub print_portfiles_link {
         }
         $output .= '</ul>';
 	$output .='</p>';
+	$output .='</div>';
     }
     $r->print($output);
     return;
@@ -718,7 +771,7 @@ sub parse_directory {
 		'&nbsp;'.$showname.'</a>';
 	    $output.='</td><td>';
 	    if ($have_meta) {
-		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Catalog Information').'" src="'.
+		$output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
 		&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
 		'" class="LC_icon" /></a>';
 	    }
@@ -728,5 +781,29 @@ sub parse_directory {
     return $output;
 }
 
+sub aboutme_access {
+    my ($uname,$udom) = @_;
+    my $privcheck = $env{'request.course.id'};
+    my $sec;
+    if ($env{'request.course.sec'} ne '') {
+        $sec = $env{'request.course.sec'};
+        $privcheck .= '/'.$sec;
+    }
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    if (($cdom eq '') || ($cnum eq '')) {
+        my %coursehash = &coursedescription($env{'request.course.id'});
+        $cdom = $coursehash{'domain'};
+        $cnum = $coursehash{'cnum'};
+    }
+    if ((&Apache::lonnet::allowed('srm',$privcheck)) || 
+        (&Apache::lonnet::allowed('dff',$privcheck))) {
+        if (&in_course($uname,$udom,$cnum,$cdom)) {
+            return 1;
+        }
+    }
+    return;
+}
+
 1;
 __END__