[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16533] Stable: Merge 16526:16532 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16533] Stable: Merge 16526:16532 from trunk |
|
Date: |
Tue, 4 Apr 2017 04:28:20 -0400 (EDT) |
Revision: 16533
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16533
Author: sigurdne
Date: 2017-04-04 04:28:19 -0400 (Tue, 04 Apr 2017)
Log Message:
-----------
Stable: Merge 16526:16532 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/js/portico/vendor.edit.js
branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-04 08:26:25 UTC (rev 16532)
+++ branches/Version-2_0-branch 2017-04-04 08:28:19 UTC (rev 16533)
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,16521,16523,16525
\ 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,16523,16525,16527-16532
\ No newline at end of property
Modified: branches/Version-2_0-branch/eventplanner/js/portico/vendor.edit.js
===================================================================
--- branches/Version-2_0-branch/eventplanner/js/portico/vendor.edit.js
2017-04-04 08:26:25 UTC (rev 16532)
+++ branches/Version-2_0-branch/eventplanner/js/portico/vendor.edit.js
2017-04-04 08:28:19 UTC (rev 16533)
@@ -32,6 +32,5 @@
{
requestUrl = phpGWLink('index.php', oArgs);
}
- alert(requestUrl);
window.location = requestUrl;
};
Modified:
branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
2017-04-04 08:26:25 UTC (rev 16532)
+++ branches/Version-2_0-branch/eventplannerfrontend/js/portico/vendor.edit.js
2017-04-04 08:28:19 UTC (rev 16533)
@@ -32,6 +32,5 @@
{
requestUrl = phpGWLink('index.php', oArgs);
}
- alert(requestUrl);
window.location = requestUrl;
};
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
2017-04-04 08:26:25 UTC (rev 16532)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
2017-04-04 08:28:19 UTC (rev 16533)
@@ -35,6 +35,27 @@
*/
public $output = array();
+ protected $webserver_url;
+
+ 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;
+
+ }
+
/**
* This function compares for major versions only
*
@@ -792,11 +813,11 @@
if ($this->is_image_dir($imagedir))
{
- return
$GLOBALS['phpgw_info']['server']['webserver_url'].'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
+ return
$this->webserver_url.'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
}
elseif ($this->is_image_dir ($imagedir_default))
{
- return
$GLOBALS['phpgw_info']['server']['webserver_url'].'/'.$appname.'/templates/base/images';
+ return
$this->webserver_url.'/'.$appname.'/templates/base/images';
}
else
{
@@ -814,6 +835,24 @@
*/
public static function find_image($module, $image)
{
+ static $webserver_url = null;
+
+ 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;
if ( !isset($found_files[$module]) ||
is_array($found_files[$module]) )
{
@@ -852,7 +891,7 @@
{
if (
isset($found_files[$module]["{$image}{$ext}"]) )
{
- return
"{$GLOBALS['phpgw_info']['server']['webserver_url']}{$found_files[$module]["{$image}{$ext}"]}/{$image}{$ext}";
+ return
"{$webserver_url}{$found_files[$module]["{$image}{$ext}"]}/{$image}{$ext}";
}
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16533] Stable: Merge 16526:16532 from trunk,
sigurdne <=