--- loncom/auth/restrictedaccess.pm	2006/07/14 21:38:26	1.2
+++ loncom/auth/restrictedaccess.pm	2008/12/11 14:52:26	1.7
@@ -45,32 +45,41 @@ sub handler {
     if (!defined($origurl)) {
 	$origurl = $r->uri;
     }
+    my $msg='';
     if (exists($env{'form.pass1'})) {
         my ($result,$end) = &check_pass($r,$origurl);
         if ($result eq 'ok') {
-	    &Apache::lonnet::appenv(('user.passphrase_access_'.$origurl =>
-					 $end));
+	    &Apache::lonnet::allowuploaded('/adm/restrictedaccess',
+					   $origurl);
 	    $env{'request.state'} = "published";
 	    $env{'request.filename'} = $origurl;
 	    $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.$origurl);
 	    return REDIRECT;
         } else {
-            &print_entryform($r,$origurl,"Invalid passphrase");
-        }
-    } else {
-        &print_entryform($r,$origurl);
+	    $msg = 'Invalid passphrase';
+	}
     }
-    return OK;
-}
 
-sub print_entryform {
-    my ($r,$origurl,$msg) = @_;
-    &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
     $r->print(&Apache::loncommon::start_page('Passphrase protected file'));
+    &print_entryform($r,$origurl,$msg);
+
+    return OK;
+}
+
+sub setup_handler {
+    my ($r) = @_;
+    $r->set_handlers('PerlHandler'=> 
+		     [\&Apache::restrictedaccess::handler]);
+    $r->handler('perl-script');		    
+}
+
+sub print_entryform {
+    my ($r,$origurl,$msg) = @_;
+
     $r->print('<script type="text/javascript">
 function verify() {
     if (document.passform.pass1.value == "") {
@@ -80,14 +89,16 @@ function verify() {
     document.passform.submit();
 } 
 </script>');
-    $r->print('<span class="LC_error">'.$msg.'</span>');
+    if ($msg ne '') {
+	$r->print('<span class="LC_error">'.$msg.'</span>');
+    }
     $r->print('<div align="center"><form name="passform" method="post" '.
               'action="/adm/restrictedaccess">');
     $r->print('<br /><br /><br />');
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_row());     
-    $r->print('<td><nobr>'.&mt('Passphrase: ').'</nobr></td>'.
-              '<td><input type="password" size="20" name="pass1"></td>');
+    $r->print('<td><span class="LC_nobreak">'.&mt('Passphrase: ').'</span></td>'.
+              '<td><input type="password" size="20" name="pass1" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::start_data_table_row());
     $r->print('<td align="center" colspan="2"><br />'.
@@ -102,21 +113,15 @@ function verify() {
 
 sub check_pass {
     my ($r,$origurl) = @_;
-    my ($udom,$unum,$group,$file_name,$result,$end);
-    if ($origurl =~  m-/+uploaded/([^/]+)/([^/]+)/portfolio(/.+)$-) {
-        $udom = $1;
-        $unum = $2;
-        $file_name = $3;
-    } elsif ($origurl =~ m-/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$-) {
-        $udom = $1;
-        $unum = $2;
-        $group = $3;
-        $file_name = $3.'/'.$4;
-    }
+    my (undef,$udom,$unum,$file_name,$group) = 
+	&Apache::lonnet::parse_portfolio_url($origurl);
+
     my $curr_perms = &Apache::lonnet::get_portfile_permissions($udom,$unum);
     my %acc_controls = &Apache::lonnet::get_access_controls($curr_perms,
                                                             $group,$file_name);
     my $access_hash = $acc_controls{$file_name};
+
+    my ($result,$end);
     foreach my $key (sort(keys(%{$access_hash}))) {
         if ($key =~ /^[^:]+:guest_(\d+)/) {
             $end = $1;