--- loncom/interface/portfolio.pm 2006/08/14 21:25:42 1.156 +++ loncom/interface/portfolio.pm 2006/08/18 20:55:44 1.156.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.156 2006/08/14 21:25:42 albertel Exp $ +# $Id: portfolio.pm,v 1.156.2.2 2006/08/18 20:55:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -636,14 +636,15 @@ sub display_access { 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 file: [_1]',$port_path.$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 $info .= &mt('Access to this file by others can be set to be one or more of the following types: public or passphrase-protected.'); $info .= '
'; +# $info .= '
  • '.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'
    '; +# $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'
    '; +# $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'); + $info .= '
    • '; if ($group eq '') { - $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:
    http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme")); + $info .= (&mt("A listing of files viewable without log-in is available at: http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio.
    For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:
    http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme
    ")); } if ($can_setacl) { @@ -1089,24 +1090,24 @@ 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(''); - } - &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(' '); +# &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(''); +# } +# &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(''); } @@ -1677,7 +1678,10 @@ sub createdir { } sub get_portfolio_root { - my ($uname,$udom) = &get_name_dom(); + my ($udom,$uname) = @_; + if (!(defined($udom)) || !(defined($uname))) { + ($uname,$udom) = &get_name_dom(); + } my $path; if (defined($env{'form.group'})) { $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';