--- loncom/interface/portfolio.pm 2007/03/03 01:33:21 1.177 +++ loncom/interface/portfolio.pm 2007/06/11 20:56:38 1.181 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.177 2007/03/03 01:33:21 albertel Exp $ +# $Id: portfolio.pm,v 1.181 2007/06/11 20:56:38 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1014,7 +1014,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). ''; } } @@ -1347,7 +1347,7 @@ sub display_access_row { ''); $colspan ++; } elsif ($type eq 'domains') { - @all_doms = &Apache::lonnet::all_domains(); + @all_doms = sort(&Apache::lonnet::all_domains()); } $r->print(&Apache::loncommon::end_data_table_header_row()); foreach my $key (@{$items}) { @@ -1818,7 +1818,7 @@ sub upload { $port_path.$env{'form.currentpath'}, $mode,\%allfiles,\%codebase); if ($result !~ m|^/uploaded/|) { - $r->print(''.'An errror occured ('.$result. + $r->print(''.'An error occured ('.$result. ') while trying to upload '.&display_file().'
'); $r->print(&done('Back',$url)); } else { @@ -1830,7 +1830,9 @@ sub upload { STATE $r->print("

Completed upload of the file. This file contained references to other files. You can upload these now:

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

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

'); } else { $r->print(&done(undef,$url)); @@ -1868,7 +1870,7 @@ sub upload_embedded { &Apache::lonnet::userfileupload('embedded_item_'.$i,'', $port_path.$path); if ($result !~ m|^/uploaded/|) { - $r->print(''.'An errror occured ('.$result. + $r->print(''.'An error occured ('.$result. ') while trying to upload '.&display_file($path,$fname).'
'); next; } else { @@ -1951,7 +1953,7 @@ sub createdir { my $result=&Apache::lonnet::mkdiruserfile($uname,$udom, $port_path.$env{'form.currentpath'}.$newdir); if ($result ne 'ok') { - $r->print(''.'An errror occured ('.$result. + $r->print(''.'An error occured ('.$result. ') while trying to create a new directory '.&display_file().'
'); } }