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

(-)a/C4/Auth.pm (-1 / +1 lines)
Lines 1199-1205 sub checkauth { Link Here
1199
                        # we have to check they are coming from the right ip range
1199
                        # we have to check they are coming from the right ip range
1200
                        my $domain = $branches->{$branchcode}->{'branchip'};
1200
                        my $domain = $branches->{$branchcode}->{'branchip'};
1201
                        $domain =~ s|\.\*||g;
1201
                        $domain =~ s|\.\*||g;
1202
                        if ( $ip !~ /^$domain/ ) {
1202
                        if ( !(in_iprange($domain) ) {
1203
                            $loggedin = 0;
1203
                            $loggedin = 0;
1204
                            $cookie = $cookie_mgr->replace_in_list( $cookie, $query->cookie(
1204
                            $cookie = $cookie_mgr->replace_in_list( $cookie, $query->cookie(
1205
                                -name     => 'CGISESSID',
1205
                                -name     => 'CGISESSID',
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 1648-1654 CREATE TABLE `branches` ( Link Here
1648
  `branchreturnpath` longtext DEFAULT NULL COMMENT 'the email to be used as Return-Path',
1648
  `branchreturnpath` longtext DEFAULT NULL COMMENT 'the email to be used as Return-Path',
1649
  `branchurl` longtext DEFAULT NULL COMMENT 'the URL for your library or branch''s website',
1649
  `branchurl` longtext DEFAULT NULL COMMENT 'the URL for your library or branch''s website',
1650
  `issuing` tinyint(4) DEFAULT NULL COMMENT 'unused in Koha',
1650
  `issuing` tinyint(4) DEFAULT NULL COMMENT 'unused in Koha',
1651
  `branchip` varchar(15) DEFAULT NULL COMMENT 'the IP address for your library or branch',
1651
  `branchip` varchar(255) DEFAULT NULL COMMENT 'the IP address for your library or branch',
1652
  `branchnotes` longtext DEFAULT NULL COMMENT 'notes related to your library or branch',
1652
  `branchnotes` longtext DEFAULT NULL COMMENT 'notes related to your library or branch',
1653
  `geolocation` varchar(255) DEFAULT NULL COMMENT 'geolocation of your library',
1653
  `geolocation` varchar(255) DEFAULT NULL COMMENT 'geolocation of your library',
1654
  `marcorgcode` varchar(16) DEFAULT NULL COMMENT 'MARC Organization Code, see http://www.loc.gov/marc/organizations/orgshome.html, when empty defaults to syspref MARCOrgCode',
1654
  `marcorgcode` varchar(16) DEFAULT NULL COMMENT 'MARC Organization Code, see http://www.loc.gov/marc/organizations/orgshome.html, when empty defaults to syspref MARCOrgCode',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-2 / +1 lines)
Lines 248-254 Link Here
248
                </li>
248
                </li>
249
                <li>
249
                <li>
250
                    <label for="branchip">IP: </label>
250
                    <label for="branchip">IP: </label>
251
                    <input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip | html %]" />
251
                    <input type="text" name="branchip" id="branchip"  size="15" maxlength="255" value="[% library.branchip | html %]" />
252
                    <div class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</div>
252
                    <div class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</div>
253
                </li>
253
                </li>
254
                <li>
254
                <li>
255
- 

Return to bug 11180