--- loncom/interface/portfolio.pm 2009/01/03 19:39:37 1.196.2.2 +++ loncom/interface/portfolio.pm 2013/05/03 17:53:02 1.245 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.196.2.2 2009/01/03 19:39:37 raeburn Exp $ +# $Id: portfolio.pm,v 1.245 2013/05/03 17:53:02 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,7 @@ use Apache::lonnet; use Apache::longroup; use Apache::lonhtmlcommon; use HTML::Entities; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub group_args { my $output; @@ -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) = @_; @@ -87,15 +87,13 @@ sub display_common { my $groupitem = &group_form_data(); my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my %text=&Apache::lonlocal::texthash( - 'upload' => 'Upload', - 'upload_label' => - 'Upload file to current directory:', - 'createdir' => 'Create Subdirectory', - 'createdir_label' => - 'Create subdirectory in current directory:', - 'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files' - ); + my %lt=&Apache::lonlocal::texthash( + 'upload' => 'Upload', + 'upload_label' => 'Upload file to current directory', + 'createdir' => 'Create Subdirectory', + 'createdir_label' => 'Create subdirectory in current directory', + 'parse' => 'Upload embedded images/multimedia/css/linked files if HTML file', + ); my $escuri = &HTML::Entities::encode($r->uri,'&<>"'); my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles'); my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory'); @@ -106,59 +104,64 @@ sub display_common { $parse_check = <<"END";
- END } - $r->print(<<"TABLE"); -$help_portfolio - - - - - - - - - -
- $text{'upload_label'} - -
- $groupitem - - - - - - -$help_fileupload -$parse_check -
-
- $text{'createdir_label'} - -
- $groupitem - - - - - $help_createdir -
-
-TABLE - } + + $r->print('
'.$help_portfolio); + # Upload File + $r->print('
' + .'
' + .'
' + .''.$lt{'upload_label'}.'' + .$groupitem + .'' + .'' + .'' + .'' + .'' + .'' + .'' + .$help_fileupload + .$parse_check + .'
' + .'
' + .'
' + ); + # Create Subdirectory + $r->print('
' + .'
' + .'
' + .''.$lt{'createdir_label'}.'' + .''.$groupitem + .'' + .'' + .'' + .'' + .'' + .'' + .$help_createdir + .'
' + .'
' + .'
' + ); + $r->print('
'); + } # end "if can_upload" + my @tree = split (/\//,$current_path); my %anchor_fields = ( 'selectfile' => $port_path, 'currentpath' => '/', 'mode' => $env{"form.mode"}, + 'symb' => $env{"form.symb"}, 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); + $r->print('
'); $r->print(''.&make_anchor($url,\%anchor_fields,$port_path).'/'); if (@tree > 1){ my $newCurrentPath = '/'; @@ -168,6 +171,7 @@ TABLE 'selectfile' => $tree[$i], 'currentpath' => $newCurrentPath, 'mode' => $env{"form.mode"}, + 'symb' => $env{"form.symb"}, 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); @@ -177,7 +181,7 @@ TABLE $r->print(''); $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory')); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); - $r->print('
print('">'. &Apache::lonhtmlcommon::select_recent($namespace,'currentpath', 'this.form.submit();')); @@ -218,12 +222,12 @@ sub display_usage { $prog_width = 100; } my $disk_meter = ' -
'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB ('.$percent.'%)',$quota.' MB')."\n". -'
'."\n". -'
'."\n". +
'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB ('.$percent.'%)',$quota.' MB')."\n". +'
'."\n". +'
'."\n". '
'."\n". -'

