--- loncom/interface/lonaboutme.pm	2008/12/17 23:05:11	1.70.2.2
+++ loncom/interface/lonaboutme.pm	2008/12/02 23:35:21	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.70.2.2 2008/12/17 23:05:11 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.76 2008/12/02 23:35:21 harmsja Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,53 @@
 # http://www.lon-capa.org/
 #
 
+=pod
+
+=head1 NAME
+
+pache::lonaboutme
+
+=head1 SYNOPSIS
+
+(empty)
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+(empty)
+
+
+=head1 SUBROUTINES
+
+=over
+
+=item handler()
+
+=item in_course()
+
+=item aboutme_info()
+
+=item print_portfiles_link()
+
+=item build_query_string()
+
+=item display_portfolio_header()
+
+=item display_portfolio_files()
+
+=item portfolio_files()
+
+=item build_hierarchy()
+
+=item parse_directory()
+
+=back
+
+=cut
+
+
 package Apache::lonaboutme;
 
 use strict;
@@ -37,6 +84,7 @@ use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
 use Apache::lonmsgdisplay();
+use Apache::lontemplate;
 use HTML::Entities();
 
 sub handler {
@@ -60,30 +108,6 @@ 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',
@@ -98,23 +122,15 @@ sub handler {
 # ----------------------------------------------- Available Portfolio file display 
     if (($target ne 'tex') && ($action eq 'portfolio')) {
         &display_portfolio_header($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>');
+        my ($blocked,$blocktext) = 
+           &Apache::loncommon::blocking_status('port',$cnum,$cdom);
+        if (!$blocked) {
+            &display_portfolio_files($r,$is_course);
         } else {
-            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;
+            $r->print($blocktext);
         }
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
     }
 
     if ($is_course) {
@@ -156,7 +172,7 @@ sub handler {
 	my $start_page = 
 	    &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
 	$r->print($start_page);
-	$r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
+	$r->print('<h2>'.&Apache::loncommon::plainname($cnum,$cdom).'</h2>');
     } else {
 	$r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
     }
@@ -166,8 +182,7 @@ sub handler {
          '&quot;</h2>');
     }
     if ($target ne 'tex') {
-	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
-		  '<p>'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'</p>'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+	$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');#OLD SendMessage POS
     } else {
 	$r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
@@ -189,8 +204,8 @@ sub handler {
 		     &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>');
+	   $r->print('<p><a href="'.$r->uri.$query_string.'">'.
+		     &mt('Edit').'</a></p>');
        }
       if (($env{'form.uploaddoc.filename'}) &&
           ($env{'form.storeupl'}) && ($allowed)) {
@@ -223,20 +238,23 @@ sub handler {
            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
        }
 
+my $lastmod;
+my $image; 
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-       my $lastmod=$syllabus{'uploaded.lastmodified'};
+       $lastmod=$syllabus{'uploaded.lastmodified'};
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
-       $r->print(&mt('Last updated').': '.$lastmod);
+       # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos
        if ($syllabus{'uploaded.photourl'}) {
 	   &Apache::lonnet::allowuploaded('/adm/aboutme',
 					  $syllabus{'uploaded.photourl'});
-	   my $image=
-               qq{<img src="$syllabus{'uploaded.photourl'}" align="right" />};
+	   $image=
+               qq{<img name="userPhoto" src="$syllabus{'uploaded.photourl'}" />};
+
 	   if ($target eq 'tex') {
 	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
 	   }
-	   $r->print($image);
+	  # $r->print($image); #Print old Image
        }
        if ($allowed) {
            $r->print(
@@ -251,31 +269,24 @@ sub handler {
 	 '</form><form method="post">');
 
        }
-       foreach my $field (sort(keys(%syllabusfields))) {
-          if (($syllabus{$field}) || ($allowed)) {
-              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').'" />');
-	      }
-	  }
+	&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));
+
+
        }
+
        if ($allowed) {
            if ($env{'form.popup'}) {
                $r->print('<input type="hidden" name="popup" value="'.
@@ -289,7 +300,8 @@ sub handler {
     }
 
     if ($target ne 'tex') {
-        &print_portfiles_link($r,$is_course);
+        # &print_portfiles_link($r,$is_course); #old Print files
+
     }
 
     if ($env{'request.course.id'}
@@ -323,10 +335,15 @@ sub handler {
         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}');
     }
+
+  
+	
     return OK;
 }
 
@@ -380,7 +397,10 @@ sub print_portfiles_link {
                          difl => 'Display file listing',
              );                     
     if ($filecounts->{'both'} > 0) {
-        $output = '<h3>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h3>';
+	$output = '<div class="ContentBoxSpecial"><h4 class="hcell">';
+	$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
+        
+	#$output = '<h4>'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
         $output .= '<a href="/adm/'.$cdom.'/'.$cnum.'/aboutme/portfolio'.
                    $query_string.'">'.$lt{'difl'}.
                    '</a><br /><br />';
@@ -404,6 +424,7 @@ sub print_portfiles_link {
 	    $output .= '<li>'.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'</li>';
         }
         $output .= '</ul>';
+	$output .='</p>';
     }
     $r->print($output);
     return;
@@ -707,29 +728,5 @@ 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__