From 76d0806b6a1c151ab38b816fed9db2f149c0fac0 Mon Sep 17 00:00:00 2001 From: dante Date: Fri, 11 Aug 2017 15:10:16 -0400 Subject: [PATCH] remove commented code --- workflow/engine/classes/Upgrade.php | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/workflow/engine/classes/Upgrade.php b/workflow/engine/classes/Upgrade.php index 80dda90a3..46b14b0fd 100644 --- a/workflow/engine/classes/Upgrade.php +++ b/workflow/engine/classes/Upgrade.php @@ -14,13 +14,11 @@ class Upgrade { $filter = new InputFilter(); - //echo "Starting core installation...\n"; $start = microtime(1); $filename = $this->addon->getDownloadFilename(); $time = microtime(1); $archive = new Archive_Tar ($filename); - //printf("Time to open archive: %f\n", microtime(1) - $time); $time = microtime(1); $extractDir = dirname($this->addon->getDownloadFilename()) . "/extract"; $extractDir = $filter->xssFilterHard($extractDir); @@ -35,34 +33,22 @@ class Upgrade if (!is_dir($backupDir)) { mkdir($backupDir); } - //printf("Time to remove old directory: %f\n", microtime(1) - $time); + $time = microtime(1); echo "Extracting files...\n"; $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"); $time = microtime(1); $checksums = array(); foreach (explode("\n", $checksumFile) as $line) { $checksums[trim(substr($line, 33))] = substr($line, 0, 32); } - //printf("Time to assemble list of checksums: %f\n", microtime(1) - $time); + $checksum = array(); $changedFiles = array(); $time = microtime(1); $files = $this->ls_dir($extractDir); - //printf("Time to list files: %f\n", microtime(1) - $time); + echo "Updating ProcessMaker files...\n"; $time = microtime(1); $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("Clearing cache...\n"); if (defined('PATH_C')) { @@ -118,22 +103,17 @@ class Upgrade $first = false; } catch (Exception $e) { 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) { $files = array(); - //if (substr($dir, -1) != "/") - // $dir .= "/"; if ($basename == null) { $basename = $dir; } foreach (glob("$dir/*") as $filename) { - //var_dump(substr($filename, strlen($basename) + 1)); if (is_dir($filename)) { $files = array_merge($files, $this->ls_dir($filename, $basename)); } else {