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

(-)a/basket/sendbasket.pl (-4 / +1 lines)
Lines 100-109 if ( $email_add ) { Link Here
100
        push( @results, $dat );
100
        push( @results, $dat );
101
    }
101
    }
102
102
103
  my $protocol = C4::Context->preference('PublicCatalogUsesSSL') ? "https://" : "http://";
103
    $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
104
  if (C4::Context->preference('OPACBaseURL')){
105
        $template2->param( OPACBaseURL =>  $protocol . C4::Context->preference('OPACBaseURL') );
106
  }
107
104
108
    my $resultsarray = \@results;
105
    my $resultsarray = \@results;
109
    $template2->param(
106
    $template2->param(
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 257-262 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
257
('OPACPatronDetails','1','','If OFF the patron details tab in the OPAC is disabled.','YesNo'),
257
('OPACPatronDetails','1','','If OFF the patron details tab in the OPAC is disabled.','YesNo'),
258
('OPACpatronimages','0',NULL,'Enable patron images in the OPAC','YesNo'),
258
('OPACpatronimages','0',NULL,'Enable patron images in the OPAC','YesNo'),
259
('OpacPrivacy','0',NULL,'if ON, allows patrons to define their privacy rules (reading history)','YesNo'),
259
('OpacPrivacy','0',NULL,'if ON, allows patrons to define their privacy rules (reading history)','YesNo'),
260
('OpacProtocol','http://','http://|https://','Public catalog/OPAC uses SSL','Choice'),
260
('OpacPublic','1',NULL,'Turn on/off public OPAC','YesNo'),
261
('OpacPublic','1',NULL,'Turn on/off public OPAC','YesNo'),
261
('opacreadinghistory','1','','If ON, enables display of Patron Circulation History in OPAC','YesNo'),
262
('opacreadinghistory','1','','If ON, enables display of Patron Circulation History in OPAC','YesNo'),
262
('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'),
263
('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'),
Lines 310-316 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
310
('previousIssuesDefaultSortOrder','asc','asc|desc','Specify the sort order of Previous Issues on the circulation page','Choice'),
311
('previousIssuesDefaultSortOrder','asc','asc|desc','Specify the sort order of Previous Issues on the circulation page','Choice'),
311
('printcirculationslips','1','','If ON, enable printing circulation receipts','YesNo'),
312
('printcirculationslips','1','','If ON, enable printing circulation receipts','YesNo'),
312
('PrintNoticesMaxLines','0','','If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.','Integer'),
313
('PrintNoticesMaxLines','0','','If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.','Integer'),
313
('PublicCatalogUsesSSL',0,'','Public catalog/OPAC uses SSL','YesNo'),
314
('QueryAutoTruncate','1',NULL,'If ON, query truncation is enabled by default','YesNo'),
314
('QueryAutoTruncate','1',NULL,'If ON, query truncation is enabled by default','YesNo'),
315
('QueryFuzzy','1',NULL,'If ON, enables fuzzy option for searches','YesNo'),
315
('QueryFuzzy','1',NULL,'If ON, enables fuzzy option for searches','YesNo'),
316
('QueryStemming','1',NULL,'If ON, enables query stemming','YesNo'),
316
('QueryStemming','1',NULL,'If ON, enables query stemming','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (-2 / +2 lines)
Lines 8205-8212 if ( CheckVersion($DBversion) ) { Link Here
8205
$DBversion = "3.15.00.XXX";
8205
$DBversion = "3.15.00.XXX";
8206
if ( CheckVersion($DBversion) ) {
8206
if ( CheckVersion($DBversion) ) {
8207
    $dbh->do(q{INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
8207
    $dbh->do(q{INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
8208
        ('PublicCatalogUsesSSL',0,'','Public catalog/OPAC uses SSL','YesNo');});
8208
        ('OpacProtocol','http://','http://|https://','Public catalog/OPAC uses SSL','Choice');});
8209
    print "Upgrade to $DBversion done (Bug 5010: Add PublicCatalogUsesSSL system preference)\n";
8209
    print "Upgrade to $DBversion done (Bug 5010: Add OpacProtocol system preference)\n";
8210
    SetVersion($DBversion);
8210
    SetVersion($DBversion);
8211
}
8211
}
8212
8212
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-3 / +3 lines)
Lines 455-464 OPAC: Link Here
455
            - patrons to select their branch on the OPAC or show branch names with callnumbers.
455
            - patrons to select their branch on the OPAC or show branch names with callnumbers.
456
        -
456
        -
457
            - The public catalog
457
            - The public catalog
458
            - pref: PublicCatalogUsesSSL
458
            - pref: OpacProtocol
459
              choices:
459
              choices:
460
                  yes: uses
460
                  "https://": uses
461
                  no: "doesn't use"
461
                  "http://": "doesn't use"
462
            - SSL.
462
            - SSL.
463
        -
463
        -
464
            - pref: SearchMyLibraryFirst
464
            - pref: SearchMyLibraryFirst
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt (-2 / +2 lines)
Lines 1-4 Link Here
1
<SUBJECT>
1
[%- USE Koha -%]<SUBJECT>
2
Your cart
2
Your cart
3
<END_SUBJECT>
3
<END_SUBJECT>
4
4
Lines 134-140 Your cart Link Here
134
134
135
            [% IF ( OPACBaseURL ) %]
135
            [% IF ( OPACBaseURL ) %]
136
            <p>
136
            <p>
137
                In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
137
                In online catalog: [% Koha.Preference( 'OPACProtocol' ) %][% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
138
            </p>
138
            </p>
139
            [% END %]
139
            [% END %]
140
            [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
140
            [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt (-2 / +2 lines)
Lines 1-4 Link Here
1
<SUBJECT>
1
[%- USE Koha -%]<SUBJECT>
2
Your list: [% shelfname %]
2
Your list: [% shelfname %]
3
<END_SUBJECT>
3
<END_SUBJECT>
4
4
Lines 141-147 Your list: [% shelfname %] Link Here
141
141
142
            [% IF ( OPACBaseURL ) %]
142
            [% IF ( OPACBaseURL ) %]
143
            <p>
143
            <p>
144
                In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
144
                In online catalog: [% Koha.Preference('OpacProtocol') %][% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
145
            </p>
145
            </p>
146
            [% END %]
146
            [% END %]
147
            [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
147
            [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
(-)a/opac/opac-sendshelf.pl (+4 lines)
Lines 107-112 if ( $email ) { Link Here
107
107
108
    my $user = GetMember(borrowernumber => $borrowernumber);
108
    my $user = GetMember(borrowernumber => $borrowernumber);
109
109
110
    if (C4::Context->preference('OPACBaseURL')){
111
          $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
112
    }
113
110
    $template2->param(
114
    $template2->param(
111
        BIBLIO_RESULTS => \@results,
115
        BIBLIO_RESULTS => \@results,
112
        email_sender   => $email_from,
116
        email_sender   => $email_from,
(-)a/virtualshelves/sendshelf.pl (-5 / +1 lines)
Lines 100-109 if ( $email ) { Link Here
100
        push( @results, $dat );
100
        push( @results, $dat );
101
    }
101
    }
102
102
103
  my $protocol = C4::Context->preference('PublicCatalogUsesSSL') ? "https://" : "http://";
103
    $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
104
  if (C4::Context->preference('OPACBaseURL')){
105
        $template2->param( OPACBaseURL => $protocol . C4::Context->preference('OPACBaseURL') );
106
  }
107
104
108
    $template2->param(
105
    $template2->param(
109
        BIBLIO_RESULTS => \@results,
106
        BIBLIO_RESULTS => \@results,
110
- 

Return to bug 5010