[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16522] Stable: Merge 16520:16521 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16522] Stable: Merge 16520:16521 from trunk |
|
Date: |
Mon, 3 Apr 2017 09:18:41 -0400 (EDT) |
Revision: 16522
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16522
Author: sigurdne
Date: 2017-04-03 09:18:40 -0400 (Mon, 03 Apr 2017)
Log Message:
-----------
Stable: Merge 16520:16521 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/inc/class.css.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.js.inc.php
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch 2017-04-03 13:18:40 UTC (rev 16522)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.css.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.css.inc.php 2017-04-03
13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.css.inc.php 2017-04-03
13:18:40 UTC (rev 16522)
@@ -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: branches/Version-2_0-branch/phpgwapi/inc/class.js.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.js.inc.php 2017-04-03
13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.js.inc.php 2017-04-03
13:18:40 UTC (rev 16522)
@@ -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:
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.inc.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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: branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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:
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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: branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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:
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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: branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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: branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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: branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
2017-04-03 13:17:14 UTC (rev 16521)
+++ branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
2017-04-03 13:18:40 UTC (rev 16522)
@@ -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] [16522] Stable: Merge 16520:16521 from trunk,
sigurdne <=