[Koha-cvs] CVS: koha/C4 Auth.pm,1.9.2.14,1.9.2.15 Print.pm,1.3.2.9,1.3.2.10
Finlay Thompson
finlayt at users.sourceforge.net
Wed Nov 13 04:02:48 CET 2002
Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv28765/C4
Modified Files:
Tag: rel-1-2
Auth.pm Print.pm
Log Message:
resolving some simple conflicts
Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9.2.14
retrieving revision 1.9.2.15
diff -C2 -r1.9.2.14 -r1.9.2.15
*** Auth.pm 25 Oct 2002 21:52:31 -0000 1.9.2.14
--- Auth.pm 13 Nov 2002 03:02:45 -0000 1.9.2.15
***************
*** 1,5 ****
package C4::Auth;
-
# Copyright 2000-2002 Katipo Communications
#
--- 1,4 ----
***************
*** 64,67 ****
--- 63,69 ----
($cardnumber) || ($cardnumber=$userid);
my $flags=getuserflags($cardnumber,$dbh);
+ foreach my $fl (keys %$flags){
+ warn "$fl : $flags->{$fl}\n";
+ }
my $configfile=configfile();
if ($userid eq $configfile->{'user'}) {
***************
*** 94,97 ****
--- 96,100 ----
my $dbh=C4Connect();
my $sth=$dbh->prepare("SELECT userid,ip,lasttime FROM sessions WHERE sessionid=?");
+ warn "SessionID = $sessionID\n";
$sth->execute($sessionID);
if ($sth->rows) {
***************
*** 122,126 ****
$sti->execute(time(), $sessionID);
! if (my $flags = haspermission($dbh, $userid, $flagsrequired)) {
return ($userid, $cookie, $sessionID, $flags);
} else {
--- 125,131 ----
$sti->execute(time(), $sessionID);
! my $flags = haspermission($dbh, $userid, $flagsrequired);
! warn "Flags : $flags\n";
! if ($flags) {
return ($userid, $cookie, $sessionID, $flags);
} else {
***************
*** 141,144 ****
--- 146,150 ----
} else {
($sessionID) || ($sessionID=int(rand()*100000).'-'.time());
+ warn "sessionID : $sessionID";
my $userid=$query->param('userid');
my $password=$query->param('password');
***************
*** 178,181 ****
--- 184,188 ----
$template->param(message => "Invalid userid or password entered.");
}
+ warn "Im in here!\n";
my @inputs;
my $self_url = $query->self_url();
Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.3.2.9
retrieving revision 1.3.2.10
diff -C2 -r1.3.2.9 -r1.3.2.10
*** Print.pm 28 Oct 2002 19:56:02 -0000 1.3.2.9
--- Print.pm 13 Nov 2002 03:02:45 -0000 1.3.2.10
***************
*** 50,53 ****
--- 50,54 ----
@ISA = qw(Exporter);
+
@EXPORT = qw(&remoteprint &printreserve &printslip);
***************
*** 70,76 ****
from C<¤tissues>.
- =cut
#'
- # FIXME - It'd be nifty if this could generate pretty PostScript.
sub remoteprint {
my ($env,$items,$borrower)=@_;
--- 71,75 ----
More information about the Koha-cvs
mailing list