Attachment #37914 for bug #7976

View | Details | Raw Unified | Return to bug 7976
Collapse All | Expand All




            query           => $query,
      type            => "opac",
      authnotrequired => 0,
      flagsrequired   => { catalogue => '*', tools => 'import_patrons' },
  }
    );


         query           => $query,
         type            => "opac",
         authnotrequired => 0,
         flagsrequired   => { catalogue => '*', tools => 'import_patrons' },
       }
     );


            $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 );





  my $query = new CGI;

    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;



=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   => { acquisition => '*' },
        }
    );

    This call passes the C<query>, C<flagsrequired> and C<authnotrequired>
    to C<&checkauth> (in this module) to perform authentification.

            $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 );

Lines 33-39 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/basket/basket.pl (-1 / +1 lines)
33	template_name => "basket/basket.tt",	33	template_name => "basket/basket.tt",
34	query => $query,	34	query => $query,
35	type => "intranet",	35	type => "intranet",
36	flagsrequired => { borrow => 1 },	36	flagsrequired => { catalogue => 1 },
37	}	37	}
38	);	38	);
39		39

Lines 40-46 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/basket/downloadcart.pl (-1 / +1 lines)
40	query => $query,	40	query => $query,
41	type => "intranet",	41	type => "intranet",
42	authnotrequired => 0,	42	authnotrequired => 0,
43	flagsrequired => { borrow => 1 },	43	flagsrequired => { catalogue => 1 },
44	}	44	}
45	);	45	);
46		46

Lines 40-46 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/basket/sendbasket.pl (-1 / +1 lines)
40	query => $query,	40	query => $query,
41	type => "intranet",	41	type => "intranet",
42	authnotrequired => 0,	42	authnotrequired => 0,
43	flagsrequired => { borrow => 1 },	43	flagsrequired => { catalogue => 1 },
44	}	44	}
45	);	45	);
46		46

