--- loncom/interface/portfolio.pm 2006/06/28 23:38:09 1.126 +++ loncom/interface/portfolio.pm 2019/08/07 16:08:04 1.260 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.126 2006/06/28 23:38:09 raeburn Exp $ +# $Id: portfolio.pm,v 1.260 2019/08/07 16:08:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,115 +36,247 @@ use Apache::lonfeedback; use Apache::lonlocal; use Apache::lonnet; use Apache::longroup; +use Apache::lonhtmlcommon; use HTML::Entities; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); -# receives a file name and path stub from username/userfiles/portfolio/ +sub group_args { + my $output; + if (defined($env{'form.group'})) { + $output .= '&group='.$env{'form.group'}; + if (defined($env{'form.ref'})) { + $output .= '&ref='.$env{'form.ref'}; + } + } + return $output; +} + +sub group_form_data { + my $output; + if (defined($env{'form.group'})) { + $output = ''; + if (exists($env{'form.ref'})) { + $output .= ''; + } + } + return $output; +} + +# receives a filename and path stub from username/userfiles/portfolio/ # returns an anchor tag consisting encoding filename and currentpath sub make_anchor { - my ($url, $filename, $current_path, $current_mode, $field_name, - $continue_select,$group) = @_; - if ($continue_select ne 'true') {$continue_select = 'false'}; - my $anchor = ''.$filename.''; + my ($url, $anchor_fields, $inner_text) = @_; + if ($$anchor_fields{'continue'} ne 'true') {$$anchor_fields{'continue'} = 'false'}; + my $anchor = ''.$inner_text.''; return $anchor; } + my $dirptr=16384; sub display_common { - my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload)=@_; - my $namespace = &get_namespace($group); - my $port_path = &get_port_path($group); + my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_; + my $namespace = &get_namespace(); + my $port_path = &get_port_path(); if ($can_upload) { - my $groupitem; - if (defined($group)) { - $groupitem = ''; - } + 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:'); + 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,'&<>"'); - $r->print(<<"TABLE"); - - - - - - - - - -
- $text{'upload_label'} - -
- $groupitem - - - - - - -
-
- $text{'createdir_label'} - -
- $groupitem - - - - - -
-
-TABLE - } + 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_portfolio_usage($group,$help_portfolio)); + my $parse_check; + if (!&suppress_embed_prompt()) { + $parse_check = <<"END"; +
+ + + +END + } + + # Find space available before uploading + my $free_space = &free_space($group); + + # Upload File + $r->print('
' + .'
' + .'
' + .''.$lt{'upload_label'}.'' + .$groupitem + .'' + .'' + .'' + .'' + .'' + .'' + .'' + .'' + .$help_fileupload + .$parse_check + .'
' + .'
' + .'
' + ); + # Create Subdirectory + $r->print('
' + .'
' + .'
' + .''.$lt{'createdir_label'}.'' + .''.$groupitem + .'' + .'' + .'' + .'' + .'' + .'' + .$help_createdir + .'
' + .'
' + .'
' + ); + } # end "if can_upload" + my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/'); + 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 = ''; + my $newCurrentPath = '/'; for (my $i = 1; $i< @tree; $i++){ $newCurrentPath .= $tree[$i].'/'; - $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/'); + my %anchor_fields = ( + 'selectfile' => $tree[$i], + 'currentpath' => $newCurrentPath, + 'mode' => $env{"form.mode"}, + 'symb' => $env{"form.symb"}, + 'fieldname' => $env{"form.fieldname"}, + 'continue' => $env{"form.continue"} + ); + $r->print(&make_anchor($url,\%anchor_fields,$tree[$i]).'/'); } } $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();')); $r->print("
"); } + +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); + return &Apache::loncommon::head_subbox( + '
' + .$helpitem + .'
' + .'
' + .&Apache::lonhtmlcommon::display_usage($current_disk_usage, + $disk_quota,'portfolio') + .'
'); +} + +sub display_directory_line { + my ($r,$select_mode, $filename, $mtime, $size, $css_class, + $line, $access_controls, $curr_access, $now, $version_flag, + $href_location, $url, $current_path, $access_admin_text, $versions)=@_; + + my $fullpath = &prepend_group($current_path.$filename); + $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(''.$version_flag.''); + } else { # this is a graded or handed back file + my ($user,$domain) = &get_name_dom($env{'form.group'}); + my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user); + if (defined($$permissions_hash{$fullpath})) { + foreach my $array_item (@{$$permissions_hash{$fullpath}}) { + if (ref($array_item) eq 'ARRAY') { + if ($$array_item[-1] eq 'handback') { + $lock_info = 'Handback'; + } elsif ($$array_item[-1] eq 'graded') { + $lock_info = 'Graded'; + } + } + } + } + if ($lock_info) { + my %anchor_fields = ('lockinfo' => $fullpath); + if ($versions) { # hold the folder open + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($fullpath); + $fname =~ s|^/||; + $anchor_fields{'showversions'} = $fname.'.'.$extension; + } + $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info); + } + $r->print(''.$lock_info.''); + } + # $r->print(''.$$version_flag{$filename}.''); + $r->print(''.&make_anchor($href_location.$filename,undef,$filename).''); + $r->print(''.$size.''); + $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); + if ($select_mode ne 'true') { + $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(&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 ($groupitem,$groupecho); - my $display_out; my $select_mode; my $checked_files; - my $port_path = &get_port_path($group); + my $port_path = &get_port_path(); my ($uname,$udom) = &get_name_dom($group); my $access_admin_text = &mt('View Status'); if ($can_setacl) { $access_admin_text = &mt('View/Change Status'); } - if ((defined($group)) && (defined($env{'request.course.id'}))) { - $groupitem = ''; - $groupecho = '&group='.$group; - } my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); @@ -152,87 +284,179 @@ sub display_directory { $current_permissions,$group); 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 = '
'.$groupitem. - ''. - ''. - ''. - ''. - '
'; - - $r->print($display_out); - return; + if ($env{"form.mode"} eq 'selectfile') { + &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('
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()); } - if (defined($group)) { - $r->print("\n".$groupitem."\n"); + + # 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 $line (sort - { - my ($afile)=split('&',$a,2); - my ($bfile)=split('&',$b,2); - return (lc($afile) cmp lc($bfile)); - } (@$dir_list)) { - #$strip holds directory/file name - #$dom - my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); - $filename =~ s/\s+$//; - my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); - if ($version) { - $versioned{$fname} .= $version.","; - } - push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); - } - foreach my $line (@dir_lines) { - my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line; - my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); + 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::lonnet::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::lonnet::file_name_version_ext($filename); if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { + my $version_flag; + my $show_versions; + my $fullpath = &prepend_group($current_path.$filename); + if ($env{'form.showversions'} =~ /$filename/) { + $show_versions = 'true'; + } + if (exists($versioned{$fullpath})) { + my %anchor_fields = ( + 'selectfile' => $fullpath, + 'continue' => 'false', + 'currentpath' => $current_path, + ); + if ($show_versions) { + # Must preserve other possible showversion files + my $version_remainder = $env{'form.showversions'}; + $version_remainder =~ s/$filename//g; + $anchor_fields{'showversions'} = $version_remainder; + $version_flag = &make_anchor('portfolio',\%anchor_fields, + ''.&mt('opened folder').''); + } else { + # allow multiple files to show versioned + $anchor_fields{'showversions'} = $env{'form.showversions'}.','.$filename; + $version_flag = &make_anchor('portfolio',\%anchor_fields, + ''.&mt('closed folder').''); + } + } else { + $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(''); + $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(''); } else { my $css_class = 'LC_browser_file'; my $line; - my $version_flag; - if (exists($versioned{$fname})) { - $version_flag = "*"; - } else { - $version_flag = ""; - } - my $fullpath = $current_path.$filename; - $fullpath = &prepend_group($fullpath,$group); if ($select_mode eq 'true') { - $line=''; + my %anchor_fields = ( + 'lockinfo' => $fullpath + ); + $line.=''; $css_class= 'LC_browser_file_locked'; } else { if (!$can_modify) { @@ -244,16 +468,18 @@ sub display_directory { $line .= ''; } if ($can_modify) { - my $cat=''.&mt('Catalog Information'). - ''; - $line .= 'Rename'; - $line .= ''; } } - $r->print(''); - $r->print($line); my $curr_access; if ($select_mode ne 'true') { my $pub_access = 0; @@ -287,36 +513,46 @@ sub display_directory { $curr_access = join('+ ',@allaccesses); } } - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - if ($select_mode ne 'true') { - $r->print(''; + &display_directory_line($r,$select_mode, $v_filename, $mtime, $size, + $css_class, $line, \%access_controls, $curr_access, $now, + undef, $href_location, $url, $current_path, $access_admin_text, 1); + } } - $r->print(''.$/); } } } if ($select_mode eq 'true') { - $r->print('
Actions NameSizeLast ModifiedCurrent Access Status
'.&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').'Go to ...'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'
'.&mt('Go to ...').''.$version_flag.''.&make_anchor($url,\%anchor_fields,$filename.'/').'
0) { + $line='Locked'.&make_anchor($url,\%anchor_fields,&mt('Locked')).''.$cat.''; + my $cat=''.&mt('Metadata').''; + my %anchor_fields = ( + 'rename' => $filename, + currentpath => $current_path + ); + $line .= &make_anchor($url,\%anchor_fields,&mt('Rename')); + $line .= ''.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat); + # ''.$cat.''; } $line .= '
'. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''. - &mt($curr_access).'   '); - $r->print(''.$access_admin_text.''); + &display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line, + \%access_controls, $curr_access,$now, $version_flag, $href_location, + $url, $current_path, $access_admin_text); + if ($show_versions) { + foreach my $dir_line (@{ $versioned{$fullpath} }) { + my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = + @$dir_line; + $line = ' 
- - - -
- + $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').' +

