[Koha-cvs] CVS: koha userpage.pl,1.3,1.4
Andrew Arensburger
arensb at users.sourceforge.net
Sat Oct 5 11:47:45 CEST 2002
Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20223
Modified Files:
userpage.pl
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.
Index: userpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/userpage.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** userpage.pl 14 Aug 2002 18:12:51 -0000 1.3
--- userpage.pl 5 Oct 2002 09:47:43 -0000 1.4
***************
*** 21,25 ****
use strict;
require Exporter;
! use C4::Database;
use C4::Output; # contains picktemplate
use CGI;
--- 21,25 ----
use strict;
require Exporter;
! use C4::Context;
use C4::Output; # contains picktemplate
use CGI;
***************
*** 28,56 ****
my $query=new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
!
!
! my %configfile;
! open (KC, "/etc/koha.conf");
! while (<KC>) {
! chomp;
! (next) if (/^\s*#/);
! if (/(.*)\s*=\s*(.*)/) {
! my $variable=$1;
! my $value=$2;
! # Clean up white space at beginning and end
! $variable=~s/^\s*//g;
! $variable=~s/\s*$//g;
! $value=~s/^\s*//g;
! $value=~s/\s*$//g;
! $configfile{$variable}=$value;
! }
! }
!
!
!
! my $includes=$configfile{'includes'};
! ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
my $templatebase="user/userpage.tmpl";
my $theme=picktemplate($includes, $templatebase);
--- 28,35 ----
my $query=new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
! my $includes = C4::Context->config('includes') ||
! "/usr/local/www/hdl/htdocs/includes";
my $templatebase="user/userpage.tmpl";
my $theme=picktemplate($includes, $templatebase);
More information about the Koha-cvs
mailing list