Lines 5-11 INSERT INTO `userflags` VALUES(3,'parameters','Administration und Systemparamete Link Here

(-)a/installer/data/mysql/de-DE/mandatory/userflags.sql (-1 lines)
5	INSERT INTO `userflags` VALUES(4,'borrowers','Benutzer anlegen/ändern',0);	5	INSERT INTO `userflags` VALUES(4,'borrowers','Benutzer anlegen/ändern',0);
6	INSERT INTO `userflags` VALUES(5,'permissions','Berechtigungen für Benutzer vergeben',0);	6	INSERT INTO `userflags` VALUES(5,'permissions','Berechtigungen für Benutzer vergeben',0);
7	INSERT INTO `userflags` VALUES(6,'reserveforothers','Vormerkungen für Benutzer setzen/ändern',0);	7	INSERT INTO `userflags` VALUES(6,'reserveforothers','Vormerkungen für Benutzer setzen/ändern',0);
8	INSERT INTO `userflags` VALUES(7,'borrow','Medien entleihen',1);
9	INSERT INTO `userflags` VALUES(9,'editcatalogue','Katalogdaten ändern (Titel- und Bestandsdaten ändern)',0);	8	INSERT INTO `userflags` VALUES(9,'editcatalogue','Katalogdaten ändern (Titel- und Bestandsdaten ändern)',0);
10	INSERT INTO `userflags` VALUES(10,'updatecharges','Gebühren verwalten',0);	9	INSERT INTO `userflags` VALUES(10,'updatecharges','Gebühren verwalten',0);
11	INSERT INTO `userflags` VALUES(11,'acquisition','Erwerbung und Verwaltung von Anschaffungsvorschlägen',0);	10	INSERT INTO `userflags` VALUES(11,'acquisition','Erwerbung und Verwaltung von Anschaffungsvorschlägen',0);

Lines 6-12 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/userflags.sql (-1 lines)
6	(4,'borrowers','Add or modify patrons',0),	6	(4,'borrowers','Add or modify patrons',0),
7	(5,'permissions','Set user permissions',0),	7	(5,'permissions','Set user permissions',0),
8	(6,'reserveforothers','Place and modify holds for patrons',0),	8	(6,'reserveforothers','Place and modify holds for patrons',0),
9	(7,'borrow','Borrow books',1),
10	(9,'editcatalogue','Edit catalog (Modify bibliographic/holdings data)',0),	9	(9,'editcatalogue','Edit catalog (Modify bibliographic/holdings data)',0),
11	(10,'updatecharges','Manage patrons fines and fees',0),	10	(10,'updatecharges','Manage patrons fines and fees',0),
12	(11,'acquisition','Acquisition and/or suggestion management',0),	11	(11,'acquisition','Acquisition and/or suggestion management',0),

Lines 5-11 INSERT INTO `userflags` VALUES(3,'parameters','Set Koha system parameters',0); Link Here

(-)a/installer/data/mysql/es-ES/mandatory/userflags.sql (-1 lines)
5	INSERT INTO `userflags` VALUES(4,'borrowers','Add or modify borrowers',0);	5	INSERT INTO `userflags` VALUES(4,'borrowers','Add or modify borrowers',0);
6	INSERT INTO `userflags` VALUES(5,'permissions','Set user permissions',0);	6	INSERT INTO `userflags` VALUES(5,'permissions','Set user permissions',0);
7	INSERT INTO `userflags` VALUES(6,'reserveforothers','Place and modify holds for patrons',0);	7	INSERT INTO `userflags` VALUES(6,'reserveforothers','Place and modify holds for patrons',0);
8	INSERT INTO `userflags` VALUES(7,'borrow','Borrow books',1);
9	INSERT INTO `userflags` VALUES(9,'editcatalogue','Edit Catalog (Modify bibliographic/holdings data)',0);	8	INSERT INTO `userflags` VALUES(9,'editcatalogue','Edit Catalog (Modify bibliographic/holdings data)',0);
10	INSERT INTO `userflags` VALUES(10,'updatecharges','Update borrower charges',0);	9	INSERT INTO `userflags` VALUES(10,'updatecharges','Update borrower charges',0);
11	INSERT INTO `userflags` VALUES(11,'acquisition','Acquisition and/or suggestion management',0);	10	INSERT INTO `userflags` VALUES(11,'acquisition','Acquisition and/or suggestion management',0);

Lines 7-13 INSERT INTO `userflags` VALUES(3,'parameters','Définition des paramètres de l' Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql (-1 lines)
7	INSERT INTO `userflags` VALUES(4,'borrowers','Gestion des lecteurs',0);	7	INSERT INTO `userflags` VALUES(4,'borrowers','Gestion des lecteurs',0);
8	INSERT INTO `userflags` VALUES(5,'permissions','Définition des habilitations',0);	8	INSERT INTO `userflags` VALUES(5,'permissions','Définition des habilitations',0);
9	INSERT INTO `userflags` VALUES(6,'reserveforothers','Ajout et modifications des réservations des adhérents',0);	9	INSERT INTO `userflags` VALUES(6,'reserveforothers','Ajout et modifications des réservations des adhérents',0);
10	INSERT INTO `userflags` VALUES(7,'borrow','Circulation (inutile normalement)',1);
11	INSERT INTO `userflags` VALUES(9,'editcatalogue','fonctions de catalogage',0);	10	INSERT INTO `userflags` VALUES(9,'editcatalogue','fonctions de catalogage',0);
12	INSERT INTO `userflags` VALUES(10,'updatecharges','Gestion des pénalités financières',0);	11	INSERT INTO `userflags` VALUES(10,'updatecharges','Gestion des pénalités financières',0);
13	INSERT INTO `userflags` VALUES(11,'acquisition','Gestion des acquisitions',0);	12	INSERT INTO `userflags` VALUES(11,'acquisition','Gestion des acquisitions',0);

Lines 7-13 INSERT INTO `userflags` VALUES(3,'parameters','Imposta i parametri di Koha',0); Link Here

(-)a/installer/data/mysql/it-IT/necessari/userflags.sql (-1 lines)
7	INSERT INTO `userflags` VALUES(4,'borrowers','Aggiungi o modifica gli utenti',0);	7	INSERT INTO `userflags` VALUES(4,'borrowers','Aggiungi o modifica gli utenti',0);
8	INSERT INTO `userflags` VALUES(5,'permissions','Imposta i permessi utente',0);	8	INSERT INTO `userflags` VALUES(5,'permissions','Imposta i permessi utente',0);
9	INSERT INTO `userflags` VALUES(6,'reserveforothers','Prenota i libri per gli utenti',0);	9	INSERT INTO `userflags` VALUES(6,'reserveforothers','Prenota i libri per gli utenti',0);
10	INSERT INTO `userflags` VALUES(7,'borrow','Presta i libri',1);
11	INSERT INTO `userflags` VALUES(9,'editcatalogue','Modifica il catalogo (modifica i dati bibliografici e titoli)',0);	10	INSERT INTO `userflags` VALUES(9,'editcatalogue','Modifica il catalogo (modifica i dati bibliografici e titoli)',0);
12	INSERT INTO `userflags` VALUES(10,'updatecharges','Aggiorna le tariffe del prestito',0);	11	INSERT INTO `userflags` VALUES(10,'updatecharges','Aggiorna le tariffe del prestito',0);
13	INSERT INTO `userflags` VALUES(11,'acquisition','Gestione delle acquisizioni e dei suggerimenti d\'acquisto',0);	12	INSERT INTO `userflags` VALUES(11,'acquisition','Gestione delle acquisizioni e dei suggerimenti d\'acquisto',0);

Lines 26-32 INSERT INTO `userflags` VALUES(3,'parameters','Endre Kohas systempreferanser',0) Link Here

(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql (-1 lines)
26	INSERT INTO `userflags` VALUES(4,'borrowers','Legge til og endre lånere',0);	26	INSERT INTO `userflags` VALUES(4,'borrowers','Legge til og endre lånere',0);
27	INSERT INTO `userflags` VALUES(5,'permissions','Endre brukerrettigheter',0);	27	INSERT INTO `userflags` VALUES(5,'permissions','Endre brukerrettigheter',0);
28	INSERT INTO `userflags` VALUES(6,'reserveforothers','Reservere og endre reservasjoner for lånere',0);	28	INSERT INTO `userflags` VALUES(6,'reserveforothers','Reservere og endre reservasjoner for lånere',0);
29	INSERT INTO `userflags` VALUES(7,'borrow','Låne dokumenter',1);
30	INSERT INTO `userflags` VALUES(9,'editcatalogue','Endre katalogen (Endre bibliografiske poster og eksemplaropplysninger)',0);	29	INSERT INTO `userflags` VALUES(9,'editcatalogue','Endre katalogen (Endre bibliografiske poster og eksemplaropplysninger)',0);
31	INSERT INTO `userflags` VALUES(10,'updatecharges','Endre gebyrer for lånere',0);	30	INSERT INTO `userflags` VALUES(10,'updatecharges','Endre gebyrer for lånere',0);
32	INSERT INTO `userflags` VALUES(11,'acquisition','Innkjøp og/eller behandling av forslag',0);	31	INSERT INTO `userflags` VALUES(11,'acquisition','Innkjøp og/eller behandling av forslag',0);

Lines 6-12 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here

(-)a/installer/data/mysql/pl-PL/mandatory/userflags.sql (-1 lines)
6	(4,'borrowers','Dodawanie i modyfikowanie użytkowników',0),	6	(4,'borrowers','Dodawanie i modyfikowanie użytkowników',0),
7	(5,'permissions','Ustawianie uprawnień użytkownikom',0),	7	(5,'permissions','Ustawianie uprawnień użytkownikom',0),
8	(6,'reserveforothers','Składanie i modyfikacja zamówień w imieniu użytkowników',0),	8	(6,'reserveforothers','Składanie i modyfikacja zamówień w imieniu użytkowników',0),
9	(7,'borrow','Wypożyczanie książek',1),
10	(9,'editcatalogue','Modyfikowanie katalogu (Modyfikacja rekordów bibliograficznych/egzemplarza)',0),	9	(9,'editcatalogue','Modyfikowanie katalogu (Modyfikacja rekordów bibliograficznych/egzemplarza)',0),
11	(10,'updatecharges','Zarządzanie należnościami',0),	10	(10,'updatecharges','Zarządzanie należnościami',0),
12	(11,'acquisition','Gromadzenie oraz/lub zarządzanie propozycjami zakupu',0),	11	(11,'acquisition','Gromadzenie oraz/lub zarządzanie propozycjami zakupu',0),

Lines 8-14 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql (-1 lines)
8	(4, 'borrowers', 'Внесение и изменение посетителей',0),	8	(4, 'borrowers', 'Внесение и изменение посетителей',0),
9	(5, 'permissions', 'Установка привилегий пользователя',0),	9	(5, 'permissions', 'Установка привилегий пользователя',0),
10	(6, 'reserveforothers','Резервирование книжек для посетителей',0),	10	(6, 'reserveforothers','Резервирование книжек для посетителей',0),
11	(7, 'borrow', 'Заем книг',1),
12	(9, 'editcatalogue', 'Изменение каталога (изменение библиографических/локальных данных)',0),	11	(9, 'editcatalogue', 'Изменение каталога (изменение библиографических/локальных данных)',0),
13	(10,'updatecharges', 'Обновление оплат пользователей',0),	12	(10,'updatecharges', 'Обновление оплат пользователей',0),
14	(11,'acquisition', 'Управление поступлениями и/или предложениями',0),	13	(11,'acquisition', 'Управление поступлениями и/или предложениями',0),

Lines 8-14 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here

(-)a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql (-1 lines)
8	(4, 'borrowers', 'Внесення та зміна відвідувачів',0),	8	(4, 'borrowers', 'Внесення та зміна відвідувачів',0),
9	(5, 'permissions', 'Встановлення привілеїв користувача',0),	9	(5, 'permissions', 'Встановлення привілеїв користувача',0),
10	(6, 'reserveforothers','Резервування книжок для відвідувачів',0),	10	(6, 'reserveforothers','Резервування книжок для відвідувачів',0),
11	(7, 'borrow', 'Випозичання книжок',1),
12	(9, 'editcatalogue', 'Редагування каталогу (зміна бібліографічних/локальних даних)',0),	11	(9, 'editcatalogue', 'Редагування каталогу (зміна бібліографічних/локальних даних)',0),
13	(10,'updatecharges', 'Оновлення сплат користувачів',0),	12	(10,'updatecharges', 'Оновлення сплат користувачів',0),
14	(11,'acquisition', 'Управління надходженнями і/чи пропозиціями',0),	13	(11,'acquisition', 'Управління надходженнями і/чи пропозиціями',0),




    SetVersion ($DBversion);
}


$DBversion = "3.19.00.018";
if ( CheckVersion($DBversion) ) {
    $dbh->do(q|

    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)

Lines 34-40 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-account.pl (-1 lines)
34	query => $query,	34	query => $query,
35	type => "opac",	35	type => "opac",
36	authnotrequired => 0,	36	authnotrequired => 0,
37	flagsrequired => { borrow => 1 },
38	debug => 1,	37	debug => 1,
39	}	38	}
40	);	39	);

