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

Merged in dheeyi/processmaker/HOR-1422 (pull request #4591)

Browse Source 
HOR-1422
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-21 15:05:25 -04:00
parent a88a7f8f1f a60e196b3d
commit a08c95c2af
5 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gulliver/system/class.bootstrap.php
View File

@@ -611,9 +611,12 @@ class Bootstrap
* 0 to delete the temporary file flag * 0 to delete the temporary file flag
* 1 to set the temporary file flag. * 1 to set the temporary file flag.
* 2 or bigger to check if the temporary file exists. * 2 or bigger to check if the temporary file exists.
* @content Contains the content of the temporary file
* true to all workspace
* nameWorkspace to specific workspace
* return true if the file exists, otherwise false. * return true if the file exists, otherwise false.
*/ */
public function isPMUnderUpdating($setFlag = 2) public function isPMUnderUpdating($setFlag = 2, $content="true")
{ {
if (!defined('PATH_DATA')) { if (!defined('PATH_DATA')) {
return false; return false;
@@ -626,12 +629,16 @@ class Bootstrap
} }
} elseif ($setFlag == 1) { } elseif ($setFlag == 1) {
$fp = fopen($fileCheck, 'w'); $fp = fopen($fileCheck, 'w');
$line = fputs($fp, "true"); $line = fputs($fp, $content);
} }
// checking temporary file // checking temporary file
if ($setFlag >= 1) { if ($setFlag >= 1) {
if (file_exists($fileCheck)) { if (file_exists($fileCheck)) {
return true; $res['action'] = true;
$fp = fopen($fileCheck, "r");
$res['workspace'] = fread($fp, filesize($fileCheck));
fclose($fp);
return $res;
} }
} }
return false; return false;

13
gulliver/system/class.g.php
View File

@@ -5122,9 +5122,12 @@ class G
* 0 to delete the temporary file flag * 0 to delete the temporary file flag
* 1 to set the temporary file flag. * 1 to set the temporary file flag.
* 2 or bigger to check if the temporary file exists. * 2 or bigger to check if the temporary file exists.
* @content Contains the content of the temporary file
* true to all workspace
* nameWorkspace to specific workspace
* return true if the file exists, otherwise false. * return true if the file exists, otherwise false.
*/ */
public function isPMUnderUpdating($setFlag = 2) public function isPMUnderUpdating($setFlag = 2, $content="true")
{ {
if (!defined('PATH_DATA')) { if (!defined('PATH_DATA')) {
return false; return false;
@@ -5136,12 +5139,16 @@ class G
} }
} elseif ($setFlag == 1) { } elseif ($setFlag == 1) {
$fp = fopen($fileCheck,'w'); $fp = fopen($fileCheck,'w');
$line = fputs($fp,"true"); $line = fputs($fp,$content);
} }
//checking temporary file //checking temporary file
if ($setFlag >= 1) { if ($setFlag >= 1) {
if (file_exists($fileCheck)) { if (file_exists($fileCheck)) {
return true; $res['action'] = true;
$fp = fopen($fileCheck, "r");
$res['workspace'] = fread($fp, filesize($fileCheck));
fclose($fp);
return $res;
} }
} }
return false; return false;

9
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -82,7 +82,14 @@ function run_upgrade($command, $args)
CLI::logging("UPGRADE", PROCESSMAKER_PATH . "upgrade.log"); CLI::logging("UPGRADE", PROCESSMAKER_PATH . "upgrade.log");
CLI::logging("Checking files integrity...\n"); CLI::logging("Checking files integrity...\n");
//setting flag to true to check into sysGeneric.php //setting flag to true to check into sysGeneric.php
$flag = G::isPMUnderUpdating(1); $workspaces = get_workspaces_from_args($command);
$oneWorkspace = 'true';
if (count($workspaces) == 1) {
foreach ($workspaces as $index => $workspace) {
$oneWorkspace = $workspace->name;
}
}
$flag = G::isPMUnderUpdating(1, $oneWorkspace);
//start to upgrade //start to upgrade
$checksum = System::verifyChecksum(); $checksum = System::verifyChecksum();
if ($checksum === false) { if ($checksum === false) {

14
workflow/public_html/bootstrap.php
View File

@@ -223,12 +223,14 @@
// the request correspond to valid php page, now parse the URI // the request correspond to valid php page, now parse the URI
G::parseURI(getenv("REQUEST_URI"), $isRestRequest); G::parseURI(getenv("REQUEST_URI"), $isRestRequest);
if(G::isPMUnderUpdating()) $arrayUpdating = G::isPMUnderUpdating();
{ if ($arrayUpdating['action']) {
header("location: /update/updating.php"); if ($arrayUpdating['workspace'] == "true" || $arrayUpdating['workspace'] == SYS_TEMP) {
if ( DEBUG_TIME_LOG ) G::logTimeByPage(); header("location: /update/updating.php");
die; if (DEBUG_TIME_LOG) G::logTimeByPage();
} die;
}
}
// verify if index.html exists // verify if index.html exists
if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template

13
workflow/public_html/sysGeneric.php
View File

@@ -484,11 +484,14 @@ if (SYS_TARGET === false) {
} }
// Bootstrap::mylog("sys_temp: ".SYS_TEMP); // Bootstrap::mylog("sys_temp: ".SYS_TEMP);
if (Bootstrap::isPMUnderUpdating()) { $arrayUpdating = Bootstrap::isPMUnderUpdating();
header( "location: /update/updating.php" ); if ($arrayUpdating['action']) {
if (DEBUG_TIME_LOG) if ($arrayUpdating['workspace'] == "true" || $arrayUpdating['workspace'] == SYS_TEMP) {
Bootstrap::logTimeByPage(); header("location: /update/updating.php");
die(); if (DEBUG_TIME_LOG)
Bootstrap::logTimeByPage();
die();
}
} }
// verify if index.html exists // verify if index.html exists