[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16520] Stable: Merge 16518:16519 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16520] Stable: Merge 16518:16519 from trunk |
Date: |
Mon, 3 Apr 2017 08:14:18 -0400 (EDT) |
Revision: 16520
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16520
Author: sigurdne
Date: 2017-04-03 08:14:18 -0400 (Mon, 03 Apr 2017)
Log Message:
-----------
Stable: Merge 16518:16519 from trunk
Modified Paths:
--------------
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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch 2017-04-03 12:14:18 UTC (rev 16520)
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
\ 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
\ No newline at end of property
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 12:13:13 UTC (rev 16519)
+++
branches/Version-2_0-branch/phpgwapi/templates/activitycalendar/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -6,6 +6,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
@@ -35,7 +49,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -44,7 +58,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -63,7 +77,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' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch/phpgwapi/templates/bkbooking/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -8,6 +8,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$config = CreateObject('phpgwapi.config','bookingfrontend');
@@ -66,7 +80,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -79,7 +93,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -189,7 +203,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' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -8,6 +8,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$config_frontend = CreateObject('phpgwapi.config',$app)->read();
@@ -64,7 +78,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -81,7 +95,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -182,7 +196,7 @@
'site_title' => $site_title,
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'site_url' => $GLOBALS['phpgw']->link("/{$app}/", array()),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -2,6 +2,19 @@
$GLOBALS['phpgw_info']['server']['no_jscombine']=true;
phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.template_portico');
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
@@ -86,7 +99,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -107,7 +120,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -178,7 +191,7 @@
'home_text' => lang('home'),
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'site_url' => $GLOBALS['phpgw']->link("/{$app}/", array()),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -5,6 +5,19 @@
{
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -35,7 +48,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -44,7 +57,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -59,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' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info.
$GLOBALS['phpgw_info']['server']['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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -6,6 +6,20 @@
$GLOBALS['phpgw_info']['server']['site_title'] = lang('please
set a site name in admin > siteconfig');
}
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
@@ -73,7 +87,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -82,7 +96,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info . $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -151,7 +165,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' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info .
$GLOBALS['phpgw_info']['server']['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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -1,6 +1,19 @@
<?php
$javascripts = array();
$stylesheets = array();
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
phpgw::import_class('phpgwapi.jquery');
phpgwapi_jquery::load_widget('core');
@@ -23,7 +36,7 @@
/*
$menu_stylesheet_widescreen = <<<HTML
- <link
href="{$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="{$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)" />
HTML;
*/
}
@@ -72,7 +85,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )
{
- $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
+ $GLOBALS['phpgw']->template->set_var( 'stylesheet_uri',
$host_info. $GLOBALS['phpgw_info']['server']['webserver_url'] . $stylesheet );
$GLOBALS['phpgw']->template->parse('stylesheets',
'stylesheet', true);
}
}
@@ -81,7 +94,7 @@
{
if( file_exists( PHPGW_SERVER_ROOT . $javascript ) )
{
- $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
+ $GLOBALS['phpgw']->template->set_var( 'javascript_uri',
$host_info. $GLOBALS['phpgw_info']['server']['webserver_url'] . $javascript );
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
@@ -115,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' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'webserver_url' => $host_info.
$GLOBALS['phpgw_info']['server']['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 12:13:13 UTC (rev 16519)
+++ branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
2017-04-03 12:14:18 UTC (rev 16520)
@@ -8,6 +8,19 @@
* @version $Id$
*/
+ $host_info = '';
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ if (empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+ $host_info =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+ $host_info =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
@@ -35,37 +48,37 @@
"/phpgwapi/templates/portico/js/base.js"
);
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/base.css";
+ $stylesheets[] = "/phpgwapi/templates/simple/css/base.css";
}
if(file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/simple/css/' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+ $stylesheets[] =
"/phpgwapi/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
else
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/simple/css/simple.css";
+ $stylesheets[] = "/phpgwapi/templates/simple/css/simple.css";
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 'simple';
}
if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/base/css/base.css"))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/base/css/base.css";
+ $stylesheets[] = "/{$app}/templates/base/css/base.css";
}
if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/simple/css/base.css"))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/simple/css/base.css";
+ $stylesheets[] = "/{$app}/templates/simple/css/base.css";
}
if(file_exists(PHPGW_SERVER_ROOT .
"/{$app}/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css"))
{
- $stylesheets[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$app}/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+ $stylesheets[] =
"/{$app}/templates/simple/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
foreach ( $stylesheets as $style )
{
- $tpl->set_var('theme_style', $style);
+ $tpl->set_var('theme_style', $host_info .
$GLOBALS['phpgw_info']['server']['webserver_url'] . $style);
$tpl->parse('theme_stylesheets', 'theme_stylesheet', true);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16520] Stable: Merge 16518:16519 from trunk,
sigurdne <=