[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16521] more on fix links in head
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16521] more on fix links in head |
Date: |
Mon, 3 Apr 2017 09:17:15 -0400 (EDT) |
Revision: 16521
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16521
Author: sigurdne
Date: 2017-04-03 09:17:14 -0400 (Mon, 03 Apr 2017)
Log Message:
-----------
more on fix links in head
Modified Paths:
--------------
trunk/phpgwapi/inc/class.css.inc.php
trunk/phpgwapi/inc/class.js.inc.php
trunk/phpgwapi/templates/activitycalendar/head.inc.php
trunk/phpgwapi/templates/bkbooking/head.inc.php
trunk/phpgwapi/templates/bookingfrontend/head.inc.php
trunk/phpgwapi/templates/frontend/head.inc.php
trunk/phpgwapi/templates/mobilefrontend/head.inc.php
trunk/phpgwapi/templates/portico/head.inc.php
trunk/phpgwapi/templates/pure/head.inc.php
trunk/phpgwapi/templates/simple/head.inc.php
Modified: trunk/phpgwapi/inc/class.css.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.css.inc.php 2017-04-03 12:14:18 UTC (rev
16520)
+++ trunk/phpgwapi/inc/class.css.inc.php 2017-04-03 13:17:14 UTC (rev
16521)
@@ -42,6 +42,8 @@
* because the css files are using relative paths
*/
var $external_files;
+
+ protected $webserver_url;
/**
* Constructor
@@ -50,6 +52,20 @@
*/
function __construct()
{
+ $webserver_url =
$GLOBALS['phpgw_info']['server']['webserver_url'];
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] ==
'/')
+ {
+ if
(!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
+ $this->webserver_url = $webserver_url;
}
/**
@@ -99,9 +115,9 @@
}
else
{
-
//echo "file:
{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/{$tpl}/css/{$file}.css
<br>";
+
//echo "file: {$this->webserver_url}/{$app}/templates/{$tpl}/css/{$file}.css
<br>";
$links .= <<<HTML
- <link
href="{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/{$tpl}/css/{$file}.css"
type="text/css" rel="stylesheet">
+ <link
href="{$this->webserver_url}/{$app}/templates/{$tpl}/css/{$file}.css"
type="text/css" rel="stylesheet">
HTML;
@@ -127,7 +143,7 @@
else
{
$links .= <<<HTML
- <link
href="{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$file}"
type="text/css" rel="stylesheet">
+ <link
href="{$this->webserver_url}/{$file}" type="text/css" rel="stylesheet">
HTML;
}
@@ -140,7 +156,7 @@
{
$cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
$cssfiles = implode(',', $cssfiles);
- $links .= "<link type=\"text/css\"
href=\"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=css&files={$cssfiles}\">\n";
+ $links .= "<link type=\"text/css\"
href=\"{$this->webserver_url}/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=css&files={$cssfiles}\">\n";
unset($cssfiles);
}
Modified: trunk/phpgwapi/inc/class.js.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.js.inc.php 2017-04-03 12:14:18 UTC (rev 16520)
+++ trunk/phpgwapi/inc/class.js.inc.php 2017-04-03 13:17:14 UTC (rev 16521)
@@ -72,6 +72,8 @@
*/
protected $external_files;
+ protected $webserver_url;
+
/**
* Constructor
*/
@@ -78,6 +80,20 @@
public function __construct()
{
$this->validate_file('core', 'base');
+ $webserver_url =
$GLOBALS['phpgw_info']['server']['webserver_url'];
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] ==
'/')
+ {
+ if
(!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
+ $this->webserver_url = $webserver_url;
}
/**
@@ -165,9 +181,9 @@
}
else
{
-
//echo "file:
{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/js/{$pkg}/{$file}.js
<br>";
+
//echo "file: {$this->webserver_url}/{$app}/js/{$pkg}/{$file}.js <br>";
$links .= '<script type="text/javascript" '
-
.
"src=\"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/js/{$pkg}/{$file}.js\">"
+
. "src=\"{$this->webserver_url}/{$app}/js/{$pkg}/{$file}.js\">"
. "</script>\n";
}
}
@@ -189,7 +205,7 @@
else
{
$links .= <<<HTML
- <script type="text/javascript"
src="{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$file}" >
+ <script type="text/javascript"
src="{$this->webserver_url}/{$file}" >
</script>
HTML;
}
@@ -201,7 +217,7 @@
$cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
$jsfiles = implode(',', $jsfiles);
$links .= '<script type="text/javascript" '
- .
"src=\"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files={$jsfiles}\">"
+ .
"src=\"{$this->webserver_url}/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files={$jsfiles}\">"
. "</script>\n";
unset($jsfiles);
}
Modified: trunk/phpgwapi/templates/activitycalendar/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/activitycalendar/head.inc.php 2017-04-03
12:14:18 UTC (rev 16520)
+++ trunk/phpgwapi/templates/activitycalendar/head.inc.php 2017-04-03
13:17:14 UTC (rev 16521)
@@ -6,17 +6,16 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
- $host_info = '';
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -49,7 +48,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$webserver_url . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -58,7 +57,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$webserver_url . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -77,7 +76,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $webserver_url,
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'navbar_config' => $_navbar_config,
'lbl_search' => lang('Search'),
Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-04-03 12:14:18 UTC
(rev 16520)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-04-03 13:17:14 UTC
(rev 16521)
@@ -8,17 +8,16 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
- $host_info = '';
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -80,7 +79,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$webserver_url . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -93,7 +92,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$webserver_url . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -203,7 +202,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $webserver_url,
// 'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'win_on_events' => $test,
'navbar_config' => $_navbar_config,
Modified: trunk/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-04-03
12:14:18 UTC (rev 16520)
+++ trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-04-03
13:17:14 UTC (rev 16521)
@@ -8,17 +8,16 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
- $host_info = '';
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -78,7 +77,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$webserver_url . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -95,7 +94,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$webserver_url . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -196,7 +195,7 @@
'site_title' => $site_title,
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'site_url' => $GLOBALS['phpgw']->link("/{$app}/", array()),
- 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $webserver_url,
'win_on_events' => $test,
'metainfo_author' => $author,
'metainfo_keywords' => $keywords,
Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php 2017-04-03 12:14:18 UTC
(rev 16520)
+++ trunk/phpgwapi/templates/frontend/head.inc.php 2017-04-03 13:17:14 UTC
(rev 16521)
@@ -2,17 +2,16 @@
$GLOBALS['phpgw_info']['server']['no_jscombine']=true;
phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.template_portico');
- $host_info = '';
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -99,7 +98,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$webserver_url . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -120,7 +119,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$webserver_url . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -191,7 +190,7 @@
'home_text' => lang('home'),
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'site_url' => $GLOBALS['phpgw']->link("/{$app}/", array()),
- 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $webserver_url,
'win_on_events' => $test,
'metainfo_author' => $author,
'metainfo_keywords' => $keywords,
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-04-03
12:14:18 UTC (rev 16520)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-04-03
13:17:14 UTC (rev 16521)
@@ -5,17 +5,17 @@
{
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
- $host_info = '';
+
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -48,7 +48,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$webserver_url . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -57,7 +57,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$webserver_url . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -72,7 +72,7 @@
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'site_url' => $GLOBALS['phpgw']->link('/home.php',
array()),
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' => $host_info.
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $webserver_url,
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'current_app_header' =>
isset($GLOBALS['phpgw_info']['flags']['app_header']) &&
$GLOBALS['phpgw_info']['flags']['app_header'] ?
$GLOBALS['phpgw_info']['flags']['app_header'] : '',
'current_user' => $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] )->__toString()
Modified: trunk/phpgwapi/templates/portico/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/head.inc.php 2017-04-03 12:14:18 UTC
(rev 16520)
+++ trunk/phpgwapi/templates/portico/head.inc.php 2017-04-03 13:17:14 UTC
(rev 16521)
@@ -6,17 +6,16 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
- $host_info = '';
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -87,7 +86,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$webserver_url . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -96,7 +95,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$webserver_url . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -165,7 +164,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $webserver_url,
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'border_layout_config' => $_border_layout_config,
'navbar_config' => $_navbar_config,
Modified: trunk/phpgwapi/templates/pure/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/pure/head.inc.php 2017-04-03 12:14:18 UTC (rev
16520)
+++ trunk/phpgwapi/templates/pure/head.inc.php 2017-04-03 13:17:14 UTC (rev
16521)
@@ -1,17 +1,17 @@
<?php
$javascripts = array();
$stylesheets = array();
- $host_info = '';
+
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -36,7 +36,7 @@
/*
$menu_stylesheet_widescreen = <<<HTML
- <link
href="{$host_info}{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.widescreen.css"
type="text/css" rel="stylesheet" media="all and (min-width: 1430px)" />
+ <link
href="{$webserver_url}/phpgwapi/js/jquery/mmenu/extensions/css/jquery.mmenu.widescreen.css"
type="text/css" rel="stylesheet" media="all and (min-width: 1430px)" />
HTML;
*/
}
@@ -85,7 +85,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info. $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$webserver_url . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -94,7 +94,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info. $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$webserver_url . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -128,7 +128,7 @@
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
- 'webserver_url' => $host_info.
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $webserver_url,
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
'menu_stylesheet_widescreen'=> $menu_stylesheet_widescreen,
'template_selector' => $template_selector
Modified: trunk/phpgwapi/templates/simple/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/simple/head.inc.php 2017-04-03 12:14:18 UTC
(rev 16520)
+++ trunk/phpgwapi/templates/simple/head.inc.php 2017-04-03 13:17:14 UTC
(rev 16521)
@@ -8,17 +8,16 @@
* @version $Id$
*/
- $host_info = '';
+ $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
- if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ if (!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
{
- $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
else
{
- $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ $webserver_url =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
}
}
@@ -78,7 +77,7 @@
foreach ( $stylesheets as $style )
{
- $tpl->set_var('theme_style', $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'] . $style);
+ $tpl->set_var('theme_style', $webserver_url . $style);
$tpl->parse('theme_stylesheets', 'theme_stylesheet', true);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16521] more on fix links in head,
sigurdne <=