Lines 35-41 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/opac/opac-basket.pl (-1 lines)
35	query => $query,	35	query => $query,
36	type => "opac",	36	type => "opac",
37	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),	37	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
38	flagsrequired => { borrow => 1 },
39	}	38	}
40	);	39	);
41		40

Lines 67-73 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-detail.pl (-1 lines)
67	query => $query,	67	query => $query,
68	type => "opac",	68	type => "opac",
69	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),	69	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
70	flagsrequired => { borrow => 1 },
71	}	70	}
72	);	71	);
73		72

Lines 39-46 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/opac/opac-downloadcart.pl (-2 / +1 lines)
39	template_name => "opac-downloadcart.tt",	39	template_name => "opac-downloadcart.tt",
40	query => $query,	40	query => $query,
41	type => "opac",	41	type => "opac",
42	authnotrequired => 1,	42	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
43	flagsrequired => { borrow => 1 },
44	}	43	}
45	);	44	);
46		45

Lines 39-46 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/opac/opac-downloadshelf.pl (-2 / +1 lines)
39	template_name => "opac-downloadshelf.tt",	39	template_name => "opac-downloadshelf.tt",
40	query => $query,	40	query => $query,
41	type => "opac",	41	type => "opac",
42	authnotrequired => 1,	42	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
43	flagsrequired => { borrow => 1 },
44	}	43	}
45	);	44	);
46		45

