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

remove commented code

Browse Source
This commit is contained in:
dante
2017-08-11 15:10:16 -04:00
parent 9ecfbe0c84
commit 76d0806b6a
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/Upgrade.php
View File

@@ -14,13 +14,11 @@ class Upgrade
{ {
$filter = new InputFilter(); $filter = new InputFilter();
//echo "Starting core installation...\n";
$start = microtime(1); $start = microtime(1);
$filename = $this->addon->getDownloadFilename(); $filename = $this->addon->getDownloadFilename();
$time = microtime(1); $time = microtime(1);
$archive = new Archive_Tar ($filename); $archive = new Archive_Tar ($filename);
//printf("Time to open archive: %f\n", microtime(1) - $time);
$time = microtime(1); $time = microtime(1);
$extractDir = dirname($this->addon->getDownloadFilename()) . "/extract"; $extractDir = dirname($this->addon->getDownloadFilename()) . "/extract";
$extractDir = $filter->xssFilterHard($extractDir); $extractDir = $filter->xssFilterHard($extractDir);
@@ -35,34 +33,22 @@ class Upgrade
if (!is_dir($backupDir)) { if (!is_dir($backupDir)) {
mkdir($backupDir); mkdir($backupDir);
} }
//printf("Time to remove old directory: %f\n", microtime(1) - $time);
$time = microtime(1); $time = microtime(1);
echo "Extracting files...\n"; echo "Extracting files...\n";
$archive->extractModify($extractDir, 'processmaker'); $archive->extractModify($extractDir, 'processmaker');
//printf("Time to extract all files: %f\n", microtime(1) - $time);
//$time = microtime(1);
//$files = $archive->listContent();
//printf("Time to get list of contents: %f\n", microtime(1) - $time);
/*$time = microtime(1);
foreach ($files as $fileinfo)
if (basename($fileinfo['filename']) == 'checksum.txt') {
$checksumFile = $archive->extractInString($fileinfo['filename']);
break;
}
printf("Time to get checksum.txt: %f\n", microtime(1) - $time);
*/
$checksumFile = file_get_contents("$extractDir/checksum.txt"); $checksumFile = file_get_contents("$extractDir/checksum.txt");
$time = microtime(1); $time = microtime(1);
$checksums = array(); $checksums = array();
foreach (explode("\n", $checksumFile) as $line) { foreach (explode("\n", $checksumFile) as $line) {
$checksums[trim(substr($line, 33))] = substr($line, 0, 32); $checksums[trim(substr($line, 33))] = substr($line, 0, 32);
} }
//printf("Time to assemble list of checksums: %f\n", microtime(1) - $time);
$checksum = array(); $checksum = array();
$changedFiles = array(); $changedFiles = array();
$time = microtime(1); $time = microtime(1);
$files = $this->ls_dir($extractDir); $files = $this->ls_dir($extractDir);
//printf("Time to list files: %f\n", microtime(1) - $time);
echo "Updating ProcessMaker files...\n"; echo "Updating ProcessMaker files...\n";
$time = microtime(1); $time = microtime(1);
$checksumTime = 0; $checksumTime = 0;
@@ -97,8 +83,7 @@ class Upgrade
} }
} }
} }
//printf("Time to create all checksums: %f\n", $checksumTime);
//printf("Time to copy files: %f\n", microtime(1) - $time);
printf("Updated %d files\n", count($changedFiles)); printf("Updated %d files\n", count($changedFiles));
printf("Clearing cache...\n"); printf("Clearing cache...\n");
if (defined('PATH_C')) { if (defined('PATH_C')) {
@@ -118,22 +103,17 @@ class Upgrade
$first = false; $first = false;
} catch (Exception $e) { } catch (Exception $e) {
printf("Errors upgrading workspace {$workspace->name}: {$e->getMessage()}\n"); printf("Errors upgrading workspace {$workspace->name}: {$e->getMessage()}\n");
//$errors = true;
} }
} }
//printf("Time to install: %f\n", microtime(1) - $start);
} }
private function ls_dir($dir, $basename = null) private function ls_dir($dir, $basename = null)
{ {
$files = array(); $files = array();
//if (substr($dir, -1) != "/")
// $dir .= "/";
if ($basename == null) { if ($basename == null) {
$basename = $dir; $basename = $dir;
} }
foreach (glob("$dir/*") as $filename) { foreach (glob("$dir/*") as $filename) {
//var_dump(substr($filename, strlen($basename) + 1));
if (is_dir($filename)) { if (is_dir($filename)) {
$files = array_merge($files, $this->ls_dir($filename, $basename)); $files = array_merge($files, $this->ls_dir($filename, $basename));
} else { } else {