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

(-)a/C4/Auth.pm (-8 / +11 lines)
Lines 1167-1180 sub checkauth { Link Here
1167
                        my $domain = $branches->{$branchcode}->{'branchip'};
1167
                        my $domain = $branches->{$branchcode}->{'branchip'};
1168
                        $domain =~ s|\.\*||g;
1168
                        $domain =~ s|\.\*||g;
1169
                        if ( $ip !~ /^$domain/ ) {
1169
                        if ( $ip !~ /^$domain/ ) {
1170
                            $loggedin = 0;
1170
                           if(!in_iprange($domain))
1171
                            $cookie = $query->cookie(
1171
                           {
1172
                                -name     => 'CGISESSID',
1172
                              $loggedin = 0;
1173
                                -value    => '',
1173
                              $cookie = $query->cookie(
1174
                                -HttpOnly => 1,
1174
                                  -name     => 'CGISESSID',
1175
                                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
1175
                                  -value    => '',
1176
                            );
1176
                                  -HttpOnly => 1,
1177
                            $info{'wrongip'} = 1;
1177
                                  -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
1178
                              );
1179
                              $info{'wrongip'} = 1;
1180
                           }
1178
                        }
1181
                        }
1179
                    }
1182
                    }
1180
1183
(-)a/Koha/Schema/Result/Branch.pm (-1 / +1 lines)
Lines 149-155 unused in Koha Link Here
149
149
150
  data_type: 'varchar'
150
  data_type: 'varchar'
151
  is_nullable: 1
151
  is_nullable: 1
152
  size: 15
152
  size: 255
153
153
154
the IP address for your library or branch
154
the IP address for your library or branch
155
155
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 1511-1517 CREATE TABLE `branches` ( Link Here
1511
  `branchreturnpath` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'the email to be used as Return-Path',
1511
  `branchreturnpath` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'the email to be used as Return-Path',
1512
  `branchurl` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'the URL for your library or branch''s website',
1512
  `branchurl` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'the URL for your library or branch''s website',
1513
  `issuing` tinyint(4) DEFAULT NULL COMMENT 'unused in Koha',
1513
  `issuing` tinyint(4) DEFAULT NULL COMMENT 'unused in Koha',
1514
  `branchip` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'the IP address for your library or branch',
1514
  `branchip` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'the IP address for your library or branch',
1515
  `branchnotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'notes related to your library or branch',
1515
  `branchnotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'notes related to your library or branch',
1516
  `opac_info` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'HTML that displays in OPAC',
1516
  `opac_info` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'HTML that displays in OPAC',
1517
  `geolocation` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'geolocation of your library',
1517
  `geolocation` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'geolocation of your library',
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-2 / +1 lines)
Lines 238-244 Libraries › Administration › Koha Link Here
238
                <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info | $raw %]</textarea></li>
238
                <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info | $raw %]</textarea></li>
239
                <li>
239
                <li>
240
                    <label for="branchip">IP: </label>
240
                    <label for="branchip">IP: </label>
241
                    <input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip | html %]" />
241
                    <input type="text" name="branchip" id="branchip"  size="15" maxlength="255" value="[% library.branchip | html %]" />
242
                    <div class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</div>
242
                    <div class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</div>
243
                </li>
243
                </li>
244
                <li>
244
                <li>
245
- 

Return to bug 11180