' @@ -341,7 +577,7 @@ sub open_form { } sub close_form { - my ($r,$url,$group,$button_text)=@_; + my ($r,$url,$button_text)=@_; if (!defined($button_text)) { $button_text = { 'continue' => &mt('Continue'), @@ -349,19 +585,12 @@ sub close_form { }; } $r->print('

'); - if (defined($group)) { - $r->print("\n".''); - } - $r->print('

'); + $r->print(&group_form_data().'

'); $r->print('

'); - if (defined($group)) { - $r->print("\n".''); - } + $env{'form.currentpath'}.'" />'. + &group_form_data()); $r->print("\n".'

'); } @@ -388,18 +617,19 @@ sub display_file { } sub done { - my ($message,$url,$group)=@_; - unless (defined $message) { - $message='Done'; - } - my $result = '

'.&mt($message).'

'; + 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 = &Apache::lonhtmlcommon::actionbox( + [&make_anchor($url,\%anchor_fields,&mt($linktext))]); return $result; } @@ -407,20 +637,24 @@ sub delete { my ($r,$url,$group)=@_; my @check; my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; - $file_name = &prepend_group($file_name,$group); + $file_name = &prepend_group($file_name); 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 ("The file is locked and cannot be deleted.
"); - $r->print(&done('Back',$url,$group)); + $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').' '.&display_file(undef,\@files).'?