Lines 44-50 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-ics.pl (-1 lines)
44	query => $query,	44	query => $query,
45	type => "opac",	45	type => "opac",
46	authnotrequired => 0,	46	authnotrequired => 0,
47	flagsrequired => { borrow => 1 },
48	debug => 1,	47	debug => 1,
49	}	48	}
50	);	49	);

Lines 33-39 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-imageviewer.pl (-1 lines)
33	query => $query,	33	query => $query,
34	type => "opac",	34	type => "opac",
35	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),	35	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
36	flagsrequired => { borrow => 1 },
37	}	36	}
38	);	37	);
39		38

Lines 35-41 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-main.pl (-1 lines)
35	type => "opac",	35	type => "opac",
36	query => $input,	36	query => $input,
37	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),	37	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
38	flagsrequired => { borrow => 1 },
39	}	38	}
40	);	39	);
41		40

Lines 41-47 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-messaging.pl (-1 lines)
41	query => $query,	41	query => $query,
42	type => 'opac',	42	type => 'opac',
43	authnotrequired => 0,	43	authnotrequired => 0,
44	flagsrequired => { borrow => 1 },
45	debug => 1,	44	debug => 1,
46	}	45	}
47	);	46	);

Lines 29-35 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-modrequest-suspend.pl (-1 lines)
29	query => $query,	29	query => $query,
30	type => "opac",	30	type => "opac",
31	authnotrequired => 0,	31	authnotrequired => 0,
32	flagsrequired => { borrow => 1 },
33	debug => 1,	32	debug => 1,
34	}	33	}
35	);	34	);

