koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha C4/Auth.pm opac/opac-account.pl opac/opac-... [rel_2_2]


From: paul poulain
Subject: [Koha-cvs] koha C4/Auth.pm opac/opac-account.pl opac/opac-... [rel_2_2]
Date: Wed, 08 Mar 2006 13:46:56 +0000

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <address@hidden>   06/03/08 13:46:55

Modified files:
        C4             : Auth.pm 
        opac           : opac-account.pl opac-basket.pl opac-detail.pl 
                         opac-ISBDdetail.pl opac-MARCdetail.pl 
                         opac-passwd.pl opac-readingrecord.pl 
                         opac-reserve.pl opac-search.pl 
                         opac-searchresults.pl opac-serial-issues.pl 
                         opac-shelves.pl opac-sidebar.pl 
                         opac-suggestions.pl opac-userdetails.pl 
                         opac-user.pl opac-userupdate.pl 

Log message:
        some opac systempreferences are set by all pages.
        Moving the $template->param where the template is open. This way, 
nothing can be forgotten, and code is more readable. Feel free to move to 
Auth.pm any new systempref
        
        (note : where it has been moved, the pref is set even if the user is 
not logged in, that's what we want)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Auth.pm.diff?only_with_tag=rel_2_2&tr1=1.36.2.10&tr2=1.36.2.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-account.pl.diff?only_with_tag=rel_2_2&tr1=1.8.2.5&tr2=1.8.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-basket.pl.diff?only_with_tag=rel_2_2&tr1=1.3.2.6&tr2=1.3.2.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-detail.pl.diff?only_with_tag=rel_2_2&tr1=1.14.2.18&tr2=1.14.2.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-ISBDdetail.pl.diff?only_with_tag=rel_2_2&tr1=1.5.2.9&tr2=1.5.2.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-MARCdetail.pl.diff?only_with_tag=rel_2_2&tr1=1.4.2.12&tr2=1.4.2.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-passwd.pl.diff?only_with_tag=rel_2_2&tr1=1.1.2.3&tr2=1.1.2.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-readingrecord.pl.diff?only_with_tag=rel_2_2&tr1=1.6.2.5&tr2=1.6.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-reserve.pl.diff?only_with_tag=rel_2_2&tr1=1.22.2.7&tr2=1.22.2.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-search.pl.diff?only_with_tag=rel_2_2&tr1=1.21.2.14&tr2=1.21.2.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-searchresults.pl.diff?only_with_tag=rel_2_2&tr1=1.16.2.4&tr2=1.16.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-serial-issues.pl.diff?only_with_tag=rel_2_2&tr1=1.1.2.9&tr2=1.1.2.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-shelves.pl.diff?only_with_tag=rel_2_2&tr1=1.3.2.7&tr2=1.3.2.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-sidebar.pl.diff?only_with_tag=rel_2_2&tr1=1.4.4.4&tr2=1.4.4.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-suggestions.pl.diff?only_with_tag=rel_2_2&tr1=1.3.2.5&tr2=1.3.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-userdetails.pl.diff?only_with_tag=rel_2_2&tr1=1.8.2.5&tr2=1.8.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-user.pl.diff?only_with_tag=rel_2_2&tr1=1.14.2.8&tr2=1.14.2.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/opac/opac-userupdate.pl.diff?only_with_tag=rel_2_2&tr1=1.11.2.4&tr2=1.11.2.5&r1=text&r2=text

Patches:
Index: koha/C4/Auth.pm
diff -u koha/C4/Auth.pm:1.36.2.10 koha/C4/Auth.pm:1.36.2.11
--- koha/C4/Auth.pm:1.36.2.10   Sun Feb  5 21:59:21 2006
+++ koha/C4/Auth.pm     Wed Mar  8 13:46:55 2006
@@ -196,6 +196,19 @@
                        $template->param(CAN_user_tools => 1); }
                
        }
