From 817ac00904d2157bb05bd725f62d902670bb18ed Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 30 Dec 2014 09:14:15 +0000 Subject: [PATCH] [PASSED QA] Bug - 5511: [Followup]: QA Fixes - Move database update entry to correct spot - Fix version number in database update - Fix capitalization in sys pref description - Fix sequence in sysprefs.sql Signed-off-by: Martin Renvoize --- installer/data/mysql/sysprefs.sql | 4 ++-- installer/data/mysql/updatedatabase.pl | 14 +++++++------- .../prog/en/modules/admin/preferences/admin.pref | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index f6efb5a..8b0284e 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -372,6 +372,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'), ('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'), ('SeparateHoldingsBranch','homebranch','homebranch|holdingbranch','Branch used to separate holdings','Choice'), +('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'), ('SessionStorage','mysql','mysql|Pg|tmp','Use database or a temporary file for storing session data','Choice'), ('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'), ('ShelfBrowserUsesHomeBranch','1','1','Use the item home branch when finding items for the shelf browser.','YesNo'), @@ -472,6 +473,5 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'), ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'), ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), -('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'), -('SessionRestrictionByIP','1','Check for Change in Remote IP address for Session Security . Disable when remote ip address changes frequently.','','YesNo'); +('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo') ; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5c1bc72..e523e67 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9578,13 +9578,6 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (3.18.0 release)\n"; } -$DBversion = "3.18.00.001"; -if ( CheckVersion($DBversion) ) { - $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SessionRestrictionByIP','1','Check for Change in Remote IP address for Session Security. Disable when remote ip address changes frequently.','','YesNo')"); - print "Upgrade to $DBversion done (Bug 5511 - SessionRestrictionByIP)"; - SetVersion ($DBversion); -} - $DBversion = "3.19.00.000"; if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (there's life after 3.18)\n"; @@ -9634,6 +9627,13 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.19.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SessionRestrictionByIP','1','Check for Change in Remote IP address for Session Security. Disable when remote ip address changes frequently.','','YesNo')"); + print "Upgrade to $DBversion done (Bug 5511 - SessionRestrictionByIP)"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 6147ef7..e1d54a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -69,7 +69,7 @@ Administration: choices: yes: Enable no: "Disable" - - Check for Change in Remote IP address for Session Security. Disable when remote ip address changes frequently. + - check for change in remote IP address for session security. Disable only when remote IP address changes frequently. # PostgreSQL is supported by CGI::Session but not by Koha. - - Store login session information -- 1.7.10.4