[Scoop-checkins] cvs commit in scoop/lib/Scoop

[cvs at versionhost.com]

Commit info for scoop/lib/Scoop:

Modified Files:
	ApacheHandler.pm 
Log Message:
Commiting bug #43. safe_mode redirect changes by MH & janra
--hulver


Index: ApacheHandler.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/ApacheHandler.pm,v
retrieving revision 1.74
retrieving revision 1.75
diff -r1.74 -r1.75
47,48c47,56
< 	# If set, Scoop will only serve pages to superuser
< 	if ($S->{UI}->{VARS}->{safe_mode} && ($S->{GID} ne 'Superuser')) {
---
> 	# If set, Scoop will only serve pages to superuser or those with the right perm
> 	if ($S->{UI}->{VARS}->{safe_mode} && ($S->{GID} ne 'Superuser') && !($S->have_perm('bypass_safe_mode'))) {
> 		my $ret = $Scoop::MP2 ? &Apache::HTTP_SERVICE_UNAVAILABLE : &Apache::Constants::HTTP_SERVICE_UNAVAILABLE;
> 		# check if a redirect page is set
> 		my $redir_page = $S->{UI}->{VARS}->{safe_mode_redirect};
> 
> 		if($redir_page) {
> 			$S->apache->header_out('Location', $redir_page);
> 			$ret  = $Scoop::MP2 ? &Apache::HTTP_MOVED_TEMPORARILY : &Apache::Constants::HTTP_MOVED_TEMPORARILY;
> 		}
51,52c59,60
< 		return $Scoop::MP2 ? &Apache::HTTP_SERVICE_UNAVAILABLE : &Apache::Constants::HTTP_SERVICE_UNAVAILABLE;
< 	}
---
> 		return $ret;
> 	} # done checking for safe mode.