+       unless ($in->{'type'} eq "intranet") {
+       $template->param(
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
+                               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"),
+                               opaclanguagesdisplay => 
C4::Context->preference("opaclanguagesdisplay"),
+               );
+       }
        $template->param(
                             LibraryName => 
C4::Context->preference("LibraryName"),
                );
Index: koha/opac/opac-ISBDdetail.pl
diff -u koha/opac/opac-ISBDdetail.pl:1.5.2.9 
koha/opac/opac-ISBDdetail.pl:1.5.2.10
--- koha/opac/opac-ISBDdetail.pl:1.5.2.9        Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-ISBDdetail.pl        Wed Mar  8 13:46:55 2006
@@ -94,16 +94,9 @@
                             authnotrequired => 1,
                             debug => 1,
                             });
-$template->param(LibraryName => C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
+$template->param(
                                subscriptions => address@hidden,
                                subscriptionsnumber => $subscriptionsnumber,
-                               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"),
 );
 
 my $ISBD = C4::Context->preference('ISBD');
Index: koha/opac/opac-MARCdetail.pl
diff -u koha/opac/opac-MARCdetail.pl:1.4.2.12 
koha/opac/opac-MARCdetail.pl:1.4.2.13
--- koha/opac/opac-MARCdetail.pl:1.4.2.12       Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-MARCdetail.pl        Wed Mar  8 13:46:55 2006
@@ -78,15 +78,6 @@
                             authnotrequired => 1,
                             debug => 1,
                             });
-$template->param(LibraryName => C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
-);
 
 # fill arrays
 my @loop_data =();
Index: koha/opac/opac-account.pl
diff -u koha/opac/opac-account.pl:1.8.2.5 koha/opac/opac-account.pl:1.8.2.6
--- koha/opac/opac-account.pl:1.8.2.5   Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-account.pl   Wed Mar  8 13:46:55 2006
@@ -60,15 +60,6 @@
 
 
 $template->param( ACCOUNT_LINES => $accts,
-                            LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
-
  );
 
 $template->param( total => sprintf("%.2f",$total) );
Index: koha/opac/opac-basket.pl
diff -u koha/opac/opac-basket.pl:1.3.2.6 koha/opac/opac-basket.pl:1.3.2.7
--- koha/opac/opac-basket.pl:1.3.2.6    Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-basket.pl    Wed Mar  8 13:46:55 2006
@@ -60,14 +60,6 @@
 # my address@hidden;
 
 $template->param(BIBLIO_RESULTS => $resultsarray,
-                            LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/opac/opac-detail.pl
diff -u koha/opac/opac-detail.pl:1.14.2.18 koha/opac/opac-detail.pl:1.14.2.19
--- koha/opac/opac-detail.pl:1.14.2.18  Mon Mar  6 19:44:08 2006
+++ koha/opac/opac-detail.pl    Wed Mar  8 13:46:55 2006
@@ -85,15 +85,6 @@
                                SITE_RESULTS => $sitearray,
                                subscriptions => address@hidden,
                                subscriptionsnumber => $subscriptionsnumber,
-                           LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
 );
 
 ## Amazon.com stuff
