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

(-)a/C4/Auth.pm (+17 lines)
Lines 472-477 sub get_template_and_user { Link Here
472
        );
472
        );
473
473
474
        $template->param(OpacPublic => '1') if ($user || C4::Context->preference("OpacPublic"));
474
        $template->param(OpacPublic => '1') if ($user || C4::Context->preference("OpacPublic"));
475
476
        # bug 8155 - comply with UK Electronic Commerce (EC Directive) Regulations 2002
477
        # if we are not using any features requiring a session, destroy it and avoid sending the CGISESSID cookie to the browser
478
        if (
479
            !(
480
                   $user
481
                || C4::Context->preference('EnableOpacSearchHistory')
482
                || C4::Context->preference('OpacBrowseResults')
483
            )
484
          )
485
        {
486
            my $session = get_session($sessionID);
487
            $session->delete();
488
            $session->flush();
489
            $template->param( SessionID => undef );
490
            $cookie = undef;
491
        }
475
    }
492
    }
476
    return ( $template, $borrowernumber, $cookie, $flags);
493
    return ( $template, $borrowernumber, $cookie, $flags);
477
}
494
}
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 285-291 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
285
INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo');
285
INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo');
286
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any message','','YesNo');
286
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any message','','YesNo');
287
INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck', '0', 'If ON, displays patron image when a patron uses web-based self-checkout', '', 'YesNo');
287
INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck', '0', 'If ON, displays patron image when a patron uses web-based self-checkout', '', 'YesNo');
288
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableOpacSearchHistory', '1', 'Enable or disable opac search history', 'YesNo','');
288
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableOpacSearchHistory', '0', 'Enable or disable opac search history', 'YesNo','');
289
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('RoutingListAddReserves','1','If ON the patrons on routing lists are automatically added to holds on the issue.','','YesNo');
289
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('RoutingListAddReserves','1','If ON the patrons on routing lists are automatically added to holds on the issue.','','YesNo');
290
INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ( 'OpacAddMastheadLibraryPulldown', '0', '', 'Adds a pulldown menu to select the library to search on the opac masthead.', 'YesNo' );
290
INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ( 'OpacAddMastheadLibraryPulldown', '0', '', 'Adds a pulldown menu to select the library to search on the opac masthead.', 'YesNo' );
291
INSERT INTO systempreferences VALUES ('ImageLimit',5,'','Limit images stored in the database by the Patron Card image manager to this number.','Integer');
291
INSERT INTO systempreferences VALUES ('ImageLimit',5,'','Limit images stored in the database by the Patron Card image manager to this number.','Integer');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-2 / +2 lines)
Lines 257-263 OPAC: Link Here
257
              choices:
257
              choices:
258
                  yes: Allow
258
                  yes: Allow
259
                  no: "Don't allow"
259
                  no: "Don't allow"
260
            - patrons to browse subject authorities on OPAC (run misc/cronjobs/build_browser_and_cloud.pl to create the browser list)
260
            - patrons to browse subject authorities on OPAC (run misc/cronjobs/build_browser_and_cloud.pl to create the browser list) ("Allow" sets a cookie on every page, which may break UK/EU law in some situations.)
261
        -
261
        -
262
            - pref: OpacAuthorities
262
            - pref: OpacAuthorities
263
              choices:
263
              choices:
Lines 436-442 OPAC: Link Here
436
              choices:
436
              choices:
437
                  yes: Keep
437
                  yes: Keep
438
                  no: "Don't keep"
438
                  no: "Don't keep"
439
            - patron search history in the OPAC.
439
            - patron search history in the OPAC. ("Keep" sets a cookie on every page, may break UK/EU law in some situations.)
440
        -
440
        -
441
            - pref: OPACPrivacy
441
            - pref: OPACPrivacy
442
              default: 0
442
              default: 0
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt (-1 / +1 lines)
Lines 84-89 please choose against which one you would like to authenticate: </p> Link Here
84
</ol></fieldset>
84
</ol></fieldset>
85
85
86
<input type="submit" value="Log In" class="submit" />
86
<input type="submit" value="Log In" class="submit" />
87
<div id="cookiewarning"><p>Logging in here will save a small piece of information (a cookie) in your browser, to avoid sending your password on every page. For more information, see <a href="http://www.allaboutcookies.org/">AllAboutCookies.org</a>.</p></div>
87
<div id="nologininstructions">  <h5>Don't have a password yet?</h5><p> If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
88
<div id="nologininstructions">  <h5>Don't have a password yet?</h5><p> If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
88
<h5>Don't have a library card?</h5><p> If you don't have a library card, stop by your local library to sign up.  </p></div>
89
<h5>Don't have a library card?</h5><p> If you don't have a library card, stop by your local library to sign up.  </p></div>
89
</form>
90
</form>
90
- 

Return to bug 8155