[interchange-cvs] interchange - jon modified lib/Vend/Util.pm
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Fri May 28 18:38:10 EDT 2004
User: jon
Date: 2004-05-28 22:38:04 GMT
Modified: lib/Vend Util.pm
Log:
Remove redundant AlwaysSecure check.
Move match_security check to be grouped with another security check
just for more logical grouping.
Revision Changes Path
2.72 +6 -10 interchange/lib/Vend/Util.pm
rev 2.72, prev_rev 2.71
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.71
retrieving revision 2.72
diff -u -u -r2.71 -r2.72
--- Util.pm 7 Mar 2004 03:14:41 -0000 2.71
+++ Util.pm 28 May 2004 22:38:03 -0000 2.72
@@ -1,6 +1,6 @@
# Vend::Util - Interchange utility functions
#
-# $Id: Util.pm,v 2.71 2004/03/07 03:14:41 mheins Exp $
+# $Id: Util.pm,v 2.72 2004/05/28 22:38:03 jon Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -87,7 +87,7 @@
use Vend::File;
use subs qw(logError logGlobal);
use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.71 $, 10);
+$VERSION = substr(q$Revision: 2.72 $, 10);
my $Eval_routine;
my $Eval_routine_file;
@@ -1178,10 +1178,6 @@
my $secure;
my @parms;
- if(exists $Vend::Cfg->{AlwaysSecure}{$path}) {
- $r = $Vend::Cfg->{SecureURL};
- }
-
my %skip = qw/form 1 href 1 reparse 1/;
for(@scratches) {
@@ -1213,10 +1209,6 @@
$ct = ++$Vend::Session->{pageCount}
unless $opt->{no_count};
- if($opt->{match_security}) {
- $opt->{secure} = $CGI::secure;
- }
-
if($opt->{no_session}) {
undef $id;
undef $ct;
@@ -1226,6 +1218,10 @@
my $cur = $Global::Variable->{MV_PAGE};
$cur =~ s{/[^/]+$}{}
and $path = "$cur/$path";
+ }
+
+ if($opt->{match_security}) {
+ $opt->{secure} = $CGI::secure;
}
if($opt->{secure} or exists $Vend::Cfg->{AlwaysSecure}{$path}) {
More information about the interchange-cvs
mailing list