fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in victorsl/processmaker/HOR-546-3018 (pull request #3930)

Browse Source 
HOR-546
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-23 18:06:29 -04:00
parent 8330ed7143 a795a78757
commit 0bcdcc634d
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/class.pmDynaform.php
View File

@@ -649,7 +649,7 @@ class pmDynaform
$javascript = " $javascript = "
<script type=\"text/javascript\"> <script type=\"text/javascript\">
var jsondata = " . G::json_encode($json) . "; var jsondata = " . G::json_encode($json) . ";
var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\"; var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";
var pm_run_outside_main_app = \"\"; var pm_run_outside_main_app = \"\";
var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\"; var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\";
var __DynaformName__ = \"" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "\"; var __DynaformName__ = \"" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "\";
@@ -705,7 +705,7 @@ class pmDynaform
$javascrip = "" . $javascrip = "" .
"<script type='text/javascript'>\n" . "<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" . "var jsondata = " . G::json_encode($json) . ";\n" .
"var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\";\n" . "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
"var pm_run_outside_main_app = null;\n" . "var pm_run_outside_main_app = null;\n" .
"var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" . "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
"var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" . "var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" .
@@ -778,7 +778,7 @@ class pmDynaform
$javascrip = "" . $javascrip = "" .
"<script type='text/javascript'>\n" . "<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" . "var jsondata = " . G::json_encode($json) . ";\n" .
"var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\";\n" . "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
"var pm_run_outside_main_app = '" . $this->fields["PM_RUN_OUTSIDE_MAIN_APP"] . "';\n" . "var pm_run_outside_main_app = '" . $this->fields["PM_RUN_OUTSIDE_MAIN_APP"] . "';\n" .
"var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" . "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
"var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" . "var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" .
@@ -831,7 +831,7 @@ class pmDynaform
$javascrip = " $javascrip = "
<script type=\"text/javascript\"> <script type=\"text/javascript\">
var jsondata = " . G::json_encode($json) . "; var jsondata = " . G::json_encode($json) . ";
var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\"; var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";
var pm_run_outside_main_app = null; var pm_run_outside_main_app = null;
var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\"; var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\";
var __DynaformName__ = \"" . $this->fields["PRO_UID"] . "_" . $this->fields["CURRENT_DYNAFORM"] . "\"; var __DynaformName__ = \"" . $this->fields["PRO_UID"] . "_" . $this->fields["CURRENT_DYNAFORM"] . "\";
@@ -871,7 +871,7 @@ class pmDynaform
$javascrip = "" . $javascrip = "" .
"<script type='text/javascript'>\n" . "<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" . "var jsondata = " . G::json_encode($json) . ";\n" .
"var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\";\n" . "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
"var pm_run_outside_main_app = null;\n" . "var pm_run_outside_main_app = null;\n" .
"var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" . "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
"var __DynaformName__ = null;\n" . "var __DynaformName__ = null;\n" .
@@ -909,7 +909,7 @@ class pmDynaform
$javascrip = "" . $javascrip = "" .
"<script type='text/javascript'>\n" . "<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" . "var jsondata = " . G::json_encode($json) . ";\n" .
"var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\";\n" . "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
"var pm_run_outside_main_app = null;\n" . "var pm_run_outside_main_app = null;\n" .
"var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" . "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
"var __DynaformName__ = null;\n" . "var __DynaformName__ = null;\n" .
@@ -944,7 +944,7 @@ class pmDynaform
"<script type='text/javascript'>" . "<script type='text/javascript'>" .
"var sysLang = '" . SYS_LANG . "';\n" . "var sysLang = '" . SYS_LANG . "';\n" .
"var jsonData = " . G::json_encode($json) . ";\n" . "var jsonData = " . G::json_encode($json) . ";\n" .
"var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\";\n" . "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
$js . $js .
"</script>"; "</script>";
@@ -965,7 +965,7 @@ class pmDynaform
$javascrip = "" . $javascrip = "" .
"<script type='text/javascript'>\n" . "<script type='text/javascript'>\n" .
"var jsondata = " . G::json_encode($json) . ";\n" . "var jsondata = " . G::json_encode($json) . ";\n" .
"var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd(false) . "\";\n" . "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
"var pm_run_outside_main_app = null;\n" . "var pm_run_outside_main_app = null;\n" .
"var dyn_uid = '" . $currentDynaform . "';\n" . "var dyn_uid = '" . $currentDynaform . "';\n" .
"var __DynaformName__ = null;\n" . "var __DynaformName__ = null;\n" .

6
workflow/engine/classes/class.system.php
View File

@@ -1257,11 +1257,9 @@ class System
/** /**
* Get the complete name of the server host configured for requests Front-End (e.g. https://127.0.0.1:81) * Get the complete name of the server host configured for requests Front-End (e.g. https://127.0.0.1:81)
* *
* @param bool $flagHttp Add https/http string
*
* @return string Returns an string with the complete name of the server host configured for requests Front-End * @return string Returns an string with the complete name of the server host configured for requests Front-End
*/ */
public static function getHttpServerHostnameRequestsFrontEnd($flagHttp = true) public static function getHttpServerHostnameRequestsFrontEnd()
{ {
try { try {
$arraySystemConfiguration = self::getSystemConfiguration(); $arraySystemConfiguration = self::getSystemConfiguration();
@@ -1270,7 +1268,7 @@ class System
$serverHostname = ($serverHostname != '')? $serverHostname : $_SERVER['HTTP_HOST']; $serverHostname = ($serverHostname != '')? $serverHostname : $_SERVER['HTTP_HOST'];
//Return //Return
return (($flagHttp)? ((G::is_https())? 'https://' : 'http://') : '') . $serverHostname; return ((G::is_https())? 'https://' : 'http://') . $serverHostname;
} catch (Exception $e) { } catch (Exception $e) {
throw $e; throw $e;
} }