From 70d42579c6126d2569bab8e964c6c9fd687ea0c3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 30 Mar 2015 18:18:16 +0200 Subject: [PATCH] [SIGNED OFF] Bug 7976: Remove the borrow permission The borrow permission was used but uselessly. For instance, at the opac, the flagsrequired parameter was set to 'borrow' but the 'authnotrequired' was set also (which means no auth required). At the end, this permission was used at only 1 place: for the basket, intranet side. This can be replaced with the catalogue permission (which is used to search). Test plan: 1/ Confirm that you are able to show/download/sent the cart (intranet side) with the catalogue permission. 2/ At the OPAC, you should be able to access the same pages as before with any other permissions. Concretely it is quite difficult to test this patch, you should have a look at the code. Signed-off-by: Nick Clemens --- C4/Auth.pm | 5 ++-- C4/InstallAuth.pm | 31 +++++++++++----------- basket/basket.pl | 2 +- basket/downloadcart.pl | 2 +- basket/sendbasket.pl | 2 +- installer/data/mysql/de-DE/mandatory/userflags.sql | 1 - installer/data/mysql/en/mandatory/userflags.sql | 1 - installer/data/mysql/es-ES/mandatory/userflags.sql | 1 - .../data/mysql/fr-FR/1-Obligatoire/userflags.sql | 1 - installer/data/mysql/it-IT/necessari/userflags.sql | 1 - .../data/mysql/nb-NO/1-Obligatorisk/userflags.sql | 1 - installer/data/mysql/pl-PL/mandatory/userflags.sql | 1 - .../ru-RU/mandatory/permissions_and_user_flags.sql | 1 - .../uk-UA/mandatory/permissions_and_user_flags.sql | 1 - installer/data/mysql/updatedatabase.pl | 12 +++++++++ opac/opac-account.pl | 1 - opac/opac-basket.pl | 1 - opac/opac-detail.pl | 1 - opac/opac-downloadcart.pl | 3 +-- opac/opac-downloadshelf.pl | 3 +-- opac/opac-ics.pl | 1 - opac/opac-imageviewer.pl | 1 - opac/opac-main.pl | 1 - opac/opac-messaging.pl | 1 - opac/opac-modrequest-suspend.pl | 1 - opac/opac-modrequest.pl | 1 - opac/opac-mymessages.pl | 1 - opac/opac-passwd.pl | 1 - opac/opac-privacy.pl | 1 - opac/opac-readingrecord.pl | 1 - opac/opac-renew.pl | 1 - opac/opac-reserve.pl | 1 - opac/opac-sendbasket.pl | 2 -- opac/opac-sendshelf.pl | 2 -- opac/opac-user.pl | 1 - opac/svc/shelfbrowser.pl | 1 - 36 files changed, 35 insertions(+), 55 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 017517c..1ab8fa0 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -106,7 +106,7 @@ C4::Auth - Authenticates Koha users query => $query, type => "opac", authnotrequired => 0, - flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' }, + flagsrequired => { catalogue => '*', tools => 'import_patrons' }, } ); @@ -130,7 +130,7 @@ automatically. This gets loaded into the template. query => $query, type => "opac", authnotrequired => 0, - flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' }, + flagsrequired => { catalogue => '*', tools => 'import_patrons' }, } ); @@ -229,7 +229,6 @@ sub get_template_and_user { $template->param( CAN_user_borrowers => 1 ); $template->param( CAN_user_permissions => 1 ); $template->param( CAN_user_reserveforothers => 1 ); - $template->param( CAN_user_borrow => 1 ); $template->param( CAN_user_editcatalogue => 1 ); $template->param( CAN_user_updatecharges => 1 ); $template->param( CAN_user_acquisition => 1 ); diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm index d6dbdd8..7ce7eca 100644 --- a/C4/InstallAuth.pm +++ b/C4/InstallAuth.pm @@ -45,13 +45,14 @@ InstallAuth - Authenticates Koha users for Install process my $query = new CGI; - my ($template, $borrowernumber, $cookie) - = get_template_and_user({template_name => "opac-main.tt", - query => $query, - type => "opac", - authnotrequired => 1, - flagsrequired => {borrow => 1}, - }); + my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { template_name => "opac-main.tt", + query => $query, + type => "opac", + authnotrequired => 1, + flagsrequired => { acquisition => '*' }, + } + ); output_html_with_http_headers $query, $cookie, $template->output; @@ -80,13 +81,14 @@ InstallAuth - Authenticates Koha users for Install process =item get_template_and_user - my ($template, $borrowernumber, $cookie) - = get_template_and_user({template_name => "opac-main.tt", - query => $query, - type => "opac", - authnotrequired => 1, - flagsrequired => {borrow => 1}, - }); + my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { template_name => "opac-main.tt", + query => $query, + type => "opac", + authnotrequired => 1, + flagsrequired => { acquisition => '*' }, + } + ); This call passes the C, C and C to C<&checkauth> (in this module) to perform authentification. @@ -139,7 +141,6 @@ sub get_template_and_user { $template->param( CAN_user_borrowers => 1 ); $template->param( CAN_user_permission => 1 ); $template->param( CAN_user_reserveforothers => 1 ); - $template->param( CAN_user_borrow => 1 ); $template->param( CAN_user_editcatalogue => 1 ); $template->param( CAN_user_updatecharges => 1 ); $template->param( CAN_user_acquisition => 1 ); diff --git a/basket/basket.pl b/basket/basket.pl index 83440fd..c5c1a12 100755 --- a/basket/basket.pl +++ b/basket/basket.pl @@ -33,7 +33,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( template_name => "basket/basket.tt", query => $query, type => "intranet", - flagsrequired => { borrow => 1 }, + flagsrequired => { catalogue => 1 }, } ); diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl index 2d2ceb8..95ff0b7 100755 --- a/basket/downloadcart.pl +++ b/basket/downloadcart.pl @@ -40,7 +40,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => { borrow => 1 }, + flagsrequired => { catalogue => 1 }, } ); diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 0614aa3..dcfb30f 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -40,7 +40,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => { borrow => 1 }, + flagsrequired => { catalogue => 1 }, } ); diff --git a/installer/data/mysql/de-DE/mandatory/userflags.sql b/installer/data/mysql/de-DE/mandatory/userflags.sql index b97bf5e..514315c 100644 --- a/installer/data/mysql/de-DE/mandatory/userflags.sql +++ b/installer/data/mysql/de-DE/mandatory/userflags.sql @@ -5,7 +5,6 @@ INSERT INTO `userflags` VALUES(3,'parameters','Administration und Systemparamete INSERT INTO `userflags` VALUES(4,'borrowers','Benutzer anlegen/ändern',0); INSERT INTO `userflags` VALUES(5,'permissions','Berechtigungen für Benutzer vergeben',0); INSERT INTO `userflags` VALUES(6,'reserveforothers','Vormerkungen für Benutzer setzen/ändern',0); -INSERT INTO `userflags` VALUES(7,'borrow','Medien entleihen',1); INSERT INTO `userflags` VALUES(9,'editcatalogue','Katalogdaten ändern (Titel- und Bestandsdaten ändern)',0); INSERT INTO `userflags` VALUES(10,'updatecharges','Gebühren verwalten',0); INSERT INTO `userflags` VALUES(11,'acquisition','Erwerbung und Verwaltung von Anschaffungsvorschlägen',0); diff --git a/installer/data/mysql/en/mandatory/userflags.sql b/installer/data/mysql/en/mandatory/userflags.sql index 40ca2b6..d8e3626 100644 --- a/installer/data/mysql/en/mandatory/userflags.sql +++ b/installer/data/mysql/en/mandatory/userflags.sql @@ -6,7 +6,6 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (4,'borrowers','Add or modify patrons',0), (5,'permissions','Set user permissions',0), (6,'reserveforothers','Place and modify holds for patrons',0), -(7,'borrow','Borrow books',1), (9,'editcatalogue','Edit catalog (Modify bibliographic/holdings data)',0), (10,'updatecharges','Manage patrons fines and fees',0), (11,'acquisition','Acquisition and/or suggestion management',0), diff --git a/installer/data/mysql/es-ES/mandatory/userflags.sql b/installer/data/mysql/es-ES/mandatory/userflags.sql index a37d7b0..81743ad 100644 --- a/installer/data/mysql/es-ES/mandatory/userflags.sql +++ b/installer/data/mysql/es-ES/mandatory/userflags.sql @@ -5,7 +5,6 @@ INSERT INTO `userflags` VALUES(3,'parameters','Set Koha system parameters',0); INSERT INTO `userflags` VALUES(4,'borrowers','Add or modify borrowers',0); INSERT INTO `userflags` VALUES(5,'permissions','Set user permissions',0); INSERT INTO `userflags` VALUES(6,'reserveforothers','Place and modify holds for patrons',0); -INSERT INTO `userflags` VALUES(7,'borrow','Borrow books',1); INSERT INTO `userflags` VALUES(9,'editcatalogue','Edit Catalog (Modify bibliographic/holdings data)',0); INSERT INTO `userflags` VALUES(10,'updatecharges','Update borrower charges',0); INSERT INTO `userflags` VALUES(11,'acquisition','Acquisition and/or suggestion management',0); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql index f9f3afc..277f84c 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql @@ -7,7 +7,6 @@ INSERT INTO `userflags` VALUES(3,'parameters','Définition des paramètres de l' INSERT INTO `userflags` VALUES(4,'borrowers','Gestion des lecteurs',0); INSERT INTO `userflags` VALUES(5,'permissions','Définition des habilitations',0); INSERT INTO `userflags` VALUES(6,'reserveforothers','Ajout et modifications des réservations des adhérents',0); -INSERT INTO `userflags` VALUES(7,'borrow','Circulation (inutile normalement)',1); INSERT INTO `userflags` VALUES(9,'editcatalogue','fonctions de catalogage',0); INSERT INTO `userflags` VALUES(10,'updatecharges','Gestion des pénalités financières',0); INSERT INTO `userflags` VALUES(11,'acquisition','Gestion des acquisitions',0); diff --git a/installer/data/mysql/it-IT/necessari/userflags.sql b/installer/data/mysql/it-IT/necessari/userflags.sql index 47fa0c6..de6ee7c 100644 --- a/installer/data/mysql/it-IT/necessari/userflags.sql +++ b/installer/data/mysql/it-IT/necessari/userflags.sql @@ -7,7 +7,6 @@ INSERT INTO `userflags` VALUES(3,'parameters','Imposta i parametri di Koha',0); INSERT INTO `userflags` VALUES(4,'borrowers','Aggiungi o modifica gli utenti',0); INSERT INTO `userflags` VALUES(5,'permissions','Imposta i permessi utente',0); INSERT INTO `userflags` VALUES(6,'reserveforothers','Prenota i libri per gli utenti',0); -INSERT INTO `userflags` VALUES(7,'borrow','Presta i libri',1); INSERT INTO `userflags` VALUES(9,'editcatalogue','Modifica il catalogo (modifica i dati bibliografici e titoli)',0); INSERT INTO `userflags` VALUES(10,'updatecharges','Aggiorna le tariffe del prestito',0); INSERT INTO `userflags` VALUES(11,'acquisition','Gestione delle acquisizioni e dei suggerimenti d\'acquisto',0); diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql index 48dd5fe..c5b26ca 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql @@ -26,7 +26,6 @@ INSERT INTO `userflags` VALUES(3,'parameters','Endre Kohas systempreferanser',0) INSERT INTO `userflags` VALUES(4,'borrowers','Legge til og endre lånere',0); INSERT INTO `userflags` VALUES(5,'permissions','Endre brukerrettigheter',0); INSERT INTO `userflags` VALUES(6,'reserveforothers','Reservere og endre reservasjoner for lånere',0); -INSERT INTO `userflags` VALUES(7,'borrow','Låne dokumenter',1); INSERT INTO `userflags` VALUES(9,'editcatalogue','Endre katalogen (Endre bibliografiske poster og eksemplaropplysninger)',0); INSERT INTO `userflags` VALUES(10,'updatecharges','Endre gebyrer for lånere',0); INSERT INTO `userflags` VALUES(11,'acquisition','Innkjøp og/eller behandling av forslag',0); diff --git a/installer/data/mysql/pl-PL/mandatory/userflags.sql b/installer/data/mysql/pl-PL/mandatory/userflags.sql index 4820be4..beafe6f 100644 --- a/installer/data/mysql/pl-PL/mandatory/userflags.sql +++ b/installer/data/mysql/pl-PL/mandatory/userflags.sql @@ -6,7 +6,6 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (4,'borrowers','Dodawanie i modyfikowanie użytkowników',0), (5,'permissions','Ustawianie uprawnień użytkownikom',0), (6,'reserveforothers','Składanie i modyfikacja zamówień w imieniu użytkowników',0), -(7,'borrow','Wypożyczanie książek',1), (9,'editcatalogue','Modyfikowanie katalogu (Modyfikacja rekordów bibliograficznych/egzemplarza)',0), (10,'updatecharges','Zarządzanie należnościami',0), (11,'acquisition','Gromadzenie oraz/lub zarządzanie propozycjami zakupu',0), diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql index 511c4d8..23af322 100644 --- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql +++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql @@ -8,7 +8,6 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (4, 'borrowers', 'Внесение и изменение посетителей',0), (5, 'permissions', 'Установка привилегий пользователя',0), (6, 'reserveforothers','Резервирование книжек для посетителей',0), - (7, 'borrow', 'Заем книг',1), (9, 'editcatalogue', 'Изменение каталога (изменение библиографических/локальных данных)',0), (10,'updatecharges', 'Обновление оплат пользователей',0), (11,'acquisition', 'Управление поступлениями и/или предложениями',0), diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql index 219ff65..3cb0571 100644 --- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql +++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql @@ -8,7 +8,6 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (4, 'borrowers', 'Внесення та зміна відвідувачів',0), (5, 'permissions', 'Встановлення привілеїв користувача',0), (6, 'reserveforothers','Резервування книжок для відвідувачів',0), - (7, 'borrow', 'Випозичання книжок',1), (9, 'editcatalogue', 'Редагування каталогу (зміна бібліографічних/локальних даних)',0), (10,'updatecharges', 'Оновлення сплат користувачів',0), (11,'acquisition', 'Управління надходженнями і/чи пропозиціями',0), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index bc765f1..9baaf2e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9951,6 +9951,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } + $DBversion = "3.19.00.018"; if ( CheckVersion($DBversion) ) { $dbh->do(q| @@ -10038,6 +10039,17 @@ while ( my $file = readdir $dirh ) { my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; } + +$DBversion = "3.19.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + DELETE FROM userflags WHERE bit=7; + |); + print "Upgrade to $DBversion done (Bug 7976 - Remotve the 'borrow' permission)\n"; + SetVersion($DBversion); +} + + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/opac/opac-account.pl b/opac/opac-account.pl index 7bbdc6e..157150e 100755 --- a/opac/opac-account.pl +++ b/opac/opac-account.pl @@ -34,7 +34,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index b374f3c..020f8b4 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -35,7 +35,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( query => $query, type => "opac", authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - flagsrequired => { borrow => 1 }, } ); diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index c8ee1f5..3cf1c15 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -67,7 +67,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - flagsrequired => { borrow => 1 }, } ); diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl index 5164c2e..8ea03e9 100755 --- a/opac/opac-downloadcart.pl +++ b/opac/opac-downloadcart.pl @@ -39,8 +39,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( template_name => "opac-downloadcart.tt", query => $query, type => "opac", - authnotrequired => 1, - flagsrequired => { borrow => 1 }, + authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), } ); diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl index 0230eba..fec6aea 100755 --- a/opac/opac-downloadshelf.pl +++ b/opac/opac-downloadshelf.pl @@ -39,8 +39,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( template_name => "opac-downloadshelf.tt", query => $query, type => "opac", - authnotrequired => 1, - flagsrequired => { borrow => 1 }, + authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), } ); diff --git a/opac/opac-ics.pl b/opac/opac-ics.pl index acaac9b..8498fae 100755 --- a/opac/opac-ics.pl +++ b/opac/opac-ics.pl @@ -44,7 +44,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-imageviewer.pl b/opac/opac-imageviewer.pl index 9d71bdc..0e359d8 100755 --- a/opac/opac-imageviewer.pl +++ b/opac/opac-imageviewer.pl @@ -33,7 +33,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - flagsrequired => { borrow => 1 }, } ); diff --git a/opac/opac-main.pl b/opac/opac-main.pl index 9db64cb..b0904c5 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -35,7 +35,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( type => "opac", query => $input, authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - flagsrequired => { borrow => 1 }, } ); diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl index b0c1cde..f82d5ff 100755 --- a/opac/opac-messaging.pl +++ b/opac/opac-messaging.pl @@ -41,7 +41,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => 'opac', authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-modrequest-suspend.pl b/opac/opac-modrequest-suspend.pl index 92461b9..aaa3f5a 100755 --- a/opac/opac-modrequest-suspend.pl +++ b/opac/opac-modrequest-suspend.pl @@ -29,7 +29,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-modrequest.pl b/opac/opac-modrequest.pl index 25ec92c..cd3e2db 100755 --- a/opac/opac-modrequest.pl +++ b/opac/opac-modrequest.pl @@ -37,7 +37,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-mymessages.pl b/opac/opac-mymessages.pl index 5859e57..ca82241 100755 --- a/opac/opac-mymessages.pl +++ b/opac/opac-mymessages.pl @@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => 'opac', authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-passwd.pl b/opac/opac-passwd.pl index 377e09e..2733e94 100755 --- a/opac/opac-passwd.pl +++ b/opac/opac-passwd.pl @@ -40,7 +40,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl index 4d611a3..bcde67d 100755 --- a/opac/opac-privacy.pl +++ b/opac/opac-privacy.pl @@ -42,7 +42,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl index 0e2d89f..a189042 100755 --- a/opac/opac-readingrecord.pl +++ b/opac/opac-readingrecord.pl @@ -46,7 +46,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl index 3a64ccf..921574f 100755 --- a/opac/opac-renew.pl +++ b/opac/opac-renew.pl @@ -39,7 +39,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index c30ee08..917e498 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -48,7 +48,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index 551ee1c..19bbad9 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -43,7 +43,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, } ); @@ -75,7 +74,6 @@ if ( $email_add ) { query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, } ); diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl index 3086ccc..4dc843d 100755 --- a/opac/opac-sendshelf.pl +++ b/opac/opac-sendshelf.pl @@ -43,7 +43,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, } ); @@ -70,7 +69,6 @@ if ( $email ) { query => $query, type => "opac", authnotrequired => 1, - flagsrequired => { borrow => 1 }, } ); diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 56354c8..799b0fe 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -60,7 +60,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); diff --git a/opac/svc/shelfbrowser.pl b/opac/svc/shelfbrowser.pl index ea0e9d7..2b24a0e 100755 --- a/opac/svc/shelfbrowser.pl +++ b/opac/svc/shelfbrowser.pl @@ -16,7 +16,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( query => $cgi, type => "opac", authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), - flagsrequired => { borrow => 1 }, } ); -- 1.9.1