@@ -, +, @@
---
C4/Auth.pm | 12 +++++-----
C4/UsageStats.pm | 2 +-
.../data/mysql/atomicupdate/bug_26176.pl | 12 ++++++----
installer/data/mysql/mandatory/sysprefs.sql | 2 +-
.../intranet-tmpl/prog/en/includes/header.inc | 4 ++--
.../en/modules/admin/preferences/admin.pref | 4 ++--
t/db_dependent/Auth.t | 24 +++++++++----------
7 files changed, 31 insertions(+), 29 deletions(-)
--- a/C4/Auth.pm
+++ a/C4/Auth.pm
@@ -498,7 +498,7 @@ sub get_template_and_user {
advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),
AllowMultipleCovers => C4::Context->preference('AllowMultipleCovers'),
AmazonCoverImages => C4::Context->preference("AmazonCoverImages"),
- StaffLoginRestrictBranchByIP => C4::Context->preference("StaffLoginRestrictBranchByIP"),
+ StaffLoginRestrictLibraryByIP => C4::Context->preference("StaffLoginRestrictLibraryByIP"),
can_see_cataloguing_module => haspermission( $user, get_cataloguing_page_permissions() ) ? 1 : 0,
canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
EasyAnalyticalRecords => C4::Context->preference('EasyAnalyticalRecords'),
@@ -1216,7 +1216,7 @@ sub checkauth {
}
if ( $type ne 'opac' ) {
my $branches = { map { $_->branchcode => $_->unblessed } Koha::Libraries->search->as_list };
- if ( C4::Context->preference('StaffLoginRestrictBranchByIP') ) {
+ if ( C4::Context->preference('StaffLoginRestrictLibraryByIP') ) {
# we have to check they are coming from the right ip range
my $domain = $branches->{$branchcode}->{'branchip'};
$domain =~ s|\.\*||g;
@@ -1238,12 +1238,12 @@ sub checkauth {
# If StaffLoginBranchBasedOnIP is enabled we will try to find a branch
# matching your ip, regardless of the choice you have passed in
(
- !C4::Context->preference('StaffLoginRestrictBranchByIP')
+ !C4::Context->preference('StaffLoginRestrictLibraryByIP')
&& C4::Context->preference('StaffLoginBranchBasedOnIP')
)
- # When StaffLoginRestrictBranchByIP is enabled we will not choose a branch matching IP
+ # When StaffLoginRestrictLibraryByIP is enabled we will not choose a branch matching IP
# if your selected branch has no IP set
- || ( C4::Context->preference('StaffLoginRestrictBranchByIP')
+ || ( C4::Context->preference('StaffLoginRestrictLibraryByIP')
&& $auth_state ne 'failed'
&& $branches->{$branchcode}->{'branchip'} )
)
@@ -1444,7 +1444,7 @@ sub checkauth {
IntranetUserCSS => C4::Context->preference("IntranetUserCSS"),
IntranetUserJS => C4::Context->preference("IntranetUserJS"),
IndependentBranches => C4::Context->preference("IndependentBranches"),
- StaffLoginRestrictBranchByIP => C4::Context->preference("StaffLoginRestrictBranchByIP"),
+ StaffLoginRestrictLibraryByIP => C4::Context->preference("StaffLoginRestrictLibraryByIP"),
wrongip => $info{'wrongip'},
PatronSelfRegistration => C4::Context->preference("PatronSelfRegistration"),
PatronSelfRegistrationDefaultCategory => C4::Context->preference("PatronSelfRegistrationDefaultCategory"),
--- a/C4/UsageStats.pm
+++ a/C4/UsageStats.pm
@@ -146,7 +146,7 @@ sub _shared_preferences {
noItemTypeImages
OpacNoItemTypeImages
virtualshelves
- StaffLoginRestrictBranchByIP
+ StaffLoginRestrictLibraryByIP
IndependentBranches
SessionStorage
Persona
--- a/installer/data/mysql/atomicupdate/bug_26176.pl
+++ a/installer/data/mysql/atomicupdate/bug_26176.pl
@@ -3,16 +3,18 @@ use Koha::Installer::Output qw(say_warning say_failure say_success say_info);
return {
bug_number => "26176",
- description => "Rename AutoLocation to StaffLoginRestrictBranchByIP",
+ description => "Rename AutoLocation to StaffLoginRestrictLibraryByIP",
up => sub {
my ($args) = @_;
my ( $dbh, $out ) = @$args{qw(dbh out)};
- $dbh->do(q{
- UPDATE systempreferences SET variable = "StaffLoginRestrictBranchByIP"
+ $dbh->do(
+ q{
+ UPDATE systempreferences SET variable = "StaffLoginRestrictLibraryByIP"
WHERE variable = "AutoLocation"
- });
+ }
+ );
- say $out "Renamed system preference 'AutoLocation' to 'StaffLoginRestrictBranchByIP'";
+ say $out "Renamed system preference 'AutoLocation' to 'StaffLoginRestrictLibraryByIP'";
},
};
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ a/installer/data/mysql/mandatory/sysprefs.sql
@@ -737,7 +737,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('StaffLangSelectorMode','footer','top|both|footer','Select the location to display the language selector in staff interface','Choice'),
('StaffLoginBranchBasedOnIP', '0','', 'Set the logged in library for the user based on their current IP','YesNo'),
('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff interface','Free'),
-('StaffLoginRestrictBranchByIP','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff interface from unauthorized IP addresses based on branch','YesNo'),
+('StaffLoginRestrictLibraryByIP','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff interface from unauthorized IP addresses based on branch','YesNo'),
('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the staff interface','Integer'),
('staffShibOnly','0','','If ON enables shibboleth only authentication for the staff client','YesNo'),
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -95,7 +95,7 @@
[% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %]
[% logged_in_user.userid | html %]
[% logged_in_user.categorycode | html %]
- [% IF ( StaffLoginRestrictBranchByIP ) %]
+ [% IF ( StaffLoginRestrictLibraryByIP ) %]