[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/opac changelanguage.pl opac-ISBDdetail.pl ... [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha/opac changelanguage.pl opac-ISBDdetail.pl ... [rel_3_0] |
|
Date: |
Wed, 10 Jan 2007 10:12:48 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 07/01/10 10:12:48
Modified files:
opac : changelanguage.pl opac-ISBDdetail.pl
opac-MARCdetail.pl opac-account.pl
opac-authorities-home.pl opac-detail.pl
opac-logout.pl opac-main.pl opac-passwd.pl
opac-readingrecord.pl opac-reserve.pl
opac-review.pl opac-search.pl
opac-serial-issues.pl opac-shelves.pl
opac-showreviews.pl opac-suggestions.pl
opac-tags_subject.pl opac-topissues.pl
opac-user.pl opac-userdetails.pl
opac-userupdate.pl
Log message:
Adding OpacTopissue, OpacCloud, OpacAuthorithies to the template->param.
+ Some cleanup.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/changelanguage.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.8.1&r2=1.1.8.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-ISBDdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16.2.6&r2=1.16.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.7&r2=1.14.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-account.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.3&r2=1.11.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authorities-home.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.4.4&r2=1.1.4.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.11&r2=1.32.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-logout.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.10.2&r2=1.5.10.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.23.2.7&r2=1.23.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-passwd.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-readingrecord.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.10.2.2&r2=1.10.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.29.2.10&r2=1.29.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-review.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.13&r2=1.38.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-serial-issues.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.2&r2=1.8.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-shelves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.9&r2=1.8.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-showreviews.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.5&r2=1.2.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-suggestions.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-tags_subject.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-topissues.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.23.2.6&r2=1.23.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userdetails.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.3&r2=1.12.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userupdate.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.1&r2=1.14.2.2
Patches:
Index: changelanguage.pl
===================================================================
RCS file: /sources/koha/koha/opac/changelanguage.pl,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -b -r1.1.8.1 -r1.1.8.2
--- changelanguage.pl 7 Dec 2006 15:42:15 -0000 1.1.8.1
+++ changelanguage.pl 10 Jan 2007 10:12:48 -0000 1.1.8.2
@@ -1,5 +1,20 @@
#!/usr/bin/perl
+# 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 C4::Output;
use CGI;
Index: opac-ISBDdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.16.2.6
retrieving revision 1.16.2.7
diff -u -b -r1.16.2.6 -r1.16.2.7
--- opac-ISBDdetail.pl 5 Jan 2007 14:47:23 -0000 1.16.2.6
+++ opac-ISBDdetail.pl 10 Jan 2007 10:12:48 -0000 1.16.2.7
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-ISBDdetail.pl,v 1.16.2.6 2007/01/05 14:47:23 alaurin Exp $
+# $Id: opac-ISBDdetail.pl,v 1.16.2.7 2007/01/10 10:12:48 toins Exp $
=head1 NAME
@@ -171,7 +171,10 @@
$res =~ s/\(\)//g;
$template->param(
ISBD => $res,
- biblionumber => $biblionumber
+ biblionumber => $biblionumber,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
# adding the $RequestOnOpac param
Index: opac-MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.14.2.7
retrieving revision 1.14.2.8
diff -u -b -r1.14.2.7 -r1.14.2.8
--- opac-MARCdetail.pl 9 Jan 2007 10:45:53 -0000 1.14.2.7
+++ opac-MARCdetail.pl 10 Jan 2007 10:12:48 -0000 1.14.2.8
@@ -275,7 +275,10 @@
item_loop => address@hidden,
item_header_loop => address@hidden,
biblionumber => $biblionumber,
- hide_marc => C4::Context->preference('hide_marc')
+ hide_marc => C4::Context->preference('hide_marc'),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-account.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-account.pl,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -b -r1.11.2.3 -r1.11.2.4
--- opac-account.pl 18 Dec 2006 16:35:19 -0000 1.11.2.3
+++ opac-account.pl 10 Jan 2007 10:12:48 -0000 1.11.2.4
@@ -77,10 +77,13 @@
$num++;
}
-$template->param( ACCOUNT_LINES => $accts, );
+$template->param (
+ ACCOUNT_LINES => $accts,
+ total => sprintf( "%.2f", $total ),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+);
-$template->param( total => sprintf( "%.2f", $total ) );
-
-#$template->param(loggeninuser => $loggedinuser);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-authorities-home.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-authorities-home.pl,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -b -r1.1.4.4 -r1.1.4.5
--- opac-authorities-home.pl 18 Dec 2006 16:35:19 -0000 1.1.4.4
+++ opac-authorities-home.pl 10 Jan 2007 10:12:48 -0000 1.1.4.5
@@ -267,6 +267,9 @@
opacsmallimage => C4::Context->preference("opacsmallimage"),
opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
# Print the page
Index: opac-detail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.32.2.11
retrieving revision 1.32.2.12
diff -u -b -r1.32.2.11 -r1.32.2.12
--- opac-detail.pl 10 Jan 2007 08:47:32 -0000 1.32.2.11
+++ opac-detail.pl 10 Jan 2007 10:12:48 -0000 1.32.2.12
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-detail.pl,v 1.32.2.11 2007/01/10 08:47:32 toins Exp $
+# $Id: opac-detail.pl,v 1.32.2.12 2007/01/10 10:12:48 toins Exp $
use strict;
require Exporter;
@@ -127,6 +127,9 @@
suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"),
reviewson => C4::Context->preference("reviewson"),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
reviews => $reviews
);
## Amazon.com stuff
Index: opac-logout.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-logout.pl,v
retrieving revision 1.5.10.2
retrieving revision 1.5.10.3
diff -u -b -r1.5.10.2 -r1.5.10.3
--- opac-logout.pl 18 Dec 2006 16:35:19 -0000 1.5.10.2
+++ opac-logout.pl 10 Jan 2007 10:12:48 -0000 1.5.10.3
@@ -1,52 +1,29 @@
#!/usr/bin/perl
+# 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;
use C4::Context;
use C4::Output;
-
my $query = new CGI;
-
my $sessionID = $query->cookie('sessionID');
-
-if ( $ENV{'REMOTE_USER'} ) {
- print $query->header();
- print startpage();
- print startmenu('catalogue');
- print qq|
-<h1>Logout Feature Not Available</h1>
-Your Koha server is configured to use a type of authentication called "Basic
-Authentication" instead of using a cookies-based authentication system. With
-Basic Authentication, the only way to logout of Koha is by exiting your
-browser.
-|;
- print endmenu('catalogue');
- print endpage();
- exit;
-}
-
-my $sessions;
-open( S, "/tmp/sessions" );
-
-# FIXME - Come up with a better logging mechanism
-while ( my ( $sid, $u, $lasttime ) = split( /:/, <S> ) ) {
- chomp $lasttime;
- (next) unless ($sid);
- (next) if ( $sid eq $sessionID );
- $sessions->{$sid}->{'userid'} = $u;
- $sessions->{$sid}->{'lasttime'} = $lasttime;
-}
-open( S, ">/tmp/sessions" );
-foreach ( keys %$sessions ) {
- my $userid = $sessions->{$_}->{'userid'};
- my $lasttime = $sessions->{$_}->{'lasttime'};
- print S "$_:$userid:$lasttime\n";
-}
-
my $dbh = C4::Context->dbh;
# Check that this is the ip that created the session before deleting it
-
my $sth = $dbh->prepare("select userid,ip from sessions where sessionID=?");
$sth->execute($sessionID);
my ( $userid, $ip );
@@ -78,12 +55,4 @@
print $query->redirect("/cgi-bin/koha/opac-main.pl");
exit;
-if ($sessionID) {
- print "Logged out of $sessionID<br>\n";
- print "<a href=shelves.pl>Login</a>";
-}
-else {
- print "Not logged in.<br>\n";
- print "<a href=shelves.pl>Login</a>";
-}
Index: opac-main.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-main.pl,v
retrieving revision 1.23.2.7
retrieving revision 1.23.2.8
diff -u -b -r1.23.2.7 -r1.23.2.8
--- opac-main.pl 9 Jan 2007 16:45:11 -0000 1.23.2.7
+++ opac-main.pl 10 Jan 2007 10:12:48 -0000 1.23.2.8
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-main.pl,v 1.23.2.7 2007/01/09 16:45:11 toins Exp $
+# $Id: opac-main.pl,v 1.23.2.8 2007/01/10 10:12:48 toins Exp $
use strict;
require Exporter;
@@ -84,6 +84,9 @@
opacsmallimage => C4::Context->preference("opacsmallimage"),
opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
opaclanguagesdisplay => 0,
);
Index: opac-passwd.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-passwd.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- opac-passwd.pl 18 Dec 2006 16:35:19 -0000 1.3.2.2
+++ opac-passwd.pl 10 Jan 2007 10:12:48 -0000 1.3.2.3
@@ -87,7 +87,12 @@
$template->param( 'Ask_data' => '1' );
}
-$template->param( LibraryName => C4::Context->preference("LibraryName"), );
+$template->param(
+ LibraryName => C4::Context->preference("LibraryName"),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-readingrecord.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -b -r1.10.2.2 -r1.10.2.3
--- opac-readingrecord.pl 18 Dec 2006 16:35:19 -0000 1.10.2.2
+++ opac-readingrecord.pl 10 Jan 2007 10:12:48 -0000 1.10.2.3
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-readingrecord.pl,v 1.10.2.2 2006/12/18 16:35:19 toins Exp $
+# $Id: opac-readingrecord.pl,v 1.10.2.3 2007/01/10 10:12:48 toins Exp $
use strict;
require Exporter;
@@ -102,6 +102,9 @@
READING_RECORD => address@hidden,
limit => $limit,
showfulllink => ( $count > 50 ),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.29.2.10
retrieving revision 1.29.2.11
diff -u -b -r1.29.2.10 -r1.29.2.11
--- opac-reserve.pl 9 Jan 2007 08:37:17 -0000 1.29.2.10
+++ opac-reserve.pl 10 Jan 2007 10:12:48 -0000 1.29.2.11
@@ -318,6 +318,12 @@
# check that you can actually make the reserve.
+$template->param(
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+);
+
output_html_with_http_headers $query, $cookie, $template->output;
# Local Variables:
Index: opac-review.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-review.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- opac-review.pl 7 Dec 2006 18:09:01 -0000 1.2.2.3
+++ opac-review.pl 10 Jan 2007 10:12:48 -0000 1.2.2.4
@@ -20,7 +20,6 @@
use strict;
require Exporter;
use CGI;
-
use C4::Auth;
use C4::Koha;
use C4::Interface::CGI::Output;
@@ -62,7 +61,7 @@
'borrowernumber' => $borrowernumber,
'type' => $type,
'review' => $reviewdata,
- 'title' => $biblio->{'title'}
+ 'title' => $biblio->{'title'},
);
# get the record
Index: opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.38.2.13
retrieving revision 1.38.2.14
diff -u -b -r1.38.2.13 -r1.38.2.14
--- opac-search.pl 5 Jan 2007 14:47:23 -0000 1.38.2.13
+++ opac-search.pl 10 Jan 2007 10:12:48 -0000 1.38.2.14
@@ -3,7 +3,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.38.2.13 2007/01/05
14:47:23 alaurin Exp $
+# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.38.2.14 2007/01/10
10:12:48 toins Exp $
#
# Copyright 2006 LibLime
#
@@ -341,9 +341,13 @@
# load the sort_by options for the template
my $sort_by = $cgi->param('sort_by');
my $sort_by_loop = displaySortby($sort_by);
- $template->param( sort_by_loop => $sort_by_loop );
+ $template->param(
+ sort_by_loop => $sort_by_loop,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+ );
- #warn "loading the template";
output_html_with_http_headers $cgi, $cookie, $template->output;
exit;
}
@@ -565,6 +569,9 @@
scan_use => $scan,
search_error => $error,
RequestOnOpac => $RequestOnOpac,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
## Now let's find out if we have any supplemental data to show the user
# and in the meantime, save the current query for statistical purposes, etc.
Index: opac-serial-issues.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- opac-serial-issues.pl 18 Dec 2006 16:35:19 -0000 1.8.2.2
+++ opac-serial-issues.pl 10 Jan 2007 10:12:48 -0000 1.8.2.3
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-serial-issues.pl,v 1.8.2.2 2006/12/18 16:35:19 toins Exp $
+# $Id: opac-serial-issues.pl,v 1.8.2.3 2007/01/10 10:12:48 toins Exp $
use strict;
use CGI;
@@ -92,6 +92,9 @@
$template->param(
biblionumber => $query->param('biblionumber'),
subscription_LOOP => $subscriptions,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
}
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-shelves.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.8.2.9
retrieving revision 1.8.2.10
diff -u -b -r1.8.2.9 -r1.8.2.10
--- opac-shelves.pl 15 Dec 2006 17:43:24 -0000 1.8.2.9
+++ opac-shelves.pl 10 Jan 2007 10:12:48 -0000 1.8.2.10
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-shelves.pl,v 1.8.2.9 2006/12/15 17:43:24 toins Exp $
+# $Id: opac-shelves.pl,v 1.8.2.10 2007/01/10 10:12:48 toins Exp $
=head1 NAME
@@ -223,6 +223,9 @@
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
output_html_with_http_headers $query, $cookie, $template->output;
@@ -231,6 +234,10 @@
#
# $Log: opac-shelves.pl,v $
+# Revision 1.8.2.10 2007/01/10 10:12:48 toins
+# Adding OpacTopissue, OpacCloud, OpacAuthorithies to the template->param.
+# + Some cleanup.
+#
# Revision 1.8.2.9 2006/12/15 17:43:24 toins
# sync with intranet.
#
Index: opac-showreviews.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-showreviews.pl,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.5 -r1.2.2.6
--- opac-showreviews.pl 7 Dec 2006 18:09:01 -0000 1.2.2.5
+++ opac-showreviews.pl 10 Jan 2007 10:12:48 -0000 1.2.2.6
@@ -18,7 +18,6 @@
use strict;
require Exporter;
use CGI;
-
use C4::Auth;
use C4::Koha;
use C4::Interface::CGI::Output;
@@ -43,7 +42,10 @@
$template->param(
reviews => $reviews,
- title => $biblio->{'title'}
+ title => $biblio->{'title'},
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-suggestions.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-suggestions.pl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- opac-suggestions.pl 18 Dec 2006 16:35:19 -0000 1.6.2.2
+++ opac-suggestions.pl 10 Jan 2007 10:12:48 -0000 1.6.2.3
@@ -1,9 +1,23 @@
#!/usr/bin/perl
+
+# 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;
require Exporter;
use CGI;
-
-
use C4::Auth; # get_template_and_user
use C4::Interface::CGI::Output;
use C4::Suggestions;
@@ -89,5 +103,9 @@
status => $status,
suggestedbyme => $suggestedbyme,
"op_$op" => 1,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
+
output_html_with_http_headers $input, $cookie, $template->output;
Index: opac-tags_subject.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-tags_subject.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- opac-tags_subject.pl 22 Dec 2006 15:02:57 -0000 1.1.2.2
+++ opac-tags_subject.pl 10 Jan 2007 10:12:48 -0000 1.1.2.3
@@ -17,14 +17,11 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-tags_subject.pl,v 1.1.2.2 2006/12/22 15:02:57 toins Exp $
+# $Id: opac-tags_subject.pl,v 1.1.2.3 2007/01/10 10:12:48 toins Exp $
-=head1 NAME
+=head1 opac-tags_subject.pl
-
-=head1 FUNCTIONS
-
-=over 2
+TODO :: Description here
=cut
@@ -80,6 +77,9 @@
$template->param(
LOOP => address@hidden,
number => $number,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-topissues.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-topissues.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- opac-topissues.pl 20 Dec 2006 10:44:51 -0000 1.1.2.1
+++ opac-topissues.pl 10 Jan 2007 10:12:48 -0000 1.1.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: opac-topissues.pl,v 1.1.2.1 2006/12/20 10:44:51 tipaul Exp $
+# $Id: opac-topissues.pl,v 1.1.2.2 2007/01/10 10:12:48 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -23,7 +23,6 @@
use C4::Auth;
use CGI;
use C4::Context;
-use HTML::Template;
use C4::Search;
use C4::Output;
use C4::Koha;
@@ -76,20 +75,20 @@
FROM biblio
LEFT JOIN items USING (biblionumber)
LEFT JOIN biblioitems USING (biblionumber)
- LEFT JOIN itemtypes USING (itemtype)
+ LEFT JOIN itemtypes ON itemtypes.itemtype =
biblioitems.itemtype
$whereclause
GROUP BY biblio.biblionumber
ORDER BY tot DESC
LIMIT $limit
";
- warn "QU : $query";
+
my $sth = $dbh->prepare($query);
$sth->execute();
my @results;
while (my $line= $sth->fetchrow_hashref) {
push @results, $line;
}
- warn ">>>".Data::Dumper::Dumper($branches);
+
$template->param(do_it => 1,
limit => $limit,
branch => $branches->{$branch}->{branchname},
@@ -120,8 +119,10 @@
$template->param(
branchloop =>address@hidden,
itemtypeloop =>address@hidden,
+ OpacCloud =>
C4::Context->preference("OpacCloud"),
+ OpacTopissue =>
C4::Context->preference("OpacTopissue"),
+ OpacAuthorities =>
C4::Context->preference("OpacAuthorities"),
);
}
output_html_with_http_headers $input, $cookie, $template->output;
-1;
Index: opac-user.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-user.pl,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -u -b -r1.23.2.6 -r1.23.2.7
--- opac-user.pl 14 Dec 2006 15:41:54 -0000 1.23.2.6
+++ opac-user.pl 10 Jan 2007 10:12:48 -0000 1.23.2.7
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: opac-user.pl,v 1.23.2.6 2006/12/14 15:41:54 toins Exp $
+# $Id: opac-user.pl,v 1.23.2.7 2007/01/10 10:12:48 toins Exp $
use strict;
require Exporter;
@@ -189,6 +189,9 @@
waiting_count => $wcount,
textmessaging => $borr->{textmessaging},
OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-userdetails.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -b -r1.12.2.3 -r1.12.2.4
--- opac-userdetails.pl 18 Dec 2006 16:35:19 -0000 1.12.2.3
+++ opac-userdetails.pl 10 Jan 2007 10:12:48 -0000 1.12.2.4
@@ -50,7 +50,12 @@
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
$template->param($borr);
-$template->param( LibraryName => C4::Context->preference("LibraryName"), );
+$template->param(
+ LibraryName => C4::Context->preference("LibraryName"),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac-userupdate.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- opac-userupdate.pl 7 Dec 2006 15:42:15 -0000 1.14.2.1
+++ opac-userupdate.pl 10 Jan 2007 10:12:48 -0000 1.14.2.2
@@ -119,6 +119,11 @@
my @bordat;
$bordat[0] = $borr;
-$template->param( BORROWER_INFO => address@hidden, );
+$template->param(
+ BORROWER_INFO => address@hidden,
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+);
output_html_with_http_headers $query, $cookie, $template->output;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/opac changelanguage.pl opac-ISBDdetail.pl ... [rel_3_0],
Antoine Farnault <=