';
+ my $result = &Apache::lonhtmlcommon::actionbox(
+ [&make_anchor($url,\%anchor_fields,&mt($linktext))]);
return $result;
}
@@ -662,8 +637,12 @@ sub delete {
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my ($uname,$udom) = &get_name_dom($group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $r->print(&mt('The file is locked and cannot be deleted.').' ');
- $r->print(&done('Back',$url));
+ $r->print(
+ '
'
+ .&mt('The file is locked and cannot be deleted.')
+ .'
'
+ .&done(undef,$url)
+ );
} else {
if (scalar(@files)) {
&open_form($r,$url);
@@ -684,18 +663,21 @@ sub delete_confirmed {
my $port_path = &get_port_path();
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
+ my @msg;
foreach my $delete_file (@files) {
- $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
- $env{'form.currentpath'}.
- $delete_file);
+ $result =
+ &Apache::lonnet::removeuserfile(
+ $uname,$udom,$port_path.
+ $env{'form.currentpath'}.
+ $delete_file);
if ($result ne 'ok') {
- $r->print(''
- .&mt('An error occurred ([_1]) while trying to delete [_2].'
- ,$result,&display_file(undef, $delete_file))
- .'
');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to delete [_2].'
+ ,$result,&display_file(undef, $delete_file)),1));
} else {
- $r->print(&mt('File: [_1] deleted.',
- &display_file(undef,$delete_file)));
+ 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 =
@@ -711,23 +693,24 @@ sub delete_confirmed {
&Apache::lonnet::modify_access_controls($file_name,\%changes,
$udom,$uname);
if ($outcome ne 'ok') {
- $r->print(' '.&mt("An error occurred ([_1]) while ".
- "trying to delete access controls for the file.",$outcome).
- '
');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while '.
+ 'trying to delete access controls for the file.',$outcome),1));
} else {
if ($deloutcome eq 'ok') {
- $r->print(' '.&mt('Access controls also deleted for the file.').'
');
+ push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message?
} else {
- $r->print(''.' '.
- &mt("An error occurred ([_1]) while ".
- "trying to delete access controls for the file.",$deloutcome).
- '
');
+ push(@msg, &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while '.
+ 'trying to delete access controls for the file.'
+ ,$deloutcome),1));
}
}
}
}
}
}
+ $r->print(&Apache::loncommon::confirmwrapper(join(' ',@msg)));
$r->print(&done(undef,$url));
}
@@ -747,12 +730,15 @@ sub delete_dir_confirmed {
my $port_path = &get_port_path();
my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
-
+
if ($result ne 'ok') {
- $r->print(''
- .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
- ,$result,$directory_name)
- .' ');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
+ ,$result,$directory_name),1)));
+ $r->print(&done(undef,$url));
+ return;
} else {
# now remove from recent
&Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
@@ -763,6 +749,10 @@ sub delete_dir_confirmed {
}
$env{'form.currentpath'} = $directory_name;
}
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Directory successfully deleted'))));
$r->print(&done(undef,$url));
}
@@ -772,7 +762,11 @@ sub rename {
my ($uname,$udom) = &get_name_dom($group);
$file_name = &prepend_group($file_name);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $r->print("The file is locked and cannot be renamed. ");
+ $r->print(
+ '
'
+ .&mt('The file is locked and cannot be renamed.')
+ .'
'
+ );
$r->print(&done(undef,$url));
} else {
&open_form($r,$url);
@@ -787,13 +781,32 @@ sub rename_confirmed {
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
+
+ # Display warning in case of filename cleaning has changed the filename
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print(
+ '
'
+ .&mt('Invalid characters')
+ .' '
+ .&mt('The new filename was changed from [_1] to [_2].'
+ ,''.&display_file('',$env{'form.filenewname'}).''
+ ,''.&display_file('',$filenewname).'')
+ .'
'
+ );
+
+ }
+
+ # Filename empty?
if ($filenewname eq '') {
- $r->print(''.
- &mt("Error: no valid filename was provided to rename to.").
- ' ');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no valid filename was provided to rename to.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
+ # Rename the file
my $chg_access;
my $result=
&Apache::lonnet::renameuserfile($uname,$udom,
@@ -802,18 +815,20 @@ sub rename_confirmed {
if ($result eq 'ok') {
$chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
} else {
- $r->print(''.
- &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
- ,$result,&display_file(),&display_file('',$filenewname))
- .' ');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
+ ,$result,&display_file(),&display_file('',$filenewname))
+ ,1)));
+ $r->print(&done(undef,$url));
return;
}
- if ($filenewname ne $env{'form.filenewname'}) {
- $r->print(&mt("The new file name was changed from: [_1] to [_2]",
- ''.&display_file('',$env{'form.filenewname'}).'',
- ''.&display_file('',$filenewname).''));
- }
$r->print($chg_access);
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('File successfully renamed'))));
$r->print(&done(undef,$url));
}
@@ -878,7 +893,13 @@ sub display_access {
my $aclcount = keys(%access_controls);
my ($header,$info);
if ($action eq 'chgaccess') {
- $header = '
'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'
';
$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.');
@@ -892,7 +913,7 @@ sub display_access {
}
$info .= " ".&Apache::lonnet::absolute_url($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").' ';
+ $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'}).'
'.
@@ -922,9 +943,11 @@ sub display_access {
sub explain_conditionals {
return
- &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').' '."\n".
- &mt('The conditions can include affiliation with a particular course or community, or a user account in a specific domain.').' '."\n".
- &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
+ &mt('Conditional files are accessible to users who satisfy the conditions you set.').'
'.
+ '
'.&mt('Conditions can be IP-based, in which case no log-in is required').'
'.
+ '
'.&mt("Conditions can also be based on a user's status, in which case the user needs an account in the LON-CAPA network, and needs to be logged in.").' '."\n".
+ &mt('The status-based conditions can include affiliation with a particular course or community, or a user account in a specific domain.').' '."\n".
+ &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'
';
}
sub view_access_settings {
@@ -965,8 +988,9 @@ sub build_access_summary {
domains => 'Conditional: domain-based',
users => 'Conditional: user-based',
course => 'Conditional: course/community-based',
+ ip => 'Conditional: IP-based',
);
- my @allscopes = ('public','guest','domains','users','course');
+ my @allscopes = ('public','guest','domains','users','course','ip');
foreach my $scope (@allscopes) {
if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
next;
@@ -1043,6 +1067,9 @@ sub build_access_summary {
} 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(' ');
}
@@ -1083,8 +1110,8 @@ sub update_access {
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print('
'.&mt('Allowing others to retrieve file: [_1]',
- $port_path.$file_name).'
'."\n");
+ $r->print('
'.&mt('Allowing others to retrieve file: [_1]',
+ ''.$port_path.$file_name.'').'
'."\n");
$file_name = &prepend_group($file_name);
my ($uname,$udom) = &get_name_dom($group);
my ($errors,$outcome,$deloutcome,$new_values,$translation);
@@ -1151,7 +1178,7 @@ sub update_access {
my $totalnew = 0;
my $status = 'new';
my ($firstitem,$lastitem);
- my @types = ('course','domains','users');
+ my @types = ('course','domains','users','ip');
foreach my $newitem (@types) {
$allnew += $env{'form.new'.$newitem};
}
@@ -1159,24 +1186,30 @@ sub update_access {
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
&open_form($r,$url);
- my %showtypes = &Apache::lonlocal::texthash (
+ my %showtypes = (
course => 'course/community',
domains => 'domain',
users => 'user',
+ ip => 'IP',
);
foreach my $newitem (@types) {
- if ($env{'form.new'.$newitem} > 0) {
- $r->print(' '.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]',''.$showtypes{$newitem},'',''.$env{'form.currentpath'}.$env{'form.selectfile'}.'').'
'.&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 $showtype;
if ($type eq 'course') {
- $showtype = &mt('course/community');
+ $showtype = 'course/community';
} elsif ($type eq 'domains') {
- $showtype = &mt('domains');
+ $showtype = 'domain';
} elsif ($type eq 'users') {
- $showtype = &mt('users');
+ $showtype = 'user';
+ } elsif ($type eq 'ip') {
+ $showtype = 'IP';
}
- my $output = &mt('Add new [_1] condition(s)?',$showtype).' '.&mt('Number to add: ').'';
- return $output;
+ return
+ &mt('Add new '.$showtype.'-based condition(s)?')
+ .' '.&mt('Number to add: ')
+ .'';
}
sub actionbox {
@@ -1690,7 +1768,7 @@ sub actionbox {
my $output = '';
+ $output .= '';
return $output;
}
@@ -1949,10 +2027,14 @@ sub upload {
my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'});
my ($state,$msg);
if ($fname eq '') {
- my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
'so after eliminating special characters there was nothing left.',
- ''.$env{'form.uploaddoc.filename'}.'');
- $r->print($msg.&done('Back',$url));
+ ''.$env{'form.uploaddoc.filename'}.''),1)));
+
+ $r->print(&done(undef,$url));
return;
}
my $disk_quota = &get_quota($group);
@@ -1969,7 +2051,7 @@ sub upload {
if ($state eq 'will_exceed_quota'
|| $state eq 'file_locked'
|| $state eq 'zero_bytes') {
- $r->print($msg.&done('Back',$url));
+ $r->print($msg.&done(undef,$url));
return;
}
@@ -2048,31 +2130,40 @@ function confirmOverwrite() {
}
// ]]>
+
$msg
-
+
+
END
} else {
- $r->print(''.&mt('An error occurred ([_1]) while trying to upload [_2].'
- ,$result,&display_file(undef,$fname)).' ');
- $r->print(&done('Back',$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to upload [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ $r->print(&done(undef,$url));
}
} elsif ($result !~ m|^/uploaded/|) {
- $r->print(''.&mt('An error occurred ([_1]) while trying to upload [_2].'
- ,$result,&display_file(undef,$fname)).' ');
- $r->print(&done('Back',$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to upload [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ $r->print(&done(undef,$url));
} else {
if (!&suppress_embed_prompt()) {
if ($mimetype eq 'text/html') {
@@ -2080,11 +2171,14 @@ END
&print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
return;
} else {
- $r->print('
'.&mt('Completed upload of the file.').' '.
- &mt('No embedded items identified.').'
');
+ $r->print('
'.&mt('No embedded items identified.').'
');
}
}
}
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('File successfully uploaded'))));
$r->print(&done(undef,$url));
}
return;
@@ -2151,10 +2245,13 @@ sub overwrite {
}
}
if ($fname eq '') {
- my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
'so after eliminating special characters there was nothing left.',
- ''.$env{'form.filename'}.'');
- $r->print($msg.&done('Back',$url));
+ ''.$env{'form.filename'}.''),1)));
+ $r->print(&done(undef,$url));
return;
}
$env{'form.'.$formname.'.filename'} = $fname;
@@ -2165,9 +2262,11 @@ sub overwrite {
\%allfiles,\%codebase,undef,undef,undef,
undef,undef,undef,\$mimetype);
if ($result !~ m|^/uploaded/|) {
- $r->print(''.&mt('An error occurred ([_1]) while trying to overwrite [_2].'
- ,$result,&display_file(undef,$fname)).' ');
- $r->print(&after_overwrite(&mt('Back'),$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to overwrite [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
} else {
if ($mode eq 'parse') {
if ($mimetype eq 'text/html') {
@@ -2175,18 +2274,21 @@ sub overwrite {
&print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
return;
} else {
- $r->print('
');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))
+ .' '.&mt('No embedded items identified.')));
}
}
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))));
}
- $r->print(&after_overwrite(undef,$url));
}
- return;
-}
-sub after_overwrite {
- my ($text,$url) = @_;
my $group_elem;
if (defined($env{'form.group'})) {
$group_elem = '';
@@ -2194,18 +2296,18 @@ sub after_overwrite {
$group_elem .= ''."\n";
}
}
- if ($text eq '') {
- $text = &mt('Done');
- }
my $hidden = &hidden_elems();
- return <$text
-
-$hidden
-$group_elem
-
-END
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ [''
+ .&mt('Return to directory')
+ .''])
+ .''
+ );
+ return;
}
sub lock_info {
@@ -2224,7 +2326,7 @@ sub lock_info {
$filetext = ''.$env{'form.lockinfo'}.
' (group: '.$group.')';
} else {
- $filetext = ''.$file_name.'';
+ $filetext = ''.$file_name.'';
}
my $title =''.&Apache::lonnet::gettitle($$array_item[0]).
@@ -2247,20 +2349,36 @@ sub lock_info {
}
}
}
- $r->print(&done(&mt('Back'),$url));
+ $r->print(&done(undef,$url));
return 'ok';
}
sub createdir {
my ($r,$url,$group)=@_;
my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
+ # Display warning in case of directory name cleaning has changed the directory name
+ if ($newdir ne $env{'form.newdir'}) {
+ $r->print(
+ '
'
+ .&mt('Invalid characters')
+ .' '
+ .&mt('The new directory name was changed from [_1] to [_2].'
+ ,''.$env{'form.newdir'}.''
+ ,''.$newdir.'')
+ .'
'
+ );
+ }
+
+ # Directory name empty?
if ($newdir eq '') {
- $r->print(''.
- &mt("Error: no directory name was provided.").
- ' ');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no directory name was provided.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
my $portfolio_root = &get_portfolio_root();
my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);
my $found_file = 0;
@@ -2272,26 +2390,32 @@ sub createdir {
}
}
}
- if ($found_file){
- $r->print(''
- .&mt('Unable to create a directory named [_1].',''.$newdir.'')
- .' '.&mt('A file or directory by that name already exists.').' ');
+ if ($found_file) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Unable to create a directory named [_1].'
+ ,''.$newdir.''),1)
+ .' '.&mt('A file or directory by that name already exists.')));
} else {
my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$newdir);
if ($result ne 'ok') {
- $r->print(''
- .&mt('An error occurred ([_1]) while trying to create a new directory [_2].'
- ,$result,&display_file())
- .' ');
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to create a new directory [_2].'
+ ,$result,&display_file()),1)));
+
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Directory successfully created'))));
}
}
- if ($newdir ne $env{'form.newdir'}) {
- $r->print(&mt('The new directory name was changed from [_1] to [_2].'
- ,''.$env{'form.newdir'}.'',''.$newdir.''));
- }
$r->print(&done(undef,$url));
}
@@ -2321,7 +2445,7 @@ sub get_group_quota {
if (%curr_groups) {
my %group_info = &Apache::longroup::get_group_settings(
$curr_groups{$group});
- $group_quota = $group_info{'quota'}; #expressed in Mb
+ $group_quota = $group_info{'quota'}; #expressed in MB
if ($group_quota) {
$group_quota = 1000 * $group_quota; #expressed in k
}
@@ -2443,8 +2567,8 @@ sub get_quota {
}
} else {
$disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
- $env{'user.domain'}); #expressed in Mb
- $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
+ $env{'user.domain'}); #expressed in MB
+ $disk_quota = 1024 * $disk_quota; # convert from MB to kB
}
return $disk_quota;
}
@@ -2547,7 +2671,7 @@ sub handler {
} else {
($uname,$udom) = &get_name_dom();
$portfolio_root = &get_portfolio_root();
- $title = &mt('My Space');
+ $title = 'My Space';
$can_modify = 1;
$can_delete = 1;
$can_upload = 1;
@@ -2621,14 +2745,18 @@ sub handler {
}
}
if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
- $r->print('');
- $r->print(&mt('No file was selected to upload.').' ');
- $r->print(&mt('To upload a file, click Browse... and select a file, then click Upload.'));
- $r->print('');
+ $r->print(
+ '
'
+ .&mt('No file was selected to upload.')
+ .' '
+ .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
+ ,'','')
+ .'
'
+ );
}
if ($env{'form.meta'}) {
&open_form($r,$url);
- $r->print(&mt('Edit the meta data').' ');
+ $r->print(&mt('Edit Metadata').' ');
&close_form($r,$url);
}
if ($env{'form.uploaddoc.filename'}) {
@@ -2662,8 +2790,8 @@ sub handler {
} elsif ($env{'form.action'} eq 'modify_orightml') {
if ($can_upload) {
my $result =
- &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,
- $portfolio_root,$group);
+ &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,
+ $udom,$portfolio_root);
$r->print($result.
&done('Return to directory',$url));
} else {