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

(-)a/installer/data/mysql/atomicupdate/bug_37221.pl (+31 lines)
Line 0 Link Here
1
use Modern::Perl;
2
use Koha::Installer::Output qw(say_warning say_failure say_success say_info);
3
4
return {
5
    bug_number  => "37221",
6
    description => "Add new system preference OPACOverDrive",
7
    up          => sub {
8
        my ($args) = @_;
9
        my ( $dbh, $out ) = @$args{qw(dbh out)};
10
11
        my $count_sql =
12
            q{SELECT count( value ) AS count FROM systempreferences WHERE variable IN ('OverDriveLibraryID', 'OverDriveClientKey', 'OverDriveClientSecret') AND value IS NOT NULL AND value != ''};
13
        my ($count) = $dbh->selectrow_array($count_sql);
14
        my $enabled =
15
            $count == 3 ? 1 : 0;    # If all 3 preferences are enabled OverDrive content has been previously enabled
16
17
        my $sth = $dbh->prepare(
18
            q{
19
            INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)
20
            VALUES ('OPACOverDrive', ?, 'Enable OverDrive integration in the OPAC', '', 'YesNo')
21
        }
22
        );
23
        $sth->execute($enabled);
24
25
        if ($enabled) {
26
            say_success( $out, "Added and enabled new system preference 'OPACOverDrive'" );
27
        } else {
28
            say_success( $out, "Added new system preference 'OPACOverDrive'" );
29
        }
30
    },
31
};
(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
Lines 582-587 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
582
('OverDriveCirculation','0','','Enable client to see their OverDrive account','YesNo'),
582
('OverDriveCirculation','0','','Enable client to see their OverDrive account','YesNo'),
583
('OverDriveClientKey','',NULL,'Client key for OverDrive integration','Free'),
583
('OverDriveClientKey','',NULL,'Client key for OverDrive integration','Free'),
584
('OverDriveClientSecret','',NULL,'Client key for OverDrive integration','Free'),
584
('OverDriveClientSecret','',NULL,'Client key for OverDrive integration','Free'),
585
('OPACOverDrive','0',NULL,'Enable OverDrive integration in the OPAC','YesNo'),
585
('OverDriveLibraryID','', NULL,'Library ID for OverDrive integration','Integer'),
586
('OverDriveLibraryID','', NULL,'Library ID for OverDrive integration','Integer'),
586
('OverDrivePasswordRequired','0','','Does the library require passwords for OverDrive SIP authentication','YesNo'),
587
('OverDrivePasswordRequired','0','','Does the library require passwords for OverDrive SIP authentication','YesNo'),
587
('OverDriveUsername','cardnumber','cardnumber|userid','Which patron information should be passed as OverDrive username','Choice'),
588
('OverDriveUsername','cardnumber','cardnumber|userid','Which patron information should be passed as OverDrive username','Choice'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref (+6 lines)
Lines 339-344 Enhanced content: Link Here
339
                  0: "Don't embed"
339
                  0: "Don't embed"
340
            - YouTube links as videos.
340
            - YouTube links as videos.
341
    OverDrive:
341
    OverDrive:
342
        -
343
            - pref: OPACOverDrive
344
              choices:
345
                  1: Enable
346
                  0: "Don't enable"
347
            - "OverDrive integration in the OPAC"
342
        -
348
        -
343
            - Include OverDrive availability information with the client key
349
            - Include OverDrive availability information with the client key
344
            - pref: OverDriveClientKey
350
            - pref: OverDriveClientKey
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-5 / +2 lines)
Lines 14-23 Link Here
14
[% SET RecallsEnabled = ( Koha.Preference('UseRecalls') == 1 ) && LoginEnabled %]
14
[% SET RecallsEnabled = ( Koha.Preference('UseRecalls') == 1 ) && LoginEnabled %]
15
[% SET ArticleRequestsEnabled = ( Koha.Preference('ArticleRequests') == 1 ) && LoginEnabled %]
15
[% SET ArticleRequestsEnabled = ( Koha.Preference('ArticleRequests') == 1 ) && LoginEnabled %]
16
[% SET MultiHolds = ( Koha.Preference('DisplayMultiPlaceHold') == 1 ) && HoldsEnabled %]
16
[% SET MultiHolds = ( Koha.Preference('DisplayMultiPlaceHold') == 1 ) && HoldsEnabled %]
17
17
[% SET OverDriveEnabled = ( Koha.Preference( "OPACOverDrive" ) && Koha.Preference('OverDriveLibraryID') && Koha.Preference('OverDriveClientKey') && Koha.Preference('OverDriveClientSecret') ) %]
18
[% IF firstPage %]
19
     [% SET OverDriveEnabled = Koha.Preference('OverDriveLibraryID') && Koha.Preference('OverDriveClientKey') && Koha.Preference('OverDriveClientSecret') %]
20
[% END %]
21
18
22
[% INCLUDE 'doc-head-open.inc' %]
19
[% INCLUDE 'doc-head-open.inc' %]
23
<title>
20
<title>
Lines 575-581 Link Here
575
                        highlightOff();
572
                        highlightOff();
576
                    });
573
                    });
