[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16541] more on webserver url
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16541] more on webserver url |
|
Date: |
Wed, 5 Apr 2017 08:48:42 -0400 (EDT) |
Revision: 16541
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16541
Author: sigurdne
Date: 2017-04-05 08:48:41 -0400 (Wed, 05 Apr 2017)
Log Message:
-----------
more on webserver url
Modified Paths:
--------------
trunk/phpgwapi/inc/class.common.inc.php
trunk/phpgwapi/inc/class.css.inc.php
trunk/phpgwapi/inc/class.js.inc.php
trunk/phpgwapi/inc/functions.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.common.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.common.inc.php 2017-04-05 07:48:41 UTC (rev
16540)
+++ trunk/phpgwapi/inc/class.common.inc.php 2017-04-05 12:48:41 UTC (rev
16541)
@@ -40,20 +40,7 @@
public 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;
-
}
/**
@@ -840,17 +827,6 @@
if(!$webserver_url)
{
$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']}";
- }
- }
}
static $found_files = null;
Modified: trunk/phpgwapi/inc/class.css.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.css.inc.php 2017-04-05 07:48:41 UTC (rev
16540)
+++ trunk/phpgwapi/inc/class.css.inc.php 2017-04-05 12:48:41 UTC (rev
16541)
@@ -53,18 +53,6 @@
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;
}
Modified: trunk/phpgwapi/inc/class.js.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.js.inc.php 2017-04-05 07:48:41 UTC (rev 16540)
+++ trunk/phpgwapi/inc/class.js.inc.php 2017-04-05 12:48:41 UTC (rev 16541)
@@ -81,18 +81,6 @@
{
$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;
}
Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php 2017-04-05 07:48:41 UTC (rev
16540)
+++ trunk/phpgwapi/inc/functions.inc.php 2017-04-05 12:48:41 UTC (rev
16541)
@@ -622,6 +622,18 @@
$GLOBALS['phpgw_info']['server'][$k] = $v;
}
+ if($GLOBALS['phpgw_info']['server']['webserver_url'] == '/')
+ {
+ if
(!empty($GLOBALS['phpgw_info']['server']['enforce_ssl']))
+ {
+
$GLOBALS['phpgw_info']['server']['webserver_url'] =
"https://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ else
+ {
+
$GLOBALS['phpgw_info']['server']['webserver_url'] =
"http://{$GLOBALS['phpgw_info']['server']['hostname']}";
+ }
+ }
+
if (
isset($GLOBALS['phpgw_info']['server']['log_levels']['global_level']) )
{
switch
($GLOBALS['phpgw_info']['server']['log_levels']['global_level'])
Modified: trunk/phpgwapi/templates/activitycalendar/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/activitycalendar/head.inc.php 2017-04-05
07:48:41 UTC (rev 16540)
+++ trunk/phpgwapi/templates/activitycalendar/head.inc.php 2017-04-05
12:48:41 UTC (rev 16541)
@@ -7,17 +7,6 @@
}
$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']}";
- }
- }
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-04-05 07:48:41 UTC
(rev 16540)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php 2017-04-05 12:48:41 UTC
(rev 16541)
@@ -9,17 +9,6 @@
}
$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']}";
- }
- }
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
Modified: trunk/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-04-05
07:48:41 UTC (rev 16540)
+++ trunk/phpgwapi/templates/bookingfrontend/head.inc.php 2017-04-05
12:48:41 UTC (rev 16541)
@@ -9,17 +9,6 @@
}
$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']}";
- }
- }
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php 2017-04-05 07:48:41 UTC
(rev 16540)
+++ trunk/phpgwapi/templates/frontend/head.inc.php 2017-04-05 12:48:41 UTC
(rev 16541)
@@ -3,17 +3,6 @@
phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.template_portico');
$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']}";
- }
- }
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-04-05
07:48:41 UTC (rev 16540)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2017-04-05
12:48:41 UTC (rev 16541)
@@ -7,17 +7,6 @@
}
$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']}";
- }
- }
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
Modified: trunk/phpgwapi/templates/portico/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/head.inc.php 2017-04-05 07:48:41 UTC
(rev 16540)
+++ trunk/phpgwapi/templates/portico/head.inc.php 2017-04-05 12:48:41 UTC
(rev 16541)
@@ -7,17 +7,6 @@
}
$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']}";
- }
- }
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
Modified: trunk/phpgwapi/templates/pure/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/pure/head.inc.php 2017-04-05 07:48:41 UTC (rev
16540)
+++ trunk/phpgwapi/templates/pure/head.inc.php 2017-04-05 12:48:41 UTC (rev
16541)
@@ -3,17 +3,6 @@
$stylesheets = array();
$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']}";
- }
- }
phpgw::import_class('phpgwapi.jquery');
phpgwapi_jquery::load_widget('core');
Modified: trunk/phpgwapi/templates/simple/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/simple/head.inc.php 2017-04-05 07:48:41 UTC
(rev 16540)
+++ trunk/phpgwapi/templates/simple/head.inc.php 2017-04-05 12:48:41 UTC
(rev 16541)
@@ -9,17 +9,6 @@
*/
$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']}";
- }
- }
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16541] more on webserver url,
sigurdne <=