Index: koha/opac/opac-passwd.pl
diff -u koha/opac/opac-passwd.pl:1.1.2.3 koha/opac/opac-passwd.pl:1.1.2.4
--- koha/opac/opac-passwd.pl:1.1.2.3    Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-passwd.pl    Wed Mar  8 13:46:55 2006
@@ -75,11 +75,6 @@
 }
 
 $template->param(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"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/opac/opac-readingrecord.pl
diff -u koha/opac/opac-readingrecord.pl:1.6.2.5 
koha/opac/opac-readingrecord.pl:1.6.2.6
--- koha/opac/opac-readingrecord.pl:1.6.2.5     Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-readingrecord.pl     Wed Mar  8 13:46:55 2006
@@ -81,14 +81,6 @@
 $template->param(READING_RECORD => address@hidden,
                                limit => $limit,
                                showfulllink => ($count > 50),          
-                            LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
 );
 
 
Index: koha/opac/opac-reserve.pl
diff -u koha/opac/opac-reserve.pl:1.22.2.7 koha/opac/opac-reserve.pl:1.22.2.8
--- koha/opac/opac-reserve.pl:1.22.2.7  Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-reserve.pl   Wed Mar  8 13:46:55 2006
@@ -174,14 +174,6 @@
 $template->param(TYPE_ROWS => address@hidden);
 $width = 2*$width -1;
 $template->param(totalwidth => 2*$width-1,
-                            LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
 );
 
 if ($query->param('item_types_selected')) {
Index: koha/opac/opac-search.pl
diff -u koha/opac/opac-search.pl:1.21.2.14 koha/opac/opac-search.pl:1.21.2.15
--- koha/opac/opac-search.pl:1.21.2.14  Sat Mar  4 06:33:54 2006
+++ koha/opac/opac-search.pl    Wed Mar  8 13:46:55 2006
@@ -161,16 +161,6 @@
                                                        numbers=>address@hidden,
                                                        searchdesc=> 
$searchdesc,
                                                        $defaultview => 1,
-                                                       suggestion => 
C4::Context->preference("suggestion"),
-                                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
-                                                       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"),
-                               opaclanguagesdisplay => 
C4::Context->preference("opaclanguagesdisplay"),
-                               LibraryName => 
C4::Context->preference("LibraryName"),
                                                        );
 
 } else {
Index: koha/opac/opac-searchresults.pl
diff -u koha/opac/opac-searchresults.pl:1.16.2.4 
koha/opac/opac-searchresults.pl:1.16.2.5
--- koha/opac/opac-searchresults.pl:1.16.2.4    Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-searchresults.pl     Wed Mar  8 13:46:55 2006
@@ -122,14 +122,6 @@
 }
 
 $template->param(numbers => $numbers,
-                            LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/opac/opac-serial-issues.pl
diff -u koha/opac/opac-serial-issues.pl:1.1.2.9 
koha/opac/opac-serial-issues.pl:1.1.2.10
--- koha/opac/opac-serial-issues.pl:1.1.2.9     Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-serial-issues.pl     Wed Mar  8 13:46:55 2006
@@ -66,12 +66,6 @@
        $template->param(
                biblionumber => $query->param('biblionumber'),
                subscription_LOOP => $subscriptions,
-               suggestion => C4::Context->preference("suggestion"),
-               virtualshelves => C4::Context->preference("virtualshelves"),
-                               LibraryName => 
C4::Context->preference("LibraryName"),
-                               opacsmallimage => 
C4::Context->preference("opacsmallimage"),
-                               opaclayoutstylesheet => 
C4::Context->preference("opaclayoutstylesheet"),
-                               opaccolorstylesheet => 
C4::Context->preference("opaccolorstylesheet"),
                );
 }
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/opac/opac-shelves.pl
diff -u koha/opac/opac-shelves.pl:1.3.2.7 koha/opac/opac-shelves.pl:1.3.2.8
--- koha/opac/opac-shelves.pl:1.3.2.7   Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-shelves.pl   Wed Mar  8 13:46:55 2006
@@ -2,7 +2,7 @@
 #script to provide bookshelf management
 # WARNING: This file uses 4-character tabs!
 #
-# $Header: /cvsroot/koha/koha/opac/opac-shelves.pl,v 1.3.2.7 2006/03/01 
22:33:25 oleonard Exp $
+# $Header: /cvsroot/koha/koha/opac/opac-shelves.pl,v 1.3.2.8 2006/03/08 
13:46:55 tipaul Exp $
 #
 # Copyright 2000-2002 Katipo Communications
 #
