Attachment #7062 for bug #7307

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




		my $opaccolorstylesheet = C4::Context->preference("opaccolorstylesheet");  
            $template->param( opaccolorstylesheet => $opaccolorstylesheet);
	}

        my $opacbaseurl;
        if ( C4::Context->preference('OPACBaseURL') ) {
            $opacbaseurl = C4::Context->preference('OPACBaseURL') 
        }
        else {
            $opacbaseurl = ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} .
                   ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}")
        }

        $template->param(
            AmazonContent             => "" . C4::Context->preference("AmazonContent"),
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),

            OPACUserCSS               => "". C4::Context->preference("OPACUserCSS"),
            OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
            OpacAuthorities           => C4::Context->preference("OpacAuthorities"),
            OPACBaseURL               => $opacbaseurl,
                   ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"),
            opac_css_override           => $ENV{'OPAC_CSS_OVERRIDE'},
            opac_search_limit         => $opac_search_limit,
            opac_limit_override       => $opac_limit_override,

Lines 175-181 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
175	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesCalendar',"noFinesWhenClosed",'Specify whether to use the Calendar in calculating duedates and fines',"ignoreCalendar\|noFinesWhenClosed",'Choice');	175	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesCalendar',"noFinesWhenClosed",'Specify whether to use the Calendar in calculating duedates and fines',"ignoreCalendar\|noFinesWhenClosed",'Choice');
176	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('previousIssuesDefaultSortOrder',"asc",'Specify the sort order of Previous Issues on the circulation page',"asc\|desc",'Choice');	176	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('previousIssuesDefaultSortOrder',"asc",'Specify the sort order of Previous Issues on the circulation page',"asc\|desc",'Choice');
177	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('todaysIssuesDefaultSortOrder',"desc",'Specify the sort order of Todays Issues on the circulation page',"asc\|desc",'Choice');	177	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('todaysIssuesDefaultSortOrder',"desc",'Specify the sort order of Todays Issues on the circulation page',"asc\|desc",'Choice');
178	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., opac.mylibrary.com, the http:// will be added automatically by Koha.',NULL,'Free');	178	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., http://opac.mylibrary.com or https://opac.mylibrary.com',NULL,'Free');
179	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('language','en','Set the default language in the staff client.',NULL,'Languages');	179	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('language','en','Set the default language in the staff client.',NULL,'Languages');
180	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryAutoTruncate',1,'If ON, query truncation is enabled by default',NULL,'YesNo');	180	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryAutoTruncate',1,'If ON, query truncation is enabled by default',NULL,'YesNo');
181	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryRemoveStopwords',0,'If ON, stopwords listed in the Administration area will be removed from queries',NULL,'YesNo');	181	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryRemoveStopwords',0,'If ON, stopwords listed in the Administration area will be removed from queries',NULL,'YesNo');

Lines 892-898 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
892	ADD `altcontactphone` varchar(50) default NULL	892	ADD `altcontactphone` varchar(50) default NULL
893	");	893	");
894	$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES	894	$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
895	('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., opac.mylibrary.com, the http:// will be added automatically by Koha.',NULL,'Free'),	895	('OPACBaseURL',NULL,'Specify the Base URL of the OPAC, e.g., http://opac.mylibrary.com or https://opac.mylibrary.com',NULL,'Free'),
896	('language','en','Set the default language in the staff client.',NULL,'Languages'),	896	('language','en','Set the default language in the staff client.',NULL,'Languages'),
897	('QueryAutoTruncate',1,'If ON, query truncation is enabled by default',NULL,'YesNo'),	897	('QueryAutoTruncate',1,'If ON, query truncation is enabled by default',NULL,'YesNo'),
898	('QueryRemoveStopwords',0,'If ON, stopwords listed in the Administration area will be removed from queries',NULL,'YesNo')	898	('QueryRemoveStopwords',0,'If ON, stopwords listed in the Administration area will be removed from queries',NULL,'YesNo')

Lines 35-41 Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt (-1 / +1 lines)
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

