X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=858be71da054dda50bf5795b6a274461d3addd97;hb=d647e72f22abc6715b6597d17a68851409b53d0b;hp=4e0c74b8af02de640969928a23d9f8466675a1ce;hpb=7588a4ac90a9b07c08a3107cd1107d773be1c991;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 4e0c74b8a..858be71da 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -23,7 +23,7 @@ Example: - <% $title |h %> + <% $title %> @@ -51,7 +51,7 @@ Example: STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - + @@ -162,7 +162,7 @@ Example:
freeside<% $company_url ? qq() : '' |n %>freeside<% $company_url ? '' : '' |n %> <% $company_name || 'ExampleCo' %> - <% $title |h %> + <% $title_noescape || encode_entities($title) %> % unless ( $nobr ) { @@ -172,7 +172,7 @@ Example: <% $menubar !~ /^\s*$/ ? "$menubar

" : '' %> <%init> -my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); +my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); my( $nobr, $nocss ) = ( 0, 0 ); my $mobile; @@ -180,6 +180,7 @@ my $mobile; if ( ref($_[0]) ) { my $opt = shift; $title = $opt->{title}; + $title_noescape = $opt->{title_noescape}; $menubar = $opt->{menubar}; $etc = $opt->{etc}; $head = $opt->{head}; @@ -206,11 +207,13 @@ if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override $mobile = $1; } -my $company_name; +my($company_name, $company_url); my @agentnums = $curuser->agentnums; if ( scalar(@agentnums) == 1 ) { $company_name = $conf->config('company_name', $agentnums[0] ); + $company_url = $conf->config('company_url', $agentnums[0] ); } else { $company_name = $conf->config('company_name'); + $company_url = $conf->config('company_url'); }