[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha admin-home.pl,1.1.2.2,1.1.2.3 bookcount.pl,1.1.4.1,
|
From: |
Steve Tonnesen |
|
Subject: |
[Koha-cvs] CVS: koha admin-home.pl,1.1.2.2,1.1.2.3 bookcount.pl,1.1.4.1,1.1.4.2 catalogue-home.pl,1.1.2.2,1.1.2.3 charges.pl,1.1.1.1.2.1,1.1.1.1.2.2 currency.pl,1.1.1.1.2.1,1.1.1.1.2.2 delbiblio.pl,1.2.2.3,1.2.2.4 deletemem.pl,1.2.2.1,1.2.2.2 delitem.pl,1.1.1.1.2.2,1.1.1.1.2.3 detail.pl,1.3.2.5,1.3.2.6 groups.pl,1.1.2.1,1.1.2.2 moredetail.pl,1.4.2.4,1.4.2.5 reports-home.pl,1.1.2.2,1.1.2.3 shelves.pl,1.2.2.2,1.2.2.3 |
|
Date: |
Mon, 28 Oct 2002 09:45:17 -0800 |
Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28530
Modified Files:
Tag: rel-1-2
admin-home.pl bookcount.pl catalogue-home.pl charges.pl
currency.pl delbiblio.pl deletemem.pl delitem.pl detail.pl
groups.pl moredetail.pl reports-home.pl shelves.pl
Log Message:
Merging from trunk to rel-1-2
Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin-home.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** admin-home.pl 26 Aug 2002 17:08:56 -0000 1.1.2.2
--- admin-home.pl 28 Oct 2002 17:45:14 -0000 1.1.2.3
***************
*** 6,31 ****
use C4::Output;
use C4::Database;
!
! my $configfile=configfile();
! my $intranetdir=$configfile->{'intranetdir'};
my $query = new CGI;
my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
! print $query->header(-cookie => $cookie);
!
! print startpage();
! print startmenu('catalogue');
!
!
! print "<p align=left>Logged in as: $loggedinuser [<a
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
!
! open H, "$intranetdir/htdocs/admin/index.html";
! while (<H>) {
! print $_;
! }
! close H;
!
! print endpage();
! print endmenu('catalogue');
--- 6,16 ----
use C4::Output;
use C4::Database;
! use HTML::Template;
my $query = new CGI;
my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
! my $template = gettemplate("parameters/admin-home.tmpl");
! $template->param(loggeninuser => $loggedinuser);
! print $query->header(-cookie => $cookie),$template->output;
Index: bookcount.pl
===================================================================
RCS file: /cvsroot/koha/koha/bookcount.pl,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -r1.1.4.1 -r1.1.4.2
*** bookcount.pl 22 Jul 2002 17:38:06 -0000 1.1.4.1
--- bookcount.pl 28 Oct 2002 17:45:14 -0000 1.1.4.2
***************
*** 1,9 ****
--- 1,30 ----
#!/usr/bin/perl
+ # $Id$
+
#written 7/3/2002 by Finlay
#script to display reports
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use strict;
use CGI;
+ use C4::Context;
use C4::Search;
use C4::Circulation::Circ2;
***************
*** 40,44 ****
! # make the page ...
print $input->header;
--- 61,65 ----
! # make the page ...
print $input->header;
***************
*** 94,102 ****
# database includes
use DBI;
- use C4::Database;
sub itemdatanum {
my ($itemnumber)address@hidden;
! my $dbh=C4Connect;
my $itm = $dbh->quote("$itemnumber");
my $query = "select * from items where itemnumber=$itm";
--- 115,122 ----
# database includes
use DBI;
sub itemdatanum {
my ($itemnumber)address@hidden;
! my $dbh = C4::Context->dbh;
my $itm = $dbh->quote("$itemnumber");
my $query = "select * from items where itemnumber=$itm";
***************
*** 105,109 ****
my $data=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
return($data);
}
--- 125,128 ----
***************
*** 111,115 ****
sub lastmove {
my ($itemnumber)address@hidden;
! my $dbh=C4Connect;
my $var1 = $dbh->quote($itemnumber);
my $sth =$dbh->prepare("select max(branchtransfers.datearrived) from
branchtransfers where branchtransfers.itemnumber=$var1");
--- 130,134 ----
sub lastmove {
my ($itemnumber)address@hidden;
! my $dbh = C4::Context->dbh;
my $var1 = $dbh->quote($itemnumber);
my $sth =$dbh->prepare("select max(branchtransfers.datearrived) from
branchtransfers where branchtransfers.itemnumber=$var1");
***************
*** 117,121 ****
my ($date) = $sth->fetchrow_array;
return(0, "Item has no branch transfers record") if not $date;
! my $var2 = $dbh->quote($date);
$sth=$dbh->prepare("Select * from branchtransfers where
branchtransfers.itemnumber=$var1 and branchtransfers.datearrived=$var2");
$sth->execute;
--- 136,140 ----
my ($date) = $sth->fetchrow_array;
return(0, "Item has no branch transfers record") if not $date;
! my $var2 = $dbh->quote($date);
$sth=$dbh->prepare("Select * from branchtransfers where
branchtransfers.itemnumber=$var1 and branchtransfers.datearrived=$var2");
$sth->execute;
***************
*** 123,127 ****
return(0, "Item has no branch transfers record") if not $data;
$sth->finish;
- $dbh->disconnect;
return($data,"");
}
--- 142,145 ----
***************
*** 129,133 ****
sub issuessince {
my ($itemnumber, $date)address@hidden;
! my $dbh=C4Connect;
my $itm = $dbh->quote($itemnumber);
my $dat = $dbh->quote($date);
--- 147,151 ----
sub issuessince {
my ($itemnumber, $date)address@hidden;
! my $dbh = C4::Context->dbh;
my $itm = $dbh->quote($itemnumber);
my $dat = $dbh->quote($date);
***************
*** 136,140 ****
my $count=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
return($count->{'count(*)'});
}
--- 154,157 ----
***************
*** 142,146 ****
sub issuesat {
my ($itemnumber, $brcd)address@hidden;
! my $dbh=C4Connect;
my $itm = $dbh->quote($itemnumber);
my $brc = $dbh->quote($brcd);
--- 159,163 ----
sub issuesat {
my ($itemnumber, $brcd)address@hidden;
! my $dbh = C4::Context->dbh;
my $itm = $dbh->quote($itemnumber);
my $brc = $dbh->quote($brcd);
***************
*** 150,154 ****
my ($count)=$sth->fetchrow_array;
$sth->finish;
- $dbh->disconnect;
return($count);
}
--- 167,170 ----
***************
*** 156,160 ****
sub lastseenat {
my ($itemnumber, $brcd)address@hidden;
! my $dbh=C4Connect;
my $itm = $dbh->quote($itemnumber);
my $brc = $dbh->quote($brcd);
--- 172,176 ----
sub lastseenat {
my ($itemnumber, $brcd)address@hidden;
! my $dbh = C4::Context->dbh;
my $itm = $dbh->quote($itemnumber);
my $brc = $dbh->quote($brcd);
***************
*** 165,173 ****
$sth->finish;
$query = "Select max(datearrived) from branchtransfers where
itemnumber=$itm and tobranch = $brc";
my $sth=$dbh->prepare($query);
$sth->execute;
my ($date2)=$sth->fetchrow_array;
$sth->finish;
- $dbh->disconnect;
$date2 =~ s/-//g;
$date2 =~ s/://g;
--- 181,189 ----
$sth->finish;
$query = "Select max(datearrived) from branchtransfers where
itemnumber=$itm and tobranch = $brc";
+ # FIXME - There's already a $sth in this scope.
my $sth=$dbh->prepare($query);
$sth->execute;
my ($date2)=$sth->fetchrow_array;
$sth->finish;
$date2 =~ s/-//g;
$date2 =~ s/://g;
Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue-home.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** catalogue-home.pl 26 Aug 2002 17:08:56 -0000 1.1.2.2
--- catalogue-home.pl 28 Oct 2002 17:45:14 -0000 1.1.2.3
***************
*** 6,36 ****
use C4::Output;
use C4::Database;
!
! my $configfile=configfile();
! my $intranetdir=$configfile->{'intranetdir'};
my $query = new CGI;
my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
!
! print $query->header(-cookie => $cookie);
!
! print startpage();
! print startmenu('catalogue');
!
! print "<p align=left>Logged in as: $loggedinuser [<a
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
my $classlist='';
! open C, "$intranetdir/htdocs/includes/cat-class-list.inc";
! while (<C>) {
! $classlist.=$_;
! }
! open H, "$intranetdir/htdocs/catalogue/index.html";
! while (<H>) {
! s/<!-- CLASSLIST -->/$classlist/;
! print $_;
! }
! close H;
!
! print endpage();
! print endmenu('catalogue');
--- 6,23 ----
use C4::Output;
use C4::Database;
! use HTML::Template;
my $query = new CGI;
my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
! my $template = gettemplate("catalogue/catalogue-home.tmpl");
my $classlist='';
! #open C, "$intranetdir/htdocs/includes/cat-class-list.inc";
! #while (<C>) {
! # $classlist.=$_;
! #}
! $template->param(loggedinuser => $loggedinuser,
! classlist => $classlist,
! opac => 0);
! print $query->header(-cookie => $cookie), $template->output;
Index: charges.pl
===================================================================
RCS file: /cvsroot/koha/koha/charges.pl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** charges.pl 9 Sep 2002 19:56:55 -0000 1.1.1.1.2.1
--- charges.pl 28 Oct 2002 17:45:14 -0000 1.1.1.1.2.2
***************
*** 4,9 ****
--- 4,28 ----
#written 8/11/99
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use strict;
use CGI;
+ use C4::Context;
use C4::Output;
use C4::Database;
***************
*** 24,28 ****
eg 1,7,7 = $1 fine, after 7 days, every 7 days";
! my $dbh=C4Connect;
my $query="Select description,categorycode from categories";
my $sth=$dbh->prepare($query);
--- 43,47 ----
eg 1,7,7 = $1 fine, after 7 days, every 7 days";
! my $dbh = C4::Context->dbh;
my $query="Select description,categorycode from categories";
my $sth=$dbh->prepare($query);
Index: currency.pl
===================================================================
RCS file: /cvsroot/koha/koha/currency.pl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** currency.pl 14 Jun 2002 21:20:26 -0000 1.1.1.1.2.1
--- currency.pl 28 Oct 2002 17:45:14 -0000 1.1.1.1.2.2
***************
*** 1,8 ****
--- 1,31 ----
#!/usr/bin/perl
+ # $Id$
+
#written by address@hidden
#9/10/2000
#script to display and update currency rates
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
+ # FIXME - There's an "admin/currency.pl", and this script never seems
+ # to be used. Is it obsolete?
+
use CGI;
use C4::Acquisitions;
***************
*** 23,27 ****
<TR VALIGN=TOP>
<TD bgcolor="99cc33" background="/images/background-mem.gif" colspan=2
><b>EXCHANGE RATES </b></TD></TR>
! <TR VALIGN=TOP>
<TD>
printend
--- 46,50 ----
<TR VALIGN=TOP>
<TD bgcolor="99cc33" background="/images/background-mem.gif" colspan=2
><b>EXCHANGE RATES </b></TD></TR>
! <TR VALIGN=TOP>
<TD>
printend
***************
*** 35,44 ****
}
print <<printend
! <p>
<input type=image name=submit src=/images/save-changes.gif border=0
width=187 height=42>
!
! </TD></TR>
! </form>
! </table>
printend
;
--- 58,67 ----
}
print <<printend
! <p>
<input type=image name=submit src=/images/save-changes.gif border=0
width=187 height=42>
!
! </TD></TR>
! </form>
! </table>
printend
;
Index: delbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/delbiblio.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** delbiblio.pl 9 Sep 2002 19:45:40 -0000 1.2.2.3
--- delbiblio.pl 28 Oct 2002 17:45:14 -0000 1.2.2.4
***************
*** 5,8 ****
--- 5,26 ----
#by address@hidden
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use strict;
Index: deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/deletemem.pl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** deletemem.pl 9 Sep 2002 19:56:55 -0000 1.2.2.1
--- deletemem.pl 28 Oct 2002 17:45:14 -0000 1.2.2.2
***************
*** 1,14 ****
#!/usr/bin/perl
! #script to delete borrowers
#written 2/5/00
#by address@hidden
use strict;
- use C4::Search;
use CGI;
use C4::Output;
- use C4::Database;
use C4::Circulation::Circ2;
#use C4::Acquisitions;
--- 1,34 ----
#!/usr/bin/perl
! # $Id$
!
! #script to delete items
#written 2/5/00
#by address@hidden
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use strict;
use CGI;
+ use C4::Context;
+ use C4::Search;
use C4::Output;
use C4::Circulation::Circ2;
#use C4::Acquisitions;
***************
*** 36,40 ****
}
my ($bor,$flags)=getpatroninformation(\%env, $member,'');
! my $dbh=C4Connect;
my $query="Select * from borrowers where guarantor='$member'";
my $sth=$dbh->prepare($query);
--- 56,60 ----
}
my ($bor,$flags)=getpatroninformation(\%env, $member,'');
! my $dbh = C4::Context->dbh;
my $query="Select * from borrowers where guarantor='$member'";
my $sth=$dbh->prepare($query);
***************
*** 42,49 ****
my $data=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
-
! if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
print $input->header;
print "<table border=1>";
--- 62,68 ----
my $data=$sth->fetchrow_hashref;
$sth->finish;
!
! if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
print $input->header;
print "<table border=1>";
***************
*** 66,70 ****
sub delmember{
my ($member)address@hidden;
! my $dbh=C4Connect;
my $query="Select * from borrowers where borrowernumber='$member'";
my $sth=$dbh->prepare($query);
--- 85,89 ----
sub delmember{
my ($member)address@hidden;
! my $dbh = C4::Context->dbh;
my $query="Select * from borrowers where borrowernumber='$member'";
my $sth=$dbh->prepare($query);
***************
*** 74,92 ****
$query="Insert into deletedborrowers values (";
foreach my $temp (@data){
! $query=$query."'$temp',";
}
$query=~ s/\,$/\)/;
# print $query;
$sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
$query = "Delete from borrowers where borrowernumber='$member'";
$sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
$query="Delete from reserves where borrowernumber='$member'";
$sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
- $dbh->disconnect;
}
--- 93,113 ----
$query="Insert into deletedborrowers values (";
foreach my $temp (@data){
! $query .= "'$temp',";
}
$query=~ s/\,$/\)/;
# print $query;
+ # FIXME - Use $dbh->do()
$sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
+ # FIXME - Use $dbh->do()
$query = "Delete from borrowers where borrowernumber='$member'";
$sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
+ # FIXME - Use $dbh->do()
$query="Delete from reserves where borrowernumber='$member'";
$sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
}
Index: delitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/delitem.pl,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** delitem.pl 9 Sep 2002 19:45:40 -0000 1.1.1.1.2.2
--- delitem.pl 28 Oct 2002 17:45:14 -0000 1.1.1.1.2.3
***************
*** 5,8 ****
--- 5,26 ----
#by address@hidden
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use strict;
Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -r1.3.2.5 -r1.3.2.6
*** detail.pl 21 Oct 2002 20:10:18 -0000 1.3.2.5
--- detail.pl 28 Oct 2002 17:45:14 -0000 1.3.2.6
***************
*** 1,12 ****
#!/usr/bin/perl
use HTML::Template;
use strict;
require Exporter;
! use C4::Database;
use C4::Output; # contains gettemplate
use CGI;
use C4::Search;
use C4::Auth;
!
my $query=new CGI;
my $type=$query->param('type');
--- 1,30 ----
#!/usr/bin/perl
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use HTML::Template;
use strict;
require Exporter;
! use C4::Context;
use C4::Output; # contains gettemplate
use CGI;
use C4::Search;
use C4::Auth;
!
my $query=new CGI;
my $type=$query->param('type');
***************
*** 15,19 ****
my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac')
? (1) : (0));
-
my $biblionumber=$query->param('bib');
--- 33,36 ----
***************
*** 57,63 ****
$template->param(nextstartfrom => $nextstartfrom);
$template->param(prevstartfrom => $prevstartfrom);
- # $template->param(template => $templatename);
- # $template->param(search => $search);
- #$template->param(includesdir => $includes);
$template->param(BIBLIO_RESULTS => $resultsarray);
$template->param(ITEM_RESULTS => $itemsarray);
--- 74,77 ----
Index: groups.pl
===================================================================
RCS file: /cvsroot/koha/koha/groups.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** groups.pl 26 Aug 2002 17:08:56 -0000 1.1.2.1
--- groups.pl 28 Oct 2002 17:45:14 -0000 1.1.2.2
***************
*** 1,7 ****
--- 1,27 ----
#!/usr/bin/perl
+ # $Id$
+
#written 14/1/2000
#script to display reports
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use CGI qw/:standard/;
use C4::Output;
***************
*** 120,124 ****
</td></tr></table>
<p>
! Printer:
<select name=printer>
$printeroptions
--- 140,144 ----
</td></tr></table>
<p>
! Printer:
<select name=printer>
$printeroptions
Index: moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/moredetail.pl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** moredetail.pl 21 Oct 2002 20:10:18 -0000 1.4.2.4
--- moredetail.pl 28 Oct 2002 17:45:14 -0000 1.4.2.5
***************
*** 1,3 ****
--- 1,23 ----
#!/usr/bin/perl
+
+ # $Id$
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use HTML::Template;
use strict;
***************
*** 69,75 ****
$item->{'issue'}="<b>Currently on issue to:</b> <a
href=/cgi-bin/koha/moremember.pl?bornum=$item->{'borrower0'}>$item->{'card'}</a><br>";
}
-
}
$template->param(BIBITEM_DATA => address@hidden);
$template->param(ITEM_DATA => address@hidden);
--- 89,95 ----
$item->{'issue'}="<b>Currently on issue to:</b> <a
href=/cgi-bin/koha/moremember.pl?bornum=$item->{'borrower0'}>$item->{'card'}</a><br>";
}
}
+ $template->param(includesdir => $includes);
$template->param(BIBITEM_DATA => address@hidden);
$template->param(ITEM_DATA => address@hidden);
Index: reports-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports-home.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** reports-home.pl 26 Aug 2002 17:08:56 -0000 1.1.2.2
--- reports-home.pl 28 Oct 2002 17:45:14 -0000 1.1.2.3
***************
*** 5,30 ****
use C4::Auth;
use C4::Output;
! use C4::Database;
!
! my $configfile=configfile();
! my $intranetdir=$configfile->{'intranetdir'};
my $query = new CGI;
my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
! print $query->header(-cookie => $cookie);
!
! print startpage();
! print startmenu('report');
!
! print "<p align=left>Logged in as: $loggedinuser [<a
href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
!
! open H, "$intranetdir/htdocs/reports/index.html";
! while (<H>) {
! print $_;
! }
! close H;
!
! print endpage();
! print endmenu('report');
--- 5,16 ----
use C4::Auth;
use C4::Output;
! use C4::Context;
! use HTML::Template;
my $query = new CGI;
my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
! my $template = gettemplate("reports/reports-home.tmpl");
! $template->param(loggedinuser => $loggedinuser);
! print $query->header(-cookie => $cookie),$template->output;
Index: shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/shelves.pl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** shelves.pl 11 Jul 2002 18:05:28 -0000 1.2.2.2
--- shelves.pl 28 Oct 2002 17:45:14 -0000 1.2.2.3
***************
*** 5,8 ****
--- 5,26 ----
#
+
+ # Copyright 2000-2002 Katipo Communications
+ #
+ # This file is part of Koha.
+ #
+ # Koha is free software; you can redistribute it and/or modify it under the
+ # terms of the GNU General Public License as published by the Free Software
+ # Foundation; either version 2 of the License, or (at your option) any later
+ # version.
+ #
+ # Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along with
+ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+ # Suite 330, Boston, MA 02111-1307 USA
+
use strict;
use C4::Search;
***************
*** 170,173 ****
--- 188,194 ----
#
# $Log$
+ # Revision 1.2.2.3 2002/10/28 17:45:14 tonnesen
+ # Merging from trunk to rel-1-2
+ #
# Revision 1.2.2.2 2002/07/11 18:05:28 tonnesen
# Committing changes to add authentication and opac templating to rel-1-2
branch
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha admin-home.pl,1.1.2.2,1.1.2.3 bookcount.pl,1.1.4.1,1.1.4.2 catalogue-home.pl,1.1.2.2,1.1.2.3 charges.pl,1.1.1.1.2.1,1.1.1.1.2.2 currency.pl,1.1.1.1.2.1,1.1.1.1.2.2 delbiblio.pl,1.2.2.3,1.2.2.4 deletemem.pl,1.2.2.1,1.2.2.2 delitem.pl,1.1.1.1.2.2,1.1.1.1.2.3 detail.pl,1.3.2.5,1.3.2.6 groups.pl,1.1.2.1,1.1.2.2 moredetail.pl,1.4.2.4,1.4.2.5 reports-home.pl,1.1.2.2,1.1.2.3 shelves.pl,1.2.2.2,1.2.2.3,
Steve Tonnesen <=
- Prev by Date:
[Koha-cvs] CVS: koha/C4 BookShelves.pm,1.2.2.2,1.2.2.3
- Next by Date:
[Koha-cvs] CVS: koha member-flags.pl,1.1,1.2 member-password.pl,1.1,1.2 admin-home.pl,1.3,1.4 catalogue-home.pl,1.2,1.3 charges.pl,1.3,1.4 deletemem.pl,1.7,1.8 delitem.pl,1.3,1.4 groups.pl,1.3,1.4
- Previous by thread:
[Koha-cvs] CVS: koha/C4 BookShelves.pm,1.2.2.2,1.2.2.3
- Next by thread:
[Koha-cvs] CVS: koha member-flags.pl,1.1,1.2 member-password.pl,1.1,1.2 admin-home.pl,1.3,1.4 catalogue-home.pl,1.2,1.3 charges.pl,1.3,1.4 deletemem.pl,1.7,1.8 delitem.pl,1.3,1.4 groups.pl,1.3,1.4
- Index(es):