577
                [% END # /IF OpacHighlightedWords %]
574
                [% END # /IF OpacHighlightedWords %]
578
                [% IF ( OverDriveEnabled ) %]
575
                [% IF ( OverDriveEnabled && firstPage ) %]
579
                    var $overdrive_results = $( '<div id="overdrive-results">' + _("Searching %s...").format('OverDrive') + ' <img class="throbber" src="[% interface | html %]/[% theme | html %]/images/spinner-small.gif" /></div>' );
576
                    var $overdrive_results = $( '<div id="overdrive-results">' + _("Searching %s...").format('OverDrive') + ' <img class="throbber" src="[% interface | html %]/[% theme | html %]/images/spinner-small.gif" /></div>' );
580
                    $( '#numresults' ) .after( $overdrive_results );
577
                    $( '#numresults' ) .after( $overdrive_results );
581
                    //Clean querystring, first we remove CCL entities, then decode HTML entities, then swap double quotes for single quotes
578
                    //Clean querystring, first we remove CCL entities, then decode HTML entities, then swap double quotes for single quotes
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-21 / +22 lines)
Lines 10-18 Link Here
10
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
10
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
11
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
11
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
12
[% SET OpacMySummaryNote = AdditionalContents.get( location => "OpacMySummaryNote", lang => lang, library => branchcode ) %]
12
[% SET OpacMySummaryNote = AdditionalContents.get( location => "OpacMySummaryNote", lang => lang, library => branchcode ) %]
13
14
[% SET borrower_club_enrollments = logged_in_user.get_club_enrollments %]
13
[% SET borrower_club_enrollments = logged_in_user.get_club_enrollments %]
15
[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1) %] <!-- 1 => OPAC -->
14
[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1) %] <!-- 1 => OPAC -->
15
[% SET OverDriveEnabled = ( Koha.Preference( "OPACOverDrive" ) && Koha.Preference('OverDriveLibraryID') && Koha.Preference('OverDriveClientKey') && Koha.Preference('OverDriveClientSecret') ) %]
16
[% SET OverDriveCirculation = ( OverDriveEnabled && Koha.Preference( "OverDriveCirculation" ) ) %]
16
17
17
[% INCLUDE 'doc-head-open.inc' %]
18
[% INCLUDE 'doc-head-open.inc' %]
18
<title>Your library home &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
19
<title>Your library home &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
Lines 1463-1489 Link Here
1463
        [% Asset.js("lib/jquery/plugins/jquery.barrating.min.js") | $raw %]
1464
        [% Asset.js("lib/jquery/plugins/jquery.barrating.min.js") | $raw %]
1464
        [% Asset.js("js/ratings.js") | $raw %]
1465
        [% Asset.js("js/ratings.js") | $raw %]
1465
    [% END %]
1466
    [% END %]
1466
    [% IF Koha.Preference('OverDriveCirculation') %]
1467
    [% IF OverDriveCirculation %]
1467
    [% Asset.js("js/overdrive.js") | $raw %]
1468
        [% Asset.js("js/overdrive.js") | $raw %]
1468
    <script>
1469
        <script>
1469
    [%- IF Koha.Preference('OverDrivePasswordRequired') -%]
1470
            [%- IF Koha.Preference('OverDrivePasswordRequired') -%]
1470
        var OD_password_required = 1;
1471
                var OD_password_required = 1;
1471
    [%- ELSE -%]
1472
            [%- ELSE -%]
1472
        var OD_password_required = 0;
1473
                var OD_password_required = 0;
1473
    [%- END -%]
1474
            [%- END -%]
1474
    $(document).ready(function() {
1475
            $(document).ready(function() {
1475
        [% IF ( overdrive_error ) %]
1476
                [% IF ( overdrive_error ) %]
1476
            KOHA.OverDriveCirculation.display_error("#opac-user-overdrive_panel", "[% overdrive_error.dquote | html %]");
1477
                    KOHA.OverDriveCirculation.display_error("#opac-user-overdrive_panel", "[% overdrive_error.dquote | html %]");
1477
        [% END %]
1478
                [% END %]
1478
1479
1479
        [% IF ( overdrive_tab ) %]
1480
                [% IF ( overdrive_tab ) %]
1480
            $("#opac-user-views a[href='#opac-user-overdrive_panel']").tab("show");
1481
                    $("#opac-user-views a[href='#opac-user-overdrive_panel']").tab("show");
1481
        [% END %]
1482
                [% END %]
1482
1483
1483
        $("#opac-user-overdrive_panel").each( function() {
1484
                $("#opac-user-overdrive_panel").each( function() {
1484
            KOHA.OverDriveCirculation.display_account_details(this);
1485
                    KOHA.OverDriveCirculation.display_account_details(this);
1485
        } );
1486
                } );
1486
    });
1487
            });
1487
    </script>
1488
        </script>
1488
    [% END %]
1489
    [% END %]
1489
[% END %]
1490
[% END %]
(-)a/opac/opac-overdrive-search.pl (+6 lines)
Lines 27-32 use C4::Output qw( output_html_with_http_headers ); Link Here
27
27
28
my $cgi = CGI->new;
28
my $cgi = CGI->new;
29
29
30
# if OPACOverDrive is disabled, leave immediately
31
if ( !C4::Context->preference('OPACOverDrive') ) {
32
    print $cgi->redirect("/cgi-bin/koha/errors/404.pl");
33
    exit;
34
}
35
30
# Getting the template and auth
36
# Getting the template and auth
31
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
37
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
32
    {
38
    {
(-)a/opac/opac-user.pl (-2 lines)
Lines 358-364 if (C4::Context->preference("OPACAmazonCoverImages") or Link Here
358
}
358
}
359
359
360
$template->param(
360
$template->param(
361
    OverDriveCirculation => C4::Context->preference('OverDriveCirculation') || 0,
362
    overdrive_error      => scalar $query->param('overdrive_error') || undef,
361
    overdrive_error      => scalar $query->param('overdrive_error') || undef,
363
    overdrive_tab        => scalar $query->param('overdrive_tab') || 0,
362
    overdrive_tab        => scalar $query->param('overdrive_tab') || 0,
364
);
363
);
365
- 

Return to bug 37221