-
- $text{'upload_label'}
- |
- $groupitem
+ 'Create subdirectory in current directory:',
+ 'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files'
+ );
+ 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');
+
+ # FIXME: This line should be deleted once Portfolio uses breadcrumbs
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')));
+
+ my $parse_check;
+ if (!&suppress_embed_prompt()) {
+ $parse_check = <<"END";
+
+
+
+
+END
+ }
+ $r->print(<<"TABLE");
+
TABLE
+ }
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"},
+ 'fieldname' => $env{"form.fieldname"},
+ 'continue' => $env{"form.continue"}
+ );
+ $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"},
+ 'fieldname' => $env{"form.fieldname"},
+ 'continue' => $env{"form.continue"}
+ );
+ $r->print(&make_anchor($url,\%anchor_fields,$tree[$i]).'/');
}
}
- $r->print('');
+ $r->print('');
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
&Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
- $r->print(' ");
}
+
+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::grades::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)=@_;
+ 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);
- if (defined($group)) {
- $groupitem = '';
- $groupecho = '&group='.$group;
+ my $access_admin_text = &mt('View Status');
+ if ($can_setacl) {
+ $access_admin_text = &mt('View/Change Status');
}
+
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash(
$current_permissions,$group);
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
my $now = time;
- if ($env{"form.mode"} eq 'selectfile'){
+ 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 '/')) {
- $display_out = '');
+ '
+ );
+ }
}
}
@@ -303,7 +513,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'),
@@ -311,19 +521,12 @@ sub close_form {
};
}
$r->print('');
- if (defined($group)) {
- $r->print("\n".'');
- }
- $r->print('
');
- $r->print('
+ $r->print(&group_form_data().'');
+ $r->print('
');
- if (defined($group)) {
- $r->print("\n".'');
- }
+ $env{'form.currentpath'}.'" />'.
+ &group_form_data());
$r->print("\n".'
');
}
@@ -331,33 +534,36 @@ 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.$_.'
';
+ foreach my $file (@$filename) {
+ $display_file_text .= $file_start.$path.$file.$file_end.'
';
}
} elsif (ref($filename) eq "SCALAR") {
- $display_file_text = ''.$path.$filename.'';
+ $display_file_text = $file_start.$path.$$filename.$file_end;
+ } else {
+ $display_file_text = $file_start.$path.$filename.$file_end;
}
return $display_file_text;
}
sub done {
- my ($message,$url,$group)=@_;
+ my ($message,$url)=@_;
unless (defined $message) {
$message='Done';
}
- my $result = '';
+ my %anchor_fields = (
+ 'showversions' => $env{'form.showversions'},
+ 'currentpath' => $env{'form.currentpath'},
+ 'fieldname' => $env{'form.fieldname'},
+ 'mode' => $env{'form.mode'}
+ );
+ my $result = ''.&make_anchor($url,\%anchor_fields,&mt($message)).'
';
return $result;
}
@@ -365,20 +571,20 @@ 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.').'
');
+ $r->print(&done('Back',$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(&done(undef,$url));
}
}
}
@@ -388,24 +594,61 @@ 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);
foreach my $delete_file (@files) {
$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).'
');
+ $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)));
+ 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') {
+ $r->print('
'.&mt("An error occurred ([_1]) while ".
+ "trying to delete access controls for the file.",$outcome).
+ '
');
+ } else {
+ if ($deloutcome eq 'ok') {
+ $r->print('
'.&mt('Access controls also deleted for the file.').'
');
+ } else {
+ $r->print(''.'
'.
+ &mt("An error occurred ([_1]) while ".
+ "trying to delete access controls for the file.",$deloutcome).
+ '
');
+ }
+ }
+ }
+ }
}
}
- $r->print(&done(undef,$url,$group));
+ $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 {
@@ -413,43 +656,42 @@ 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(''
+ .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
+ ,$result,$directory_name)
+ .'
');
} else {
# now remove from recent
-# $r->print('
removing '.$directory_name.'
print(&done(undef,$url,$group));
+ $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("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);
}
}
@@ -457,52 +699,276 @@ 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();
if ($filenewname eq '') {
- $r->print(''.
+ $r->print(''.
&mt("Error: no valid filename was provided to rename to.").
- '
');
- $r->print(&done(undef,$url,$group));
+ '
');
+ $r->print(&done(undef,$url));
return;
}
+ 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(' An errror occured ('.$result.
- ') while trying to rename '.&display_file().' to '.
- &display_file(undef,$filenewname).'
');
+ 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))
+ .'
');
+ return;
}
if ($filenewname ne $env{'form.filenewname'}) {
- $r->print("The new file name was changed from:
".$env{'form.filenewname'}." to $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(&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) = @_;
+ 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);
- &open_form($r,$url);
- $r->print(''.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'
'."\n");
- $r->print(&mt('Access to this file by others can be set to be one or more of the following types: public, password-protected or conditional.').'
- '.&mt('Public files are available to anyone without the need for login.').'
- '.&mt('Password-protected files do not require log-in, but will require the viewer to enter the password you set.').'
- '.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satify the conditions you set.').'
'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'
'.&mt('Alternatively you can grant access to people with specific LON-CAPA usernames and domains.').'
');
- &access_setting_table($r,$access_controls{$file_name});
- my $button_text = {
+ 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'}).'
';
+ $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.');
+ $info .= '
- '.&explain_conditionals();
+ $info .= '
'.
+ &mt('A listing of files viewable without log-in is available at: ')."http://$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 .= "
http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme
";
+ if ($group ne '') {
+ $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'
';
+ }
+ } 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);
+ $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,$access_controls{$file_name},$aclcount);
+ }
+}
+
+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('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
+}
+
+sub view_access_settings {
+ my ($r,$url,$access_controls,$aclcount) = @_;
+ my ($showstart,$showend);
+ my %todisplay;
+ foreach my $key (sort(keys(%{$access_controls}))) {
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ $todisplay{$scope}{$key} = $$access_controls{$key};
+ }
+ if ($aclcount) {
+ $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').
+ ' | '.&mt('Additional information').' | ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ my $count = 1;
+ my $chg = 'none';
+ &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 %anchor_fields = (
+ 'currentpath' => $env{'form.currentpath'}
+ );
+ $r->print('
'.&make_anchor($url, \%anchor_fields, &mt('Return to directory')));
+ return;
+}
+
+sub build_access_summary {
+ my ($r,$count,$chg,%todisplay) = @_;
+ my ($showstart,$showend);
+ my %scope_desc = (
+ public => 'Public',
+ guest => 'Passphrase-protected',
+ domains => 'Conditional: domain-based',
+ users => 'Conditional: user-based',
+ course => 'Conditional: course-based',
+ );
+ my @allscopes = ('public','guest','domains','users','course');
+ foreach my $scope (@allscopes) {
+ if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
+ next;
+ }
+ foreach my $key (sort(keys(%{$todisplay{$scope}}))) {
+ if ($count) {
+ $r->print(&Apache::loncommon::start_data_table_row());
+ }
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ my $content = $todisplay{$scope}{$key};
+ if ($chg eq 'delete') {
+ $showstart = &mt('Deleted');
+ $showend = $showstart;
+ } else {
+ $showstart = localtime($start);
+ if ($end == 0) {
+ $showend = &mt('No end date');
+ } else {
+ $showend = localtime($end);
+ }
+ }
+ $r->print(''.&mt($scope_desc{$scope}));
+ 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'}.')');
+ }
+ }
+ $r->print(' | '.&mt('Start: ').$showstart.
+ ' '.&mt('End: ').$showend.' | ');
+ if ($chg ne 'delete') {
+ if ($scope eq 'guest') {
+ $r->print(&mt('Passphrase').': '.$content->{'password'});
+ } elsif ($scope eq 'course') {
+ $r->print('');
+ $r->print(''.&mt('Roles').' | '.
+ &mt('Access').' | '.
+ &mt('Sections').' | ');
+ $r->print(''.&mt('Groups').' | ');
+ $r->print(' ');
+ foreach my $id (sort(keys(%{$content->{'roles'}}))) {
+ $r->print('');
+ 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') {
+ $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(' ');
+ }
+ $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);
+ } else {
+ $r->print(' ');
+ }
+ } else {
+ $r->print(' ');
+ }
+ $r->print(' | ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $count ++;
+ }
+ }
}
+
sub update_access {
- my ($r,$url,$group) = @_;
- my $function = &Apache::loncommon::get_users_function();
- my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
+ my ($r,$url,$group,$port_path) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -527,9 +993,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) {
@@ -539,23 +1005,26 @@ sub update_access {
}
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
- my %access_controls = &Apache::lonnet::get_access_controls(
- $current_permissions,$group,$file_name);
+ my %access_controls =
+ &Apache::lonnet::get_access_controls($current_permissions,
+ $group,$file_name);
if ($totalprocessed) {
if ($outcome eq 'ok') {
my $updated_controls = $access_controls{$file_name};
my ($showstart,$showend);
$r->print(&Apache::loncommon::start_data_table());
- $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(''.&mt('Type of change').' | '.
&mt('Access control').' | '.&mt('Dates available').
' | '.&mt('Additional information').' | ');
- $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table_header_row());
foreach my $chg (sort(keys(%processing))) {
if (@{$processing{$chg}} > 0) {
if ($chg eq 'delete') {
if (!($deloutcome eq 'ok')) {
- $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);
+ $errors .=''.
+ &mt('A problem occurred deleting access controls: [_1]',$deloutcome).
+ '';
next;
}
}
@@ -564,101 +1033,24 @@ sub update_access {
$r->print(''.&mt($title{$chg}).
'. | ');
my $count = 0;
+ my %todisplay;
foreach my $key (sort(keys(%{$$changes{$chg}}))) {
- if ($count) {
- $r->print(&Apache::loncommon::start_data_table_row());
- }
- my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
my $newkey = $key;
if ($chg eq 'activate') {
$newkey =~ s/^(\d+)/$$translation{$1}/;
}
- my %content = &Apache::lonnet::parse_access_controls(
- $$updated_controls{$newkey});
- if ($chg eq 'delete') {
- $showstart = &mt('Deleted');
- $showend = $showstart;
- } else {
- $showstart = localtime($start);
- if ($end == 0) {
- $showend = &mt('No end date');
- } else {
- $showend = localtime($end);
- }
- }
- $r->print(''.&mt($scope));
- if (($scope eq 'course') || ($scope eq 'group')) {
- if ($chg ne 'delete') {
- my $cid = $content{'domain'}.'_'.$content{'number'};
- my %course_description = &Apache::lonnet::coursedescription($cid);
- $r->print(' ('.$course_description{'description'}.')');
- }
- }
- $r->print(' | '.&mt('Start: ').$showstart.
- ' '.&mt('End: ').$showend.' | ');
- if ($chg ne 'delete') {
- if ($scope eq 'guest') {
- $r->print(&mt('Password').': '.$content{'password'});
- } elsif ($scope eq 'course' || $scope eq 'group') {
- $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(' ');
- foreach my $id (sort(keys(%{$content{'roles'}}))) {
- $r->print('');
- foreach my $item ('role','access','section','group') {
- $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) {
@@ -669,16 +1061,16 @@ sub update_access {
my $totalnew = 0;
my $status = 'new';
my ($firstitem,$lastitem);
- foreach my $newitem ('course','group','domains','users') {
+ foreach my $newitem ('course','domains','users') {
$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') {
+ &open_form($r,$url);
+ foreach my $newitem ('course','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'}).'
');
+ $r->print(' '.&mt('Add new [_1]-based access control for portfolio file: [_2]',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'
');
$firstitem = $totalnew;
$lastitem = $totalnew + $env{'form.new'.$newitem};
$totalnew = $lastitem;
@@ -690,106 +1082,88 @@ sub update_access {
$access_controls{$file_name},$now,$then);
}
}
- &close_form($r,$url,$group);
+ &close_form($r,$url);
} else {
- $r->print(' '.
- &mt('Display all access settings for this file').'');
+ my %anchor_fields = (
+ 'currentpath' => $env{'form.currentpath'},
+ 'access' => $env{'form.selectfile'}
+ );
+ $r->print(' '.&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')));
}
return;
}
sub build_access_record {
my ($num,$scope,$start,$end,$chg) = @_;
- my $record = ''.$start.''.
- $end.'';
- if ($scope eq 'guest') {
- $record .= ''.$env{'form.password'}.'';
- } elsif (($scope eq 'course') || ($scope eq 'group')) {
- $record .= ''.$env{'form.crsdom_'.$num}.''.
- $env{'form.crsnum_'.$num}.'';
+ my $record = {
+ type => $scope,
+ time => {
+ start => $start,
+ end => $end
+ },
+ };
+
+ if ($scope eq 'guest') {
+ $record->{'password'} = $env{'form.password'};
+ } elsif ($scope eq 'course') {
+ $record->{'domain'} = $env{'form.crsdom_'.$num};
+ $record->{'number'} = $env{'form.crsnum_'.$num};
my @role_ids;
- my @delete_role_ids;
- if (exists($env{'form.delete_role_'.$num})) {
- @delete_role_ids = &Apache::loncommon::get_env_multiple('form.delete_role_'.$num);
- }
- if (exists($env{'form.preserve_role_'.$num})) {
- my @preserves = &Apache::loncommon::get_env_multiple('form.preserve_role_'.$num);
- if (@delete_role_ids > 0) {
- foreach my $id (@preserves) {
- if (grep/^\Q$id\E$/,@delete_role_ids) {
- next;
- }
- push(@role_ids,$id);
- }
- } else {
- push(@role_ids,@preserves);
- }
- }
- my $next_id = '';
- if (exists($env{'form.add_role_'.$num})) {
- $next_id = $env{'form.add_role_'.$num};
- if ($next_id) {
- push(@role_ids,$next_id);
- }
- }
+ my @delete_role_ids =
+ &Apache::loncommon::get_env_multiple('form.delete_role_'.$num);
+ my @preserves =
+ &Apache::loncommon::get_env_multiple('form.preserve_role_'.$num);
+ if (@delete_role_ids) {
+ foreach my $id (@preserves) {
+ if (grep {$_ = $id} (@delete_role_ids)) {
+ next;
+ }
+ push(@role_ids,$id);
+ }
+ } else {
+ push(@role_ids,@preserves);
+ }
+
+ my $next_id = $env{'form.add_role_'.$num};
+ if ($next_id) {
+ push(@role_ids,$next_id);
+ }
+
foreach my $id (@role_ids) {
my (@roles,@accesses,@sections,@groups);
if (($id == $next_id) && ($chg eq 'update')) {
- @roles = split(/,/,$env{'form.role_'.$num.'_'.$next_id});
+ @roles = split(/,/,$env{'form.role_'.$num.'_'.$next_id});
@accesses = split(/,/,$env{'form.access_'.$num.'_'.$next_id});
@sections = split(/,/,$env{'form.section_'.$num.'_'.$next_id});
- @groups = split(/,/,$env{'form.group_'.$num.'_'.$next_id});
+ @groups = split(/,/,$env{'form.group_'.$num.'_'.$next_id});
} else {
@roles = &Apache::loncommon::get_env_multiple('form.role_'.$num.'_'.$id);
@accesses = &Apache::loncommon::get_env_multiple('form.access_'.$num.'_'.$id);
@sections = &Apache::loncommon::get_env_multiple('form.section_'.$num.'_'.$id);
@groups = &Apache::loncommon::get_env_multiple('form.group_'.$num.'_'.$id);
}
- $record .= '';
- foreach my $role (@roles) {
- $record .= ''.$role.'';
- }
- foreach my $access (@accesses) {
- $record .= ''.$access.'';
- }
- foreach my $section (@sections) {
- $record .= '';
- }
- foreach my $group (@groups) {
- $record .= ''.$group.'';
- }
- $record .= '';
+ $record->{'roles'}{$id}{'role'} = \@roles;
+ $record->{'roles'}{$id}{'access'} = \@accesses;
+ $record->{'roles'}{$id}{'section'} = \@sections;
+ $record->{'roles'}{$id}{'group'} = \@groups;
}
} elsif ($scope eq 'domains') {
my @doms = &Apache::loncommon::get_env_multiple('form.dom_'.$num);
- foreach my $dom (@doms) {
- if ($dom ne '') {
- $record .= ''.$dom.'';
- }
- }
+ $record->{'dom'} = \@doms;
} elsif ($scope eq 'users') {
my $userlist = $env{'form.users_'.$num};
- $userlist =~ s/[\r\n\f]+//g;
- $userlist =~ s/\s+//g;
- my @users = split/,/,$userlist;
- my %userhash;
- my @unique_users;
- foreach my $user (@users) {
- if (!exists($userhash{$user})) {
- $userhash{$user} = 1;
- push(@unique_users,$user);
- }
- }
- $record .= '';
- foreach my $user (@unique_users) {
+ $userlist =~ s/\s+//sg;
+ my %userhash = map { ($_,1) } (split(/,/,$userlist));
+ foreach my $user (keys(%userhash)) {
my ($uname,$udom) = split(/:/,$user);
- $record .= ''.$uname.''.$udom.
- '';
- }
- $record .= '';
+ push(@{$record->{'users'}}, {
+ 'uname' => $uname,
+ 'udom' => $udom
+ });
+ }
}
- $record .= '';
return $record;
}
@@ -806,29 +1180,27 @@ sub get_dates_from_form {
}
sub sort_users {
- my ($users_hash) = @_;
- my @curr_users;
- foreach my $user (keys(%{$users_hash})) {
- $curr_users[$$users_hash{$user}] = $user;
- }
- my $curr_user_list = join(",\n",@curr_users);
+ my ($users) = @_;
+ my @curr_users = map {
+ $_->{'uname'}.':'.$_->{'udom'}
+ } (@{$users});
+ my $curr_user_list = join(",\n",sort(@curr_users));
return $curr_user_list;
}
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 $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') {
@@ -839,27 +1211,42 @@ 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);
+ }
}
$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);
+ }
+ $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_row());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(''.&mt('Action').' | '.&mt('Dates available').' | ');
- $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table_header_row());
$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).' | ');
@@ -867,20 +1254,18 @@ sub access_setting_table {
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print(' | ');
- $r->print(''.&mt('Password-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_row());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(' | '.&mt('Action').' | '.&mt('Dates available').
- ' | '. &mt('Password').' | ');
- $r->print(&Apache::loncommon::end_data_table_row());
+ ''. &mt('Passphrase').' | ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
$r->print(&Apache::loncommon::start_data_table_row());
my $passwd;
if ($guest) {
- my %content = &Apache::lonnet::parse_access_controls(
- $$access_controls{$guest});
- $passwd = $content{'password'};
+ $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).' | ');
@@ -889,36 +1274,75 @@ 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(' | | '.
+ '');
+ my $numconditionals = 0;
+ my $conditionstext;
+ my %cond_status;
+ foreach my $scope ('domains','users','course') {
+ $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;
+ }
+ }
+ }
+ }
+ }
+ 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(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
+ }
+}
+
+sub condition_setting {
+ my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
+ $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);
+ &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then);
$r->print(' | | ');
- if (@courses > 0 || @groups > 0) {
+ if ($acl_count->{course} > 0) {
$r->print('');
} else {
$r->print(' | ');
}
- &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+ &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then);
$r->print(' | ');
- if (@courses > 0 || @groups > 0) {
- $r->print(' | ');
- } else {
- $r->print(' | | ');
- }
- &access_element($r,'group',\%acl_count,\@groups,$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 {
@@ -926,7 +1350,7 @@ sub access_element {
my $title = $type;
$title =~ s/s$//;
$title =~ s/^(\w)/uc($1)/e;
- $r->print(''.&mt('[_1]-based conditional access: ',$title));
+ $r->print(''.&mt('[_1]-based conditional access: ',&mt($title)));
if ($$acl_count{$type}) {
$r->print($$acl_count{$type}.' ');
if ($$acl_count{$type} > 1) {
@@ -946,89 +1370,81 @@ sub display_access_row {
my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
if (@{$items} > 0) {
my @all_doms;
- my $tablecolor;
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_row());
- $r->print(''.&mt('Action?').' | '.&mt($uctype).' | | '.
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print(' | '.&mt('Action?').' | '.&mt($uctype).' | '.
&mt('Dates available').' | ');
- if (($type eq 'course') || ($type eq 'group')) {
+ if ($type eq 'course' && $status eq 'old') {
$r->print(''.&mt('Allowed [_1] member affiliations',$type).
' | ');
$colspan ++;
- my $function = &Apache::loncommon::get_users_function();
- $tablecolor=&Apache::loncommon::designparm($function.'.tabbg');
} elsif ($type eq 'domains') {
- @all_doms = &Apache::loncommon::get_domains();
+ @all_doms = sort(&Apache::lonnet::all_domains());
}
- $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table_header_row());
foreach my $key (@{$items}) {
- if (($type eq 'course') || ($type eq 'group')) {
- &course_row($r,$status,$type,$key,$access_controls,
- $tablecolor,$now,$then);
+ $r->print(&Apache::loncommon::start_data_table_row());
+ 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);
}
+ $r->print(&Apache::loncommon::end_data_table_row());
}
- $r->print(&Apache::loncommon::end_data_table_row());
- $r->print(&Apache::loncommon::start_data_table_row());
if ($status eq 'old') {
+ $r->print(&Apache::loncommon::start_data_table_row());
$r->print(''.&additional_item($type).
' | ');
+ $r->print(&Apache::loncommon::end_data_table_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 [_1]-based conditions defined.',&mt($type)).'
'
+ .&additional_item($type));
}
return;
}
-sub course_row {
- my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
- my %content;
- my $defdom = $env{'user.domain'};
- if ($status eq 'old') {
- %content = &Apache::lonnet::parse_access_controls(
- $$access_controls{$item});
- $defdom = $content{'domain'};
- }
- $r->print(&Apache::loncommon::coursebrowser_javascript($defdom));
- $r->print(qq|
+sub course_js {
+ return qq|
-|);
- $r->print(&Apache::loncommon::start_data_table_row());
- my $crsgrptext = 'Groups';
- if ($type eq 'group') {
- $crsgrptext = 'Teams';
+|;
+}
+
+sub course_row {
+ my ($r,$status,$type,$item,$access_controls,$now,$then) = @_;
+ my $content;
+ my $defdom = $env{'user.domain'};
+ if ($status eq 'old') {
+ $content = $$access_controls{$item};
+ $defdom = $content->{'domain'};
}
+ my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
+ .&course_js();
+ my $uctype = $type;
+ $uctype =~ s/^(\w)/uc($1)/e;
my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
$type);
- $r->print(''.&actionbox($status,$num,$scope).' | ');
+ $r->print(''.$js.&actionbox($status,$num,$scope).' | ');
if ($status eq 'old') {
- my $cid = $content{'domain'}.'_'.$content{'number'};
+ my $cid = $content->{'domain'}.'_'.$content->{'number'};
my %course_description = &Apache::lonnet::coursedescription($cid);
- $r->print(''.$course_description{'description'}.' | ');
+ $r->print(''.$course_description{'description'}.' | ');
} elsif ($status eq 'new') {
- my $uctype = $type;
- $uctype =~ s/^(\w)/uc($1)/e;
- $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,$uctype).' | ');
}
- $r->print(''.&dateboxes($num,$start,$end).' | ');
- $r->print(' '.&mt('Add a roles-based condition').' | ');
- } elsif ($status eq 'new') {
- my $role_id = 1;
- my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');
- $r->print('