Lines 37-43 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-modrequest.pl (-1 lines)
37	query => $query,	37	query => $query,
38	type => "opac",	38	type => "opac",
39	authnotrequired => 0,	39	authnotrequired => 0,
40	flagsrequired => { borrow => 1 },
41	debug => 1,	40	debug => 1,
42	}	41	}
43	);	42	);

Lines 36-42 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-mymessages.pl (-1 lines)
36	query => $query,	36	query => $query,
37	type => 'opac',	37	type => 'opac',
38	authnotrequired => 0,	38	authnotrequired => 0,
39	flagsrequired => { borrow => 1 },
40	debug => 1,	39	debug => 1,
41	}	40	}
42	);	41	);

Lines 40-46 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-passwd.pl (-1 lines)
40	query => $query,	40	query => $query,
41	type => "opac",	41	type => "opac",
42	authnotrequired => 0,	42	authnotrequired => 0,
43	flagsrequired => { borrow => 1 },
44	debug => 1,	43	debug => 1,
45	}	44	}
46	);	45	);

Lines 42-48 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-privacy.pl (-1 lines)
42	query => $query,	42	query => $query,
43	type => "opac",	43	type => "opac",
44	authnotrequired => 0,	44	authnotrequired => 0,
45	flagsrequired => { borrow => 1 },
46	debug => 1,	45	debug => 1,
47	}	46	}
48	);	47	);

Lines 46-52 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-readingrecord.pl (-1 lines)
46	query => $query,	46	query => $query,
47	type => "opac",	47	type => "opac",
48	authnotrequired => 0,	48	authnotrequired => 0,
49	flagsrequired => { borrow => 1 },
50	debug => 1,	49	debug => 1,
51	}	50	}
52	);	51	);

