| - $text{'upload_label'} - | -$groupitem - - | -
| - $text{'createdir_label'} - | -- - | -
'); - if (defined($group)) { - $r->print("\n".''); - } - $r->print('
'); + $r->print(&group_form_data().''); $r->print(''); } @@ -332,33 +598,38 @@ sub close_form { sub display_file { my ($path,$filename)=@_; my $display_file_text; + my $file_start=''; + my $file_end=''; if (!defined($path)) { $path=$env{'form.currentpath'}; } if (!defined($filename)) { $filename=$env{'form.selectfile'}; - $display_file_text = ''.$path.$filename.''; + $display_file_text = $file_start.$path.$filename.$file_end; } elsif (ref($filename) eq "ARRAY") { - foreach (@$filename) { - $display_file_text .= ''.$path.$_.'' + .&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.'.&mt('No file was checked to delete.').'
'); + $r->print(&done(undef,$url)); } } } @@ -389,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).''.&mt('Delete').' '.&display_file().'?
'); - &close_form($r,$url,$group); + $r->print(''.&mt('Delete [_1]?',&display_file()).'
'); + &close_form($r,$url); } sub delete_dir_confirmed { @@ -414,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.'' + .&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); } } @@ -458,52 +784,312 @@ 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).'')
+ .'
| '.&mt('Roles').' | '. + &mt('Access').' | '. + &mt('Sections').' | '); + $r->print(''.&mt('Groups').' | '); + $r->print('
|---|---|---|---|
| '); + if ($item eq 'role') { + my $role_output; + foreach my $role (@{$content->{'roles'}{$id}{$item}}) { + if ($role eq 'all') { + $role_output .= $role.','; + } elsif ($role =~ /^cr/) { + $role_output .= (split('/',$role))[3].','; + } else { + $role_output .= &Apache::lonnet::plaintext($role,$crstype).','; + } + } + $role_output =~ s/,$//; + $r->print($role_output); + } else { + $r->print(join(',',@{$content->{'roles'}{$id}{$item}})); + } + $r->print(' | '); + } + $r->print('
| '.&mt('Roles').' | '. - &mt('Access').' | '. - &mt('Sections').' | '); - if ($scope eq 'course') { - $r->print(''.&mt('Groups').' | '); - } else { - $r->print(''.&mt('Teams').' | '); - } - $r->print('|||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| '); - if ($item eq 'role') { - my $ucscope = $scope; - $ucscope =~ s/^(\w)/uc($1)/; - my $role_output; - foreach my $role (@{$content->{'roles'}{$id}{$item}}) { - if ($role eq 'all') { - $role_output .= $role.','; - } elsif ($role =~ /^cr/) { - $role_output .= (split('/',$role))[3].','; - } else { - $role_output .= &Apache::lonnet::plaintext($role,$ucscope).','; - } - } - $role_output =~ s/,$//; - $r->print($role_output); - } else { - $r->print(join(',',@{$content->{'roles'}{$id}{$item}})); - } - $r->print(' | '); - } - } - $r->print(&Apache::loncommon::end_data_table_row()); - $r->print(&Apache::loncommon::end_data_table()); - } 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); - } else { - $r->print(' '); - } - } else { - $r->print(' '); - } - $r->print(''); - $r->print(&Apache::loncommon::end_data_table_row()); - $count ++; + $todisplay{$scope}{$newkey} = $$updated_controls{$newkey}; } + &build_access_summary($r,$count,$chg,%todisplay); } } $r->print(&Apache::loncommon::end_data_table()); } else { if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) { - $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome); + $errors .= ''. + &mt('A problem occurred saving access control settings: [_1]',$outcome). + ''; } } if ($errors) { @@ -670,32 +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('|||||||||||||||||
');
- $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(' |
' + .&mt('No '.$infotype.'-based conditions defined') + .'
' + .&additional_item($type) + ); } return; } @@ -970,34 +1578,38 @@ sub display_access_row { sub course_js { return qq| |; } sub course_row { - my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_; - my %content; + my ($r,$status,$type,$item,$access_controls,$now,$then) = @_; + my $content; my $defdom = $env{'user.domain'}; if ($status eq 'old') { - $defdom = $$access_controls{$item}{'domain'}; + $content = $$access_controls{$item}; + $defdom = $content->{'domain'}; } my $js = &Apache::loncommon::coursebrowser_javascript($defdom) .&course_js(); - my $crsgrptext = 'Groups'; - if ($type eq 'group') { - $crsgrptext = 'Teams'; - } + my $showtype = &mt('Course/Community'); + my $crstype = 'Course'; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, $type); $r->print('| '.&mt('Action').' | '.&mt('Roles').' | '. - &mt('Access').' | '.&mt('Sections').' | '. - &mt($crsgrptext).' | '.&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; 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('Action').' | '. + ''.&mt('Roles').' | '. + ''.&mt('Access').' | '. + ''.&mt('Sections').' | '. + ''.&mt('Groups').' |
|---|---|---|---|---|