[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Auth.pm opac/opac-ISBDdetail.pl opac/op... [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha C4/Auth.pm opac/opac-ISBDdetail.pl opac/op... [rel_3_0] |
|
Date: |
Wed, 10 Jan 2007 10:52:59 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 07/01/10 10:52:59
Modified files:
C4 : Auth.pm
opac : opac-ISBDdetail.pl opac-MARCdetail.pl
opac-account.pl opac-authorities-home.pl
opac-detail.pl opac-main.pl opac-passwd.pl
opac-readingrecord.pl opac-reserve.pl
opac-search.pl opac-serial-issues.pl
opac-shelves.pl opac-suggestions.pl
opac-tags_subject.pl opac-topissues.pl
opac-user.pl opac-userdetails.pl
opac-userupdate.pl
tools : koha-news.pl
Log message:
adding syspref directly to Auth.pm instead of to the template.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.20&r2=1.54.2.21
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-ISBDdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.16.2.7&r2=1.16.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.8&r2=1.14.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-account.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.4&r2=1.11.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-authorities-home.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.4.5&r2=1.1.4.6
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.12&r2=1.32.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-main.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.23.2.8&r2=1.23.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-passwd.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-readingrecord.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.10.2.3&r2=1.10.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.29.2.11&r2=1.29.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.14&r2=1.38.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-serial-issues.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.3&r2=1.8.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-shelves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.10&r2=1.8.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-suggestions.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-tags_subject.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-topissues.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-user.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-userdetails.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.4&r2=1.12.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-userupdate.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.2&r2=1.14.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/tools/koha-news.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
Patches:
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.20
retrieving revision 1.54.2.21
diff -u -b -r1.54.2.20 -r1.54.2.21
--- C4/Auth.pm 22 Dec 2006 17:19:52 -0000 1.54.2.20
+++ C4/Auth.pm 10 Jan 2007 10:52:58 -0000 1.54.2.21
@@ -37,7 +37,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.54.2.20 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.54.2.21 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -225,6 +225,7 @@
LibraryName => C4::Context->preference("LibraryName"),
LoginBranchname =>
(C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),
AutoLocation => C4::Context->preference("AutoLocation"),
+ hide_marc => C4::Context->preference('hide_marc'),
);
}
else {
@@ -240,6 +241,7 @@
opacheader => "" . C4::Context->preference("opacheader"),
opaccredits => "" . C4::Context->preference("opaccredits"),
opacsmallimage => "" . C4::Context->preference("opacsmallimage"),
+ opaclargeimage => "" . C4::Context->preference("opaclargeimage"),
opaclayoutstylesheet => ""
. C4::Context->preference("opaclayoutstylesheet"),
opaccolorstylesheet => ""
@@ -259,6 +261,11 @@
OpacPasswordChange =>
C4::Context->preference("OpacPasswordChange"),
opacreadinghistory =>
C4::Context->preference("opacreadinghistory"),
opacuserjs => C4::Context->preference("opacuserjs"),
+ OpacCloud => C4::Context->preference("OpacCloud"),
+ OpacTopissue => C4::Context->preference("OpacTopissue"),
+ OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+ reviewson => C4::Context->preference("reviewson"),
+ hide_marc => C4::Context->preference('hide_marc'),
);
}
return ( $template, $borrowernumber, $cookie );
Index: opac/opac-ISBDdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.16.2.7
retrieving revision 1.16.2.8
diff -u -b -r1.16.2.7 -r1.16.2.8
--- opac/opac-ISBDdetail.pl 10 Jan 2007 10:12:48 -0000 1.16.2.7
+++ opac/opac-ISBDdetail.pl 10 Jan 2007 10:52:58 -0000 1.16.2.8
@@ -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.7 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-ISBDdetail.pl,v 1.16.2.8 2007/01/10 10:52:58 toins Exp $
=head1 NAME
@@ -171,10 +171,7 @@
$res =~ s/\(\)//g;
$template->param(
ISBD => $res,
- biblionumber => $biblionumber,
- OpacCloud => C4::Context->preference("OpacCloud"),
- OpacTopissue => C4::Context->preference("OpacTopissue"),
- OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+ biblionumber => $biblionumber
);
# adding the $RequestOnOpac param
Index: opac/opac-MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.14.2.8
retrieving revision 1.14.2.9
diff -u -b -r1.14.2.8 -r1.14.2.9
--- opac/opac-MARCdetail.pl 10 Jan 2007 10:12:48 -0000 1.14.2.8
+++ opac/opac-MARCdetail.pl 10 Jan 2007 10:52:58 -0000 1.14.2.9
@@ -275,10 +275,6 @@
item_loop => address@hidden,
item_header_loop => address@hidden,
biblionumber => $biblionumber,
- 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/opac-account.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-account.pl,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -b -r1.11.2.4 -r1.11.2.5
--- opac/opac-account.pl 10 Jan 2007 10:12:48 -0000 1.11.2.4
+++ opac/opac-account.pl 10 Jan 2007 10:52:58 -0000 1.11.2.5
@@ -79,10 +79,7 @@
$template->param (
ACCOUNT_LINES => $accts,
- total => sprintf( "%.2f", $total ),
- OpacCloud => C4::Context->preference("OpacCloud"),
- OpacTopissue => C4::Context->preference("OpacTopissue"),
- OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+ total => sprintf( "%.2f", $total )
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-authorities-home.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-authorities-home.pl,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -b -r1.1.4.5 -r1.1.4.6
--- opac/opac-authorities-home.pl 10 Jan 2007 10:12:48 -0000 1.1.4.5
+++ opac/opac-authorities-home.pl 10 Jan 2007 10:52:58 -0000 1.1.4.6
@@ -259,18 +259,7 @@
}
-$template->param(
- authtypesloop => address@hidden,
- LibraryName => C4::Context->preference("LibraryName"),
- OpacNav => C4::Context->preference("OpacNav"),
- opaccredits => C4::Context->preference("opaccredits"),
- 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"),
-);
+$template->param( authtypesloop => address@hidden );
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-detail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.32.2.12
retrieving revision 1.32.2.13
diff -u -b -r1.32.2.12 -r1.32.2.13
--- opac/opac-detail.pl 10 Jan 2007 10:12:48 -0000 1.32.2.12
+++ opac/opac-detail.pl 10 Jan 2007 10:52:58 -0000 1.32.2.13
@@ -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.12 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-detail.pl,v 1.32.2.13 2007/01/10 10:52:58 toins Exp $
use strict;
require Exporter;
@@ -123,15 +123,9 @@
biblionumber => $biblionumber,
subscriptions => address@hidden,
subscriptionsnumber => $subscriptionsnumber,
- LibraryName => C4::Context->preference("LibraryName"),
- 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
#not used unless preference set
if ( C4::Context->preference("AmazonContent") == 1 ) {
Index: opac/opac-main.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-main.pl,v
retrieving revision 1.23.2.8
retrieving revision 1.23.2.9
diff -u -b -r1.23.2.8 -r1.23.2.9
--- opac/opac-main.pl 10 Jan 2007 10:12:48 -0000 1.23.2.8
+++ opac/opac-main.pl 10 Jan 2007 10:52:58 -0000 1.23.2.9
@@ -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.8 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-main.pl,v 1.23.2.9 2007/01/10 10:52:58 toins Exp $
use strict;
require Exporter;
@@ -73,20 +73,7 @@
$template->param(
branchloop => address@hidden,
- suggestion => C4::Context->preference("suggestion"),
- virtualshelves => C4::Context->preference("virtualshelves"),
textmessaging => $borrower->{textmessaging},
- opaclargeimage => C4::Context->preference("opaclargeimage"),
- LibraryName => C4::Context->preference("LibraryName"),
- OpacNav => C4::Context->preference("OpacNav"),
- opaccredits => C4::Context->preference("opaccredits"),
- opacreadinghistory => C4::Context->preference("opacreadinghistory"),
- 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/opac-passwd.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-passwd.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- opac/opac-passwd.pl 10 Jan 2007 10:12:48 -0000 1.3.2.3
+++ opac/opac-passwd.pl 10 Jan 2007 10:52:58 -0000 1.3.2.4
@@ -87,13 +87,6 @@
$template->param( 'Ask_data' => '1' );
}
-$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;
sub goodkey {
Index: opac/opac-readingrecord.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -b -r1.10.2.3 -r1.10.2.4
--- opac/opac-readingrecord.pl 10 Jan 2007 10:12:48 -0000 1.10.2.3
+++ opac/opac-readingrecord.pl 10 Jan 2007 10:52:58 -0000 1.10.2.4
@@ -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.3 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-readingrecord.pl,v 1.10.2.4 2007/01/10 10:52:58 toins Exp $
use strict;
require Exporter;
@@ -102,9 +102,6 @@
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/opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.29.2.11
retrieving revision 1.29.2.12
diff -u -b -r1.29.2.11 -r1.29.2.12
--- opac/opac-reserve.pl 10 Jan 2007 10:12:48 -0000 1.29.2.11
+++ opac/opac-reserve.pl 10 Jan 2007 10:52:58 -0000 1.29.2.12
@@ -316,14 +316,6 @@
}
}
-# 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/opac-search.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-search.pl,v
retrieving revision 1.38.2.14
retrieving revision 1.38.2.15
diff -u -b -r1.38.2.14 -r1.38.2.15
--- opac/opac-search.pl 10 Jan 2007 10:12:48 -0000 1.38.2.14
+++ opac/opac-search.pl 10 Jan 2007 10:52:58 -0000 1.38.2.15
@@ -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.14 2007/01/10
10:12:48 toins Exp $
+# $Header: /sources/koha/koha/opac/opac-search.pl,v 1.38.2.15 2007/01/10
10:52:58 toins Exp $
#
# Copyright 2006 LibLime
#
@@ -555,23 +555,11 @@
searchdesc => $search_desc,
opacfacets => 1,
facets_loop => $facets,
- suggestion => C4::Context->preference("suggestion"),
- virtualshelves => C4::Context->preference("virtualshelves"),
- LibraryName => C4::Context->preference("LibraryName"),
- OpacNav => C4::Context->preference("OpacNav"),
- opaccredits => C4::Context->preference("opaccredits"),
- AmazonContent => C4::Context->preference("AmazonContent"),
- opacsmallimage => C4::Context->preference("opacsmallimage"),
- opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
- opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
"BiblioDefaultView"
. C4::Context->preference("BiblioDefaultView") => 1,
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/opac-serial-issues.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -b -r1.8.2.3 -r1.8.2.4
--- opac/opac-serial-issues.pl 10 Jan 2007 10:12:48 -0000 1.8.2.3
+++ opac/opac-serial-issues.pl 10 Jan 2007 10:52:58 -0000 1.8.2.4
@@ -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.3 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-serial-issues.pl,v 1.8.2.4 2007/01/10 10:52:58 toins Exp $
use strict;
use CGI;
@@ -92,9 +92,6 @@
$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/opac-shelves.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.8.2.10
retrieving revision 1.8.2.11
diff -u -b -r1.8.2.10 -r1.8.2.11
--- opac/opac-shelves.pl 10 Jan 2007 10:12:48 -0000 1.8.2.10
+++ opac/opac-shelves.pl 10 Jan 2007 10:52:58 -0000 1.8.2.11
@@ -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.10 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-shelves.pl,v 1.8.2.11 2007/01/10 10:52:58 toins Exp $
=head1 NAME
@@ -218,14 +218,7 @@
$template->param(
shelvesloop => address@hidden,
- intranetcolorstylesheet =>
- C4::Context->preference("intranetcolorstylesheet"),
- 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;
@@ -234,6 +227,9 @@
#
# $Log: opac-shelves.pl,v $
+# Revision 1.8.2.11 2007/01/10 10:52:58 toins
+# adding syspref directly to Auth.pm instead of to the template.
+#
# Revision 1.8.2.10 2007/01/10 10:12:48 toins
# Adding OpacTopissue, OpacCloud, OpacAuthorithies to the template->param.
# + Some cleanup.
Index: opac/opac-suggestions.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-suggestions.pl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -b -r1.6.2.3 -r1.6.2.4
--- opac/opac-suggestions.pl 10 Jan 2007 10:12:48 -0000 1.6.2.3
+++ opac/opac-suggestions.pl 10 Jan 2007 10:52:58 -0000 1.6.2.4
@@ -103,9 +103,6 @@
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/opac-tags_subject.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-tags_subject.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- opac/opac-tags_subject.pl 10 Jan 2007 10:12:48 -0000 1.1.2.3
+++ opac/opac-tags_subject.pl 10 Jan 2007 10:52:58 -0000 1.1.2.4
@@ -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-tags_subject.pl,v 1.1.2.3 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-tags_subject.pl,v 1.1.2.4 2007/01/10 10:52:58 toins Exp $
=head1 opac-tags_subject.pl
@@ -76,10 +76,7 @@
}
$template->param(
LOOP => address@hidden,
- number => $number,
- OpacCloud => C4::Context->preference("OpacCloud"),
- OpacTopissue => C4::Context->preference("OpacTopissue"),
- OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+ number => $number
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: opac/opac-topissues.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-topissues.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/opac-topissues.pl 10 Jan 2007 10:12:48 -0000 1.1.2.2
+++ opac/opac-topissues.pl 10 Jan 2007 10:52:58 -0000 1.1.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: opac-topissues.pl,v 1.1.2.2 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-topissues.pl,v 1.1.2.3 2007/01/10 10:52:58 toins Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -47,7 +47,6 @@
my $branches = GetBranches();
my $itemtypes = GetItemTypes();
-#warn "calcul : ".$calc;
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => 'opac-topissues.tmpl',
query => $input,
@@ -119,9 +118,6 @@
$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;
Index: opac/opac-user.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-user.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/opac-user.pl 10 Jan 2007 10:12:48 -0000 1.23.2.7
+++ opac/opac-user.pl 10 Jan 2007 10:52:58 -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-user.pl,v 1.23.2.7 2007/01/10 10:12:48 toins Exp $
+# $Id: opac-user.pl,v 1.23.2.8 2007/01/10 10:52:58 toins Exp $
use strict;
require Exporter;
@@ -188,10 +188,6 @@
$template->param(
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/opac-userdetails.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -b -r1.12.2.4 -r1.12.2.5
--- opac/opac-userdetails.pl 10 Jan 2007 10:12:48 -0000 1.12.2.4
+++ opac/opac-userdetails.pl 10 Jan 2007 10:52:58 -0000 1.12.2.5
@@ -50,12 +50,6 @@
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
$template->param($borr);
-$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/opac-userupdate.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -b -r1.14.2.2 -r1.14.2.3
--- opac/opac-userupdate.pl 10 Jan 2007 10:12:48 -0000 1.14.2.2
+++ opac/opac-userupdate.pl 10 Jan 2007 10:52:58 -0000 1.14.2.3
@@ -120,10 +120,7 @@
$bordat[0] = $borr;
$template->param(
- BORROWER_INFO => address@hidden,
- OpacCloud => C4::Context->preference("OpacCloud"),
- OpacTopissue => C4::Context->preference("OpacTopissue"),
- OpacAuthorities => C4::Context->preference("OpacAuthorities"),
+ BORROWER_INFO => address@hidden
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: tools/koha-news.pl
===================================================================
RCS file: /sources/koha/koha/tools/koha-news.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- tools/koha-news.pl 9 Jan 2007 16:43:04 -0000 1.1.2.4
+++ tools/koha-news.pl 10 Jan 2007 10:52:58 -0000 1.1.2.5
@@ -36,10 +36,9 @@
my $title = $cgi->param('title');
my $new = $cgi->param('new');
my $expirationdate = $cgi->param('expirationdate');
-my $displayed = $cgi->param('displayed') || 0;
+my $order = $cgi->param('order') || 0;
my $lang = $cgi->param('lang');
-$displayed = 1 if $displayed eq "on";
my $new_detail = get_opac_new($id);
@@ -84,11 +83,11 @@
}
elsif ( $op eq 'add' ) {
- add_opac_new( $title, $new, $lang, $expirationdate, $displayed );
+ add_opac_new( $title, $new, $lang, $expirationdate, $order );
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}
elsif ( $op eq 'edit' ) {
- upd_opac_new( $id, $title, $new, $lang, $expirationdate, $displayed );
+ upd_opac_new( $id, $title, $new, $lang, $expirationdate, $order );
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}
elsif ( $op eq 'del' ) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/Auth.pm opac/opac-ISBDdetail.pl opac/op... [rel_3_0],
Antoine Farnault <=