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 310-315 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'),
310
('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'),
311
('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'),
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
('PublicCatalogUsesSSL',0,'','Public catalog/OPAC uses SSL','YesNo'),
313
('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'),
314
('QueryFuzzy','1',NULL,'If ON, enables fuzzy option for searches','YesNo'),
315
('QueryFuzzy','1',NULL,'If ON, enables fuzzy option for searches','YesNo'),
315
('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 (+9 lines)
Lines 8202-8207 if ( CheckVersion($DBversion) ) { Link Here
8202
    SetVersion($DBversion);
8202
    SetVersion($DBversion);
8203
}
8203
}
8204
8204
8205
$DBversion = "3.15.00.XXX";
8206
if ( CheckVersion($DBversion) ) {
8207
    $dbh->do(q{INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
8208
        ('PublicCatalogUsesSSL',0,'','Public catalog/OPAC uses SSL','YesNo');});
8209
    print "Upgrade to $DBversion done (Bug 5010: Add PublicCatalogUsesSSL system preference)\n";
8210
    SetVersion($DBversion);
8211
}
8212
8213
8205
=head1 FUNCTIONS
8214
=head1 FUNCTIONS
8206
8215
8207
=head2 TableExists($table)
8216
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+7 lines)
Lines 454-459 OPAC: Link Here
454
                  no: Allow
454
                  no: Allow
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
458
            - pref: PublicCatalogUsesSSL
459
              choices:
460
                  yes: uses
461
                  no: "doesn't use"
462
            - SSL.
463
        -
457
            - pref: SearchMyLibraryFirst
464
            - pref: SearchMyLibraryFirst
458
              choices:
465
              choices:
459
                  yes: Limit
466
                  yes: Limit
(-)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