fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvement, change "green" to "classic

Browse Source
This commit is contained in:
Julio Cesar Laura
2012-07-18 15:59:13 -04:00
parent 7390750b38
commit 8f749c7e09
16 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.txt
View File

@@ -325,7 +325,7 @@ For example, if installed on the local machine at port 8080, then use:
http://localhost:8080 http://localhost:8080
The web browser should be redirected to the address: 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. 2. The installation configuration page should appear to setup ProcessMaker.
(If the default Apache page appears, then disable it and restart Apache.) (If the default Apache page appears, then disable it and restart Apache.)

2
gulliver/bin/tasks/templates/index.html.tpl
View File

@@ -3,6 +3,6 @@
<title>Redirector</title> <title>Redirector</title>
<meta http-equiv="PRAGMA" content="NO-CACHE" /> <meta http-equiv="PRAGMA" content="NO-CACHE" />
<meta http-equiv="CACHE-CONTROL" content="NO-STORE" /> <meta http-equiv="CACHE-CONTROL" content="NO-STORE" />
<meta http-equiv="REFRESH" content="0;URL=/sys{projectName}/en/green/login/login.html" /> <meta http-equiv="REFRESH" content="0;URL=/sys{projectName}/en/classic/login/login.html" />
</head> </head>
</html> </html>

2
gulliver/bin/tasks/templates/sysGeneric.php.tpl
View File

@@ -123,7 +123,7 @@ $docuroot = explode ( PATH_SEP , $_SERVER['DOCUMENT_ROOT'] );
require_once('sysUnnamed.php'); die; require_once('sysUnnamed.php'); die;
break; break;
case 'sysNamed' : case 'sysNamed' :
header('location : ' . $_SERVER['REQUEST_URI'] . 'en/green/login/login' ); header('location : ' . $_SERVER['REQUEST_URI'] . 'en/classic/login/login' );
die; die;
break; break;
case 'jsMethod' : case 'jsMethod' :

