From 31da66b4edf5db0b3c74e7b3809eb5b58c95e59e Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Wed, 28 May 2014 12:12:00 +1200 Subject: [PATCH] [SIGNED-OFF] Bug 9530: Adding sysprefs and making changes to the branch table Content-Type: text/plain; charset="utf-8" To allow for separate Reply To and From email addresses for notices This patch will make no functional changes, it just sets up the db changes needed. To Test: Apply patch, upgrade DB, make sure everything still works fine (Or wait to test with following patches) Signed-off-by: Owen Leonard --- installer/data/mysql/kohastructure.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 15 +++++++++++++++ .../prog/en/modules/admin/branches.tt | 2 ++ .../prog/en/modules/admin/preferences/admin.pref | 10 ++++++++++ 4 files changed, 29 insertions(+) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index b46dc6a..bfbbaf8 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -389,6 +389,8 @@ CREATE TABLE `branches` ( -- information about your libraries or branches are st `branchphone` mediumtext, -- the primary phone for your library or branch `branchfax` mediumtext, -- the fax number for your library or branch `branchemail` mediumtext, -- the primary email address for your library or branch + `branchreplyto` mediumtext, -- the email to be used as a Reply-To + `branchreturnpath` mediumtext, -- the email to be used as Return-Path `branchurl` mediumtext, -- the URL for your library or branch's website `issuing` tinyint(4) default NULL, -- unused in Koha `branchip` varchar(15) default NULL, -- the IP address for your library or branch diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 3f1af57..312c232 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8600,6 +8600,21 @@ $DBversion = "3.17.00.013"; if ( CheckVersion($DBversion) ) { $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('maxreserves',50,'System-wide maximum number of holds a patron can place','','Integer')"); print "Upgrade to $DBversion done (Re-add system preference maxreserves)\n"; + SetVersion ($DBversion); +} + +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do( +"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReplytoDefault', '', NULL, 'The default email address to be set as replyto.', 'Free')" + ); + $dbh->do( +"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReturnpathDefault', '', NULL, 'The default email address to be set as return-path', 'Free')" + ); + $dbh->do("ALTER TABLE branches ADD branchreplyto mediumtext AFTER branchemail"); + $dbh->do("ALTER TABLE branches ADD branchreturnpath mediumtext AFTER branchreplyto"); + print +"Upgrade to $DBversion done (Bug XXX Adding replyto and returnpath addresses.)\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index f12107f..361d4ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -126,6 +126,8 @@ tinyMCE.init({
  • +
  • +
  • Can be entered as a single IP, or a subnet such as 192.168.1.*
  • 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 1215ac1..b58b78c 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 @@ -7,6 +7,16 @@ Administration: class: email - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)" - + - Use + - pref: ReplytoDefault + class: email + - "as the email address that will be set as the replyto in emails" + - + - Use + - pref: ReturnpathDefault + class: email + - "as the email address set as the return path, if you leave this empty the admin address will be used." + - - Show - pref: DebugLevel default: 0 -- 1.7.9.5