@@ -58,14 +58,6 @@
 my ($shelflist) = GetShelfList($loggedinuser,2);
 
 $template->param({     loggedinuser => $loggedinuser,
-                               LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
                                });
 SWITCH: {
        if ($query->param('op') eq 'modifsave') {
@@ -192,6 +184,12 @@
 
 #
 # $Log: opac-shelves.pl,v $
+# Revision 1.3.2.8  2006/03/08 13:46:55  tipaul
+# some opac systempreferences are set by all pages.
+# Moving the $template->param where the template is open. This way, nothing 
can be forgotten, and code is more readable. Feel free to move to Auth.pm any 
new systempref
+#
+# (note : where it has been moved, the pref is set even if the user is not 
logged in, that's what we want)
+#
 # Revision 1.3.2.7  2006/03/01 22:33:25  oleonard
 # Enabling several new system preferences: opacreadinghistory, 
opaccolorstylesheet, opaclanguagesdisplay, opaclayoutstylesheet, opacsmallimage
 #
Index: koha/opac/opac-sidebar.pl
diff -u koha/opac/opac-sidebar.pl:1.4.4.4 koha/opac/opac-sidebar.pl:1.4.4.5
--- koha/opac/opac-sidebar.pl:1.4.4.4   Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-sidebar.pl   Wed Mar  8 13:46:55 2006
@@ -27,14 +27,6 @@
 
 my $self_url = $query->url(-absolute => 1);
 $template->param(url => $self_url,
-                               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"),
-                               opacsmallimage => 
C4::Context->preference("opacsmallimage"),
-                               opaclayoutstylesheet => 
C4::Context->preference("opaclayoutstylesheet"),
-                               opaccolorstylesheet => 
C4::Context->preference("opaccolorstylesheet"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/opac/opac-suggestions.pl
diff -u koha/opac/opac-suggestions.pl:1.3.2.5 
koha/opac/opac-suggestions.pl:1.3.2.6
--- koha/opac/opac-suggestions.pl:1.3.2.5       Sat Mar  4 06:05:13 2006
+++ koha/opac/opac-suggestions.pl       Wed Mar  8 13:46:55 2006
@@ -79,13 +79,5 @@
                                status => $status,
                                suggestedbyme => $suggestedbyme,
                                "op_$op" => 1,
-                               LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
 );
 output_html_with_http_headers $input, $cookie, $template->output;
Index: koha/opac/opac-user.pl
diff -u koha/opac/opac-user.pl:1.14.2.8 koha/opac/opac-user.pl:1.14.2.9
--- koha/opac/opac-user.pl:1.14.2.8     Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-user.pl      Wed Mar  8 13:46:55 2006
@@ -140,16 +140,8 @@
 
 $template->param(WAITING => address@hidden);
 $template->param(waiting_count => $wcount,
-                               LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               OpacPasswordChange => 
C4::Context->preference("OpacPasswordChange"),
                                textmessaging => $borr->{textmessaging},
-                               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"),
+                               OpacPasswordChange => 
C4::Context->preference("OpacPasswordChange"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/opac/opac-userdetails.pl
diff -u koha/opac/opac-userdetails.pl:1.8.2.5 
koha/opac/opac-userdetails.pl:1.8.2.6
--- koha/opac/opac-userdetails.pl:1.8.2.5       Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-userdetails.pl       Wed Mar  8 13:46:55 2006
@@ -32,13 +32,6 @@
 
 $template->param($borr);
 $template->param(LibraryName => C4::Context->preference("LibraryName"),
-                                       suggestion => 
C4::Context->preference("suggestion"),
-                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
-                                       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"),
        );
 
 output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/opac/opac-userupdate.pl
diff -u koha/opac/opac-userupdate.pl:1.11.2.4 
koha/opac/opac-userupdate.pl:1.11.2.5
--- koha/opac/opac-userupdate.pl:1.11.2.4       Wed Mar  1 22:33:25 2006
+++ koha/opac/opac-userupdate.pl        Wed Mar  8 13:46:55 2006
@@ -88,14 +88,6 @@
 $bordat[0] = $borr;
 
 $template->param(BORROWER_INFO => address@hidden,
-                            LibraryName => 
C4::Context->preference("LibraryName"),
-                               suggestion => 
C4::Context->preference("suggestion"),
-                               virtualshelves => 
C4::Context->preference("virtualshelves"),
-                               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"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]