6
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -363,7 +363,7 @@ class CaseScheduler extends BaseCaseScheduler {
if ($sActualDataHour < $dActualSysHour) { if ($sActualDataHour < $dActualSysHour) {
$_PORT = (SERVER_PORT != '80') ? ':' . SERVER_PORT : ''; $_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"); println(" - Connecting webservice: $defaultEndpoint");
$user = $aRow ["SCH_DEL_USER_NAME"]; $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'] : ''; $_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 ['SERVER_NAME'] . ':' . $_PORT . '/sys' . SYS_SYS .'/'.SYS_LANG.'/classic/green/services/wsdl2';
$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"); println(" - Connecting webservice: $defaultEndpoint");
$user = $aRow ["SCH_DEL_USER_NAME"]; $user = $aRow ["SCH_DEL_USER_NAME"];
$pass = $aRow ["SCH_DEL_USER_PASS"]; $pass = $aRow ["SCH_DEL_USER_PASS"];

4
workflow/engine/methods/install/install.js
View File

@@ -572,7 +572,7 @@ var installer=function()
this.installation=function(rpc) this.installation=function(rpc)
{ {
/* var r = new leimnud.module.rpc.xmlhttp({ /* var r = new leimnud.module.rpc.xmlhttp({
url :"/sysworkflow/en/green/tools/updateTranslation", url :"/sysworkflow/en/classic/tools/updateTranslation",
method :"GET" method :"GET"
}); });
r.callback=function(rpc) r.callback=function(rpc)
@@ -608,7 +608,7 @@ var installer=function()
this.options.buttong.value="Finish Installation"; this.options.buttong.value="Finish Installation";
this.options.buttong.onmouseup=function() this.options.buttong.onmouseup=function()
{ {
window.location = "/sysworkflow/en/green/login/login"; window.location = "/sysworkflow/en/classic/login/login";
}.extend(this); }.extend(this);
tdS.appendChild(this.options.buttong); tdS.appendChild(this.options.buttong);
this.buttonFun(this.options.buttong); this.buttonFun(this.options.buttong);

2
workflow/engine/methods/install/install.php
View File

@@ -43,7 +43,7 @@ echo '<?xml version="1.0" encoding="UTF-8" ?>';
<script type='text/javascript' src='/js/maborak/core/maborak.js'></script> <script type='text/javascript' src='/js/maborak/core/maborak.js'></script>
<link rel="stylesheet" type="text/css" href="/js/maborak/samples/style.css" /> <link rel="stylesheet" type="text/css" href="/js/maborak/samples/style.css" />
<script type='text/javascript' src='/sys/en/green/install/install.js'></script> <script type='text/javascript' src='/sys/en/classic/install/install.js'></script>
<script type='text/javascript'> <script type='text/javascript'>
var ifr; var ifr;
var forceCssLoad = true; var forceCssLoad = true;

10
workflow/engine/methods/install/installServer.php
View File

@@ -191,7 +191,7 @@ else if($action==="install")
* *
* 4.2 Update translation from this url (background) * 4.2 Update translation from this url (background)
* *
* http://ProcessmakerHostname/sysworkflow/en/green/tools/updateTranslation * http://ProcessmakerHostname/sysworkflow/en/classic/tools/updateTranslation
* *
* *
* *
@@ -325,22 +325,22 @@ else if($action==="install")
fclose( $fp ); fclose( $fp );
/* Update languages */ /* Update languages */
$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/tools/updateTranslation"); $update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/tools/updateTranslation");
$logger->log("Update language => ".((!$update)?$update:"OK")); $logger->log("Update language => ".((!$update)?$update:"OK"));
/* Heartbeat Enable/Disable */ /* Heartbeat Enable/Disable */
if(!isset($dataClient->heartbeatEnabled)) $dataClient->heartbeatEnabled=true; if(!isset($dataClient->heartbeatEnabled)) $dataClient->heartbeatEnabled=true;
$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/install/heartbeatStatus?status=".$dataClient->heartbeatEnabled); $update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/install/heartbeatStatus?status=".$dataClient->heartbeatEnabled);
$logger->log("Heartbeat Status => ".str_replace("<br>","\n",$update)); $logger->log("Heartbeat Status => ".str_replace("<br>","\n",$update));
/* Autoinstall Process */ /* Autoinstall Process */
$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/install/autoinstallProcesses"); $update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/install/autoinstallProcesses");
if (trim(str_replace("<br>","",$update)) == "") if (trim(str_replace("<br>","",$update)) == "")
$update = "Nothing to do."; $update = "Nothing to do.";
$logger->log("Process AutoInstall => ".str_replace("<br>","\n",$update)); $logger->log("Process AutoInstall => ".str_replace("<br>","\n",$update));
/* Autoinstall Plugins */ /* Autoinstall Plugins */
$update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/green/install/autoinstallPlugins"); $update = file_get_contents("http://".$_SERVER['SERVER_NAME'].":".$_SERVER['SERVER_PORT']."/sysworkflow/en/classic/install/autoinstallPlugins");
if (trim(str_replace("<br>","",$update)) == "") if (trim(str_replace("<br>","",$update)) == "")
$update = "Nothing to do."; $update = "Nothing to do.";
$logger->log("Plugin AutoInstall => ".str_replace("<br>","\n",$update)); $logger->log("Plugin AutoInstall => ".str_replace("<br>","\n",$update));

2
workflow/engine/methods/services/wsdl.php
View File

@@ -4,7 +4,7 @@
$lang = defined ('SYS_LANG') ? SYS_LANG : 'en'; $lang = defined ('SYS_LANG') ? SYS_LANG : 'en';
$endpoint = 'http://' .$_SERVER['SERVER_NAME'] . ':' .$_SERVER['SERVER_PORT'] . $endpoint = 'http://' .$_SERVER['SERVER_NAME'] . ':' .$_SERVER['SERVER_PORT'] .
'/sys' .SYS_SYS.'/' .$lang . '/green/services/soap'; '/sys' .SYS_SYS.'/' .$lang . '/classic/services/soap';
//print $endpoint; die; //print $endpoint; die;
$content = str_replace ( "___SOAP_ADDRESS___", $endpoint, $content ); $content = str_replace ( "___SOAP_ADDRESS___", $endpoint, $content );

2
workflow/engine/methods/services/wsdl2.php
View File

@@ -5,7 +5,7 @@
$http = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ) ? 'https' : 'http'; $http = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ) ? 'https' : 'http';
$endpoint = $http . '://' .$_SERVER['SERVER_NAME'] . ':' .$_SERVER['SERVER_PORT'] . $endpoint = $http . '://' .$_SERVER['SERVER_NAME'] . ':' .$_SERVER['SERVER_PORT'] .
'/sys' .SYS_SYS.'/' .$lang . '/green/services/soap2'; '/sys' .SYS_SYS.'/' .$lang . '/classic/services/soap2';
$content = str_replace ( "___SOAP_ADDRESS___", $endpoint, $content ); $content = str_replace ( "___SOAP_ADDRESS___", $endpoint, $content );

2
workflow/engine/methods/setup/jasper.php
View File