'; - return $disk_meter; +'
'; + return &Apache::loncommon::head_subbox($disk_meter); } sub display_directory_line { @@ -232,11 +236,11 @@ sub display_directory_line { $href_location, $url, $current_path, $access_admin_text, $versions)=@_; my $fullpath = &prepend_group($current_path.$filename); - $r->print(''); + $r->print(&Apache::loncommon::start_data_table_row()); $r->print($line); # contains first two cells of table my $lock_info; if ($version_flag) { # versioned can't be versioned, so TRUE when root file - $r->print(''); + $r->print(''); $r->print(''.$version_flag.''); } else { # this is a graded or handed back file my ($user,$domain) = &get_name_dom($env{'form.group'}); @@ -268,22 +272,25 @@ sub display_directory_line { $r->print(''.$size.''); $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); if ($select_mode ne 'true') { - $r->print(''. - &mt($curr_access).'   '); + $r->print('  '); # Display status + $r->print('' + .&mt($curr_access).'   ' + ); my %anchor_fields = ( 'access' => $filename, 'currentpath' => $current_path ); $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).''); + } else { + $r->print('  '); # Display status } - $r->print(''.$/); + $r->print(&Apache::loncommon::end_data_table_row().$/); } sub display_directory { my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, $can_modify,$can_delete,$can_setacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my $display_out; my $select_mode; my $checked_files; my $port_path = &get_port_path(); @@ -300,63 +307,102 @@ sub display_directory { my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group); my $now = time; if ($env{"form.mode"} eq 'selectfile') { - &select_files($r); - $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); - $select_mode = 'true'; - } - if ($is_empty && ($current_path ne '/') && $can_delete) { - $display_out = ''. - &group_form_data(). - ''. - ''. - ''. - ''. - ''; - - $r->print($display_out); - return; + &select_files($r,$dir_list); + $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); + $select_mode = 'true'; } if ($select_mode eq 'true') { $r->print('
'); - $r->print(''. - ''); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'' + .'' + .'' + .'' + .'' + .'' + .'' + .&Apache::loncommon::end_data_table_header_row() + ); } else { $r->print(''); - $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList', - &mt('Using the portfolio file list'))); - $r->print('
Select  NameSizeLast Modified
'.&mt('Select').'  '.&mt('Name').''.&mt('Size').''.&mt('Last Modified').' 
'. - '' + $r->print( + '

' + .&Apache::loncommon::help_open_topic( + 'Portfolio FileList', + &mt('Using the portfolio file list')) + .'

' + ); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() .'' - .'' + .'' + .'' .'' .'' .'' + .'' .'' - .''); + .&Apache::loncommon::end_data_table_header_row()); + } + + # Empty directory? + if ($is_empty && ($current_path ne '/') && $can_delete) { + my $cols = ($select_mode eq 'true') ? 7 : 9; + # Empty message + $r->print( + &Apache::loncommon::start_data_table_row() + .'' + .&Apache::loncommon::end_data_table_row() + .&Apache::loncommon::end_data_table() + .'' + ); + # Delete button + $r->print( + ''. + &group_form_data(). + ''. + '

'. + ''. + '

'. + ''. + ''. + '' + ); + # Directory is empty, so nothing else to display + return; } + $r->print("\n".&group_form_data()."\n"); my $href_location="/uploaded/$udom/$uname/$port_path".$current_path; 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) { my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); @@ -390,30 +436,43 @@ sub display_directory { $version_flag = ' '; } if ($dirptr&$testdir) { - my $colspan='colspan="2"'; + my $colspan_folder=''; + my $colspan_fill=''; if ($select_mode eq 'true'){ - undef($colspan); + $colspan_fill=' colspan="3"'; + } else { + $colspan_folder=' colspan="2"'; + $colspan_fill=' colspan="4"'; } - $r->print(''); - $r->print(''); + $r->print(''); + $r->print(''.&mt('closed folder').'' + .''); my %anchor_fields = ( 'selectfile' => $filename.'/', 'currentpath' => $current_path.$filename.'/', 'mode' => $env{"form.mode"}, + 'symb' => $env{"form.symb"}, 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); - $r->print(''); + $r->print('' + .''); + $r->print(' '); $r->print(''); } else { my $css_class = 'LC_browser_file'; my $line; if ($select_mode eq 'true') { - $line='
'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'    '.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').''.&mt('Size').''.&mt('Last Modified').' '.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'
' + .'

' + .&mt('This directory is empty.') + .'

