[interchange-cvs] interchange - kwalsh modified 2 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Tue Aug 8 03:20:42 EDT 2006
User: kwalsh
Date: 2006-08-08 07:20:42 GMT
Modified: lib/Vend Error.pm Interpolate.pm
Log:
* Added a new $Vend::LockedOut internal flag to test for locked out
users instead of testing for "http://127.0.0.1". This avoids a
side-effect that could be felt by people running Interchange on
their local workstation.
Revision Changes Path
2.12 +3 -2 interchange/lib/Vend/Error.pm
rev 2.12, prev_rev 2.11
Index: Error.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Error.pm,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- Error.pm 5 Apr 2006 14:42:19 -0000 2.11
+++ Error.pm 8 Aug 2006 07:20:42 -0000 2.12
@@ -1,6 +1,6 @@
# Vend::Error - Handle Interchange error pages and messages
#
-# $Id: Error.pm,v 2.11 2006/04/05 14:42:19 mheins Exp $
+# $Id: Error.pm,v 2.12 2006/08/08 07:20:42 kwalsh Exp $
#
# Copyright (C) 2002-2005 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -38,7 +38,7 @@
use vars qw/$VERSION/;
-$VERSION = substr(q$Revision: 2.11 $, 10);
+$VERSION = substr(q$Revision: 2.12 $, 10);
sub get_locale_message {
my ($code, $message, @arg) = @_;
@@ -195,6 +195,7 @@
logGlobal({level => 'notice'}, $msg);
}
$Vend::Cfg->{VendURL} = $Vend::Cfg->{SecureURL} = 'http://127.0.0.1';
+ $Vend::LockedOut = 1;
logError($msg) if $msg;
}
2.276 +3 -3 interchange/lib/Vend/Interpolate.pm
rev 2.276, prev_rev 2.275
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.275
retrieving revision 2.276
diff -u -r2.275 -r2.276
--- Interpolate.pm 8 Aug 2006 02:01:02 -0000 2.275
+++ Interpolate.pm 8 Aug 2006 07:20:42 -0000 2.276
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.275 2006/08/08 02:01:02 kwalsh Exp $
+# $Id: Interpolate.pm,v 2.276 2006/08/08 07:20:42 kwalsh Exp $
#
# Copyright (C) 2002-2006 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.275 $, 10);
+$VERSION = substr(q$Revision: 2.276 $, 10);
@EXPORT = qw (
@@ -5109,7 +5109,7 @@
my $opt = shift;
my $abort;
- if ($Vend::Cfg->{VendURL} eq 'http://127.0.0.1') {
+ if ($Vend::LockedOut) {
$abort = 1;
delete $opt->{new};
}
More information about the interchange-cvs
mailing list