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

(-)a/installer/data/mysql/kohastructure.sql (+2 lines)
Lines 389-394 CREATE TABLE `branches` ( -- information about your libraries or branches are st Link Here
389
  `branchphone` mediumtext, -- the primary phone for your library or branch
389
  `branchphone` mediumtext, -- the primary phone for your library or branch
390
  `branchfax` mediumtext, -- the fax number for your library or branch
390
  `branchfax` mediumtext, -- the fax number for your library or branch
391
  `branchemail` mediumtext, -- the primary email address for your library or branch
391
  `branchemail` mediumtext, -- the primary email address for your library or branch
392
  `branchreplyto` mediumtext, -- the email to be used as a Reply-To
393
  `branchreturnpath` mediumtext, -- the email to be used as Return-Path
392
  `branchurl` mediumtext, -- the URL for your library or branch's website
394
  `branchurl` mediumtext, -- the URL for your library or branch's website
393
  `issuing` tinyint(4) default NULL, -- unused in Koha
395
  `issuing` tinyint(4) default NULL, -- unused in Koha
394
  `branchip` varchar(15) default NULL, -- the IP address for your library or branch
396
  `branchip` varchar(15) default NULL, -- the IP address for your library or branch
(-)a/installer/data/mysql/updatedatabase.pl (+14 lines)
Lines 8778-8783 if ( CheckVersion($DBversion) ) { Link Here
8778
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('StatisticsFields','location|itype|ccode','Define fields (from the items table) used for statistics members',NULL,'Free')
8778
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('StatisticsFields','location|itype|ccode','Define fields (from the items table) used for statistics members',NULL,'Free')
8779
    });
8779
    });
8780
    print "Upgrade to $DBversion done (Bug 12728: Checked syspref StatisticsFields)\n";
8780
    print "Upgrade to $DBversion done (Bug 12728: Checked syspref StatisticsFields)\n";
8781
}
8782
8783
$DBversion = "3.17.00.XXX";
8784
if ( CheckVersion($DBversion) ) {
8785
    $dbh->do(
8786
"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReplytoDefault',  '',  NULL,  'The default email address to be set as replyto.',  'Free')"
8787
    );
8788
    $dbh->do(
8789
"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReturnpathDefault',  '',  NULL,  'The default email address to be set as return-path',  'Free')"
8790
    );
8791
    $dbh->do("ALTER TABLE branches ADD branchreplyto mediumtext AFTER branchemail");
8792
    $dbh->do("ALTER TABLE branches ADD branchreturnpath mediumtext AFTER branchreplyto");
8793
    print
8794
"Upgrade to $DBversion done (Bug XXX Adding replyto and returnpath addresses.)\n";
8781
    SetVersion($DBversion);
8795
    SetVersion($DBversion);
8782
}
8796
}
8783
8797
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (+2 lines)
Lines 126-131 tinyMCE.init({ Link Here
126
        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
126
        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
127
        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
127
        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
128
        <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email"  size="80" value="[% branchemail |html %]" /></li>
128
        <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email"  size="80" value="[% branchemail |html %]" /></li>
129
        <li><label for="branchreply">Reply-To (if different to Email): </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email"  size="80" value="[% branchreplyto |html %]" /></li>
130
        <li><label for="branchreturnpath">Return-Path (if different to Email): </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email"  size="80" value="[% branchreturnpath |html %]" /></li>
129
        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% branchurl |html %]" class="url" /></li>
131
        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% branchurl |html %]" class="url" /></li>
130
        <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
132
        <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
131
        <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
133
        <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (-1 / +10 lines)
Lines 7-12 Administration: Link Here
7
              class: email
7
              class: email
8
            - "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.)"
8
            - "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.)"
9
        -
9
        -
10
           - Use
11
           - pref: ReplytoDefault
12
             class: email
13
           - "as the email address that will be set as the replyto in emails"
14
        -
15
           - Use
16
           - pref: ReturnpathDefault
17
             class: email
18
           - "as the email address set as the return path, if you leave this empty the admin address will be used."
19
        -
10
            - Show
20
            - Show
11
            - pref: DebugLevel
21
            - pref: DebugLevel
12
              default: 0
22
              default: 0
13
- 

Return to bug 9530