@@ -, +, @@ --- 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 | 9 +++++++ 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, 32 insertions(+), 55 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -107,7 +107,7 @@ C4::Auth - Authenticates Koha users query => $query, type => "opac", authnotrequired => 0, - flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' }, + flagsrequired => { catalogue => '*', tools => 'import_patrons' }, } ); @@ -131,7 +131,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' }, } ); @@ -227,7 +227,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 ); --- a/C4/InstallAuth.pm +++ a/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 ); --- a/basket/basket.pl +++ a/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 }, } ); --- a/basket/downloadcart.pl +++ a/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 }, } ); --- a/basket/sendbasket.pl +++ a/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 }, } ); --- a/installer/data/mysql/de-DE/mandatory/userflags.sql +++ a/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); --- a/installer/data/mysql/en/mandatory/userflags.sql +++ a/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), --- a/installer/data/mysql/es-ES/mandatory/userflags.sql +++ a/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); --- a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql +++ a/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); --- a/installer/data/mysql/it-IT/necessari/userflags.sql +++ a/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); --- a/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql +++ a/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); --- a/installer/data/mysql/pl-PL/mandatory/userflags.sql +++ a/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), --- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql +++ a/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), --- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql +++ a/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), --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -9902,6 +9902,15 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$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) --- a/opac/opac-account.pl +++ a/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, } ); --- a/opac/opac-basket.pl +++ a/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 }, } ); --- a/opac/opac-detail.pl +++ a/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 }, } ); --- a/opac/opac-downloadcart.pl +++ a/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 ), } ); --- a/opac/opac-downloadshelf.pl +++ a/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 ), } ); --- a/opac/opac-ics.pl +++ a/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, } ); --- a/opac/opac-imageviewer.pl +++ a/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 }, } ); --- a/opac/opac-main.pl +++ a/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 }, } ); --- a/opac/opac-messaging.pl +++ a/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, } ); --- a/opac/opac-modrequest-suspend.pl +++ a/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, } ); --- a/opac/opac-modrequest.pl +++ a/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, } ); --- a/opac/opac-mymessages.pl +++ a/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, } ); --- a/opac/opac-passwd.pl +++ a/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, } ); --- a/opac/opac-privacy.pl +++ a/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, } ); --- a/opac/opac-readingrecord.pl +++ a/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, } ); --- a/opac/opac-renew.pl +++ a/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, } ); --- a/opac/opac-reserve.pl +++ a/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, } ); --- a/opac/opac-sendbasket.pl +++ a/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 }, } ); --- a/opac/opac-sendshelf.pl +++ a/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 }, } ); --- a/opac/opac-user.pl +++ a/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, } ); --- a/opac/svc/shelfbrowser.pl +++ a/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 }, } ); --