' + .'
'.&mt('closed folder').''.&mt('Go to ...').'
'.&mt('Go to ...').''.$version_flag.''.&make_anchor($url,\%anchor_fields,$filename.'/').''.$version_flag.''.&make_anchor($url,\%anchor_fields,$filename.'/').'
0) { + $line=''; } if ($can_modify) { - my $cat=''.&mt('Catalog Information'). - ''; + my $cat=''.&mt('Metadata').''; my %anchor_fields = ( 'rename' => $filename, currentpath => $current_path @@ -494,20 +552,29 @@ sub display_directory { } } if ($select_mode eq 'true') { - $r->print('
+ $r->print(&Apache::loncommon::end_data_table()); + if ($zerobyte) { + $r->print('

'.&mt('[quant,_1,file] in list not selectable as file size is 0 bytes.',$zerobyte).'

'); + } + $r->print(' + -
- +

+
+ +

'); } else { - $r->print(''); + $r->print(&Apache::loncommon::end_data_table()); if ($can_delete) { $r->print(' +

'. &Apache::loncommon::help_open_topic('Portfolio DeleteFile').' +

' @@ -572,17 +639,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 = '

'.&make_anchor($url,\%anchor_fields,&mt($message)).'

'; + my $result = &Apache::lonhtmlcommon::actionbox( + [&make_anchor($url,\%anchor_fields,&mt($linktext))]); return $result; } @@ -594,15 +663,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.').'
'); - $r->print(&done('Back',$url)); + $r->print( + '

' + .&mt('The file is locked and cannot be deleted.') + .'

' + .&done(undef,$url) + ); } else { if (scalar(@files)) { &open_form($r,$url); $r->print('

'.&mt('Delete [_1]?',&display_file(undef,\@files)).'

'); &close_form($r,$url); } else { - $r->print("No file was checked to delete.
"); + $r->print('

'.&mt('No file was checked to delete.').'

'); $r->print(&done(undef,$url)); } } @@ -616,18 +689,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('' - .&mt('An error occurred ([_1]) while trying to delete [_2].' - ,$result,&display_file(undef, $delete_file)) - .'

'); - } 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 = @@ -643,23 +719,24 @@ sub delete_confirmed { &Apache::lonnet::modify_access_controls($file_name,\%changes, $udom,$uname); if ($outcome ne 'ok') { - $r->print('
'.&mt("An error occurred ([_1]) while ". - "trying to delete access controls for the file.",$outcome). - '

'); + 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('
'.&mt('Access controls also deleted for the file.').'

'); + push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message? } else { - $r->print(''.'
'. - &mt("An error occurred ([_1]) while ". - "trying to delete access controls for the file.",$deloutcome). - '

'); + 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('
',@msg))); $r->print(&done(undef,$url)); } @@ -679,12 +756,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('' - .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].' - ,$result,$directory_name) - .'
'); + $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.'/']); @@ -695,6 +775,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)); } @@ -704,7 +788,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.
"); + $r->print( + '

' + .&mt('The file is locked and cannot be renamed.') + .'

' + ); $r->print(&done(undef,$url)); } else { &open_form($r,$url); @@ -719,13 +807,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( + '

' + .&mt('Invalid characters') + .'
' + .&mt('The new filename was changed from [_1] to [_2].' + ,''.&display_file('',$env{'form.filenewname'}).'' + ,''.&display_file('',$filenewname).'') + .'

' + ); + + } + + # Filename empty? if ($filenewname eq '') { - $r->print(''. - &mt("Error: no valid filename was provided to rename to."). - '
'); - $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, @@ -734,18 +841,20 @@ sub rename_confirmed { if ($result eq 'ok') { $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname); } else { - $r->print(''. - &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].' - ,$result,&display_file(),&display_file('',$filenewname)) - .'
'); + $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:
[_1] to [_2]", - ''.&display_file('',$env{'form.filenewname'}).'', - ''.&display_file('',$filenewname).'')); - } $r->print($chg_access); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('File successfully renamed')))); $r->print(&done(undef,$url)); } @@ -810,7 +919,13 @@ sub display_access { my $aclcount = keys(%access_controls); my ($header,$info); if ($action eq 'chgaccess') { - $header = '

'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'; + $header = + '

' + .&mt('Allowing others to retrieve file: [_1]' + ,'' + .$port_path.$env{'form.currentpath'}.$env{'form.access'} + .'') + .'

'; $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 .= '
  • '.&mt('Public files are available to anyone without the need for login.'); $info .= '
  • '.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.'); @@ -855,7 +970,7 @@ sub display_access { sub explain_conditionals { return &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'
    '."\n". - &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'
    '."\n". + &mt('The conditions can include affiliation with a particular course or community, or a user account in a specific domain.').'
    '."\n". &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'); } @@ -896,7 +1011,7 @@ sub build_access_summary { guest => 'Passphrase-protected', domains => 'Conditional: domain-based', users => 'Conditional: user-based', - course => 'Conditional: course-based', + course => 'Conditional: course/community-based', ); my @allscopes = ('public','guest','domains','users','course'); foreach my $scope (@allscopes) { @@ -913,19 +1028,24 @@ 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(''.&mt($scope_desc{$scope})); + my $crstype; if ($scope eq 'course') { if ($chg ne 'delete') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); $r->print('
    ('.$course_description{'description'}.')'); + $crstype = 'Course'; + if ($course_description{'type'} ne '') { + $crstype = $course_description{'type'}; + } } } $r->print(''.&mt('Start: ').$showstart. @@ -945,8 +1065,6 @@ sub build_access_summary { foreach my $item ('role','access','section','group') { $r->print(''); if ($item eq 'role') { - my $ucscope = $scope; - $ucscope =~ s/^(\w)/uc($1)/e; my $role_output; foreach my $role (@{$content->{'roles'}{$id}{$item}}) { if ($role eq 'all') { @@ -954,7 +1072,7 @@ sub build_access_summary { } elsif ($role =~ /^cr/) { $role_output .= (split('/',$role))[3].','; } else { - $role_output .= &Apache::lonnet::plaintext($role,$ucscope).','; + $role_output .= &Apache::lonnet::plaintext($role,$crstype).','; } } $role_output =~ s/,$//; @@ -1012,8 +1130,8 @@ sub update_access { } } my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; - $r->print('

    '.&mt('Allowing others to retrieve file: [_1]', - $port_path.$file_name).'

    '."\n"); + $r->print('

    '.&mt('Allowing others to retrieve file: [_1]', + ''.$port_path.$file_name.'').'

    '."\n"); $file_name = &prepend_group($file_name); my ($uname,$udom) = &get_name_dom($group); my ($errors,$outcome,$deloutcome,$new_values,$translation); @@ -1080,22 +1198,28 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - foreach my $newitem ('course','domains','users') { + my @types = ('course','domains','users'); + foreach my $newitem (@types) { $allnew += $env{'form.new'.$newitem}; } if ($allnew > 0) { my $now = time; my $then = $now + (60*60*24*180); # six months approx. &open_form($r,$url); - foreach my $newitem ('course','domains','users') { + my %showtypes = &Apache::lonlocal::texthash ( + course => 'course/community', + domains => 'domain', + users => 'user', + ); + foreach my $newitem (@types) { if ($env{'form.new'.$newitem} > 0) { - $r->print('
    '.&mt('Add new [_1]-based access control for portfolio file: [_2]',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'

    '); + $r->print('
    '.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]',''.$showtypes{$newitem},'',''.$env{'form.currentpath'}.$env{'form.selectfile'}.'').'

    '); $firstitem = $totalnew; $lastitem = $totalnew + $env{'form.new'.$newitem}; $totalnew = $lastitem; my @numbers; for (my $i=$firstitem; $i<$lastitem; $i++) { - push (@numbers,$i); + push(@numbers,$i); } &display_access_row($r,$status,$newitem,\@numbers, $access_controls{$file_name},$now,$then); @@ -1107,9 +1231,11 @@ sub update_access { 'currentpath' => $env{'form.currentpath'}, 'access' => $env{'form.selectfile'} ); - $r->print('
    '.&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('
    '.&Apache::lonhtmlcommon::actionbox(\@actions)); } return; } @@ -1332,7 +1458,7 @@ sub standard_settings { &build_access_summary($r,$count,$chg,%conditionals); $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.')); + $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course/community affiliation.')); } } @@ -1366,10 +1492,12 @@ sub acl_status { sub access_element { my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_; - my $title = $type; - $title =~ s/s$//; - $title =~ s/^(\w)/uc($1)/e; - $r->print('

    '.&mt('[_1]-based conditional access: ',&mt($title))); + my %typetext = &Apache::lonlocal::texthash( + domains => 'Domain', + users => 'User', + course => 'Course/Community' + ); + $r->print('

    '.&mt('[_1]-based conditional access: ',$typetext{$type})); if ($$acl_count{$type}) { $r->print($$acl_count{$type}.' '); if ($$acl_count{$type} > 1) { @@ -1387,17 +1515,24 @@ sub access_element { sub display_access_row { my ($r,$status,$type,$items,$access_controls,$now,$then) = @_; + my $showtype; + if ($type eq 'course') { + $showtype = &mt('Courses/Communities'); + } elsif ($type eq 'domains') { + $showtype = &mt('Domains'); + } elsif ($type eq 'users') { + $showtype = &mt('Users'); + } if (@{$items} > 0) { my @all_doms; my $colspan = 3; - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); - $r->print(''.&mt('Action?').''.&mt($uctype).''. + $r->print(''.&mt('Action?').''.$showtype.''. &mt('Dates available').''); if ($type eq 'course' && $status eq 'old') { - $r->print(''.&mt('Allowed [_1] member affiliations',$type). + + $r->print(''.&mt('Allowed course/community affiliations'). ''); $colspan ++; } elsif ($type eq 'domains') { @@ -1424,8 +1559,8 @@ sub display_access_row { } $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&mt('No [_1]-based conditions defined.',&mt($type)).'
    ' - .&additional_item($type)); + $r->print(&mt('No [_1]-based conditions defined.',$showtype).'
    '. + &additional_item($type)); } return; } @@ -1486,17 +1621,20 @@ sub course_row { } my $js = &Apache::loncommon::coursebrowser_javascript($defdom) .&course_js(); - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; + my $showtype = &mt('Course/Community'); + my $crstype = 'Course'; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, $type); $r->print(''.$js.&actionbox($status,$num,$scope).''); if ($status eq 'old') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); + if ($course_description{'type'} ne '') { + $crstype = $course_description{'type'}; + } $r->print(''.$course_description{'description'}.''); } elsif ($status eq 'new') { - $r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).'  '); + $r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$showtype).'  '); } $r->print(''.&dateboxes($num,$start,$end)); my $newrole_id = 1; @@ -1514,19 +1652,19 @@ sub course_row { $max_id = $role_id; } $max_id ++; - my $role_selects = &role_selectors($num,$role_id,$type,$content,'display'); + my $role_selects = &role_selectors($num,$role_id,$crstype,$content,'display'); $r->print('
    '.$role_selects.''); } $r->print(''); } $r->print('
    '.&mt('Add a roles-based condition'). - ' {'domain'}','$content->{'number'}', - '$uctype'".')" value="" />'); + '$showtype'".')" value="" />'); $newrole_id = $max_id; } else { - $r->print(''); + $r->print(''); } $r->print(&add_course_role($num,$newrole_id)); $r->print(''); @@ -1547,14 +1685,14 @@ sub domains_row { my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, 'domains'); - my $dom_select = ''. ' '; if ($status eq 'old') { my $content = $$access_controls{$item}; foreach my $dom (@{$all_doms}) { if ((@{$content->{'dom'}} > 0) && (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) { - $dom_select .= ''; } else { $dom_select .= ''; @@ -1584,7 +1722,15 @@ sub users_row { sub additional_item { my ($type) = @_; - my $output = &mt('Add new [_1] condition(s)?',&mt($type)).' '.&mt('Number to add: ').''; + my $showtype; + if ($type eq 'course') { + $showtype = &mt('course/community'); + } elsif ($type eq 'domains') { + $showtype = &mt('domains'); + } elsif ($type eq 'users') { + $showtype = &mt('users'); + } + my $output = &mt('Add new [_1] condition(s)?',$showtype).' '.&mt('Number to add: ').''; return $output; } @@ -1655,10 +1801,12 @@ sub role_selectors { $cdom = $env{'form.cdom'}; $cnum = $env{'form.cnum'}; } - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; + my $crstype = 'Course'; + if ($cnum =~ /^$match_community$/) { + $crstype = 'Community' + } my ($sections,$groups,$allroles,$rolehash,$accesshash) = - &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype); + &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$crstype); if (!@{$sections}) { @{$sections} = ('none'); } else { @@ -1691,12 +1839,12 @@ sub role_selectors { 'group' => $groups, ); foreach my $item ('role','access','section','group') { - $output .= ''."\n"; foreach my $entry (@{$allitems{$item}}) { if ($caller eq 'display') { if ((@{$$content{'roles'}{$role_id}{$item}} > 0) && (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) { - $output .= ' '; next; } @@ -1753,19 +1901,45 @@ function getIndexByName(item) { END_SCRIPT - $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.')); - $r->print('
    '.$role_selects.'
    '.&mt('Roles').''.&mt('[_1] status',$type).''.&mt('Sections').''.&mt('Groups').'

    '); + $r->print( + '

    ' + .&mt('Select roles, '.lc($type).' status, section(s) and group(s) for users' + .' who will be able to access the portfolio file.') + .'

    ' + ); + $r->print( + '' + .'' + .'' + .'' + .'' + .'' + .''.$role_selects.'' + .'
    '.&mt('Roles').''.&mt("$type status").''.&mt('Sections').''.&mt('Groups').'

    ' + .'' + ); return; } sub select_files { - my ($r) = @_; + my ($r,$dir_list) = @_; if ($env{'form.continue'} eq 'true') { # here we update the selections for the currentpath # eventually, have to handle removing those not checked, but . . . my @items=&Apache::loncommon::get_env_multiple('form.checkfile'); if (scalar(@items)){ - &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items); + my @ok_items; + if (ref($dir_list) eq 'ARRAY') { + foreach my $dir_line (@{$dir_list}) { + my ($filename,undef,undef,undef,undef,undef,undef,undef,$size)=split(/\&/,$dir_line,10); + if (grep(/^\Q$filename\E$/,@items)) { + if ($size) { + push(@ok_items,$filename); + } + } + } + } + &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @ok_items); } } else { #empty the file for a fresh start @@ -1794,122 +1968,317 @@ ENDSMP ENDSMP $r->print($javascript); - $r->print("

    ".&mt('Select portfolio files')."

    ". - &mt('Check as many as you wish in response to the problem.')."
    "); + $r->print("

    ".&mt('Select portfolio files')."

    "); my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'}); if (@otherfiles) { - $r->print("".&mt('Files selected from other directories:')."
    "); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .''.&mt('Files selected from other directories:')."" + .&Apache::loncommon::end_data_table_header_row() + ); foreach my $file (@otherfiles) { - $r->print($file."
    "); - } - } -} - - -sub check_for_upload { - my ($path,$fname,$group,$element) = @_; - my $disk_quota = &get_quota($group); - my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?) - my $portfolio_root = &get_portfolio_root(); - my $port_path = &get_port_path(); - my ($uname,$udom) = &get_name_dom($group); - # Fixme --- Move the checking for existing file to LOND error return - my @dir_list=&get_dir_list($portfolio_root,$path,$group); - my $found_file = 0; - my $locked_file = 0; - foreach my $line (@dir_list) { - my ($file_name)=split(/\&/,$line,2); - if ($file_name eq $fname){ - $file_name = $path.$file_name; - $file_name = &prepend_group($file_name); - $found_file = 1; - if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $locked_file = 1; - } - } - } - my $getpropath = 1; - my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); - - if (($current_disk_usage + $filesize) > $disk_quota){ - my $msg = ''. - &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.',''.$fname.'',$filesize).''. - '
    '.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage); - return ('will_exceed_quota',$msg); - } elsif ($found_file) { - if ($locked_file) { - my $msg = ''; - $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].',''.$fname.'',''.$port_path.$env{'form.currentpath'}.''); - $msg .= '
    '; - $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.',''.$fname.''); - return ('file_locked',$msg); - } else { - my $msg = ''; - $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].',''.$fname.'',$port_path.$env{'form.currentpath'}); - $msg .= ''; - $msg .= '
    '; - $msg .= &mt('To upload, rename or delete existing [_1] in [_2].',''.$fname.'', $port_path.$env{'form.currentpath'}); - return ('file_exists',$msg); + $r->print(&Apache::loncommon::start_data_table_row() + .''.$file."" + .&Apache::loncommon::end_data_table_row() + ); } + $r->print(&Apache::loncommon::end_data_table() + .'
    ' + ); } + $r->print('
    ' + .&mt('Check as many files as you wish in response to the problem:') + .'
    ' + ); } sub upload { my ($r,$url,$group)=@_; - my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'}); + my $formname = 'uploaddoc'; + my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'}); + my ($state,$msg); + if ($fname eq '') { + $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.', + ''.$env{'form.uploaddoc.filename'}.''),1))); + + $r->print(&done(undef,$url)); + return; + } my $disk_quota = &get_quota($group); my $portfolio_root = &get_portfolio_root(); my $port_path = &get_port_path(); my ($uname,$udom) = &get_name_dom($group); my $getpropath = 1; my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); - my ($state,$msg) = + ($state,$msg) = &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname, - $group,'uploaddoc',$portfolio_root, + $group,$formname,$portfolio_root, $port_path,$disk_quota, $current_disk_usage,$uname,$udom); if ($state eq 'will_exceed_quota' || $state eq 'file_locked' - || $state eq 'file_exists' ) { - $r->print($msg.&done('Back',$url)); + || $state eq 'zero_bytes') { + $r->print($msg.&done(undef,$url)); return; } - my (%allfiles,%codebase,$mode); - if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) { + my (%allfiles,%codebase,$mode,$mimetype); + if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) { if ($env{'form.parserflag'}) { $mode = 'parse'; } } + my $context; + if ($state eq 'existingfile') { + $context = $state; + } + my $subdir = $port_path.$env{'form.currentpath'}; + $subdir =~ s{(/)$}{}; + my ($result,$timestamp) = + &Apache::lonnet::userfileupload($formname,$context,$subdir, + $mode,\%allfiles,\%codebase,undef,undef, + undef,undef,undef,undef,\$mimetype); + if ($state eq 'existingfile') { + my $group_elem; + my $rootdir = $r->dir_config('lonDaemons').'/tmp/overwrites'; + if ($group eq '') { + $rootdir .= '/'.$env{'user.domain'}.'/'.$env{'user.name'}; + } else { + $rootdir .= '/'.$env{'course.'.$env{'request.course.id'}.'.domain'}. + '/'.$env{'course.'.$env{'request.course.id'}.'.num'}; + $group_elem = ''; + } + if (($result eq $rootdir.'/'.$port_path.$env{'form.currentpath'}.$fname) && ($timestamp =~ /^\d+$/)) { + my $showfname = &HTML::Entities::encode($fname,'&<>"'); + my %lt = &Apache::lonlocal::texthash ( + over => 'Overwrite existing file?', + yes => 'Yes', + no => 'No', + undo => 'This action can not be undone.', + conf => 'Are you sure you want to overwrite an existing file?', + cont => 'Continue', + ); + my $parserflag; + my $hidden = &hidden_elems(); + if ($mode eq 'parse') { + $parserflag = ''; + } + $r->print(<<"END"); + +

    +$msg +

    + +

    $lt{'over'} +  +

    +

    + + + +$hidden +$parserflag +$group_elem + +

    +
    +END + } else { + $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( + &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') { + if (keys(%allfiles) > 0) { + &print_dependency_form($r,$url,\%allfiles,\%codebase,$result); + return; + } else { + $r->print('

    '.&mt('No embedded items identified.').'

    '); + } + } + } + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('File successfully uploaded')))); + $r->print(&done(undef,$url)); + } + return; +} + +sub hidden_elems { + my $contelem; + if ($env{'form.mode'} eq 'selectfile') { + $contelem = ''; + } + return < + + + + +$contelem +END +} + +sub print_dependency_form { + my ($r,$url,$allfiles,$codebase,$result) = @_; + my $container = &HTML::Entities::encode($result,'<>"&'); + my $state = &embedded_form_elems($container); + my ($embedded,$num,$pathchg) = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase, + {'error_on_invalid_names' => 1, + 'ignore_remote_references' => 1,}); + if ($embedded) { + if ($num || $pathchg) { + $r->print('

    '.&mt("Reference Warning").'

    '); + } else { + $r->print('

    '.&mt("Reference Information").'

    '); + } + if ($num) { + $r->print('

    '.&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.'). + '

    '. + '

    '.&mt("Please select the locations from which the referenced files are to be uploaded.").'

    '. + $embedded. + '

    '.&mt('or').'

    '.&done('Return to directory',$url)); + } else { + $r->print('

    '.&mt("Completed upload of the file. This file contained references to other files.").'

    '. + $embedded. + '

    '.&done('Return to directory',$url).'

    '); + } + } else { + $r->print(&done(undef,$url)); + } + return; +} + +sub overwrite { + my ($r,$url,$group)=@_; + my $formname = 'existingfile'; + my $port_path = &get_port_path(); + my $fname = &Apache::lonnet::clean_filename($env{'form.filename'}); + my (%allfiles,%codebase,$mode,$mimetype); + unless (&suppress_embed_prompt()) { + if ($env{'form.parserflag'}) { + if ($fname =~ /\.s?html?$/i) { + $mode = 'parse'; + } + } + } + if ($fname eq '') { + $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.', + ''.$env{'form.filename'}.''),1))); + $r->print(&done(undef,$url)); + return; + } + $env{'form.'.$formname.'.filename'} = $fname; + my $subdir = $port_path.$env{'form.currentpath'}; + $subdir =~ s{(/)$}{}; my $result= - &Apache::lonnet::userfileupload('uploaddoc','', - $port_path.$env{'form.currentpath'}, - $mode,\%allfiles,\%codebase); + &Apache::lonnet::userfileupload($formname,'overwrite',$subdir,$mode, + \%allfiles,\%codebase,undef,undef,undef, + undef,undef,undef,\$mimetype); if ($result !~ m|^/uploaded/|) { - $r->print(''.&mt('An error occurred ([_1]) while trying to upload [_2].' - ,$result,&display_file()).'
    '); - $r->print(&done('Back',$url)); - } else { - if (%allfiles) { - if (!&suppress_embed_prompt()) { - my $state = < - - - -STATE - $r->print("

    ".&mt("Reference Warning")."

    "); - $r->print("

    ".&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.")."

    "); - $r->print("

    ".&mt("Please select the locations from which the referenced files are to be uploaded.")."

    "); - $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase, - {'error_on_invalid_names' => 1, - 'ignore_remote_references' => 1,})); - $r->print('

    Or '.&done('Return to directory',$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') { + if (keys(%allfiles) > 0) { + &print_dependency_form($r,$url,\%allfiles,\%codebase,$result); + return; + } else { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Overwriting completed.')) + .'
    '.&mt('No embedded items identified.'))); + } } - } else { - $r->print(&done(undef,$url)); - } + } else { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Overwriting completed.')))); + } + } + + my $group_elem; + if (defined($env{'form.group'})) { + $group_elem = ''; + if (defined($env{'form.ref'})) { + $group_elem .= ''."\n"; + } } + my $hidden = &hidden_elems(); + $r->print( + &Apache::lonhtmlcommon::actionbox( + ['' + .&mt('Return to directory') + .'']) + .'
    ' + .$hidden + .$group_elem + .'
    ' + ); + return; } sub lock_info { @@ -1928,7 +2297,7 @@ sub lock_info { $filetext = ''.$env{'form.lockinfo'}. ' (group: '.$group.')'; } else { - $filetext = ''.$file_name.''; + $filetext = ''.$file_name.''; } my $title =''.&Apache::lonnet::gettitle($$array_item[0]). @@ -1951,49 +2320,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( + '

    ' + .&mt('Invalid characters') + .'
    ' + .&mt('The new directory name was changed from [_1] to [_2].' + ,''.$env{'form.newdir'}.'' + ,''.$newdir.'') + .'

    ' + ); + } + + # Directory name empty? if ($newdir eq '') { - $r->print(''. - &mt("Error: no directory name was provided."). - '
    '); - $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('' - .&mt('Unable to create a directory named [_1].',''.$newdir.'') - .' '.&mt('A file or directory by that name already exists.').'
    '); + if ($found_file) { + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Unable to create a directory named [_1].' + ,''.$newdir.''),1) + .'
    '.&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('' - .&mt('An error occurred ([_1]) while trying to create a new directory [_2].' - ,$result,&display_file()) - .'
    '); + $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].' - ,''.$env{'form.newdir'}.'',''.$newdir.'')); - } $r->print(&done(undef,$url)); } @@ -2081,12 +2474,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 = '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').''; $r->print('
    '.$rtnlink); - $r->print(&Apache::loncommon::end_page()); return; } @@ -2161,6 +2554,20 @@ sub suppress_embed_prompt { return $suppress_prompt; } +sub embedded_form_elems { + my ($container) = @_; + my $state = < + + + + +STATE + if ($env{'form.group'} ne '') { + $state .= ''."\n"; + } + return $state; +} sub handler { # this handles file management @@ -2168,7 +2575,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; @@ -2207,7 +2614,7 @@ sub handler { $r->print(&mt('Not a valid group for this course')); $earlyout = 1; } - $title = &mt('Group files for [_1]', $group); + $title = &mt('Group portfolio for [_1]', $group); } else { $r->print(&mt('Invalid group')); $earlyout = 1; @@ -2235,7 +2642,7 @@ sub handler { } else { ($uname,$udom) = &get_name_dom(); $portfolio_root = &get_portfolio_root(); - $title = &mt('Portfolio Manager'); + $title = &mt('My Space'); $can_modify = 1; $can_delete = 1; $can_upload = 1; @@ -2247,22 +2654,20 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # Give the LON-CAPA page header + my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}]; + if ($env{"form.mode"} eq 'selectfile'){ $r->print(&Apache::loncommon::start_page($title,undef, {'only_body' => 1})); } elsif ($env{'form.action'} eq 'rolepicker') { $r->print(&Apache::loncommon::start_page('New role-based condition',undef, {'no_nav_bar' => 1, })); - } else { + } elsif ($caller eq 'coursegrp_portfolio') { $r->print(&Apache::loncommon::start_page($title)); - } - $r->rflush(); - if ($caller ne 'coursegrp_portfolio') { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/portfolio", - text=>"Portfolio Manager"}); + } else { + $r->print(&Apache::loncommon::start_page($title,undef, + {'bread_crumbs' => $brcrum})); if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) { - $r->print(&Apache::lonhtmlcommon::breadcrumbs()); $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.').'
      • '. @@ -2270,47 +2675,96 @@ sub handler { '
    '); $r->print(&Apache::loncommon::end_page()); return OK; - } else { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Portfolio Manager')); } } + $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; - } - if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){ - $r->print(''); - $r->print(&mt('No file was selected to upload.').' '); - $r->print(&mt('To upload a file, click Browse... and select a file, then click Upload.')); - $r->print(''); - } + 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( + '

    ' + .&mt('No file was selected to upload.') + .'
    ' + .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].' + ,'','') + .'

    ' + ); + } if ($env{'form.meta'}) { &open_form($r,$url); $r->print(&mt('Edit the meta data').'
    '); &close_form($r,$url); } - if ($env{'form.store'}) { - } - if ($env{'form.uploaddoc.filename'}) { if ($can_upload) { &upload($r,$url,$group); } else { &missing_priv($r,$url,'upload'); } + } elsif ($env{'form.action'} eq 'process_overwrite') { + if ($can_upload) { + &overwrite($r,$url,$group); + } else { + &missing_priv($r,$url,'existingfile'); + } } elsif ($env{'form.action'} eq 'upload_embedded') { if ($can_upload) { my $disk_quota = &get_quota($group); my $getpropath = 1; my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); - $r->print( + my $container = &HTML::Entities::encode($env{'form.container'},'<>&"'); + my $state = &embedded_form_elems($container). + ''; + my ($result,$flag) = &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom, - $group,$portfolio_root,$group,$disk_quota,$current_disk_usage)); - $r->print(&done(undef,$url)); + $group,$portfolio_root,$group,$disk_quota,$current_disk_usage,$state,$url); + $r->print($result.&done('Return to directory',$url)); + } else { + &missing_priv($r,$url,'upload'); + } + } elsif ($env{'form.action'} eq 'modify_orightml') { + if ($can_upload) { + 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'); } @@ -2380,6 +2834,16 @@ sub handler { } elsif ($env{'form.lockinfo'}) { &lock_info($r,$url,$group); } else { + if ($env{'form.action'} eq 'cancel_overwrite') { + if ($can_upload) { + my $formname = 'existingfile'; + my $fname = &Apache::lonnet::clean_filename($env{'form.filename'}); + $env{'form.'.$formname.'.filename'} = $fname; + my $subdir = $port_path.$env{'form.currentpath'}; + $subdir =~ s{(/)$}{}; + &Apache::lonnet::userfileupload($formname,'canceloverwrite',$subdir); + } + } my $current_path='/'; if ($env{'form.currentpath'}) { $current_path = $env{'form.currentpath'}; @@ -2388,8 +2852,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 @@ -2404,16 +2869,25 @@ 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()); } + $r->print(&Apache::loncommon::end_page()); return OK; }