From 5fe9a04c2dc9f8a19bc4a5deb457ff160adc62cf Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 11 Aug 2017 17:10:14 -0400 Subject: [PATCH] HOR-3670-RG-4 Files review: workflow/engine/classes/Stat.php workflow/engine/classes/Tar_File.php workflow/engine/classes/Tasks.php workflow/engine/classes/ToolBar.php workflow/engine/classes/TriggerLibrary.php --- workflow/engine/classes/BzipFile.php | 2 +- workflow/engine/classes/Gzip_File.php | 2 +- workflow/engine/classes/Stat.php | 17 +--- .../classes/{Tar_File.php => TarFile.php} | 27 +----- workflow/engine/classes/Tasks.php | 88 ++----------------- workflow/engine/classes/ToolBar.php | 34 +------ workflow/engine/classes/TriggerLibrary.php | 80 +++++++---------- .../engine/classes/XmlForm_Field_ToolBar.php | 2 +- .../ProcessMaker/BusinessModel/Process.php | 2 +- .../BusinessModel/TriggerWizard.php | 2 +- .../templates/triggers/triggersTree.php | 2 +- .../triggers/triggers_CreateWizard.php | 2 +- .../triggers/triggers_EditWizard.php | 2 +- 13 files changed, 52 insertions(+), 210 deletions(-) rename workflow/engine/classes/{Tar_File.php => TarFile.php} (83%) diff --git a/workflow/engine/classes/BzipFile.php b/workflow/engine/classes/BzipFile.php index 98da97790..4cf6414cf 100644 --- a/workflow/engine/classes/BzipFile.php +++ b/workflow/engine/classes/BzipFile.php @@ -3,7 +3,7 @@ /** * This class is derived from the class archive, is employed to use files .bzip */ -class BzipFile extends tar_file +class BzipFile extends TarFile { /** diff --git a/workflow/engine/classes/Gzip_File.php b/workflow/engine/classes/Gzip_File.php index 0bb6821d0..a216a09ed 100644 --- a/workflow/engine/classes/Gzip_File.php +++ b/workflow/engine/classes/Gzip_File.php @@ -23,7 +23,7 @@ * * @package workflow.engine.classes * - */class gzip_file extends tar_file + */class gzip_file extends TarFile { /** diff --git a/workflow/engine/classes/Stat.php b/workflow/engine/classes/Stat.php index 7a825c847..15a13c929 100644 --- a/workflow/engine/classes/Stat.php +++ b/workflow/engine/classes/Stat.php @@ -1,23 +1,10 @@ status = false; } diff --git a/workflow/engine/classes/Tar_File.php b/workflow/engine/classes/TarFile.php similarity index 83% rename from workflow/engine/classes/Tar_File.php rename to workflow/engine/classes/TarFile.php index da28e89c2..626b4da95 100644 --- a/workflow/engine/classes/Tar_File.php +++ b/workflow/engine/classes/TarFile.php @@ -1,25 +1,10 @@ archive($name); $this->options['type'] = "tar"; @@ -102,7 +87,7 @@ class tar_file extends Archive while ($block = fread($fp, 512)) { $temp = unpack("a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100symlink/a6magic/a2temp/a32temp/a32temp/a8temp/a8temp/a155prefix/a12temp", $block); $file = array('name' => $this->options['basedir'] . '/' . $temp['prefix'] . $temp['name'], 'stat' => array(2 => $temp['mode'], 4 => octdec($temp['uid']), 5 => octdec($temp['gid']), 7 => octdec($temp['size']), 9 => octdec($temp['mtime']) - ), 'checksum' => octdec($temp['checksum']), 'type' => $temp['type'], 'magic' => $temp['magic'] + ), 'checksum' => octdec($temp['checksum']), 'type' => $temp['type'], 'magic' => $temp['magic'] ); if ($file['checksum'] == 0x00000000) { break; @@ -125,7 +110,6 @@ class tar_file extends Archive $this->files[] = $file; } elseif ($file['type'] == 5) { if (!is_dir($file['name'])) { - //mkdir($file['name'], $file['stat'][2]); mkdir($file['name'], 0775); } } elseif ($this->options['overwrite'] == 0 && file_exists($file['name'])) { @@ -133,23 +117,18 @@ class tar_file extends Archive continue; } elseif ($file['type'] == 2) { symlink($temp['symlink'], $file['name']); - //chmod($file['name'], $file['stat'][2]); } elseif ($new = @fopen($file['name'], "wb")) { fwrite($new, fread($fp, $file['stat'][7])); if ((512 - $file['stat'][7] % 512) != 512) { fread($fp, (512 - $file['stat'][7] % 512)); } - //fread($fp, (512 - $file['stat'][7] % 512) == 512 ? 0 : (512 - $file['stat'][7] % 512)); fclose($new); - //chmod($file['name'], $file['stat'][2]); chmod($file['name'], 0777); $this->files[] = $file['name']; } else { $this->error[] = "Could not open {$file['name']} for writing."; continue; } - //chown($file['name'], $file['stat'][4]); - //chgrp($file['name'], $file['stat'][5]); @touch($file['name'], $file['stat'][9]); unset($file); } diff --git a/workflow/engine/classes/Tasks.php b/workflow/engine/classes/Tasks.php index 01d442f08..7237ecc9a 100644 --- a/workflow/engine/classes/Tasks.php +++ b/workflow/engine/classes/Tasks.php @@ -1,51 +1,6 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ -require_once 'classes/model/GroupUser.php'; -require_once 'classes/model/Groupwf.php'; -require_once 'classes/model/ObjectPermission.php'; -require_once 'classes/model/Process.php'; -require_once 'classes/model/Route.php'; -require_once 'classes/model/Event.php'; -require_once 'classes/model/Step.php'; -require_once 'classes/model/StepTrigger.php'; -require_once 'classes/model/Task.php'; -require_once 'classes/model/TaskUser.php'; -require_once 'classes/model/Users.php'; -require_once 'classes/model/Gateway.php'; - -/** - * Tasks - Tasks -/** - * Tasks - Tasks class - * - * @package workflow.engine.ProcessMaker - * @author Julio Cesar Laura Avenda�o - * @copyright 2007 COLOSA - */class Tasks +class Tasks { /** @@ -89,7 +44,7 @@ require_once 'classes/model/Gateway.php'; try { $aTasks = array(); $oCriteria = new Criteria('workflow'); - $oCriteria->addSelectColumn( TaskPeer::TAS_UID ); + $oCriteria->addSelectColumn(TaskPeer::TAS_UID); $oCriteria->add(TaskPeer::PRO_UID, $sProUid); $oCriteria->addAscendingOrderByColumn(TaskPeer::TAS_TITLE); $oDataset = TaskPeer::doSelectRS($oCriteria); @@ -162,7 +117,6 @@ require_once 'classes/model/Gateway.php'; return; } - /** * Get all Routes for any Process * @@ -210,7 +164,7 @@ require_once 'classes/model/Gateway.php'; $oProcessMap = new ProcessMap(); $oTask = new Task(); $oEvent = new Event(); - //unset ($row['ROU_UID']); + //Saving Gateway into the GATEWAY table $idTask = $row['TAS_UID']; $nextTask = $row['ROU_NEXT_TASK']; @@ -306,7 +260,7 @@ require_once 'classes/model/Gateway.php'; { foreach ($aRoutes as $key => $row) { $oRoute = new Route(); - //krumo ($row); + if (is_array($oRoute->load($row['ROU_UID']))) { $oRoute->remove($row['ROU_UID']); } else { @@ -384,15 +338,6 @@ require_once 'classes/model/Gateway.php'; $oDataset1->next(); while ($aRow1 = $oDataset1->getRow()) { //Delete the triggers assigned to step - /* $oCriteria = new Criteria('workflow'); - $oCriteria->add(StepTriggerPeer::STEP_UID, $aRow1['STEP_UID']); - $oDataset2 = StepTriggerPeer::doSelectRS($oCriteria); - $oDataset2->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset2->next(); - while ($aRow2 = $oDataset2->getRow()) { - $oStepTrigger->remove($aRow2['STEP_UID'], $aRow2['TAS_UID'], $aRow2['TRI_UID'], $aRow2['ST_TYPE']); - $oDataset2->next(); - } */ $oStep->remove($aRow1['STEP_UID']); $oDataset1->next(); } @@ -565,24 +510,6 @@ require_once 'classes/model/Gateway.php'; { try { $oTaskUser = new TaskUser(); - /* $oCriteria = new Criteria('workflow'); - $oCriteria->add(GroupUserPeer::GRP_UID, $sGroupUID); - $oDataset = GroupUserPeer::doSelectRS($oCriteria); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - while ($aGroupUser = $oDataset->getRow()) { - $oCriteria = new Criteria('workflow'); - $oCriteria->add(TaskUserPeer::TAS_UID, $sTaskUID); - $oCriteria->add(TaskUserPeer::USR_UID, $aGroupUser['USR_UID']); - $oDataset2 = TaskUserPeer::doSelectRS($oCriteria); - $oDataset2->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset2->next(); - $aRow = $oDataset2->getRow(); - if (!is_array($aRow)) { - $this->assignUser($sTaskUID, $aGroupUser['USR_UID'], $iType); - } - $oDataset->next(); - } */ return $oTaskUser->create(array('TAS_UID' => $sTaskUID, 'USR_UID' => $sGroupUID, 'TU_TYPE' => $iType, 'TU_RELATION' => 2 )); } catch (Exception $oError) { @@ -680,10 +607,6 @@ require_once 'classes/model/Gateway.php'; { try { $oCriteria = new Criteria('workflow'); - //$oCriteria->add(StepPeer::PRO_UID, $sProcessUID); - //$oDataset = StepPeer::doSelectRS($oCriteria); - //$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - //$oDataset->next(); return true; } catch (Exception $oError) { throw ($oError); @@ -701,9 +624,8 @@ require_once 'classes/model/Gateway.php'; try { $aTasks = array(); $oCriteria = new Criteria('workflow'); - $oCriteria->addSelectColumn( TaskPeer::TAS_UID ); + $oCriteria->addSelectColumn(TaskPeer::TAS_UID); $oCriteria->add(TaskPeer::PRO_UID, $sProUid); - //$oCriteria->add(TaskPeer::TAS_USER, $sUsrUid); $oCriteria->add(TaskPeer::TAS_START, 'TRUE'); $oDataset = TaskPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); diff --git a/workflow/engine/classes/ToolBar.php b/workflow/engine/classes/ToolBar.php index fa339b7ac..94b69a786 100644 --- a/workflow/engine/classes/ToolBar.php +++ b/workflow/engine/classes/ToolBar.php @@ -1,38 +1,6 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - -/** - * ToolBar - ToolBar -/** - * ToolBar - ToolBar class - * - * @package workflow.engine.ProcessMaker - */class ToolBar extends form +class ToolBar extends form { public $type = 'toolbar'; public $align = 'left'; diff --git a/workflow/engine/classes/TriggerLibrary.php b/workflow/engine/classes/TriggerLibrary.php index e95f81d02..8a26f5d83 100644 --- a/workflow/engine/classes/TriggerLibrary.php +++ b/workflow/engine/classes/TriggerLibrary.php @@ -1,56 +1,45 @@ - * - * This -/** - * - * @package workflow.engine.ProcessMaker - */class triggerLibrary + +class TriggerLibrary { - - private $_aTriggerClasses_ = array (); - - private static $instance = NULL; + private $_aTriggerClasses_ = array(); + private static $instance = null; /** * __construct * * @return void */ - function __construct () + public function __construct() { //Initialize the Library and register the Default - $this->registerFunctionsFileToLibrary( PATH_CORE . "classes" . PATH_SEP . "class.pmFunctions.php", "ProcessMaker Functions" ); + $this->registerFunctionsFileToLibrary(PATH_CORE . "classes" . PATH_SEP . "class.pmFunctions.php", "ProcessMaker Functions"); //Register all registered PLugin Functions - if (class_exists( 'folderData' )) { - //$folderData = new folderData($sProUid, $proFields['PRO_TITLE'], $sAppUid, $Fields['APP_TITLE'], $sUsrUid); + if (class_exists('folderData')) { $oPluginRegistry = PluginRegistry::loadSingleton(); $aAvailablePmFunctions = $oPluginRegistry->getPmFunctions(); $oPluginRegistry->setupPlugins(); //Get and setup enabled plugins foreach ($aAvailablePmFunctions as $key => $class) { $filePlugin = PATH_PLUGINS . $class . PATH_SEP . 'classes' . PATH_SEP . 'class.pmFunctions.php'; - if (file_exists( $filePlugin ) && ! is_dir( $filePlugin )) { - $this->registerFunctionsFileToLibrary( $filePlugin, "ProcessMaker Functions" ); + if (file_exists($filePlugin) && !is_dir($filePlugin)) { + $this->registerFunctionsFileToLibrary($filePlugin, "ProcessMaker Functions"); } } - } //Add External Triggers - $dir = G::ExpandPath( "classes" ) . 'triggers'; - $filesArray = array (); + $dir = G::ExpandPath("classes") . 'triggers'; + $filesArray = array(); - if (file_exists( $dir )) { - if ($handle = opendir( $dir )) { - while (false !== ($file = readdir( $handle ))) { - if ($file != "." && $file != ".." && ! is_dir( $dir . PATH_SEP . $file )) { - $this->registerFunctionsFileToLibrary( $dir . PATH_SEP . $file, "ProcessMaker External Functions" ); + if (file_exists($dir)) { + if ($handle = opendir($dir)) { + while (false !== ($file = readdir($handle))) { + if ($file != "." && $file != ".." && !is_dir($dir . PATH_SEP . $file)) { + $this->registerFunctionsFileToLibrary($dir . PATH_SEP . $file, "ProcessMaker External Functions"); } } - closedir( $handle ); + closedir($handle); } } } @@ -60,10 +49,10 @@ * * @return self::$instance; */ - function &getSingleton () + public function &getSingleton() { - if (self::$instance == NULL) { - self::$instance = new triggerLibrary(); + if (self::$instance == null) { + self::$instance = new TriggerLibrary(); } return self::$instance; } @@ -73,9 +62,9 @@ * * @return serialize ( self::$instance ); */ - function serializeInstance () + public function serializeInstance() { - return serialize( self::$instance ); + return serialize(self::$instance); } /** @@ -84,13 +73,13 @@ * @param integer $serialized * @return void */ - function unSerializeInstance ($serialized) + public function unSerializeInstance($serialized) { - if (self::$instance == NULL) { + if (self::$instance == null) { self::$instance = new PluginRegistry(); } - $instance = unserialize( $serialized ); + $instance = unserialize($serialized); self::$instance = $instance; } @@ -101,15 +90,14 @@ * @param string $libraryName * @return void */ - function registerFunctionsFileToLibrary ($filePath, $libraryName) + public function registerFunctionsFileToLibrary($filePath, $libraryName) { - $aLibrary = $this->getMethodsFromLibraryFile( $filePath ); + $aLibrary = $this->getMethodsFromLibraryFile($filePath); $aLibrary->libraryFile = $filePath; $aLibrary->libraryName = $libraryName; - if (isset( $aLibrary->info['className'] )) { + if (isset($aLibrary->info['className'])) { $this->_aTriggerClasses_[$aLibrary->info['className']] = $aLibrary; } - } /** @@ -118,12 +106,11 @@ * @param string $file * @return object(PHPClass) $parsedLibrary */ - function getMethodsFromLibraryFile ($file) + public function getMethodsFromLibraryFile($file) { // parse class comments from file $parsedLibrary = new PHPClass(); - //$success = $parsedLibrary->parseFromFile ( PATH_CORE . "classes" . PATH_SEP . $file ); - $success = $parsedLibrary->parseFromFile( $file ); + $success = $parsedLibrary->parseFromFile($file); return $parsedLibrary; } @@ -133,7 +120,7 @@ * * @return array ($this->_aTriggerClasses_) */ - function getRegisteredClasses () + public function getRegisteredClasses() { return ($this->_aTriggerClasses_); } @@ -144,7 +131,7 @@ * @param string $libraryClassName * @return array ($this->_aTriggerClasses_[$libraryClassName]) */ - function getLibraryDefinition ($libraryClassName) + public function getLibraryDefinition($libraryClassName) { return ($this->_aTriggerClasses_[$libraryClassName]); } @@ -154,9 +141,8 @@ * * @return void */ - function __destruct () + public function __destruct() { - //TODO - Insert your code here } } diff --git a/workflow/engine/classes/XmlForm_Field_ToolBar.php b/workflow/engine/classes/XmlForm_Field_ToolBar.php index 0b815a7ce..387758b8b 100644 --- a/workflow/engine/classes/XmlForm_Field_ToolBar.php +++ b/workflow/engine/classes/XmlForm_Field_ToolBar.php @@ -64,7 +64,7 @@ */ public function render($value) { - $this->toolBar = new toolBar($this->xmlfile, $this->home); + $this->toolBar = new ToolBar($this->xmlfile, $this->home); $template = PATH_CORE . 'templates/' . $this->type . '.html'; $out = $this->toolBar->render($template, $scriptCode); $oHeadPublisher = & headPublisher::getSingleton(); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php index d378b0765..429661919 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php @@ -1617,7 +1617,7 @@ class Process $triggerWizard->setFormatFieldNameInUppercase($this->formatFieldNameInUppercase); $triggerWizard->setArrayFieldNameForException($this->arrayFieldNameForException); - $triggerLibrary = \triggerLibrary::getSingleton(); + $triggerLibrary = \TriggerLibrary::getSingleton(); $library = $triggerLibrary->getRegisteredClasses(); ksort($library); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php b/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php index 120b21f3c..6efcf6d02 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php @@ -38,7 +38,7 @@ class TriggerWizard //Library - $this->library = \triggerLibrary::getSingleton(); + $this->library = \TriggerLibrary::getSingleton(); } catch (\Exception $e) { throw $e; } diff --git a/workflow/engine/templates/triggers/triggersTree.php b/workflow/engine/templates/triggers/triggersTree.php index 0b0bc71b3..3e190c8d7 100644 --- a/workflow/engine/templates/triggers/triggersTree.php +++ b/workflow/engine/templates/triggers/triggersTree.php @@ -25,7 +25,7 @@ try { - $triggerLibrary = triggerLibrary::getSingleton(); + $triggerLibrary = TriggerLibrary::getSingleton(); $triggerLibraryO = $triggerLibrary->getRegisteredClasses(); $oTree = new Tree(); diff --git a/workflow/engine/templates/triggers/triggers_CreateWizard.php b/workflow/engine/templates/triggers/triggers_CreateWizard.php index 600bb010e..2a2949669 100644 --- a/workflow/engine/templates/triggers/triggers_CreateWizard.php +++ b/workflow/engine/templates/triggers/triggers_CreateWizard.php @@ -25,7 +25,7 @@ try { - $triggerLibrary = triggerLibrary::getSingleton (); + $triggerLibrary = TriggerLibrary::getSingleton (); $libraryClassName = $_GET ['LIBRARY']; $libraryMethod = $_GET ['NAME_FUN']; $sProUid = $_GET ['PRO_UID']; diff --git a/workflow/engine/templates/triggers/triggers_EditWizard.php b/workflow/engine/templates/triggers/triggers_EditWizard.php index b206fa3a1..721b161de 100644 --- a/workflow/engine/templates/triggers/triggers_EditWizard.php +++ b/workflow/engine/templates/triggers/triggers_EditWizard.php @@ -25,7 +25,7 @@ try { - $triggerLibrary = triggerLibrary::getSingleton (); + $triggerLibrary = TriggerLibrary::getSingleton (); $libraryClassName = $_GET ['LIBRARY_CLASS']; $libraryMethod = $_GET ['PMFUNTION_NAME']; $sProUid = $_GET ['PRO_UID'];