Lines 39-45 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-renew.pl (-1 lines)
39	query => $query,	39	query => $query,
40	type => "opac",	40	type => "opac",
41	authnotrequired => 0,	41	authnotrequired => 0,
42	flagsrequired => { borrow => 1 },
43	debug => 1,	42	debug => 1,
44	}	43	}
45	);	44	);

Lines 48-54 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-reserve.pl (-1 lines)
48	query => $query,	48	query => $query,
49	type => "opac",	49	type => "opac",
50	authnotrequired => 0,	50	authnotrequired => 0,
51	flagsrequired => { borrow => 1 },
52	debug => 1,	51	debug => 1,
53	}	52	}
54	);	53	);

Lines 43-49 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/opac/opac-sendbasket.pl (-2 lines)
43	query => $query,	43	query => $query,
44	type => "opac",	44	type => "opac",
45	authnotrequired => 0,	45	authnotrequired => 0,
46	flagsrequired => { borrow => 1 },
47	}	46	}
48	);	47	);
49		48
Lines 75-81 if ( $email_add ) { Link Here
75	query => $query,	74	query => $query,
76	type => "opac",	75	type => "opac",
77	authnotrequired => 0,	76	authnotrequired => 0,
78	flagsrequired => { borrow => 1 },
79	}	77	}
80	);	78	);
81		79

Lines 43-49 my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( Link Here

(-)a/opac/opac-sendshelf.pl (-2 lines)
43	query => $query,	43	query => $query,
44	type => "opac",	44	type => "opac",
45	authnotrequired => 0,	45	authnotrequired => 0,
46	flagsrequired => { borrow => 1 },
47	}	46	}
48	);	47	);
49		48
Lines 70-76 if ( $email ) { Link Here
70	query => $query,	69	query => $query,
71	type => "opac",	70	type => "opac",
72	authnotrequired => 1,	71	authnotrequired => 1,
73	flagsrequired => { borrow => 1 },
74	}	72	}
75	);	73	);
76		74

Lines 60-66 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-user.pl (-1 lines)
60	query => $query,	60	query => $query,
61	type => "opac",	61	type => "opac",
62	authnotrequired => 0,	62	authnotrequired => 0,
63	flagsrequired => { borrow => 1 },
64	debug => 1,	63	debug => 1,
65	}	64	}
66	);	65	);

Lines 16-22 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/svc/shelfbrowser.pl (-2 lines)
16	query => $cgi,	16	query => $cgi,
17	type => "opac",	17	type => "opac",
18	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),	18	authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
19	flagsrequired => { borrow => 1 },
20	}	19	}
21	);	20	);
22		21
23	-

Return to bug 7976

Lines 106-112 C4::Auth - Authenticates Koha users Link Here

(-)a/C4/Auth.pm (-3 / +2 lines)
106	query => $query,	106	query => $query,
107	type => "opac",	107	type => "opac",
108	authnotrequired => 0,	108	authnotrequired => 0,
109	flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' },	109	flagsrequired => { catalogue => '*', tools => 'import_patrons' },
110	}	110	}
111	);	111	);
112		112
Lines 130-136 automatically. This gets loaded into the template. Link Here
130	query => $query,	130	query => $query,
131	type => "opac",	131	type => "opac",
132	authnotrequired => 0,	132	authnotrequired => 0,
133	flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' },	133	flagsrequired => { catalogue => '*', tools => 'import_patrons' },
134	}	134	}
135	);	135	);
136		136
Lines 229-235 sub get_template_and_user { Link Here
229	$template->param( CAN_user_borrowers => 1 );	229	$template->param( CAN_user_borrowers => 1 );
230	$template->param( CAN_user_permissions => 1 );	230	$template->param( CAN_user_permissions => 1 );
231	$template->param( CAN_user_reserveforothers => 1 );	231	$template->param( CAN_user_reserveforothers => 1 );
232	$template->param( CAN_user_borrow => 1 );
233	$template->param( CAN_user_editcatalogue => 1 );	232	$template->param( CAN_user_editcatalogue => 1 );
234	$template->param( CAN_user_updatecharges => 1 );	233	$template->param( CAN_user_updatecharges => 1 );
235	$template->param( CAN_user_acquisition => 1 );	234	$template->param( CAN_user_acquisition => 1 );

Lines 9951-9956 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+12 lines)
9951	SetVersion ($DBversion);	9951	SetVersion ($DBversion);
9952	}	9952	}
9953		9953
		9954