Lines 36-42 Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt (-1 / +1 lines)
36	LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]	36	LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
37	url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]	37	url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
38	In the online catalog:	38	In the online catalog:
39	http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber \|url %][% END %]	39	[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber \|url %][% END %]
40	Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]	40	Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
41	[% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]	41	[% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
42		42




my @addpubshelves;
my $pubshelves = $session->param('pubshelves');
my $barshelves = $session->param('barshelves');
my $OPACrssURL;
foreach my $shelf (@$pubshelves) {
	next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) );
	push (@addpubshelves, $shelf);
}

if ( C4::Context->preference('OPACBaseURL') ) {
    $OPACrssURL = C4::Context->preference('OPACBaseURL');
    $template->param( OPACBaseURL       => $OPACrssURL );
}

if (@addpubshelves) {
	$template->param( addpubshelves     => scalar (@addpubshelves));
	$template->param( addpubshelvesloop => \@addpubshelves);
- 

Return to bug 7307

Lines 421-426 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-2 / +11 lines)
421	my $opaccolorstylesheet = C4::Context->preference("opaccolorstylesheet");	421	my $opaccolorstylesheet = C4::Context->preference("opaccolorstylesheet");
422	$template->param( opaccolorstylesheet => $opaccolorstylesheet);	422	$template->param( opaccolorstylesheet => $opaccolorstylesheet);
423	}	423	}
		424
		425	my $opacbaseurl;
		426	if ( C4::Context->preference('OPACBaseURL') ) {
		427	$opacbaseurl = C4::Context->preference('OPACBaseURL')
		428	}
		429	else {
		430	$opacbaseurl = ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} .
		431	($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}")
		432	}
		433
424	$template->param(	434	$template->param(
425	AmazonContent => "" . C4::Context->preference("AmazonContent"),	435	AmazonContent => "" . C4::Context->preference("AmazonContent"),
426	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),	436	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),
Lines 442-449 sub get_template_and_user { Link Here
442	OPACUserCSS => "". C4::Context->preference("OPACUserCSS"),	452	OPACUserCSS => "". C4::Context->preference("OPACUserCSS"),
443	OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),	453	OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
444	OpacAuthorities => C4::Context->preference("OpacAuthorities"),	454	OpacAuthorities => C4::Context->preference("OpacAuthorities"),
445	OPACBaseURL => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} .	455	OPACBaseURL => $opacbaseurl,
446	($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"),
447	opac_css_override => $ENV{'OPAC_CSS_OVERRIDE'},	456	opac_css_override => $ENV{'OPAC_CSS_OVERRIDE'},
448	opac_search_limit => $opac_search_limit,	457	opac_search_limit => $opac_search_limit,
449	opac_limit_override => $opac_limit_override,	458	opac_limit_override => $opac_limit_override,

Lines 714-724 my $session = get_session($cgi->cookie("CGISESSID")); Link Here

(-)a/opac/opac-search.pl (-1 / +6 lines)
714	my @addpubshelves;	714	my @addpubshelves;
715	my $pubshelves = $session->param('pubshelves');	715	my $pubshelves = $session->param('pubshelves');
716	my $barshelves = $session->param('barshelves');	716	my $barshelves = $session->param('barshelves');
		717	my $OPACrssURL;
717	foreach my $shelf (@$pubshelves) {	718	foreach my $shelf (@$pubshelves) {
718	next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) );	719	next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) );
719	push (@addpubshelves, $shelf);	720	push (@addpubshelves, $shelf);
720	}	721	}
721		722
		723	if ( C4::Context->preference('OPACBaseURL') ) {
		724	$OPACrssURL = C4::Context->preference('OPACBaseURL');
		725	$template->param( OPACBaseURL => $OPACrssURL );
		726	}
		727
722	if (@addpubshelves) {	728	if (@addpubshelves) {
723	$template->param( addpubshelves => scalar (@addpubshelves));	729	$template->param( addpubshelves => scalar (@addpubshelves));
724	$template->param( addpubshelvesloop => \@addpubshelves);	730	$template->param( addpubshelvesloop => \@addpubshelves);
725	-