'); - &close_form($r,$url,$group); + $r->print('

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

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

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

'); + $r->print(&done(undef,$url)); } } } @@ -430,24 +664,65 @@ sub delete_confirmed { my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my $result; my ($uname,$udom) = &get_name_dom($group); - my $port_path = &get_port_path($group); + 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(' An error occured ('.$result. - ') while trying to delete '.&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 = + &Apache::lonnet::get_access_controls($current_permissions, + $group,$file_name); + if (keys(%access_controls) > 0) { + my %changes; + foreach my $key (keys(%{$access_controls{$file_name}})) { + $changes{'delete'}{$key} = 1; + } + if (keys(%changes) > 0) { + my ($outcome,$deloutcome,$new_values,$translation) = + &Apache::lonnet::modify_access_controls($file_name,\%changes, + $udom,$uname); + if ($outcome ne 'ok') { + 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') { + push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message? + } else { + push(@msg, &Apache::lonhtmlcommon::confirm_success( + &mt('An error occurred ([_1]) while '. + 'trying to delete access controls for the file.' + ,$deloutcome),1)); + } + } + } + } } } - $r->print(&done(undef,$url,$group)); + $r->print(&Apache::loncommon::confirmwrapper(join('
',@msg))); + $r->print(&done(undef,$url)); } sub delete_dir { - my ($r,$url,$group)=@_; + my ($r,$url)=@_; &open_form($r,$url); - $r->print('

'.&mt('Delete').' '.&display_file().'?

'); - &close_form($r,$url,$group); + $r->print('

'.&mt('Delete [_1]?',&display_file()).'

'); + &close_form($r,$url); } sub delete_dir_confirmed { @@ -455,43 +730,53 @@ sub delete_dir_confirmed { my $directory_name = $env{'form.currentpath'}; $directory_name =~ s|/$||; # remove any trailing slash my ($uname,$udom) = &get_name_dom($group); - my $namespace = &get_namespace($group); - my $port_path = &get_port_path($group); + my $namespace = &get_namespace(); + my $port_path = &get_port_path(); my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. $directory_name); - + if ($result ne 'ok') { - $r->print(' An error occured (dir) ('.$result. - ') while trying to delete '.$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 -# $r->print('
removing '.$directory_name.'
print(&done(undef,$url,$group)); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Directory successfully deleted')))); + $r->print(&done(undef,$url)); } sub rename { my ($r,$url,$group)=@_; my $file_name = $env{'form.currentpath'}.$env{'form.rename'}; my ($uname,$udom) = &get_name_dom($group); - $file_name = &prepend_group($file_name,$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(&done(undef,$url,$group)); + $r->print( + '

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

' + ); + $r->print(&done(undef,$url)); } else { &open_form($r,$url); - $r->print('

'.&mt('Rename').' '.&display_file().' to - ?

'); - &close_form($r,$url,$group); + $r->print('

'.&mt('Rename [_1] to [_2]?', &display_file() + , '').'

'); + &close_form($r,$url); } } @@ -499,64 +784,178 @@ sub rename_confirmed { my ($r,$url,$group)=@_; my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); my ($uname,$udom) = &get_name_dom($group); - my $port_path = &get_port_path($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,$group)); - 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, $port_path.$env{'form.currentpath'}.$env{'form.selectfile'}, $port_path.$env{'form.currentpath'}.$filenewname); - if ($result ne 'ok') { - $r->print(''. - &mt('An errror occured ([_1]) while trying to rename [_2]' - .' to [_3]',$result,&display_file(), - &display_file('',$filenewname)).'
'); - } - 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).'')); + if ($result eq 'ok') { + $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname); + } else { + $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; + } + $r->print($chg_access); + $r->print( + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('File successfully renamed')))); + $r->print(&done(undef,$url)); +} + +sub access_for_renamed { + my ($filenewname,$group,$udom,$uname) = @_; + my $oldfile = $env{'form.currentpath'}.$env{'form.selectfile'}; + $oldfile = &prepend_group($oldfile); + my $newfile = $env{'form.currentpath'}.$filenewname; + $newfile = &prepend_group($newfile); + my $current_permissions = + &Apache::lonnet::get_portfile_permissions($udom,$uname); + my %access_controls = + &Apache::lonnet::get_access_controls($current_permissions, + $group,$oldfile); + my $chg_text; + if (keys(%access_controls) > 0) { + my %change_old; + my %change_new; + foreach my $key (keys(%{$access_controls{$oldfile}})) { + $change_old{'delete'}{$key} = 1; + $change_new{'activate'}{$key} = $access_controls{$oldfile}{$key}; + } + my ($outcome,$deloutcome,$new_values,$translation) = + &Apache::lonnet::modify_access_controls($oldfile,\%change_old, + $udom,$uname); + if ($outcome ne 'ok') { + $chg_text ='

'.&mt("An error occurred ([_1]) while ". + "trying to delete access control records for the old name.",$outcome). + '
'; + } else { + if ($deloutcome ne 'ok') { + $chg_text = '


'. + &mt("An error occurred ([_1]) while ". + "trying to delete access control records for the old name.",$deloutcome). + '
'; + } + } + ($outcome,$deloutcome,$new_values,$translation) = + &Apache::lonnet::modify_access_controls($newfile,\%change_new, + $udom,$uname); + if ($outcome ne 'ok') { + $chg_text .= '

'. + &mt("An error occurred ([_1]) while ". + "trying to update access control records for the new name.",$outcome). + '
'; + } + if ($chg_text eq '') { + $chg_text = '

'.&mt('Access controls updated to reflect the name change.'); + } } - $r->print(&done(undef,$url,$group)); + return $chg_text; } sub display_access { - my ($r,$url,$group,$can_setacl) = @_; + my ($r,$url,$group,$can_setacl,$port_path,$action) = @_; my ($uname,$udom) = &get_name_dom($group); my $file_name = $env{'form.currentpath'}.$env{'form.access'}; - $file_name = &prepend_group($file_name,$group); + $file_name = &prepend_group($file_name); my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name); my $aclcount = keys(%access_controls); - my $header = '

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

'; - my $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.').'
'; + my ($header,$info); + if ($action eq 'chgaccess') { + $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('A listing of files viewable without log-in is available at: ')."".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio.
"; + if ($group eq '') { + $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:"); + } else { + $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:"); + } + $info .= "
".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme
"; + if ($group ne '') { + $info .= &mt("Users with course editing rights may add a 'Group Portfolio' item using the Course Editor (Collaboration tab), to provide access to viewable group portfolio files.").'
'; + } + } else { + $header = '

'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'. + &explain_conditionals().'
'; + } if ($can_setacl) { &open_form($r,$url); $r->print($header.$info); - &access_setting_table($r,$access_controls{$file_name}); + $r->print('
'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', &mt('Help on setting up share access'))); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', &mt('Help on changing settings'))); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', &mt('Help on removing share access'))); + &access_setting_table($r,$url,$file_name,$access_controls{$file_name}, + $action); my $button_text = { 'continue' => &mt('Proceed'), - 'cancel' => &mt('Back to directory listing'), + 'cancel' => &mt('Return to directory'), }; - &close_form($r,$url,$group,$button_text); + &close_form($r,$url,$button_text); } else { $r->print($header); if ($aclcount) { $r->print($info); } - &view_access_settings($r,$url,$group,$access_controls{$file_name}, - $aclcount); + &view_access_settings($r,$url,$access_controls{$file_name},$aclcount); } } +sub explain_conditionals { + return + &mt('Conditional files are accessible to users who satisfy the conditions you set.').'
'; +} + sub view_access_settings { - my ($r,$url,$group,$access_controls,$aclcount) = @_; + my ($r,$url,$access_controls,$aclcount) = @_; my ($showstart,$showend); my %todisplay; foreach my $key (sort(keys(%{$access_controls}))) { @@ -564,7 +963,7 @@ sub view_access_settings { $todisplay{$scope}{$key} = $$access_controls{$key}; } if ($aclcount) { - $r->print(&mt('

Current access controls defined for this file:

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

'.&mt('Current access controls defined for this file:').'

'); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print(''.&mt('Access control').''.&mt('Dates available'). @@ -575,14 +974,12 @@ sub view_access_settings { &build_access_summary($r,$count,$chg,%todisplay); $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&mt('No access control settings currently exist for this file.
' )); - } - my $group_arg; - if ($group) { - $group_arg = '&group='.$group; + $r->print(&mt('No access control settings currently exist for this file.').'
'); } - $r->print('
'.&mt('Return to directory listing').''); + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'} + ); + $r->print('
'.&make_anchor($url, \%anchor_fields, &mt('Return to directory'))); return; } @@ -594,10 +991,10 @@ sub build_access_summary { guest => 'Passphrase-protected', domains => 'Conditional: domain-based', users => 'Conditional: user-based', - course => 'Conditional: course-based', - group => 'Conditional: group-based', + course => 'Conditional: course/community-based', + ip => 'Conditional: IP-based', ); - my @allscopes = ('public','guest','domains','users','course','group'); + my @allscopes = ('public','guest','domains','users','course','ip'); foreach my $scope (@allscopes) { if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) { next; @@ -612,19 +1009,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})); - if (($scope eq 'course') || ($scope eq 'group')) { + 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. @@ -632,24 +1034,18 @@ sub build_access_summary { if ($chg ne 'delete') { if ($scope eq 'guest') { $r->print(&mt('Passphrase').': '.$content->{'password'}); - } elsif ($scope eq 'course' || $scope eq 'group') { - $r->print(''); + } elsif ($scope eq 'course') { + $r->print('
'); $r->print(''); - if ($scope eq 'course') { - $r->print(''); - } else { - $r->print(''); - } + $r->print(''); $r->print(''); foreach my $id (sort(keys(%{$content->{'roles'}}))) { $r->print(''); foreach my $item ('role','access','section','group') { $r->print(''); + $r->print(''); } - $r->print("
'.&mt('Roles').''. &mt('Access').''. &mt('Sections').''.&mt('Groups').''.&mt('Teams').''.&mt('Groups').'
'); 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') { @@ -657,7 +1053,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/,$//; @@ -665,16 +1061,19 @@ sub build_access_summary { } else { $r->print(join(',',@{$content->{'roles'}{$id}{$item}})); } - $r->print('
"); + $r->print(''); } - $r->print(""); + $r->print(''); } elsif ($scope eq 'domains') { $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}})); } elsif ($scope eq 'users') { my $curr_user_list = &sort_users($content->{'users'}); $r->print(&mt('Users: ').$curr_user_list); + } elsif ($scope eq 'ip') { + my $curr_ips_list = &sort_ips($content->{'ip'}); + $r->print(&mt('IP(s):').' '.$curr_ips_list); } else { $r->print(' '); } @@ -690,7 +1089,7 @@ sub build_access_summary { sub update_access { - my ($r,$url,$group) = @_; + my ($r,$url,$group,$port_path) = @_; my $totalprocessed = 0; my %processing; my %title = ( @@ -715,9 +1114,9 @@ sub update_access { } } my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; - $r->print('

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

'."\n"); - $file_name = &prepend_group($file_name,$group); + $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); if ($totalprocessed) { @@ -771,7 +1170,7 @@ sub update_access { } else { if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) { $errors .= ''. - &mt('A problem occurred storing access control settings: [_1]',$outcome). + &mt('A problem occurred saving access control settings: [_1]',$outcome). ''; } } @@ -783,36 +1182,50 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - foreach my $newitem ('course','group','domains','users') { + my @types = ('course','domains','users','ip'); + 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,$group); - foreach my $newitem ('course','group','domains','users') { - if ($env{'form.new'.$newitem} > 0) { - $r->print('
'.&mt('Add new [_1]-based access control for portfolio file: [_2]',$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); - } - &display_access_row($r,$status,$newitem,\@numbers, - $access_controls{$file_name},$now,$then); - } - } - &close_form($r,$url,$group); - } else { - my $group_arg; - if ($group) { - $group_arg = '&group='.$group; - } - $r->print('
'. - &mt('Display all access settings for this file').''); + &open_form($r,$url); + my %showtypes = ( + course => 'course/community', + domains => 'domain', + users => 'user', + ip => 'IP', + ); + foreach my $newitem (@types) { + next if ($env{'form.new'.$newitem} <= 0); + $r->print( + '

' + .&mt('Add new [_1]'.$showtypes{$newitem}.'-based[_2] access control for portfolio file: [_3]', + '','', + '' + .$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); + } + &display_access_row($r,$status,$newitem,\@numbers, + $access_controls{$file_name},$now,$then); + } + &close_form($r,$url); + } else { + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'}, + 'access' => $env{'form.selectfile'} + ); + my @actions; + push(@actions, &make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file'))); + delete $anchor_fields{'access'}; + push(@actions, &make_anchor($url,\%anchor_fields,&mt('Return to directory'))); + $r->print('
'.&Apache::lonhtmlcommon::actionbox(\@actions)); } return; } @@ -829,7 +1242,7 @@ sub build_access_record { if ($scope eq 'guest') { $record->{'password'} = $env{'form.password'}; - } elsif (($scope eq 'course') || ($scope eq 'group')) { + } elsif ($scope eq 'course') { $record->{'domain'} = $env{'form.crsdom_'.$num}; $record->{'number'} = $env{'form.crsnum_'.$num}; my @role_ids; @@ -885,6 +1298,13 @@ sub build_access_record { 'udom' => $udom }); } + } elsif ($scope eq 'ip') { + my $ipslist = $env{'form.ips_'.$num}; + $ipslist =~ s/\s+//sg; + my %ipshash = map { ($_,1) } (split(/,/,$ipslist)); + foreach my $ip (keys(%ipshash)) { + push(@{$record->{'ip'}},$ip); + } } return $record; } @@ -910,20 +1330,27 @@ sub sort_users { return $curr_user_list; } +sub sort_ips { + my ($ips) = @_; + if (ref($ips) eq 'ARRAY') { + return join(",\n",sort(@{$ips})); + } +} + sub access_setting_table { - my ($r,$access_controls) = @_; + my ($r,$url,$filename,$access_controls,$action) = @_; my ($public,$publictext); - $publictext = &mt('Off'); + $publictext ='Off'; my ($guest,$guesttext); - $guesttext = &mt('Off'); + $guesttext = 'Off'; my @courses = (); - my @groups = (); my @domains = (); my @users = (); + my @ips = (); my $now = time; my $then = $now + (60*60*24*180); # six months approx. my ($num,$scope,$publicnum,$guestnum); - my (%acl_count,%end,%start); + my (%acl_count,%end,%start,%conditionals); foreach my $key (sort(keys(%{$access_controls}))) { ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key); if ($scope eq 'public') { @@ -934,19 +1361,36 @@ sub access_setting_table { $guest=$key; $guestnum = $num; $guesttext = &acl_status($start{$key},$end{$key},$now); - } elsif ($scope eq 'course') { - push(@courses,$key); - } elsif ($scope eq 'group') { - push(@groups,$key); - } elsif ($scope eq 'domains') { - push(@domains,$key); - } elsif ($scope eq 'users') { - push(@users,$key); + } else { + $conditionals{$scope}{$key} = $$access_controls{$key}; + if ($scope eq 'course') { + push(@courses,$key); + } elsif ($scope eq 'domains') { + push(@domains,$key); + } elsif ($scope eq 'users') { + push(@users,$key); + } elsif ($scope eq 'ip') { + push(@ips,$key); + } } $acl_count{$scope} ++; } $r->print('
'); - $r->print('

'.&mt('Public access:').' '.$publictext.'

'); + if ($action eq 'chgaccess') { + &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start, + \%end,$public,$publicnum,$publictext,$guest,$guestnum, + $guesttext,$access_controls,%conditionals); + } else { + &condition_setting($r,$access_controls,$now,$then,\%acl_count, + \@domains,\@users,\@courses,\@ips); + } + $r->print('
'); +} + +sub standard_settings { + my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum, + $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_; + $r->print('

'.&mt('Public access: [_1]',&mt($publictext)).'

'); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print(''.&mt('Action').''.&mt('Dates available').''); @@ -954,7 +1398,7 @@ sub access_setting_table { $r->print(&Apache::loncommon::start_data_table_row()); if ($public) { $r->print(''.&actionbox('old',$publicnum,'public').''. - &dateboxes($publicnum,$start{$public},$end{$public}).''); + &dateboxes($publicnum,$start->{$public},$end->{$public}).''); } else { $r->print(''.&actionbox('new','0','public').''. &dateboxes('0',$now,$then).''); @@ -962,7 +1406,7 @@ sub access_setting_table { $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); $r->print(' '); - $r->print('

'.&mt('Passphrase-protected access:').' '.$guesttext.'

'); + $r->print('

'.&mt('Passphrase-protected access: [_1]',&mt($guesttext)).'

'); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print(''.&mt('Action').''.&mt('Dates available'). @@ -973,7 +1417,7 @@ sub access_setting_table { if ($guest) { $passwd = $$access_controls{$guest}{'password'}; $r->print(''.&actionbox('old',$guestnum,'guest').''. - &dateboxes($guestnum,$start{$guest},$end{$guest}).''); + &dateboxes($guestnum,$start->{$guest},$end->{$guest}).''); } else { $r->print(''.&actionbox('new','1','guest').''. &dateboxes('1',$now,$then).''); @@ -982,51 +1426,84 @@ sub access_setting_table { $passwd.'" />'); $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); - $r->print(' '); - &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); - $r->print(' '); - &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); - $r->print(''); - if (@courses > 0 || @groups > 0) { - $r->print(''); - } else { - $r->print(''); + $r->print(' '. + ''); + my $numconditionals = 0; + my $conditionstext; + my %cond_status; + foreach my $scope ('domains','users','course','ip') { + $numconditionals += $acl_count->{$scope}; + if ($acl_count->{$scope} > 0) { + if ($conditionstext ne 'Active') { + foreach my $key (keys(%{$conditionals{$scope}})) { + $conditionstext = &acl_status($start->{$key},$end->{$key},$now); + if ($conditionstext eq 'Active') { + last; + } + } + } + } } - &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); - $r->print(''); - if (@courses > 0 || @groups > 0) { - $r->print(' '); + if ($conditionstext eq '') { + $conditionstext = 'Off'; + } + my %anchor_fields = ( + 'access' => $env{'form.selectfile'}, + 'action' => 'chgconditions', + 'currentpath' => $env{'form.currentpath'}, + ); + $r->print('

'.&mt('Conditional access: [_1]',&mt($conditionstext)).'

'); + if ($numconditionals > 0) { + my $count = 1; + my $chg = 'none'; + $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).'

'); + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print(''.&mt('Access control').''.&mt('Dates available'). + ''.&mt('Additional information').''); + $r->print(&Apache::loncommon::end_data_table_header_row()); + &build_access_summary($r,$count,$chg,%conditionals); + $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(' '); + $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt("based on domain, username, course/community affiliation or user's IP address.")); } - &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); +} + +sub condition_setting { + my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses,$ips) = @_; + $r->print(''); + &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then); + $r->print(' '); + &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then); + $r->print(''); + &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then); + $r->print(' '); + &access_element($r,'ip',$acl_count,$ips,$access_controls,$now,$then); $r->print(''); } sub acl_status { my ($start,$end,$now) = @_; if ($start > $now) { - return &mt('Inactive'); + return 'Inactive'; } if ($end && $end<$now) { - return &mt('Inactive'); + return 'Inactive'; } - return &mt('Active'); + return 'Active'; } 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: ',$title)); + my %typetext = ( + domains => 'Domain', + users => 'User', + course => 'Course/Community', + ip => 'IP', + ); + $r->print('

'.&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')); } @@ -1037,32 +1514,46 @@ sub access_element { sub display_access_row { my ($r,$status,$type,$items,$access_controls,$now,$then) = @_; + 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'; + } elsif ($type eq 'ip') { + $showtype = &mt('IP-based'); + $infotype = 'IP'; + } 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') || ($type eq 'group')) { - $r->print(''.&mt('Allowed [_1] member affiliations',$type). + if ($type eq 'course' && $status eq 'old') { + $r->print(''.&mt('Allowed course/community affiliations'). ''); $colspan ++; } elsif ($type eq 'domains') { - @all_doms = &Apache::loncommon::get_domains(); + @all_doms = sort(&Apache::lonnet::all_domains()); } $r->print(&Apache::loncommon::end_data_table_header_row()); foreach my $key (@{$items}) { $r->print(&Apache::loncommon::start_data_table_row()); - if (($type eq 'course') || ($type eq 'group')) { + if ($type eq 'course') { &course_row($r,$status,$type,$key,$access_controls,$now,$then); } elsif ($type eq 'domains') { &domains_row($r,$status,$key,\@all_doms,$access_controls,$now, $then); } elsif ($type eq 'users') { &users_row($r,$status,$key,$access_controls,$now,$then); + } elsif ($type eq 'ip') { + &ips_row($r,$status,$key,$access_controls,$now,$then); } $r->print(&Apache::loncommon::end_data_table_row()); } @@ -1074,8 +1565,12 @@ sub display_access_row { } $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&mt('No [_1]-based conditions defined.
',$type). - &additional_item($type)); + $r->print( + '

' + .&mt('No '.$infotype.'-based conditions defined') + .'

' + .&additional_item($type) + ); } return; } @@ -1083,34 +1578,38 @@ sub display_access_row { sub course_js { return qq| |; } @@ -1133,59 +1633,78 @@ sub course_row { } my $js = &Apache::loncommon::coursebrowser_javascript($defdom) .&course_js(); - my $crsgrptext = 'Groups'; - if ($type eq 'group') { - $crsgrptext = 'Teams'; - } - 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,undef,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).''); - $r->print(''); - $r->print(''); + $r->print(''.$role_selects.''); - } - $r->print('
'.&mt('Action').''.&mt('Roles').''. - &mt('Access').''.&mt('Sections').''. - &mt($crsgrptext).'
'.&dateboxes($num,$start,$end)); + my $newrole_id = 1; if ($status eq 'old') { + $r->print(''); my $max_id = 0; - foreach my $role_id (sort(keys(%{$content->{'roles'}}))) { - if ($role_id > $max_id) { - $max_id = $role_id; - } - $max_id ++; - my $role_selects = &role_selectors($num,$role_id,$status,$type,$content,'display'); - $r->print('


'.&mt('Add a roles-based condition').' {'domain'}','$content->{'number'}','$uctype'".')" value="'.$max_id.'" />'); - } elsif ($status eq 'new') { - my $role_id = 1; - my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display'); - $r->print(''.&mt('Add').''.$role_selects); - $r->print(''); + if (keys(%{$content->{'roles'}}) > 0) { + $r->print(''. + ''. + ''. + ''. + ''); + foreach my $role_id (sort(keys(%{$content->{'roles'}}))) { + if ($role_id > $max_id) { + $max_id = $role_id; + } + $max_id ++; + my $role_selects = &role_selectors($num,$role_id,$crstype,$content,'display'); + $r->print(''.$role_selects.''); + } + $r->print('
'.&mt('Action').''.&mt('Roles').''.&mt('Access').''.&mt('Sections').''.&mt('Groups').'

'); + } + $r->print('
'.&mt('Add a roles-based condition'). + ' {'domain'}','$content->{'number'}', + '$showtype'".')" value="" />'); + $newrole_id = $max_id; + } else { + $r->print(''); } + $r->print(&add_course_role($num,$newrole_id)); + $r->print(''); return; } +sub add_course_role { + my ($num,$max_id) = @_; + my $output; + $output .=''. + ''. + ''. + ''; + return $output; +} + 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 .= ''; @@ -1213,25 +1732,59 @@ sub users_row { $r->print(''.&actionbox($status,$num,$scope).''.&mt("Format for users' username:domain information:").'
sparty:msu,illini:uiuc ... etc.
'.&dateboxes($num,$start,$end).''); } +sub ips_row { + my ($r,$status,$item,$access_controls,$now,$then) = @_; + my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, + 'ip'); + my $curr_ips_list; + if ($status eq 'old') { + my $content = $$access_controls{$item}; + $curr_ips_list = &sort_ips($content->{'ip'}); + } + $r->print(''.&actionbox($status,$num,$scope).''.&mt('Format for IP controls').'
'. + &mt('[_1] or [_2] or [_3] or [_4] or [_5]','35.8.*','35.8.3.[34-56]', + '*.msu.edu','35.8.3.34','somehostname.pa.msu.edu').'
'. + &mt('Use a comma to separate different ranges.').'
'. + ''. + ''.&dateboxes($num,$start,$end).''); +} + sub additional_item { my ($type) = @_; - my $output = &mt('Add new [_1] condition(s)?',$type).' '.&mt('Number to add: ').''; - return $output; + my $showtype; + if ($type eq 'course') { + $showtype = 'course/community'; + } elsif ($type eq 'domains') { + $showtype = 'domain'; + } elsif ($type eq 'users') { + $showtype = 'user'; + } elsif ($type eq 'ip') { + $showtype = 'IP'; + } + return + &mt('Add new '.$showtype.'-based condition(s)?') + .' '.&mt('Number to add: ') + .''; } sub actionbox { my ($status,$num,$scope) = @_; - my $output = '
'. ''; + $output .= ''; return $output; } @@ -1246,7 +1799,7 @@ sub dateboxes { undef,undef,1); my $enddate = &Apache::lonhtmlcommon::date_setter('portform', 'enddate_'.$num,$end,undef,undef,undef,1,undef, - undef,undef,1). '