@@ -62,7 +62,7 @@
if ( $formatReport == RUN_OUTPUT_FORMAT_HTML) { if ( $formatReport == RUN_OUTPUT_FORMAT_HTML) {
//$pageReport = isset ( $_GET['page'] ) ? $_GET['page'] : 1; //$pageReport = isset ( $_GET['page'] ) ? $_GET['page'] : 1;
//$output_params[RUN_OUTPUT_PAGE] = $pageReport; //$output_params[RUN_OUTPUT_PAGE] = $pageReport;
//$output_params[RUN_OUTPUT_IMAGES_URI] = '/sysos/en/green/'; //$output_params[RUN_OUTPUT_IMAGES_URI] = '/sysos/'. SYS_LANG. '/classic';
} }
$result = $oJasper->ws_runReport($currentUri, $report_params, $output_params, $attachments); $result = $oJasper->ws_runReport($currentUri, $report_params, $output_params, $attachments);

8
workflow/engine/methods/setup/webServicesAjax.php
View File

@@ -87,7 +87,7 @@ switch ($_POST ['action']) {
$_SESSION ['_DBArray'] = $_DBArray; $_SESSION ['_DBArray'] = $_DBArray;
if (! isset ( $_SESSION ['END_POINT'] )) { if (! isset ( $_SESSION ['END_POINT'] )) {
//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS.'/en/green/services/wsdl'; //$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS. '/'. SYS_LANG .'/classic/services/wsdl';
$wsdl = 'http://' . $_SERVER ['HTTP_HOST']; $wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
$workspace = SYS_SYS; $workspace = SYS_SYS;
} else { } else {
@@ -95,7 +95,7 @@ switch ($_POST ['action']) {
$workspace = $_SESSION ['WS_WORKSPACE']; $workspace = $_SESSION ['WS_WORKSPACE'];
} }
$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/green/services/wsdl2'; $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/wsdl2';
$wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint; $wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
@@ -137,7 +137,7 @@ switch ($_POST ['action']) {
if (isset ( $_POST ["epr"] )) { if (isset ( $_POST ["epr"] )) {
$_SESSION ['END_POINT'] = $_POST ["epr"]; $_SESSION ['END_POINT'] = $_POST ["epr"];
} }
$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/green/services/wsdl2'; $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/wsdl2';
$endpoint = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint; $endpoint = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
@@ -1269,7 +1269,7 @@ case "removeUserFromGroup" :
$del_index = 1; $del_index = 1;
function sendFile($FILENAME, $USR_UID, $APP_UID, $DEL_INDEX = 1, $DOC_UID = NULL, $title = NULL, $comment = NULL) { function sendFile($FILENAME, $USR_UID, $APP_UID, $DEL_INDEX = 1, $DOC_UID = NULL, $title = NULL, $comment = NULL) {
$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/green/services/upload'; $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/'. SYS_LANG .'/classic/services/upload';
$upload = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint; $upload = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
$DOC_UID = ($DOC_UID != NULL) ? $DOC_UID : - 1; $DOC_UID = ($DOC_UID != NULL) ? $DOC_UID : - 1;

4
workflow/engine/methods/setup/webServicesSetupSave.php
View File

@@ -5,11 +5,11 @@ if($_POST['form']['WS_PROTOCOL']!='' && $_POST['form']['WS_WORKSPACE']!='')
{ {
if($_POST['form']['WS_PORT']!='') if($_POST['form']['WS_PORT']!='')
{ {
$_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] . ':' .$_POST['form']['WS_PORT'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/green/services/wsdl2'; $_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] . ':' .$_POST['form']['WS_PORT'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/classic/services/wsdl2';
G::header('location: webServices?x=1'); G::header('location: webServices?x=1');
} }
else else
{ $_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/green/services/wsdl2'; { $_SESSION['END_POINT']=$_POST['form']['WS_PROTOCOL'].'://' .$_POST['form']['WS_HOST'] .'/sys' .$_POST['form']['WS_WORKSPACE'].'/en/classic/services/wsdl2';
G::header('location: webServices?x=1'); G::header('location: webServices?x=1');
} }
$_SESSION['WS_WORKSPACE']=$_POST['form']['WS_WORKSPACE']; $_SESSION['WS_WORKSPACE']=$_POST['form']['WS_WORKSPACE'];

19
workflow/engine/templates/setup/webServicesTree.php
View File

@@ -41,18 +41,17 @@ if (isset ( $_GET ['x'] )) {
$workspace = ''; $workspace = '';
} }
} else { } else {
if (! isset ( $_SESSION ['END_POINT'] )) { if (! isset ( $_SESSION ['END_POINT'] )) {
//$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS.'/en/green/services/wsdl'; //$wsdl = 'http://'.$_SERVER['HTTP_HOST'].'/sys'.SYS_SYS.'/en/classic/services/wsdl';
$wsdl = 'http://' . $_SERVER ['HTTP_HOST']; $wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
$workspace = SYS_SYS; $workspace = SYS_SYS;
} else { } else {
$wsdl = $_SESSION ['END_POINT']; $wsdl = $_SESSION ['END_POINT'];
$workspace = $_SESSION ['WS_WORKSPACE']; $workspace = $_SESSION ['WS_WORKSPACE'];
} }
} }
$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . SYS_SYS . '/en/classic/services/wsdl2';
'/en/green/services/wsdl2';
$wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint; $wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;

8
workflow/engine/xmlform/login/newSite.xml
View File

@@ -64,7 +64,7 @@
/*data.goto = data.submit.parentNode.appendChild(new button('Open workspace',function() /*data.goto = data.submit.parentNode.appendChild(new button('Open workspace',function()
{ {
window.location="/sys"+data.name.value+"/en/green/login/login"; window.location="/sys"+data.name.value+"/en/classic/login/login";
return false; return false;
},{fontWeight:'bold'},{type:'reset'})).disable(); },{fontWeight:'bold'},{type:'reset'})).disable();
*/ */
@@ -100,7 +100,7 @@
}); });
function redirectLogin(){ function redirectLogin(){
location.href="/sys"+data.name.value+"/en/green/login/login"; location.href="/sys"+data.name.value+"/en/classic/login/login";
} }
var status_in_progress=function(form) var status_in_progress=function(form)
@@ -147,11 +147,11 @@
label: G_STRINGS.NEW_SITE_SUCCESS +" "+ data.name.value +"<br/>"+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRM+"<br/>"+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRMNOTE, label: G_STRINGS.NEW_SITE_SUCCESS +" "+ data.name.value +"<br/>"+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRM+"<br/>"+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRMNOTE,
action: function(){ action: function(){
parent.parent.window.location="/sys"+data.name.value+"/en/green/login/login"; parent.parent.window.location="/sys"+data.name.value+"/en/classic/login/login";
/* if (typeof(window.parent.admToolsContent) != 'undefined'){ /* if (typeof(window.parent.admToolsContent) != 'undefined'){
parent.parent.window.location="/sys"+data.name.value+"/en/green/login/login"; parent.parent.window.location="/sys"+data.name.value+"/en/classic/login/login";
} else { } else {
setTimeout('redirectLogin()', 1000); setTimeout('redirectLogin()', 1000);
}*/ }*/

6
workflow/engine/xmlform/login/newSiteAdd.xml
View File

@@ -82,7 +82,7 @@
/*data.goto = data.submit.parentNode.appendChild(new button('Open workspace',function() /*data.goto = data.submit.parentNode.appendChild(new button('Open workspace',function()
{ {
window.location="/sys"+data.name.value+"/en/green/login/login"; window.location="/sys"+data.name.value+"/en/classic/login/login";
return false; return false;
},{fontWeight:'bold'},{type:'reset'})).disable(); },{fontWeight:'bold'},{type:'reset'})).disable();
*/ */
@@ -147,7 +147,7 @@
action: function(){ action: function(){
if (typeof(window.parent.admToolsContent) != 'undefined'){ if (typeof(window.parent.admToolsContent) != 'undefined'){
parent.window.location="/sys"+data.name.value+"/en/green/login/login"; parent.window.location="/sys"+data.name.value+"/en/classic/login/login";
} else { } else {
setTimeout('redirectLogin()', 1000); setTimeout('redirectLogin()', 1000);
@@ -179,7 +179,7 @@
//data.name.passed(); //data.name.passed();
function redirectLogin(){ function redirectLogin(){
location.href="/sys"+data.name.value+"/en/green/login/login"; location.href="/sys"+data.name.value+"/en/classic/login/login";
} }
]]></JS> ]]></JS>
</dynaForm> </dynaForm>

2
workflow/public_html/sysGeneric.php
View File

@@ -233,7 +233,7 @@
die; die;
break; break;
case 'sysNamed' : case 'sysNamed' :
header('location : ' . $_SERVER['REQUEST_URI'] . 'en/green/login/login' ); header('location : ' . $_SERVER['REQUEST_URI'] . '/' .SYS_LANG. '/classic/login/login' );
die; die;
break; break;
case 'jsMethod' : case 'jsMethod' :