--- loncom/interface/lonaboutme.pm 2006/08/02 19:29:35 1.44
+++ loncom/interface/lonaboutme.pm 2006/08/07 19:51:54 1.50
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "About Me" Personal Information
#
-# $Id: lonaboutme.pm,v 1.44 2006/08/02 19:29:35 albertel Exp $
+# $Id: lonaboutme.pm,v 1.50 2006/08/07 19:51:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,7 +48,7 @@ sub handler {
if ($target eq 'tex') {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
- my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
+ my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri);
# Is this even a user?
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
&Apache::loncommon::simple_error_page($r,'No info',
@@ -62,18 +62,14 @@ sub handler {
'ccc_webreferences' => 'Web References');
# ------------------------------------------------------------ Get Query String
- &Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['forceedit','forcestudent','register','action']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['forceedit','forcestudent',
+ 'register']);
# ----------------------------------------------- Available Portfolio file display
- if (($target ne 'tex') && ($env{'form.action'} eq 'portfolio')) {
- my %lt = &Apache::lonlocal::texthash (
- withoutpass => 'passphrase not required',
- withpass => 'passphrase protected',
- both => 'all access types ',
- );
+ if (($target ne 'tex') && ($action eq 'portfolio')) {
&display_portfolio_header($r);
- &display_portfolio_files($r,\%lt);
+ &display_portfolio_files($r);
$r->print(&Apache::loncommon::end_page());
return OK;
}
@@ -93,7 +89,7 @@ sub handler {
my $start_page =
&Apache::loncommon::start_page("Personal Information",undef,
{'function' => $forcestudent,
- 'domain' => $cdom,
+ 'domain' => $cdom,
'force_register' =>
$forceregister,});
$r->print($start_page);
@@ -219,7 +215,7 @@ sub handler {
if ($allowed) {
$r->print('');
}
- if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');}
+ if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');}
} else {
$r->print(''.&mt('No personal information provided').'.
');
}
@@ -274,19 +270,19 @@ sub print_portfiles_link {
my ($r) = @_;
my ($cdom,$cnum,$name) = &aboutme_info($r);
my $filecounts = &portfolio_files($r,'showlink');
- my $query_string = &build_query_string({'action' => 'portfolio',});
+ my $query_string = &build_query_string();
my $output;
if ($filecounts->{'both'} > 0) {
$output = &mt('Viewable portfolio files
');
- $output .= ''.&mt('Display file listing').
'
';
- $output .= &mt('A total of [_1] portfolio files owned by [_2] are available for viewing.',$filecounts->{'both'},$name).'';
+ $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).'';
if ($filecounts->{'withoutpass'}) {
- $output .= '- '.&mt('[_1] files are either publicly accessible, or directly available to you because of your current role, domain and/or username.',$filecounts->{'withoutpass'}).'
';
+ $output .= '- '.&mt('[quant,_1,file] are publicly accessible.',$filecounts->{'withoutpass'}).'
';
}
if ($filecounts->{'withpass'}) {
- $output .= '- '.&mt('[_1] files will be available after you have entered a passphrase set for each specific file.',$filecounts->{'withpass'}).'
';
+ $output .= '- '.&mt('[quant,_1,file] require a passphrase for access.',$filecounts->{'withpass'}).'
';
}
$output .= '
';
}
@@ -298,9 +294,9 @@ sub build_query_string {
my ($new_items) = @_;
my $query_string;
my @formelements = ('register');
- my $nonew = 1;
+ my $new = 0;
if (ref($new_items) eq 'HASH') {
- $nonew = 0;
+ $new = 1;
if (!defined($new_items->{'forceedit'}) &&
!defined($new_items->{'forcestudent'})) {
push(@formelements,('forceedit','forcestudent'));
@@ -310,12 +306,12 @@ sub build_query_string {
}
foreach my $element (@formelements) {
if (exists($env{'form.'.$element})) {
- if (($nonew) || (!defined($new_items->{$element}))) {
+ if ((!$new) || (!defined($new_items->{$element}))) {
$query_string .= '&'.$element.'='.$env{'form.'.$element};
}
}
}
- if (!$nonew) {
+ if ($new) {
foreach my $key (keys(%{$new_items})) {
$query_string .= '&'.$key.'='.$new_items->{$key};
}
@@ -339,7 +335,7 @@ sub display_portfolio_header {
({href=>"/adm/$cdom/$cnum/aboutme".$query_string,
text=>"Personal information - $name",
title=>"Go to personal information page for $name"},
- {href=>"/adm/$cdom/$cnum/aboutme?action=portfolio",
+ {href=>"/adm/$cdom/$cnum/aboutme/portfolio",
text=>"Viewable files - $name",
title=>"Viewable portfolio files for $name"}
);
@@ -350,29 +346,34 @@ sub display_portfolio_header {
}
sub display_portfolio_files {
- my ($r,$lt) = @_;
- my ($cdom,$cnum,$name) = aboutme_info($r);
+ my ($r) = @_;
+ my ($cdom,$cnum,$name) = &aboutme_info($r);
+ my %lt = ( withoutpass => 'passphrase not required',
+ withpass => 'passphrase protected',
+ both => 'all access types ',);
+ %lt = &Apache::lonlocal::texthash(%lt);
+
my $portaccess = 'withoutpass';
if (exists($env{'form.portaccess'})) {
$portaccess = $env{'form.portaccess'};
}
- my $output = '