[interchange-cvs] interchange - racke modified 4 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed May 7 13:26:00 2003
User: racke
Date: 2003-05-07 17:25:19 GMT
Modified: lib/Vend Dispatch.pm Server.pm Session.pm UserDB.pm
Log:
continued removal of static page building related code
Revision Changes Path
1.17 +3 -7 interchange/lib/Vend/Dispatch.pm
rev 1.17, prev_rev 1.16
Index: Dispatch.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Dispatch.pm 28 Apr 2003 15:25:32 -0000 1.16
+++ Dispatch.pm 7 May 2003 17:25:19 -0000 1.17
@@ -1,6 +1,6 @@
# Vend::Dispatch - Handle Interchange page requests
#
-# $Id: Dispatch.pm,v 1.16 2003/04/28 15:25:32 mheins Exp $
+# $Id: Dispatch.pm,v 1.17 2003/05/07 17:25:19 racke Exp $
#
# Copyright (C) 2002 ICDEVGROUP <interchange@icdevgroup.org>
# Copyright (C) 2002 Mike Heins <mike@perusion.net>
@@ -26,7 +26,7 @@
package Vend::Dispatch;
use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.16 $, 10);
+$VERSION = substr(q$Revision: 1.17 $, 10);
use POSIX qw(strftime);
use Vend::Util;
@@ -1003,9 +1003,6 @@
or die "Couldn't change to $Vend::Cfg->{VendRoot}: $!\n";
POSIX::setlocale(POSIX::LC_ALL, $Vend::Cfg->{ExecutionLocale});
set_file_permissions();
-# STATICPAGE
- tie_static_dbm() if $Vend::Cfg->{StaticDBM};
-# END STATICPAGE
umask $Vend::Cfg->{Umask};
#show_times("end cgi and config mapping") if $Global::ShowTimes;
@@ -1273,8 +1270,7 @@
$Vend::Session->{'user'} = $CGI::user;
- undef $Vend::Cookie if
- $Vend::Session->{logged_in} && ! $Vend::Cfg->{StaticLogged};
+ undef $Vend::Cookie if $Vend::Session->{logged_in};
$CGI::pragma = 'no-cache'
if delete $::Scratch->{mv_no_cache};
2.32 +2 -3 interchange/lib/Vend/Server.pm
rev 2.32, prev_rev 2.31
Index: Server.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Server.pm,v
retrieving revision 2.31
retrieving revision 2.32
diff -u -r2.31 -r2.32
--- Server.pm 7 Apr 2003 14:15:19 -0000 2.31
+++ Server.pm 7 May 2003 17:25:19 -0000 2.32
@@ -1,6 +1,6 @@
# Vend::Server - Listen for Interchange CGI requests as a background server
#
-# $Id: Server.pm,v 2.31 2003/04/07 14:15:19 mheins Exp $
+# $Id: Server.pm,v 2.32 2003/05/07 17:25:19 racke Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -25,7 +25,7 @@
package Vend::Server;
use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.31 $, 10);
+$VERSION = substr(q$Revision: 2.32 $, 10);
use POSIX qw(setsid strftime);
use Vend::Util;
@@ -412,7 +412,6 @@
$Vend::Expire || undef,
]
unless $Vend::CookieID;
- push @jar, ['MV_STATIC', 1] if $Vend::Cfg->{Static};
push @jar, @{$::Instance->{Cookies}}
if defined $::Instance->{Cookies};
$out = '';
2.12 +2 -35 interchange/lib/Vend/Session.pm
rev 2.12, prev_rev 2.11
Index: Session.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Session.pm,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- Session.pm 4 Apr 2003 04:43:20 -0000 2.11
+++ Session.pm 7 May 2003 17:25:19 -0000 2.12
@@ -1,6 +1,6 @@
# Vend::Session - Interchange session routines
#
-# $Id: Session.pm,v 2.11 2003/04/04 04:43:20 mheins Exp $
+# $Id: Session.pm,v 2.12 2003/05/07 17:25:19 racke Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -26,7 +26,7 @@
require Exporter;
use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.11 $, 10);
+$VERSION = substr(q$Revision: 2.12 $, 10);
@ISA = qw(Exporter);
@@ -565,39 +565,6 @@
return ($expire > $time);
}
-
-sub tie_static_dbm {
- my $rw = shift;
- untie(%Vend::StaticDBM) if $rw;
- if($Global::GDBM) {
- my $flags = $rw ? &GDBM_WRITER : &GDBM_READER;
- $flags = &GDBM_NEWDB
- if $rw && (! -f "$Vend::Cfg->{StaticDBM}.gdbm");
- tie(%Vend::StaticDBM,
- 'GDBM_File',
- "$Vend::Cfg->{StaticDBM}.gdbm",
- $flags,
- $Vend::Cfg->{'FileCreationMask'},
- )
- or $Vend::Cfg->{SaveStaticDBM} = delete $Vend::Cfg->{StaticDBM};
- }
- elsif ($Global::DB_File) {
- tie(%Vend::StaticDBM,
- 'DB_File',
- "$Vend::Cfg->{StaticDBM}.db",
- ($rw ? &O_RDWR | &O_CREAT : &O_RDONLY),
- $Vend::Cfg->{'FileCreationMask'},
- )
- or undef $Vend::Cfg->{StaticDBM};
- }
- else {
- $Vend::Cfg->{SaveStaticDBM} = delete $Vend::Cfg->{StaticDBM};
- }
- ::logError("Failed to create StaticDBM %s", $Vend::Cfg->{StaticDBM})
- if $rw && ! $Vend::Cfg->{StaticDBM};
- return $Vend::Cfg->{StaticDBM} || undef;
-}
-
1;
2.16 +4 -6 interchange/lib/Vend/UserDB.pm
rev 2.16, prev_rev 2.15
Index: UserDB.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/UserDB.pm,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -r2.15 -r2.16
--- UserDB.pm 5 May 2003 14:13:47 -0000 2.15
+++ UserDB.pm 7 May 2003 17:25:19 -0000 2.16
@@ -1,6 +1,6 @@
# Vend::UserDB - Interchange user database functions
#
-# $Id: UserDB.pm,v 2.15 2003/05/05 14:13:47 mheins Exp $
+# $Id: UserDB.pm,v 2.16 2003/05/07 17:25:19 racke Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -16,7 +16,7 @@
package Vend::UserDB;
-$VERSION = substr(q$Revision: 2.15 $, 10);
+$VERSION = substr(q$Revision: 2.16 $, 10);
use vars qw!
$VERSION
@@ -1646,8 +1646,7 @@
{
$Vend::admin = 1;
}
- undef $Vend::Cookie
- unless $Vend::Cfg->{StaticLogged};
+ undef $Vend::Cookie;
::update_user();
}
}
@@ -1661,8 +1660,7 @@
if($status and ! $options{no_login}) {
$Vend::Session->{logged_in} = 1;
$Vend::Session->{username} = $user->{USERNAME};
- undef $Vend::Cookie
- unless $Vend::Cfg->{StaticLogged};
+ undef $Vend::Cookie;
}
}
elsif($function eq 'logout') {