--- loncom/interface/portfolio.pm 2010/11/28 00:04:05 1.231
+++ loncom/interface/portfolio.pm 2013/08/13 17:38:19 1.249
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.231 2010/11/28 00:04:05 raeburn Exp $
+# $Id: portfolio.pm,v 1.249 2013/08/13 17:38:19 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -63,7 +63,7 @@ sub group_form_data {
return $output;
}
-# receives a file name and path stub from username/userfiles/portfolio/
+# receives a filename and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
my ($url, $anchor_fields, $inner_text) = @_;
@@ -98,7 +98,7 @@ sub display_common {
my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
- $r->print(&display_usage($group));
+ $r->print(&display_portfolio_usage($group,$help_portfolio));
my $parse_check;
if (!&suppress_embed_prompt()) {
$parse_check = <<"END";
@@ -112,7 +112,6 @@ sub display_common {
END
}
- $r->print('<div>'.$help_portfolio);
# Upload File
$r->print('<div class="LC_left_float">'
.'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
@@ -122,6 +121,7 @@ END
.'<input name="uploaddoc" type="file" />'
.'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
.'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+ .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
.'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
.'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
.'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'
@@ -139,6 +139,7 @@ END
.'<input name="newdir" type="text" />'.$groupitem
.'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
.'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+ .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
.'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
.'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
.'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'
@@ -147,7 +148,6 @@ END
.'</form>'
.'</div>'
);
- $r->print('</div>');
} # end "if can_upload"
my @tree = split (/\//,$current_path);
@@ -155,6 +155,7 @@ END
'selectfile' => $port_path,
'currentpath' => '/',
'mode' => $env{"form.mode"},
+ 'symb' => $env{"form.symb"},
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
@@ -168,6 +169,7 @@ END
'selectfile' => $tree[$i],
'currentpath' => $newCurrentPath,
'mode' => $env{"form.mode"},
+ 'symb' => $env{"form.symb"},
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
@@ -177,53 +179,28 @@ END
$r->print('</span>');
$r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
&Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
- $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"}.&group_args());
+ $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"}.'&symb='.$env{'form.symb'}.&group_args());
$r->print('">'.
&Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
'this.form.submit();'));
$r->print("</form>");
}
-sub display_usage {
- my ($group) = @_;
+sub display_portfolio_usage {
+ my ($group,$helpitem) = @_;
my $disk_quota = &get_quota($group);
my $getpropath = 1;
my $portfolio_root = &get_portfolio_root();
my ($uname,$udom) = &get_name_dom($group);
my $current_disk_usage =
&Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
- my $usage = $current_disk_usage/1000;
- my $quota = $disk_quota/1000;
- my $percent;
- if ($disk_quota == 0) {
- $percent = 100.0;
- } else {
- $percent = 100*($current_disk_usage/$disk_quota);
- }
- $usage = sprintf("%.2f",$usage);
- $quota = sprintf("%.2f",$quota);
- $percent = sprintf("%.0f",$percent);
- my ($color,$cssclass);
- if ($percent <= 60) {
- $color = '#00A000';
- } elsif ($percent > 60 && $percent < 90) {
- $color = '#FFD300';
- $cssclass = 'class="LC_warning"';
- } elsif( $percent >= 90) {
- $color = '#FF0000';
- $cssclass = 'class="LC_error"';
- }
- my $prog_width = $percent;
- if ($prog_width > 100) {
- $prog_width = 100;
- }
- my $disk_meter = '
- <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
-' <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
-' <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
-' </div>'."\n".
-' </div>';
- return &Apache::loncommon::head_subbox($disk_meter);
+ return &Apache::loncommon::head_subbox(
+ '<div style="float:right;padding-top:0;margin-top;0">'
+ .$helpitem
+ .'</div>'
+ .'<div>'
+ .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
+ .'</div>');
}
sub display_directory_line {
@@ -379,22 +356,24 @@ sub display_directory {
my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
my @dir_lines;
my %versioned;
- foreach my $dir_line (sort
- {
- my ($afile)=split('&',$a,2);
- my ($bfile)=split('&',$b,2);
- return (lc($afile) cmp lc($bfile));
- } (@$dir_list)) {
- my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);
- $filename =~ s/\s+$//;
- my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
- if ($version) {
- my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
- push(@{ $versioned{$fullpath} },
- [$filename,$dom,$testdir,$size,$mtime,$obs,]);
- } else {
- push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
- }
+ if (ref($dir_list) eq 'ARRAY') {
+ foreach my $dir_line (sort
+ {
+ my ($afile)=split('&',$a,2);
+ my ($bfile)=split('&',$b,2);
+ return (lc($afile) cmp lc($bfile));
+ } (@{$dir_list})) {
+ my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);
+ $filename =~ s/\s+$//;
+ my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
+ if ($version) {
+ my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
+ push(@{ $versioned{$fullpath} },
+ [$filename,$dom,$testdir,$size,$mtime,$obs,]);
+ } else {
+ push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
+ }
+ }
}
my $zerobyte;
foreach my $dir_line (@dir_lines) {
@@ -445,6 +424,7 @@ sub display_directory {
'selectfile' => $filename.'/',
'currentpath' => $current_path.$filename.'/',
'mode' => $env{"form.mode"},
+ 'symb' => $env{"form.symb"},
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
@@ -552,10 +532,11 @@ sub display_directory {
$r->print('
<input type="hidden" name="continue" value="true" />
<input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
+ <input type="hidden" name="symb" value="'.$env{'form.symb'}.'" />
<input type="hidden" name="mode" value="selectfile" />
<p>
<input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
- <input type="button" name="doit" onClick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
+ <input type="button" name="doit" onclick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
</p>
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>');
@@ -631,17 +612,19 @@ sub display_file {
}
sub done {
- my ($message,$url)=@_;
- unless (defined $message) {
- $message='Done';
+ my ($linktext,$url)=@_;
+ unless (defined($linktext)) {
+ $linktext='Return to directory';
}
my %anchor_fields = (
'showversions' => $env{'form.showversions'},
'currentpath' => $env{'form.currentpath'},
'fieldname' => $env{'form.fieldname'},
+ 'symb' => $env{'form.symb'},
'mode' => $env{'form.mode'}
);
- my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';
+ my $result = &Apache::lonhtmlcommon::actionbox(
+ [&make_anchor($url,\%anchor_fields,&mt($linktext))]);
return $result;
}
@@ -653,15 +636,19 @@ sub delete {
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my ($uname,$udom) = &get_name_dom($group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $r->print(&mt('The file is locked and cannot be deleted.').'<br />');
- $r->print(&done('Back',$url));
+ $r->print(
+ '<p class="LC_warning">'
+ .&mt('The file is locked and cannot be deleted.')
+ .'</p>'
+ .&done(undef,$url)
+ );
} else {
if (scalar(@files)) {
&open_form($r,$url);
$r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');
&close_form($r,$url);
} else {
- $r->print("No file was checked to delete.<br />");
+ $r->print('<p class="LC_warning">'.&mt('No file was checked to delete.').'</p>');
$r->print(&done(undef,$url));
}
}
@@ -675,18 +662,21 @@ sub delete_confirmed {
my $port_path = &get_port_path();
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
+ my @msg;
foreach my $delete_file (@files) {
- $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
- $env{'form.currentpath'}.
- $delete_file);
+ $result =
+ &Apache::lonnet::removeuserfile(
+ $uname,$udom,$port_path.
+ $env{'form.currentpath'}.
+ $delete_file);
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'
- .&mt('An error occurred ([_1]) while trying to delete [_2].'
- ,$result,&display_file(undef, $delete_file))
- .'</span><br /><br />');
- } else {
- $r->print(&mt('File: [_1] deleted.',
- &display_file(undef,$delete_file)));
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to delete [_2].'
+ ,$result,&display_file(undef, $delete_file)),1));
+ } else {
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('File: [_1] deleted.'
+ ,&display_file(undef,$delete_file))));
my $file_name = $env{'form.currentpath'}.$delete_file;
$file_name = &prepend_group($file_name);
my %access_controls =
@@ -702,23 +692,24 @@ sub delete_confirmed {
&Apache::lonnet::modify_access_controls($file_name,\%changes,
$udom,$uname);
if ($outcome ne 'ok') {
- $r->print('<br />'.&mt("An error occurred ([_1]) while ".
- "trying to delete access controls for the file.",$outcome).
- '</span><br /><br />');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while '.
+ 'trying to delete access controls for the file.',$outcome),1));
} else {
if ($deloutcome eq 'ok') {
- $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');
+ push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message?
} else {
- $r->print('<span class="LC_error">'.'<br />'.
- &mt("An error occurred ([_1]) while ".
- "trying to delete access controls for the file.",$deloutcome).
- '</span><br /><br />');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while '.
+ 'trying to delete access controls for the file.'
+ ,$deloutcome),1));
}
}
}
}
}
}
+ $r->print(&Apache::loncommon::confirmwrapper(join('<br />',@msg)));
$r->print(&done(undef,$url));
}
@@ -738,12 +729,15 @@ sub delete_dir_confirmed {
my $port_path = &get_port_path();
my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
-
+
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'
- .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
- ,$result,$directory_name)
- .'</span><br />');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
+ ,$result,$directory_name),1)));
+ $r->print(&done(undef,$url));
+ return;
} else {
# now remove from recent
&Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
@@ -754,6 +748,10 @@ sub delete_dir_confirmed {
}
$env{'form.currentpath'} = $directory_name;
}
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Directory successfully deleted'))));
$r->print(&done(undef,$url));
}
@@ -763,7 +761,11 @@ sub rename {
my ($uname,$udom) = &get_name_dom($group);
$file_name = &prepend_group($file_name);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $r->print("The file is locked and cannot be renamed.<br />");
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('The file is locked and cannot be renamed.')
+ .'</p>'
+ );
$r->print(&done(undef,$url));
} else {
&open_form($r,$url);
@@ -778,13 +780,32 @@ sub rename_confirmed {
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
+
+ # Display warning in case of filename cleaning has changed the filename
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print(
+ '<p><span class="LC_warning">'
+ .&mt('Invalid characters')
+ .'</span><br />'
+ .&mt('The new filename was changed from [_1] to [_2].'
+ ,'<span class="LC_filename">'.&display_file('',$env{'form.filenewname'}).'</span>'
+ ,'<span class="LC_filename">'.&display_file('',$filenewname).'</span>')
+ .'</p>'
+ );
+
+ }
+
+ # Filename empty?
if ($filenewname eq '') {
- $r->print('<span class="LC_error">'.
- &mt("Error: no valid filename was provided to rename to.").
- '</span><br />');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no valid filename was provided to rename to.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
+ # Rename the file
my $chg_access;
my $result=
&Apache::lonnet::renameuserfile($uname,$udom,
@@ -793,18 +814,20 @@ sub rename_confirmed {
if ($result eq 'ok') {
$chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
} else {
- $r->print('<span class="LC_error">'.
- &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
- ,$result,&display_file(),&display_file('',$filenewname))
- .'</span><br />');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
+ ,$result,&display_file(),&display_file('',$filenewname))
+ ,1)));
+ $r->print(&done(undef,$url));
return;
}
- if ($filenewname ne $env{'form.filenewname'}) {
- $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",
- '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
- '<strong>'.&display_file('',$filenewname).'</strong>'));
- }
$r->print($chg_access);
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('File successfully renamed'))));
$r->print(&done(undef,$url));
}
@@ -869,7 +892,13 @@ sub display_access {
my $aclcount = keys(%access_controls);
my ($header,$info);
if ($action eq 'chgaccess') {
- $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+ $header =
+ '<h2>'
+ .&mt('Allowing others to retrieve file: [_1]'
+ ,'<span class="LC_filename">'
+ .$port_path.$env{'form.currentpath'}.$env{'form.access'}
+ .'</span>')
+ .'</h2>';
$info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
$info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
$info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
@@ -972,11 +1001,11 @@ sub build_access_summary {
$showstart = &mt('Deleted');
$showend = $showstart;
} else {
- $showstart = localtime($start);
+ $showstart = &Apache::lonlocal::locallocaltime($start);
if ($end == 0) {
$showend = &mt('No end date');
} else {
- $showend = localtime($end);
+ $showend = &Apache::lonlocal::locallocaltime($end);
}
}
$r->print('<td>'.&mt($scope_desc{$scope}));
@@ -1074,8 +1103,8 @@ sub update_access {
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
- $port_path.$file_name).'</h3>'."\n");
+ $r->print('<h2>'.&mt('Allowing others to retrieve file: [_1]',
+ '<span class="LC_filename">'.$port_path.$file_name.'</span>').'</h2>'."\n");
$file_name = &prepend_group($file_name);
my ($uname,$udom) = &get_name_dom($group);
my ($errors,$outcome,$deloutcome,$new_values,$translation);
@@ -1150,24 +1179,29 @@ sub update_access {
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
&open_form($r,$url);
- my %showtypes = &Apache::lonlocal::texthash (
+ my %showtypes = (
course => 'course/community',
domains => 'domain',
users => 'user',
);
foreach my $newitem (@types) {
- if ($env{'form.new'.$newitem} > 0) {
- $r->print('<br />'.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]','<b>'.$showtypes{$newitem},'</b>','<b>'.$env{'form.currentpath'}.$env{'form.selectfile'}.'</b>').'<br /><br />');
- $firstitem = $totalnew;
- $lastitem = $totalnew + $env{'form.new'.$newitem};
- $totalnew = $lastitem;
- my @numbers;
- for (my $i=$firstitem; $i<$lastitem; $i++) {
- push (@numbers,$i);
- }
- &display_access_row($r,$status,$newitem,\@numbers,
- $access_controls{$file_name},$now,$then);
+ next if ($env{'form.new'.$newitem} <= 0);
+ $r->print(
+ '<p>'
+ .&mt('Add new [_1]'.$showtypes{$newitem}.'-based[_2] access control for portfolio file: [_3]',
+ '<b>','</b>',
+ '<span class="LC_filename"><b>'
+ .$env{'form.currentpath'}.$env{'form.selectfile'}.'</b></span>')
+ .'</p>');
+ $firstitem = $totalnew;
+ $lastitem = $totalnew + $env{'form.new'.$newitem};
+ $totalnew = $lastitem;
+ my @numbers;
+ for (my $i=$firstitem; $i<$lastitem; $i++) {
+ push(@numbers,$i);
}
+ &display_access_row($r,$status,$newitem,\@numbers,
+ $access_controls{$file_name},$now,$then);
}
&close_form($r,$url);
} else {
@@ -1175,9 +1209,11 @@ sub update_access {
'currentpath' => $env{'form.currentpath'},
'access' => $env{'form.selectfile'}
);
- $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
+ my @actions;
+ push(@actions, &make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
delete $anchor_fields{'access'};
- $r->print(' '.&make_anchor($url,\%anchor_fields,&mt('Return to directory')));
+ push(@actions, &make_anchor($url,\%anchor_fields,&mt('Return to directory')));
+ $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
}
return;
}
@@ -1434,19 +1470,14 @@ sub acl_status {
sub access_element {
my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;
- my %typetext = &Apache::lonlocal::texthash(
+ my %typetext = (
domains => 'Domain',
users => 'User',
course => 'Course/Community'
);
- $r->print('<h3>'.&mt('[_1]-based conditional access: ',$typetext{$type}));
+ $r->print('<h3>'.&mt($typetext{$type}.'-based conditional access:').' ');
if ($$acl_count{$type}) {
- $r->print($$acl_count{$type}.' ');
- if ($$acl_count{$type} > 1) {
- $r->print(&mt('conditions'));
- } else {
- $r->print(&mt('condition'));
- }
+ $r->print(&mt('[quant,_1,condition]',$$acl_count{$type}));
} else {
$r->print(&mt('Off'));
}
@@ -1457,13 +1488,16 @@ sub access_element {
sub display_access_row {
my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
- my $showtype;
+ my ($showtype, $infotype);
if ($type eq 'course') {
$showtype = &mt('Courses/Communities');
+ $infotype = 'Course/Community';
} elsif ($type eq 'domains') {
$showtype = &mt('Domains');
+ $infotype = 'Domain';
} elsif ($type eq 'users') {
$showtype = &mt('Users');
+ $infotype = 'User';
}
if (@{$items} > 0) {
my @all_doms;
@@ -1501,8 +1535,12 @@ sub display_access_row {
}
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('No [_1]-based conditions defined.',$showtype).'<br />'.
- &additional_item($type));
+ $r->print(
+ '<p class="LC_info">'
+ .&mt('No '.$infotype.'-based conditions defined')
+ .'</p>'
+ .&additional_item($type)
+ );
}
return;
}
@@ -1510,6 +1548,7 @@ sub display_access_row {
sub course_js {
return qq|
<script type="text/javascript">
+// <![CDATA[
function setRoleOptions(num,roleid,cdom,cnum,type) {
updateIndexNum = getIndexByValue('update',num);
var addItem = 'add_role_'+num;
@@ -1549,6 +1588,7 @@ function getIndexByValue(name,value) {
return -1;
}
+// ]]>
</script>
|;
}
@@ -1601,7 +1641,7 @@ sub course_row {
}
$r->print('<br />'.&mt('Add a roles-based condition').
' <input type="checkbox" name="add_role_'.
- $num.'" onClick="javascript:setRoleOptions('."'$num',
+ $num.'" onclick="javascript:setRoleOptions('."'$num',
'$max_id','$content->{'domain'}','$content->{'number'}',
'$showtype'".')" value="" />');
$newrole_id = $max_id;
@@ -1666,14 +1706,16 @@ sub additional_item {
my ($type) = @_;
my $showtype;
if ($type eq 'course') {
- $showtype = &mt('course/community');
+ $showtype = 'course/community';
} elsif ($type eq 'domains') {
- $showtype = &mt('domains');
+ $showtype = 'domain';
} elsif ($type eq 'users') {
- $showtype = &mt('users');
+ $showtype = 'user';
}
- my $output = &mt('Add new [_1] condition(s)?',$showtype).' '.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
- return $output;
+ return
+ &mt('Add new '.$showtype.'-based condition(s)?')
+ .' '.&mt('Number to add: ')
+ .'<input type="text" name="new'.$type.'" size="3" value="0" />';
}
sub actionbox {
@@ -1940,10 +1982,14 @@ sub upload {
my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'});
my ($state,$msg);
if ($fname eq '') {
- my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
'so after eliminating special characters there was nothing left.',
- '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>');
- $r->print($msg.&done('Back',$url));
+ '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>'),1)));
+
+ $r->print(&done(undef,$url));
return;
}
my $disk_quota = &get_quota($group);
@@ -1960,7 +2006,7 @@ sub upload {
if ($state eq 'will_exceed_quota'
|| $state eq 'file_locked'
|| $state eq 'zero_bytes') {
- $r->print($msg.&done('Back',$url));
+ $r->print($msg.&done(undef,$url));
return;
}
@@ -2039,31 +2085,40 @@ function confirmOverwrite() {
}
// ]]>
</script>
+<p>
$msg
-<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
-<span class="LC_nobreak">$lt{'over'}
+</p>
+<form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
+<p class="LC_nobreak">$lt{'over'}
<label><input type="radio" name="overwrite" value="1" />
$lt{'yes'}</label>
-<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></span>
+<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></p>
+<p>
<input type="hidden" name="action" value="cancel_overwrite" />
<input type="hidden" name="filename" value="$showfname" />
<input type="hidden" name="timestamp" value="$timestamp" />
$hidden
$parserflag
$group_elem
-<br /><br />
<input type="submit" name="process" value="$lt{'cont'}" />
-</form></div>
+</p>
+</form>
END
} else {
- $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
- ,$result,&display_file(undef,$fname)).'</span><br />');
- $r->print(&done('Back',$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to upload [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ $r->print(&done(undef,$url));
}
} elsif ($result !~ m|^/uploaded/|) {
- $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
- ,$result,&display_file(undef,$fname)).'</span><br />');
- $r->print(&done('Back',$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to upload [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ $r->print(&done(undef,$url));
} else {
if (!&suppress_embed_prompt()) {
if ($mimetype eq 'text/html') {
@@ -2071,11 +2126,14 @@ END
&print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
return;
} else {
- $r->print('<p>'.&mt('Completed upload of the file.').'<br />'.
- &mt('No embedded items identified.').'</p>');
+ $r->print('<p class="LC_warning">'.&mt('No embedded items identified.').'</p>');
}
}
}
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('File successfully uploaded'))));
$r->print(&done(undef,$url));
}
return;
@@ -2088,6 +2146,7 @@ sub hidden_elems {
}
return <<END;
<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+<input type="hidden" name="symb" value="$env{'form.symb'}" />
<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
<input type="hidden" name="mode" value="$env{'form.mode'}" />
<input type="hidden" name="showversions" value="$env{'form.showversions'}" />
@@ -2109,7 +2168,10 @@ sub print_dependency_form {
$r->print('<h3>'.&mt("Reference Information").'</h3>');
}
if ($num) {
- $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.").'</p>'.
+ $r->print('<p>'.&mt('Completed upload of the file.').' '.
+ &mt('This file contained references to other files.').' '.
+ &mt('You must upload the referenced files or else the uploaded file may not work properly.').
+ '</p>'.
'<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
$embedded.
'<p>'.&mt('or').'</p>'.&done('Return to directory',$url));
@@ -2130,7 +2192,6 @@ sub overwrite {
my $port_path = &get_port_path();
my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
my (%allfiles,%codebase,$mode,$mimetype);
- my $mode;
unless (&suppress_embed_prompt()) {
if ($env{'form.parserflag'}) {
if ($fname =~ /\.s?html?$/i) {
@@ -2139,10 +2200,13 @@ sub overwrite {
}
}
if ($fname eq '') {
- my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
'so after eliminating special characters there was nothing left.',
- '<span class="LC_filename">'.$env{'form.filename'}.'</span>');
- $r->print($msg.&done('Back',$url));
+ '<span class="LC_filename">'.$env{'form.filename'}.'</span>'),1)));
+ $r->print(&done(undef,$url));
return;
}
$env{'form.'.$formname.'.filename'} = $fname;
@@ -2153,9 +2217,11 @@ sub overwrite {
\%allfiles,\%codebase,undef,undef,undef,
undef,undef,undef,\$mimetype);
if ($result !~ m|^/uploaded/|) {
- $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].'
- ,$result,&display_file(undef,$fname)).'</span><br />');
- $r->print(&after_overwrite(&mt('Back'),$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to overwrite [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
} else {
if ($mode eq 'parse') {
if ($mimetype eq 'text/html') {
@@ -2163,18 +2229,21 @@ sub overwrite {
&print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
return;
} else {
- $r->print('<p>'.&mt('Overwriting completed.').'<br />'.
- &mt('No embedded items identified.').'</p>');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))
+ .'<br />'.&mt('No embedded items identified.')));
}
}
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))));
}
- $r->print(&after_overwrite(undef,$url));
}
- return;
-}
-sub after_overwrite {
- my ($text,$url) = @_;
my $group_elem;
if (defined($env{'form.group'})) {
$group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
@@ -2182,18 +2251,18 @@ sub after_overwrite {
$group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";
}
}
- if ($text eq '') {
- $text = &mt('Done');
- }
my $hidden = &hidden_elems();
- return <<END;
-
-<h3><a href="javascript:document.overwritedone.submit();">$text</a></h3>
-<form name="overwritedone" method="post" action="$url" />
-$hidden
-$group_elem
-</form>
-END
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ ['<a href="javascript:document.overwritedone.submit();">'
+ .&mt('Return to directory')
+ .'</a>'])
+ .'<form name="overwritedone" method="post" action="'.$url.'">'
+ .$hidden
+ .$group_elem
+ .'</form>'
+ );
+ return;
}
sub lock_info {
@@ -2212,7 +2281,7 @@ sub lock_info {
$filetext = '<strong>'.$env{'form.lockinfo'}.
'</strong> (group: '.$group.')';
} else {
- $filetext = '<strong>'.$file_name.'</strong>';
+ $filetext = '<span class="LC_filename">'.$file_name.'</span>';
}
my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
@@ -2235,49 +2304,73 @@ sub lock_info {
}
}
}
- $r->print(&done(&mt('Back'),$url));
+ $r->print(&done(undef,$url));
return 'ok';
}
sub createdir {
my ($r,$url,$group)=@_;
my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
+ # Display warning in case of directory name cleaning has changed the directory name
+ if ($newdir ne $env{'form.newdir'}) {
+ $r->print(
+ '<p><span class="LC_warning">'
+ .&mt('Invalid characters')
+ .'</span><br />'
+ .&mt('The new directory name was changed from [_1] to [_2].'
+ ,'<span class="LC_filename">'.$env{'form.newdir'}.'</span>'
+ ,'<span class="LC_filename">'.$newdir.'</span>')
+ .'</p>'
+ );
+ }
+
+ # Directory name empty?
if ($newdir eq '') {
- $r->print('<span class="LC_error">'.
- &mt("Error: no directory name was provided.").
- '</span><br />');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no directory name was provided.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
my $portfolio_root = &get_portfolio_root();
- my @dir_list=&get_dir_list($portfolio_root,undef,$group);
+ my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);
my $found_file = 0;
- foreach my $line (@dir_list) {
- my ($filename)=split(/\&/,$line,2);
- if ($filename eq $newdir){
- $found_file = 1;
+ if (ref($dirlistref) eq 'ARRAY') {
+ foreach my $line (@{$dirlistref}) {
+ my ($filename)=split(/\&/,$line,2);
+ if ($filename eq $newdir){
+ $found_file = 1;
+ }
}
}
- if ($found_file){
- $r->print('<span class="LC_error">'
- .&mt('Unable to create a directory named [_1].','<strong>'.$newdir.'</strong>')
- .' '.&mt('A file or directory by that name already exists.').'</span><br />');
+ if ($found_file) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Unable to create a directory named [_1].'
+ ,'<span class="LC_filename">'.$newdir.'</span>'),1)
+ .'<br />'.&mt('A file or directory by that name already exists.')));
} else {
my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$newdir);
if ($result ne 'ok') {
- $r->print('<span class="LC_error">'
- .&mt('An error occurred ([_1]) while trying to create a new directory [_2].'
- ,$result,&display_file())
- .'</span><br />');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to create a new directory [_2].'
+ ,$result,&display_file()),1)));
+
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Directory successfully created'))));
}
}
- if ($newdir ne $env{'form.newdir'}) {
- $r->print(&mt('The new directory name was changed from [_1] to [_2].'
- ,'<strong>'.$env{'form.newdir'}.'</strong>','<strong>'.$newdir.'</strong>'));
- }
$r->print(&done(undef,$url));
}
@@ -2365,12 +2458,13 @@ sub get_port_path {
sub missing_priv {
my ($r,$url,$priv) = @_;
- my $longtext = {
+ my %longtext =
+ &Apache::lonlocal::texthash(
upload => 'upload files',
delete => 'delete files',
rename => 'rename files',
setacl => 'set access controls for files',
- };
+ );
my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');
my $rtnlink = '<a href="'.$url;
if ($url =~ /\?/) {
@@ -2380,13 +2474,13 @@ sub missing_priv {
}
$rtnlink .= 'currentpath='.$escpath;
$r->print('<h3>'.&mt('Action disallowed').'</h3>');
- $r->print(&mt('You do not have sufficient privileges to [_1] ',
- $longtext->{$priv}));
+ $r->print(&mt('You do not have sufficient privileges to [_1]',
+ $longtext{$priv}));
if (defined($env{'form.group'})) {
- $r->print(&mt("in the group's group portfolio."));
+ $r->print(' '.&mt("in the group's group portfolio."));
$rtnlink .= &group_args()
} else {
- $r->print(&mt('in this portfolio.'));
+ $r->print(' '.&mt('in this portfolio.'));
}
$rtnlink .= '">'.&mt('Return to directory').'</a>';
$r->print('<br />'.$rtnlink);
@@ -2448,6 +2542,7 @@ sub embedded_form_elems {
my ($container) = @_;
my $state = <<STATE;
<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+ <input type="hidden" name="symb" value="$env{'form.symb'}" />
<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
<input type="hidden" name="mode" value="$env{'form.mode'}" />
<input type="hidden" name="container" value="$container" />
@@ -2464,7 +2559,7 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath','meta','lockinfo','currentfile','action',
'fieldname','mode','rename','continue','group','access','setnum',
- 'cnum','cdom','type','setroles','showversions','ref']);
+ 'cnum','cdom','type','setroles','showversions','ref','symb']);
my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
@@ -2567,18 +2662,52 @@ sub handler {
}
}
$r->rflush();
+ # Check if access to portfolio is blocked by one or more blocking events in courses.
my ($blocked,$blocktext) =
&Apache::loncommon::blocking_status('port',$uname,$udom);
if ($blocked) {
- $r->print($blocktext);
- $r->print(&Apache::loncommon::end_page());
- return OK;
+ my $evade_block;
+ # If portfolio display is in a window popped up from a "Select Portfolio Files"
+ # link in a .task resource, check if access to the task included proctor validation
+ # of check-in to a slot limited by IP.
+ # If so, and the slot is between its open and close dates, override the block.
+ if ($env{'request.course.id'} && $env{'form.symb'}) {
+ (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+ if ($res =~ /\.task$/i) {
+ my %history =
+ &Apache::lonnet::restore($env{'form.symb'},$env{'request.course.id'},
+ $env{'user.domain'},$env{'user.name'});
+ my $version = $history{'resource.0.version'};
+ if ($history{'resource.'.$version.'.0.checkedin'}) {
+ if ($history{'resource.'.$version.'.0.checkedin.slot'}) {
+ my %slot = &Apache::lonnet::get_slot($history{'resource.'.$version.'.0.checkedin.slot'});
+ if ($slot{'ip'}) {
+ if (&Apache::loncommon::check_ip_acc($slot{'ip'})) {
+ my $now = time;
+ if (($slot{'slottime'} < $now) && ($slot{'endtime'} > $now)) {
+ $evade_block = 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ unless ($evade_block) {
+ $r->print($blocktext);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
}
if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
- $r->print('<span class="LC_error">');
- $r->print(&mt('No file was selected to upload.').' ');
- $r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));
- $r->print('</span>');
+ $r->print(
+ '<p><span class="LC_warning">'
+ .&mt('No file was selected to upload.')
+ .'</span><br />'
+ .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
+ ,'<strong>','</strong>')
+ .'</p>'
+ );
}
if ($env{'form.meta'}) {
&open_form($r,$url);
@@ -2615,8 +2744,11 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'modify_orightml') {
if ($can_upload) {
- $r->print(&Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,$portfolio_root,$group));
- $r->print(&done('Return to directory',$url));
+ my $result =
+ &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,
+ $udom,$portfolio_root);
+ $r->print($result.
+ &done('Return to directory',$url));
} else {
&missing_priv($r,$url,'upload');
}
@@ -2704,8 +2836,9 @@ sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();
$r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
}
- my @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
- if ($dir_list[0] eq 'no_such_dir'){
+ my ($dirlistref,$listerror) =
+ &get_dir_list($portfolio_root,$current_path,$group);
+ if ($listerror eq 'no_such_dir'){
# two main reasons for this:
# 1) never been here, so directory structure not created
# 2) back-button navigation after deleting a directory
@@ -2720,13 +2853,22 @@ sub handler {
$current_path = '/'; # force it back to the root
}
# now grab the directory list again, for the first time
- @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
+ ($dirlistref,$listerror) =
+ &get_dir_list($portfolio_root,$current_path,$group);
}
# need to know if directory is empty so it can be removed if desired
- my $is_empty=(@dir_list == 2);
- &display_common($r,$url,$current_path,$is_empty,\@dir_list,
+ my $is_empty;
+ if ($listerror eq 'empty') {
+ $is_empty = 1;
+ } elsif (ref($dirlistref) eq 'ARRAY') {
+ if ((scalar(@{$dirlistref}) == 2) && ($dirlistref->[0] =~ /^\.+\&/)
+ && ($dirlistref->[1] =~ /^\.+\&/)) {
+ $is_empty = 1;
+ }
+ }
+ &display_common($r,$url,$current_path,$is_empty,$dirlistref,
$can_upload,$group);
- &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
+ &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group,
$can_upload,$can_modify,$can_delete,$can_setacl);
}
$r->print(&Apache::loncommon::end_page());