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

(-)a/basket/sendbasket.pl (-1 / +6 lines)
Lines 86-92 if ( $email_add ) { Link Here
86
        if($dat->{'author'} || @$marcauthorsarray) {
86
        if($dat->{'author'} || @$marcauthorsarray) {
87
          $hasauthors = 1;
87
          $hasauthors = 1;
88
        }
88
        }
89
	
89
90
90
91
        $dat->{MARCNOTES}      = $marcnotesarray;
91
        $dat->{MARCNOTES}      = $marcnotesarray;
92
        $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
92
        $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
Lines 100-105 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://";
104
  if (C4::Context->preference('OPACBaseURL')){
105
        $template2->param( OPACBaseURL =>  $protocol . C4::Context->preference('OPACBaseURL') );
106
  }
107
103
    my $resultsarray = \@results;
108
    my $resultsarray = \@results;
104
    $template2->param(
109
    $template2->param(
105
        BIBLIO_RESULTS => $resultsarray,
110
        BIBLIO_RESULTS => $resultsarray,
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 303-308 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
303
('previousIssuesDefaultSortOrder','asc','asc|desc','Specify the sort order of Previous Issues on the circulation page','Choice'),
303
('previousIssuesDefaultSortOrder','asc','asc|desc','Specify the sort order of Previous Issues on the circulation page','Choice'),
304
('printcirculationslips','1','','If ON, enable printing circulation receipts','YesNo'),
304
('printcirculationslips','1','','If ON, enable printing circulation receipts','YesNo'),
305
('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'),
305
('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'),
306
('PublicCatalogUsesSSL',0,'','Public catalog/OPAC uses SSL','YesNo'),
306
('QueryAutoTruncate','1',NULL,'If ON, query truncation is enabled by default','YesNo'),
307
('QueryAutoTruncate','1',NULL,'If ON, query truncation is enabled by default','YesNo'),
307
('QueryFuzzy','1',NULL,'If ON, enables fuzzy option for searches','YesNo'),
308
('QueryFuzzy','1',NULL,'If ON, enables fuzzy option for searches','YesNo'),
308
('QueryStemming','1',NULL,'If ON, enables query stemming','YesNo'),
309
('QueryStemming','1',NULL,'If ON, enables query stemming','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+12 lines)
Lines 7825-7830 if ( CheckVersion($DBversion) ) { Link Here
7825
}
7825
}
7826
7826
7827
7827
7828
7829
$DBversion = "3.15.00.XXX";
7830
if ( CheckVersion($DBversion) ) {
7831
    $dbh->do(q{INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES 
7832
        ('PublicCatalogUsesSSL',0,'','Public catalog/OPAC uses SSL','YesNo');});
7833
    print "Upgrade to $DBversion done (Bug 5010: Add PublicCatalogUsesSSL system preference)\n";
7834
    SetVersion($DBversion);
7835
}
7836
7837
7838
7839
7828
=head1 FUNCTIONS
7840
=head1 FUNCTIONS
7829
7841
7830
=head2 TableExists($table)
7842
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+7 lines)
Lines 434-439 OPAC: Link Here
434
                  no: Allow
434
                  no: Allow
435
            - patrons to select their branch on the OPAC or show branch names with callnumbers.
435
            - patrons to select their branch on the OPAC or show branch names with callnumbers.
436
        -
436
        -
437
            - The public catalog
438
            - pref: PublicCatalogUsesSSL
439
              choices: 
440
                  yes: uses
441
                  no: "doesn't use"
442
            - SSL.
443
        -
437
            - pref: SearchMyLibraryFirst
444
            - pref: SearchMyLibraryFirst
438
              choices:
445
              choices:
439
                  yes: Limit
446
                  yes: Limit
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt (-1 / +1 lines)
Lines 35-41 Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT Link Here
35
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
35
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
36
URL : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
36
URL : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
37
In the online catalog:
37
In the online catalog:
38
    http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
38
    [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
39
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
39
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
40
    [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
40
    [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
41
41
(-)a/virtualshelves/sendshelf.pl (-2 / +2 lines)
Lines 100-107 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
  if (C4::Context->preference('OPACBaseURL')){
104
  if (C4::Context->preference('OPACBaseURL')){
104
        $template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
105
        $template2->param( OPACBaseURL => $protocol . C4::Context->preference('OPACBaseURL') );
105
  }
106
  }
106
107
107
    $template2->param(
108
    $template2->param(
108
- 

Return to bug 5010