[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm

[albertel]

albertel		Tue Jun 27 11:37:20 2006 EDT

  Modified files:              
    /loncom/interface	portfolio.pm 
  Log:
  - disabling user/group access restrictions screen for 2.2
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.121 loncom/interface/portfolio.pm:1.122
--- loncom/interface/portfolio.pm:1.121	Mon Jun 26 18:23:27 2006
+++ loncom/interface/portfolio.pm	Tue Jun 27 11:37:17 2006
@@ -526,7 +526,20 @@
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);
     my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
-    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.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
+    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.').
+	'<br /><ul><li>'.
+	&mt('Public files are available to anyone without the need for login.').
+	'</li><li>'.
+	&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').
+	'</li>'.
+	#'<li>'.
+	#&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').
+	#'<br />'.
+	#&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').
+	#'<br />'.
+	#&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').
+	'</li></ul>';
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
@@ -973,24 +986,25 @@
               $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
-    $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
-    &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
-    $r->print('</td><td>&nbsp;</td><td valign="top">');
-    &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
-    $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
-    if (@courses > 0 || @groups > 0) {
-        $r->print('<td colspan="3" valign="top">');
-    } else {
-        $r->print('<td valign="top">');
-    }
-    &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
-    $r->print('</td>');
-    if (@courses > 0 || @groups > 0) {
-        $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
-    } else {
-        $r->print('<td>&nbsp;</td><td valign="top">');
-    }
-    &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
+
+    #$r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
+    #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
+    #$r->print('</td><td>&nbsp;</td><td valign="top">');
+    #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
+    #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
+    #if (@courses > 0 || @groups > 0) {
+    #    $r->print('<td colspan="3" valign="top">');
+    #} else {
+    #    $r->print('<td valign="top">');
+    #}
+    #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+    #$r->print('</td>');
+    #if (@courses > 0 || @groups > 0) {
+    #    $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
+    #} else {
+    #    $r->print('<td>&nbsp;</td><td valign="top">');
+    #}
+    #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
     $r->print('</td></tr></table>');
 }