From 8f749c7e097509263da9fcbbfc6a792baf171948 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Wed, 18 Jul 2012 15:59:13 -0400 Subject: [PATCH] Improvement, change "green" to "classic --- README.txt | 2 +- gulliver/bin/tasks/templates/index.html.tpl | 2 +- .../bin/tasks/templates/sysGeneric.php.tpl | 2 +- .../engine/classes/model/CaseScheduler.php | 6 ++--- workflow/engine/methods/install/install.js | 4 +-- workflow/engine/methods/install/install.php | 2 +- .../engine/methods/install/installServer.php | 10 ++++---- workflow/engine/methods/services/wsdl.php | 2 +- workflow/engine/methods/services/wsdl2.php | 2 +- workflow/engine/methods/setup/jasper.php | 2 +- .../engine/methods/setup/webServicesAjax.php | 8 +++--- .../methods/setup/webServicesSetupSave.php | 4 +-- .../templates/setup/webServicesTree.php | 25 +++++++++---------- workflow/engine/xmlform/login/newSite.xml | 8 +++--- workflow/engine/xmlform/login/newSiteAdd.xml | 6 ++--- workflow/public_html/sysGeneric.php | 2 +- 16 files changed, 43 insertions(+), 44 deletions(-) diff --git a/README.txt b/README.txt index b0bb1be95..412c23262 100755 --- a/README.txt +++ b/README.txt @@ -325,7 +325,7 @@ For example, if installed on the local machine at port 8080, then use: http://localhost:8080 The web browser should be redirected to the address: - http://IP-ADDRESS/sys/en/green/login + http://IP-ADDRESS/sys/en/classic/login 2. The installation configuration page should appear to setup ProcessMaker. (If the default Apache page appears, then disable it and restart Apache.) diff --git a/gulliver/bin/tasks/templates/index.html.tpl b/gulliver/bin/tasks/templates/index.html.tpl index 667bbbc82..120d501e6 100755 --- a/gulliver/bin/tasks/templates/index.html.tpl +++ b/gulliver/bin/tasks/templates/index.html.tpl @@ -3,6 +3,6 @@ Redirector - + diff --git a/gulliver/bin/tasks/templates/sysGeneric.php.tpl b/gulliver/bin/tasks/templates/sysGeneric.php.tpl index 2b96a46c6..47b34d2a8 100755 --- a/gulliver/bin/tasks/templates/sysGeneric.php.tpl +++ b/gulliver/bin/tasks/templates/sysGeneric.php.tpl @@ -123,7 +123,7 @@ $docuroot = explode ( PATH_SEP , $_SERVER['DOCUMENT_ROOT'] ); require_once('sysUnnamed.php'); die; break; case 'sysNamed' : - header('location : ' . $_SERVER['REQUEST_URI'] . 'en/green/login/login' ); + header('location : ' . $_SERVER['REQUEST_URI'] . 'en/classic/login/login' ); die; break; case 'jsMethod' : diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php index 984d30203..63739842d 100755 --- a/workflow/engine/classes/model/CaseScheduler.php +++ b/workflow/engine/classes/model/CaseScheduler.php @@ -363,7 +363,7 @@ class CaseScheduler extends BaseCaseScheduler { if ($sActualDataHour < $dActualSysHour) { $_PORT = (SERVER_PORT != '80') ? ':' . SERVER_PORT : ''; - $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2'; + $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/'.SYS_LANG.'/classic/services/wsdl2'; println(" - Connecting webservice: $defaultEndpoint"); $user = $aRow ["SCH_DEL_USER_NAME"]; @@ -532,8 +532,8 @@ class CaseScheduler extends BaseCaseScheduler { $_PORT = (isset($_SERVER ['SERVER_PORT']) && $_SERVER ['SERVER_PORT'] != '80') ? ':' . $_SERVER ['SERVER_PORT'] : ''; - //$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2'; - $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2'; + //$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_PORT . '/sys' . SYS_SYS .'/'.SYS_LANG.'/classic/green/services/wsdl2'; + $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/'.SYS_LANG.'/classic/services/wsdl2'; println(" - Connecting webservice: $defaultEndpoint"); $user = $aRow ["SCH_DEL_USER_NAME"]; $pass = $aRow ["SCH_DEL_USER_PASS"]; diff --git a/workflow/engine/methods/install/install.js b/workflow/engine/methods/install/install.js index f8b1287c6..06bc22167 100755 --- a/workflow/engine/methods/install/install.js +++ b/workflow/engine/methods/install/install.js @@ -572,7 +572,7 @@ var installer=function() this.installation=function(rpc) { /* var r = new leimnud.module.rpc.xmlhttp({ - url :"/sysworkflow/en/green/tools/updateTranslation", + url :"/sysworkflow/en/classic/tools/updateTranslation", method :"GET" }); r.callback=function(rpc) @@ -608,7 +608,7 @@ var installer=function() this.options.buttong.value="Finish Installation"; this.options.buttong.onmouseup=function() { - window.location = "/sysworkflow/en/green/login/login"; + window.location = "/sysworkflow/en/classic/login/login"; }.extend(this); tdS.appendChild(this.options.buttong); this.buttonFun(this.options.buttong); diff --git a/workflow/engine/methods/install/install.php b/workflow/engine/methods/install/install.php index 3ebb4d712..d13be542d 100755 --- a/workflow/engine/methods/install/install.php +++ b/workflow/engine/methods/install/install.php @@ -43,7 +43,7 @@ echo ''; - +