--- loncom/interface/lonaboutme.pm 2008/12/08 23:13:52 1.77
+++ loncom/interface/lonaboutme.pm 2009/04/03 15:22:22 1.123
@@ -1,7 +1,7 @@
# The LearningOnline Network
-# "About Me" Personal Information
+# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.77 2008/12/08 23:13:52 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.123 2009/04/03 15:22:22 amueller 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;
@@ -110,30 +111,32 @@ sub handler {
my $candisplay = 1;
if (!$is_course) {
- $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('
'.&mt('No user home page available') .'
'.
- &mt('This is a result of one of the following:').''.
- '- '.&mt('The administrator of this domain has disabled home page functionality for this specific user.').'
'.
- '- '.&mt('The domain has been configured to disable, by default, home page functionality for all users in the domain.').'
'.
- '
');
- $r->print(&Apache::loncommon::end_page());
+ 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 personal information page available').'}}\\\\\\\\');
+ } else {
+ $r->print(&Apache::loncommon::start_page("Personal Information Page"));
+ $r->print(''.&mt('No user personal information page available') .'
'.
+ &mt('This is a result of one of the following:').''.
+ '- '.&mt('The administrator of this domain has disabled personal information page functionality for this specific user.').'
'.
+ '- '.&mt('The domain has been configured to disable, by default, personal information page functionality for all users in the domain.').'
'.
+ '
');
+ $r->print(&Apache::loncommon::end_page());
+ }
+ return OK;
}
- return OK;
}
}
# --------------------------------------------------------- The syllabus fields
my %syllabusfields=&Apache::lonlocal::texthash(
'aaa_contactinfo' => 'Contact Information',
- 'bbb_aboutme' => 'About Me',
+ 'bbb_aboutme' => 'Personal Information',
'ccc_webreferences' => 'Web References');
# ------------------------------------------------------------ Get Query String
@@ -144,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(''.&mt('No user portfolio available') .'
'.
+ &mt('This is a result of one of the following:').''.
+ '- '.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'
'.
+ '- '.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'
'.
+ '
');
} 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;
@@ -157,15 +168,18 @@ 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(''.&mt('Group files').'
');
+ $r->print(''.&mt('Group Portfolio').'
');
&print_portfiles_link($r,$is_course);
$r->print(&Apache::loncommon::end_page());
}
@@ -180,9 +194,18 @@ sub handler {
if ($forcestudent eq '') {
$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
- my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
+
if ($target ne 'tex') {
my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
my $args = {'function' => $forcestudent,
@@ -191,44 +214,91 @@ sub handler {
if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;
}
+ $args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information Page"}];
my $start_page =
- &Apache::loncommon::start_page("Personal Information",$rss_link,$args);
+ &Apache::loncommon::start_page("Personal Data",$rss_link,$args);
$r->print($start_page);
- $r->print(''.&Apache::loncommon::plainname($cnum,$cdom).'
');
- } else {
- $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\');
- }
- if ($courseenv{'nickname'}) {
- $r->print(
- '"'.$courseenv{'nickname'}.
- '"
');
- }
- if ($target ne 'tex') {
- $r->print(''.&Apache::lonnet::domain($cdom,'description').'
');#OLD SendMessage POS
- } else {
- $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\');
- }
- my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
- my $allowed=0;
+
+ }
+
+#Print Privacy Note
+ if ($allowed) {
+ $r->print(''
+ .''.&mt('Privacy Note:').' '
+ .&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.')
+ .'
'
+ );
+ }
+
+#Print last modified
+ my $lastmod;
+ if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
+ $lastmod=$syllabus{'uploaded.lastmodified'};
+ $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
+ $r->print('');
+ $r->print(&mt('Last updated').': '.$lastmod . '');
+ $r->print('
');
+}
+#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(
+ ''.&mt('Show Public View').''
+ .&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(
+ ''. &mt('Edit').''));
+ }
+ $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('');
+ $r->print('
'.&Apache::loncommon::plainname($cnum,$cdom).'
');
+ $r->print('
');
+ if ($courseenv{'nickname'}) {
+ $r->print('"'.$courseenv{'nickname'}.'"
');
+ }
+ $r->print(''.&Apache::lonnet::domain($cdom,'description').'
');
+ }
+ 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?
- my $privleged=$allowed=(($env{'user.name'} eq $cnum) &&
- ($env{'user.domain'} eq $cdom));
- if ($forcestudent or $target eq 'tex') { $allowed=0; }
-
- if ($allowed) {
- my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}});
- $r->print(''.&mt('Privacy Note').': '.
- &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.').
- '
'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).''.&mt('Show Public View').''.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'
');
- } elsif ($privleged && $target ne 'tex') {
- my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}});
- $r->print(''.
- &mt('Edit').'
');
- }
+
+ my $query_string;
+
if (($env{'form.uploaddoc.filename'}) &&
($env{'form.storeupl'}) && ($allowed)) {
if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
@@ -236,7 +306,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);
@@ -260,55 +330,67 @@ sub handler {
&Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
}
-my $lastmod;
my $image;
# ---------------------------------------------------------------- Get syllabus
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
if ($syllabus{'uploaded.photourl'}) {
&Apache::lonnet::allowuploaded('/adm/aboutme',
$syllabus{'uploaded.photourl'});
- $image=
- qq{
};
+
+ #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{
};
+
if ($target eq 'tex') {
$image=&Apache::lonxml::xmlparse($r,'tex',$image);
}
- # $r->print($image); #Print old Image
+
}
+
if ($allowed) {
$r->print(
- ''.
'');
+ if ($syllabus{'uploaded.photourl'}) {
+ $r->print('')
+ }
+ $r->print('');
}
- &Apache::lontemplate::print_content_template($r,$allowed,$target,\%syllabusfields,\%syllabus);
- if($target ne 'tex')
- {
-
- &print_portfiles_link($r,$is_course);
- $r->print('
');
- $r->print($image);
- $r->print('
');
- $r->print('
');
- $r->print('');
-
- $r->print('Kontakt');
- $r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'
'.&Apache::lonrss::advertisefeeds($cnum,$cdom));
+ if($allowed) {
+ $r->print('