9954	$DBversion = "3.19.00.018";	9955	$DBversion = "3.19.00.018";
9955	if ( CheckVersion($DBversion) ) {	9956	if ( CheckVersion($DBversion) ) {
9956	$dbh->do(q\|	9957	$dbh->do(q\|
Lines 10038-10043 while ( my $file = readdir $dirh ) { Link Here
10038	my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1;	10039	my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1;
10039	}	10040	}
10040		10041
		10042
		10043	$DBversion = "3.19.00.XXX";
		10044	if ( CheckVersion($DBversion) ) {
		10045	$dbh->do(q\|
		10046	DELETE FROM userflags WHERE bit=7;
		10047	\|);
		10048	print "Upgrade to $DBversion done (Bug 7976 - Remotve the 'borrow' permission)\n";
		10049	SetVersion($DBversion);
		10050	}
		10051
		10052
10041	=head1 FUNCTIONS	10053	=head1 FUNCTIONS
10042		10054
10043	=head2 TableExists($table)	10055	=head2 TableExists($table)

Lines 45-57 InstallAuth - Authenticates Koha users for Install process Link Here

(-)a/C4/InstallAuth.pm (-15 / +16 lines)
45		45
46	my $query = new CGI;	46	my $query = new CGI;
47		47
48	my ($template, $borrowernumber, $cookie)	48	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
49	= get_template_and_user({template_name => "opac-main.tt",	49	{ template_name => "opac-main.tt",
50	query => $query,	50	query => $query,
51	type => "opac",	51	type => "opac",
52	authnotrequired => 1,	52	authnotrequired => 1,
53	flagsrequired => {borrow => 1},	53	flagsrequired => { acquisition => '*' },
54	});	54	}
		55	);
55		56
56	output_html_with_http_headers $query, $cookie, $template->output;	57	output_html_with_http_headers $query, $cookie, $template->output;
57		58
Lines 80-92 InstallAuth - Authenticates Koha users for Install process Link Here
80		81
81	=item get_template_and_user	82	=item get_template_and_user
82		83
83	my ($template, $borrowernumber, $cookie)	84	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
84	= get_template_and_user({template_name => "opac-main.tt",	85	{ template_name => "opac-main.tt",
85	query => $query,	86	query => $query,
86	type => "opac",	87	type => "opac",
87	authnotrequired => 1,	88	authnotrequired => 1,
88	flagsrequired => {borrow => 1},	89	flagsrequired => { acquisition => '*' },
89	});	90	}
		91	);
90		92
91	This call passes the C<query>, C<flagsrequired> and C<authnotrequired>	93	This call passes the C<query>, C<flagsrequired> and C<authnotrequired>
92	to C<&checkauth> (in this module) to perform authentification.	94	to C<&checkauth> (in this module) to perform authentification.
Lines 139-145 sub get_template_and_user { Link Here
139	$template->param( CAN_user_borrowers => 1 );	141	$template->param( CAN_user_borrowers => 1 );
140	$template->param( CAN_user_permission => 1 );	142	$template->param( CAN_user_permission => 1 );
141	$template->param( CAN_user_reserveforothers => 1 );	143	$template->param( CAN_user_reserveforothers => 1 );
142	$template->param( CAN_user_borrow => 1 );
143	$template->param( CAN_user_editcatalogue => 1 );	144	$template->param( CAN_user_editcatalogue => 1 );
144	$template->param( CAN_user_updatecharges => 1 );	145	$template->param( CAN_user_updatecharges => 1 );
145	$template->param( CAN_user_acquisition => 1 );	146	$template->param( CAN_user_acquisition => 1 );