From 5cc99250750eb1c38ef92b7c2f84a36206398747 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Thu, 14 Mar 2013 11:33:22 -0400 Subject: [PATCH] BUG 0000 Adjustment for the standardization of code. CODE_STYLE --- gulliver/system/class.dbtable.php | 149 +++--- gulliver/system/class.menu.php | 126 ++--- gulliver/system/class.xmlformExtension.php | 319 ++++++----- .../classes/class.serverConfiguration.php | 214 ++++---- workflow/engine/classes/class.tasks.php | 502 +++++++++--------- .../engine/classes/entities/FacetRequest.php | 76 +-- .../classes/entities/SolrRequestData.php | 82 +-- 7 files changed, 742 insertions(+), 726 deletions(-) diff --git a/gulliver/system/class.dbtable.php b/gulliver/system/class.dbtable.php index 38a63dcd2..12ab7d9f9 100755 --- a/gulliver/system/class.dbtable.php +++ b/gulliver/system/class.dbtable.php @@ -39,15 +39,16 @@ */ class DBTable { - var $_dbc; - var $_dbses; - var $_dset; - var $table_name; - var $table_keys; - var $Fields = null; - var $is_new; - var $errorLevel; - var $debug = false; + + public $_dbc; + public $_dbses; + public $_dset; + public $table_name; + public $table_keys; + public $Fields = null; + public $is_new; + public $errorLevel; + public $debug = false; /** * Initiate a database conecction using default values @@ -57,11 +58,11 @@ class DBTable * @param object $objConnection conecction string * @return void */ - function dBTable ($objConnection = null, $strTable = "", $arrKeys = array( 'UID' )) + public function dBTable($objConnection = null, $strTable = "", $arrKeys = array('UID')) { $this->_dbc = null; $this->_dbses = null; - $this->SetTo( $objConnection, $strTable, $arrKeys ); + $this->SetTo($objConnection, $strTable, $arrKeys); } /** @@ -74,25 +75,25 @@ class DBTable * @param array $arrKeys table keys defaultvalue=UID * @return void */ - function setTo ($objDBConnection, $strTable = "", $arrKeys = array( 'UID' )) + public function setTo($objDBConnection, $strTable = "", $arrKeys = array('UID')) { $this->_dbc = $objDBConnection; - if ($this->_dbc != null && strcasecmp( get_class( $objDBConnection ), 'dbconnection' ) == 0) { - $this->_dbses = new DBSession( $this->_dbc ); - $this->_dbses->UseDB( DB_NAME ); + if ($this->_dbc != null && strcasecmp(get_class($objDBConnection), 'dbconnection') == 0) { + $this->_dbses = new DBSession($this->_dbc); + $this->_dbses->UseDB(DB_NAME); } else { - $dberror = PEAR::raiseError( null, DB_ERROR_OBJECT_NOT_DEFINED, null, 'null', "You tried to call to a DBTable function without create an instance of DBConnection", 'G_Error', true ); + $dberror = PEAR::raiseError(null, DB_ERROR_OBJECT_NOT_DEFINED, null, 'null', "You tried to call to a DBTable function without create an instance of DBConnection", 'G_Error', true); //DBconnection::logError( $dberror ); return $dberror; } $this->is_new = true; $this->Fields = null; $this->table_name = $strTable; - if (is_array( $arrKeys )) { + if (is_array($arrKeys)) { $this->table_keys = $arrKeys; } else { - $this->table_keys = array (0 => $arrKeys + $this->table_keys = array(0 => $arrKeys ); } $this->errorLevel = $this->_dbc->errorLevel; @@ -105,23 +106,23 @@ class DBTable * @access public * @return void */ - function loadEmpty () + public function loadEmpty() { $stQry = "DESCRIBE `" . $this->table_name . "`"; - $dset = $this->_dbses->execute( $stQry ); + $dset = $this->_dbses->execute($stQry); //$dset = new DBRecordSet( $this->_dbses->Result ); $nlim = $dset->Count(); $this->Fields = null; - for ($ncount = 0; $ncount < $nlim; $ncount ++) { + for ($ncount = 0; $ncount < $nlim; $ncount++) { $data = $dset->Read(); $fname = $data['Field']; $fval = ""; - $ftypearr = explode( $data['Type'], '(' ); + $ftypearr = explode($data['Type'], '('); $ftype = $ftypearr[0]; if ($data['Key'] == 'PRI') { - if (is_array( $this->table_keys )) { - $this->table_keys[count( $this->table_keys ) - 1] = $fname; + if (is_array($this->table_keys)) { + $this->table_keys[count($this->table_keys) - 1] = $fname; } else { $this->table_keys[0] = $fname; } @@ -152,7 +153,7 @@ class DBTable * @param string $strWhere string which contains conditions * @return strint */ - function loadWhere ($strWhere) + public function loadWhere($strWhere) { $this->Fields = null; @@ -160,8 +161,8 @@ class DBTable if ($strWhere != "") { $stQry .= " WHERE " . $strWhere; } - $this->_dset = $this->_dbses->Execute( $stQry, $this->debug, $this->errorLevel ); - if (DB::isError( $this->_dset )) { + $this->_dset = $this->_dbses->Execute($stQry, $this->debug, $this->errorLevel); + if (DB::isError($this->_dset)) { return $this->_dset; } @@ -184,13 +185,13 @@ class DBTable * @param array array of arguments key values * @return void */ - function load () + public function load() { // bug::traceRoute(); $ncount = 0; $stWhere = ""; $arrKeys = func_get_args(); - if (isset( $arrKeys[0] ) && is_array( $arrKeys[0] )) { + if (isset($arrKeys[0]) && is_array($arrKeys[0])) { foreach ($this->table_keys as $key => $val) { if ($stWhere == "") { $stWhere .= " $val = '" . $arrKeys[0][$val] . "' "; @@ -205,10 +206,10 @@ class DBTable } else { $stWhere .= " AND " . $this->table_keys[$ncount] . "='" . $val . "'"; } - $ncount ++; + $ncount++; } } - return $this->LoadWhere( $stWhere ); + return $this->LoadWhere($stWhere); } /** @@ -219,15 +220,15 @@ class DBTable * @param eter string seq * @return string */ - function nextvalPGSql ($seq) + public function nextvalPGSql($seq) { $stQry = " Select NEXTVAL( '$seq' ) "; - $dset = $this->_dbses->Execute( $stQry ); + $dset = $this->_dbses->Execute($stQry); $row = $dset->Read(); - if (is_array( $row )) { + if (is_array($row)) { return $row['NEXTVAL']; } - die( "Sequence '$seq' is not exist!!" ); + die("Sequence '$seq' is not exist!!"); return - 1; } @@ -239,11 +240,11 @@ class DBTable * @return boolean * */ - function insert () + public function insert() { $strFields = ""; $strValues = ""; - if (defined( 'DB_ADAPTER' )) { + if (defined('DB_ADAPTER')) { $DBEngine = DB_ADAPTER; } else { $DBEngine = 'mysql'; @@ -251,23 +252,23 @@ class DBTable foreach ($this->Fields as $field => $val) { $strFields .= $field . ","; $iskey = false; - if (isset( $this->table_keys ) && is_array( $this->table_keys )) { - $iskey = in_array( $field, $this->table_keys ) && strtoupper( substr( trim( $val ), 0, 7 ) ) == "NEXTVAL"; + if (isset($this->table_keys) && is_array($this->table_keys)) { + $iskey = in_array($field, $this->table_keys) && strtoupper(substr(trim($val), 0, 7)) == "NEXTVAL"; } - $dbcType = isset( $this->_dbc->type ) ? $this->_dbc->type : $DBEngine; + $dbcType = isset($this->_dbc->type) ? $this->_dbc->type : $DBEngine; // Commented by new format of textarea in javascript - if (! $iskey) { + if (!$iskey) { $val = "'" . $val . "'"; } - ///-- $val = "'" . G::sqlEscape( $val , $dbcType ) . "'"; + ///-- $val = "'" . G::sqlEscape( $val , $dbcType ) . "'"; $strValues .= $val . ", "; } - $strFields = substr( $strFields, 0, strlen( $strFields ) - 1 ); - $strValues = substr( $strValues, 0, strlen( $strValues ) - 1 ); + $strFields = substr($strFields, 0, strlen($strFields) - 1); + $strValues = substr($strValues, 0, strlen($strValues) - 1); $stQry = "INSERT INTO `" . $this->table_name . "` ( " . $strFields . " ) values ( " . $strValues . " ) "; - $result = $this->_dbses->Execute( $stQry, $this->debug ); + $result = $this->_dbses->Execute($stQry, $this->debug); return $result; } @@ -278,14 +279,14 @@ class DBTable * @access public * @return boolean */ - function update () + public function update() { $stQry = ""; $stWhere = ''; - $remainKeys = array (); + $remainKeys = array(); - if (defined( 'DB_ADAPTER' )) { + if (defined('DB_ADAPTER')) { $DBEngine = DB_ADAPTER; } else { $DBEngine = 'mysql'; @@ -296,21 +297,21 @@ class DBTable } foreach ($this->Fields as $field => $val) { $iskey = false; - $iskey = in_array( $field, $this->table_keys ); + $iskey = in_array($field, $this->table_keys); if ($iskey == false) { $stQry .= $field . "='" . $val . "', "; // Commented by new format of textarea in javascript ///-- $stQry .= $field . "='" . G::sqlEscape ( $val, isset( $this->_dbc->type) ? $this->_dbc->type : $DBEngine ) . "', "; } else { if ($stWhere == "") { - $stWhere .= $field . "='" . G::sqlEscape( $val, isset( $this->_dbc->type ) ? $this->_dbc->type : $DBEngine ) . "'"; + $stWhere .= $field . "='" . G::sqlEscape($val, isset($this->_dbc->type) ? $this->_dbc->type : $DBEngine ) . "'"; } else { - $stWhere .= " AND " . $field . "='" . G::sqlEscape( $val, isset( $this->_dbc->type ) ? $this->_dbc->type : $DBEngine ) . "'"; + $stWhere .= " AND " . $field . "='" . G::sqlEscape($val, isset($this->_dbc->type) ? $this->_dbc->type : $DBEngine ) . "'"; } $remainKeys[$field] = true; } } - foreach ($remainKeys as $field => $bool) + foreach ($remainKeys as $field => $bool) { if ($bool == false) { if ($stWhere != "") { $stWhere = " AND "; @@ -318,20 +319,21 @@ class DBTable $stWhere .= $field . "= ''"; $remainKeys[$field] = true; } + } - $stQry = trim( $stQry ); - $stQry = substr( $stQry, 0, strlen( $stQry ) - 1 ); //to remove the last comma , - if (! $stQry) { + $stQry = trim($stQry); + $stQry = substr($stQry, 0, strlen($stQry) - 1); //to remove the last comma , + if (!$stQry) { return; } $stQry = "UPDATE `" . $this->table_name . "` SET " . $stQry; - $stWhere = trim( $stWhere ); + $stWhere = trim($stWhere); if ($stWhere != "") { $stQry .= " WHERE " . $stWhere; } $result = false; - $result = $this->_dbses->execute( $stQry, $this->debug, $this->errorLevel ); + $result = $this->_dbses->execute($stQry, $this->debug, $this->errorLevel); $this->is_new = false; return $result; } @@ -345,7 +347,7 @@ class DBTable * @access public * @return boolean */ - function save () + public function save() { if ($this->is_new == true) { return $this->Insert(); @@ -361,13 +363,13 @@ class DBTable * @access public * @return boolean */ - function delete () + public function delete() { $stQry = "delete from `" . $this->table_name . "` "; $stWhere = ''; - $remainKeys = array (); - if (defined( 'DB_ADAPTER' )) { + $remainKeys = array(); + if (defined('DB_ADAPTER')) { $DBEngine = DB_ADAPTER; } else { $DBEngine = 'mysql'; @@ -375,21 +377,21 @@ class DBTable foreach ($this->table_keys as $k => $v) { $remainKeys[$v] = false; } - if (is_array( $this->Fields )) { + if (is_array($this->Fields)) { foreach ($this->Fields as $field => $val) { $iskey = false; - $iskey = in_array( $field, $this->table_keys ); + $iskey = in_array($field, $this->table_keys); if ($iskey == true) { if ($stWhere == "") { - $stWhere .= $field . "='" . G::sqlEscape( $val, isset( $this->_dbc->type ) ? $this->_dbc->type : $DBEngine ) . "'"; + $stWhere .= $field . "='" . G::sqlEscape($val, isset($this->_dbc->type) ? $this->_dbc->type : $DBEngine ) . "'"; } else { - $stWhere .= " AND " . $field . "='" . G::sqlEscape( $val, isset( $this->_dbc->type ) ? $this->_dbc->type : $DBEngine ) . "'"; + $stWhere .= " AND " . $field . "='" . G::sqlEscape($val, isset($this->_dbc->type) ? $this->_dbc->type : $DBEngine ) . "'"; } $remainKeys[$field] = true; } } } - foreach ($remainKeys as $field => $bool) + foreach ($remainKeys as $field => $bool) { if ($bool == false) { if ($stWhere != "") { $stWhere .= " AND "; @@ -397,17 +399,18 @@ class DBTable $stWhere .= $field . "= ''"; $remainKeys[$field] = true; } + } - $stQry = trim( $stQry ); - $stWhere = trim( $stWhere ); + $stQry = trim($stQry); + $stWhere = trim($stWhere); if ($stWhere == '') { - $dberror = PEAR::raiseError( null, G_ERROR_WARNING_MESSAGE, null, 'null', "You tried to call delete method without WHERE clause, if you want to delete all records use dbsession", 'G_Error', true ); - DBconnection::logError( $dberror, $this->errorLevel ); + $dberror = PEAR::raiseError(null, G_ERROR_WARNING_MESSAGE, null, 'null', "You tried to call delete method without WHERE clause, if you want to delete all records use dbsession", 'G_Error', true); + DBconnection::logError($dberror, $this->errorLevel); return $dberror; } $stQry .= " WHERE " . $stWhere; - $result = $this->_dbses->execute( $stQry, $this->debug, $this->errorLevel ); + $result = $this->_dbses->execute($stQry, $this->debug, $this->errorLevel); $this->is_new = false; return $result; } @@ -421,9 +424,9 @@ class DBTable * @access public * @return boolean */ - function next () + public function next() { $this->Fields = $this->_dset->read(); } } - + \ No newline at end of file diff --git a/gulliver/system/class.menu.php b/gulliver/system/class.menu.php index a17bd5479..6ebc472c5 100755 --- a/gulliver/system/class.menu.php +++ b/gulliver/system/class.menu.php @@ -30,6 +30,7 @@ * @package gulliver.system * */ + /** * * @@ -43,18 +44,19 @@ */ class Menu { - var $Id = null; - var $Options = null; - var $Labels = null; - var $Icons = null; - var $JS = null; - var $Types = null; - var $Class = "mnu"; - var $Classes = null; - var $Enabled = null; - var $optionOn = - 1; - var $id_optionOn = ""; - var $ElementClass = null; + + public $Id = null; + public $Options = null; + public $Labels = null; + public $Icons = null; + public $JS = null; + public $Types = null; + public $Class = "mnu"; + public $Classes = null; + public $Enabled = null; + public $optionOn = - 1; + public $id_optionOn = ""; + public $ElementClass = null; /** * Set menu style @@ -64,7 +66,7 @@ class Menu * @param $strClass name of style class default value 'mnu' * @return void */ - function SetClass ($strClass = "mnu") + public function SetClass($strClass = "mnu") { $this->Class = "mnu"; } @@ -77,35 +79,35 @@ class Menu * @param $strMenuName name of menu * @return void */ - function Load ($strMenuName) + public function Load($strMenuName) { global $G_TMP_MENU; $G_TMP_MENU = null; $G_TMP_MENU = new Menu(); - $fMenu = G::ExpandPath( "menus" ) . $strMenuName . ".php"; + $fMenu = G::ExpandPath("menus") . $strMenuName . ".php"; //if the menu file doesn't exists, then try with the plugins folders - if (! is_file( $fMenu )) { - $aux = explode( PATH_SEP, $strMenuName ); - if (count( $aux ) == 2) { + if (!is_file($fMenu)) { + $aux = explode(PATH_SEP, $strMenuName); + if (count($aux) == 2) { $oPluginRegistry = & PMPluginRegistry::getSingleton(); - if ($oPluginRegistry->isRegisteredFolder( $aux[0] )) { + if ($oPluginRegistry->isRegisteredFolder($aux[0])) { $fMenu = PATH_PLUGINS . $aux[0] . PATH_SEP . $aux[1] . ".php"; } } } - if (! is_file( $fMenu )) { + if (!is_file($fMenu)) { return; } include ($fMenu); //this line will add options to current menu. $oPluginRegistry = & PMPluginRegistry::getSingleton(); - $oPluginRegistry->getMenus( $strMenuName ); + $oPluginRegistry->getMenus($strMenuName); //? $c = 0; - for ($i = 0; $i < count( $G_TMP_MENU->Options ); $i ++) + for ($i = 0; $i < count($G_TMP_MENU->Options); $i++) { if ($G_TMP_MENU->Enabled[$i] == 1) { $this->Options[$c] = $G_TMP_MENU->Options[$i]; $this->Labels[$c] = $G_TMP_MENU->Labels[$i]; @@ -116,15 +118,17 @@ class Menu $this->Id[$c] = $G_TMP_MENU->Id[$i]; $this->Classes[$c] = $G_TMP_MENU->Classes[$i]; $this->ElementClass[$c] = $G_TMP_MENU->ElementClass[$i]; - $c ++; + $c++; } else { - if ($i == $this->optionOn) + if ($i == $this->optionOn) { $this->optionOn = - 1; - elseif ($i < $this->optionOn) - $this->optionOn --; - elseif ($this->optionOn > 0) - $this->optionOn --; //added this line + } elseif ($i < $this->optionOn) { + $this->optionOn--; + } elseif ($this->optionOn > 0) { + $this->optionOn--; //added this line + } } + } $G_TMP_MENU = null; } @@ -135,11 +139,11 @@ class Menu * @access public * @return int */ - function OptionCount () + public function OptionCount() { $result = 0; - if (is_array( $this->Options )) { - $result = count( $this->Options ); + if (is_array($this->Options)) { + $result = count($this->Options); } return $result; } @@ -154,7 +158,7 @@ class Menu * @param string $strType type, defualt value ='plugins' * @return void */ - function AddOption ($strLabel, $strURL, $strType = "plugins") + public function AddOption($strLabel, $strURL, $strType = "plugins") { $pos = $this->OptionCount(); $this->Options[$pos] = $strURL; @@ -162,7 +166,7 @@ class Menu $this->Types[$pos] = $strType; $this->Enabled[$pos] = 1; $this->Id[$pos] = $pos; - unset( $pos ); + unset($pos); } /** @@ -176,20 +180,20 @@ class Menu * @param string $strType type, defualt value ='plugins' * @return void */ - function AddIdOption ($strId, $strLabel, $strURL, $strType = "plugins") + public function AddIdOption($strId, $strLabel, $strURL, $strType = "plugins") { $pos = $this->OptionCount(); $this->Options[$pos] = $strURL; $this->Labels[$pos] = $strLabel; $this->Types[$pos] = $strType; $this->Enabled[$pos] = 1; - if (is_array( $strId )) { + if (is_array($strId)) { $this->Id[$pos] = $strId[0]; $this->Classes[$pos] = $strId[1]; } else { $this->Id[$pos] = $strId; } - unset( $pos ); + unset($pos); } /** @@ -201,7 +205,7 @@ class Menu * @param string $strType type, defualt value ='plugins' * @return void */ - function AddRawOption ($strURL = "", $strType = "plugins") + public function AddRawOption($strURL = "", $strType = "plugins") { $pos = $this->OptionCount(); $this->Options[$pos] = $strURL; @@ -209,7 +213,7 @@ class Menu $this->Types[$pos] = $strType; $this->Enabled[$pos] = 1; $this->Id[$pos] = $pos; - unset( $pos ); + unset($pos); } /** @@ -224,7 +228,7 @@ class Menu * @param string $elementClass default value ='' * @return void */ - function AddIdRawOption ($strId, $strURL = "", $label = "", $icon = "", $js = "", $strType = "plugins", $elementClass = '') + public function AddIdRawOption($strId, $strURL = "", $label = "", $icon = "", $js = "", $strType = "plugins", $elementClass = '') { $pos = $this->OptionCount(); $this->Options[$pos] = $strURL; @@ -234,13 +238,13 @@ class Menu $this->Types[$pos] = $strType; $this->Enabled[$pos] = 1; $this->ElementClass[$pos] = $elementClass; - if (is_array( $strId )) { + if (is_array($strId)) { $this->Id[$pos] = $strId[0]; $this->Classes[$pos] = $strId[1]; } else { $this->Id[$pos] = $strId; } - unset( $pos ); + unset($pos); } /** @@ -251,7 +255,7 @@ class Menu * @param string $intPos menu option's position * @return void */ - function DisableOptionPos ($intPos) + public function DisableOptionPos($intPos) { $this->Enabled[$intPos] = 0; } @@ -264,10 +268,10 @@ class Menu * @param string $id menu's id * @return void */ - function DisableOptionId ($id) + public function DisableOptionId($id) { - if (array_search( $id, $this->Id )) { - $this->Enabled[array_search( $id, $this->Id )] = 0; + if (array_search($id, $this->Id)) { + $this->Enabled[array_search($id, $this->Id)] = 0; } } @@ -279,7 +283,7 @@ class Menu * @param string $intPos menu option's position * @return void */ - function RenderOption ($intPos) + public function RenderOption($intPos) { if ($this->Enabled[$intPos] != 1) { return; @@ -290,9 +294,9 @@ class Menu } $target = $this->Options[$intPos]; if ($this->Types[$intPos] != "absolute") { - if (defined( 'ENABLE_ENCRYPT' )) { + if (defined('ENABLE_ENCRYPT')) { $target = "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target; - } else if (defined( 'SYS_SYS' )) { + } elseif (defined('SYS_SYS')) { $target = "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target; } else { $target = "/sys/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target; @@ -301,10 +305,9 @@ class Menu $label = $this->Labels[$intPos]; $result = ""; - $result .= htmlentities( $label, ENT_NOQUOTES, 'utf-8' ); + $result .= htmlentities($label, ENT_NOQUOTES, 'utf-8'); $result .= ""; - print ($result) ; - + print ($result); } /** @@ -319,18 +322,18 @@ class Menu * @param string $G_ID_MENU_SELECTED * @return array */ - function generateArrayForTemplate ($G_MAIN_MENU, $classOn, $classOff, $G_MENU_SELECTED, $G_ID_MENU_SELECTED) + public function generateArrayForTemplate($G_MAIN_MENU, $classOn, $classOff, $G_MENU_SELECTED, $G_ID_MENU_SELECTED) { - $menus = array (); + $menus = array(); if ($G_MAIN_MENU == null) { return $menus; } - $this->Load( $G_MAIN_MENU ); + $this->Load($G_MAIN_MENU); $this->optionOn = $G_MENU_SELECTED; $this->id_optionOn = $G_ID_MENU_SELECTED; //$this->Class = $G_MENU_CLASS; - if (is_array( $this->Options )) { - for ($ncount = 0; $ncount < $this->OptionCount(); $ncount ++) { + if (is_array($this->Options)) { + for ($ncount = 0; $ncount < $this->OptionCount(); $ncount++) { $target = $this->Options[$ncount]; //$aux = $this->Icons[$ncount]; @@ -340,10 +343,10 @@ class Menu $target = $this->Options[$ncount]; } if ($this->Types[$ncount] != 'absolute') { - if (defined( 'SYS_SYS' )) { - $target = '/sys' . SYS_TEMP . G::encryptLink( '/' . SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount] ); + if (defined('SYS_SYS')) { + $target = '/sys' . SYS_TEMP . G::encryptLink('/' . SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount]); } else { - $target = '/sys/' . G::encryptLink( SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount] ); + $target = '/sys/' . G::encryptLink(SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount]); } } $label = $this->Labels[$ncount]; @@ -374,11 +377,10 @@ class Menu $elementclass = 'class="' . $this->ElementClass[$ncount] . '"'; } - $menus[] = array ('id' => $ncount,'target' => $target,'label' => $label,'onMenu' => $onMenu,'classname' => $classname,'imageLeft' => $imageLeft,'onclick' => $onclick,'icon' => $icon,'aux' => $aux,'idName' => $idName,'elementclass' => $elementclass - ); + $menus[] = array('id' => $ncount, 'target' => $target, 'label' => $label, 'onMenu' => $onMenu, 'classname' => $classname, 'imageLeft' => $imageLeft, 'onclick' => $onclick, 'icon' => $icon, 'aux' => $aux, 'idName' => $idName, 'elementclass' => $elementclass); } } return $menus; } } - + \ No newline at end of file diff --git a/gulliver/system/class.xmlformExtension.php b/gulliver/system/class.xmlformExtension.php index c431c05b5..57c413ad4 100755 --- a/gulliver/system/class.xmlformExtension.php +++ b/gulliver/system/class.xmlformExtension.php @@ -1,161 +1,160 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - -/** - * - * @package gulliver.system - */ - -class XmlForm_Field_Label extends XmlForm_Field -{ - var $withoutValue = true; - var $align = 'left'; -} - -/** - * Special class for pagedTable - * condition: PHP expression whose result defines whether to "mark" - * the following columns (that is if true) - * - * @package gulliver.system - */ -class XmlForm_Field_cellMark extends XmlForm_Field -{ - /* Defines the style of the next tds - of the pagedTable. - */ - var $showInTable = "0"; - var $style = ""; - var $styleAlt = ""; - var $className = ""; - var $classNameAlt = ""; - var $condition = 'false'; - - /** - * tdStyle - * - * @param string $values - * @param string $owner - * - * @return string $value - */ - function tdStyle ($values, $owner) - { - $value = G::replaceDataField( $this->condition, $owner->values ); - $value = @eval( 'return (' . $value . ');' ); - $row = $values['row__']; - $style = ((($row % 2) == 0) && ($this->styleAlt != 0)) ? $this->styleAlt : $this->style; - return ($value) ? $style : ''; - } - - /** - * tdClass - * - * @param string $values - * @param string $owner - * - * @return $value - */ - function tdClass ($values, $owner) - { - $value = G::replaceDataField( $this->condition, $owner->values ); - $value = @eval( 'return (' . $value . ');' ); - $row = $values['row__']; - $style = (($row % 2) == 0) ? $this->classNameAlt : $this->className; - return ($value) ? $style : ''; - } -} - -/** - * XmlForm_Field_DVEditor - * - * extends XmlForm_Field - * - * @package gulliver.system - * - */ -class XmlForm_Field_DVEditor extends XmlForm_Field -{ - var $toolbarSet = 'toolbar2lines.html'; - var $width = '90%'; - var $height = '200'; - - /** - * render - * - * @param string $value - * @param string $owner default value NULL - * - * @return string '
...
' - */ - function render ($value, $owner = null) - { - return '
'; - } - - /** - * attachEvents - * - * @param string $element - * - * @return $html - */ - function attachEvents ($element) - { - $html = 'var _editor' . $this->name . '=new DVEditor(getField("form[' . $this->name . ']").parentNode,getField("form[' . $this->name . ']").value)'; - return $html; - } -} - -/** - * Special field: Add a search box (fast search) for the related pagedTable - * - * The PAGED_TABLE_ID reserved field must be defined in the xml. - * Use PAGED_TABLE_FAST_SEARCH reserved field, it contains the saved value for each table. - * example: - * Ex1. - * - * - * Search - * - * Ex2 (Using type="text"). - * - * - * Search - * - * - * @package gulliver.system - */ -class XmlForm_Field_FastSearch extends XmlForm_Field_Text -{ - var $onkeypress = "if (event.keyCode===13)@#PAGED_TABLE_ID.doFastSearch(this.value);if (event.keyCode===13)return false;"; - var $colAlign = "right"; - var $colWidth = "180"; - var $label = "@G::LoadTranslation(ID_SEARCH)"; +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * + */ + +/** + * + * @package gulliver.system + */ +class XmlForm_Field_Label extends XmlForm_Field +{ + public $withoutValue = true; + public $align = 'left'; } - + +/** + * Special class for pagedTable + * condition: PHP expression whose result defines whether to "mark" + * the following columns (that is if true) + * + * @package gulliver.system + */ +class XmlForm_Field_cellMark extends XmlForm_Field +{ + /* Defines the style of the next tds + of the pagedTable. + */ + public $showInTable = "0"; + public $style = ""; + public $styleAlt = ""; + public $className = ""; + public $classNameAlt = ""; + public $condition = 'false'; + + /** + * tdStyle + * + * @param string $values + * @param string $owner + * + * @return string $value + */ + public function tdStyle($values, $owner) + { + $value = G::replaceDataField($this->condition, $owner->values); + $value = @eval('return (' . $value . ');'); + $row = $values['row__']; + $style = ((($row % 2) == 0) && ($this->styleAlt != 0)) ? $this->styleAlt : $this->style; + return ($value) ? $style : ''; + } + + /** + * tdClass + * + * @param string $values + * @param string $owner + * + * @return $value + */ + public function tdClass($values, $owner) + { + $value = G::replaceDataField($this->condition, $owner->values); + $value = @eval('return (' . $value . ');'); + $row = $values['row__']; + $style = (($row % 2) == 0) ? $this->classNameAlt : $this->className; + return ($value) ? $style : ''; + } +} + +/** + * XmlForm_Field_DVEditor + * + * extends XmlForm_Field + * + * @package gulliver.system + * + */ +class XmlForm_Field_DVEditor extends XmlForm_Field +{ + public $toolbarSet = 'toolbar2lines.html'; + public $width = '90%'; + public $height = '200'; + + /** + * render + * + * @param string $value + * @param string $owner default value NULL + * + * @return string '
...
' + */ + public function render($value, $owner = null) + { + return '
'; + } + + /** + * attachEvents + * + * @param string $element + * + * @return $html + */ + public function attachEvents($element) + { + $html = 'var _editor' . $this->name . '=new DVEditor(getField("form[' . $this->name . ']").parentNode,getField("form[' . $this->name . ']").value)'; + return $html; + } +} + +/** + * Special field: Add a search box (fast search) for the related pagedTable + * + * The PAGED_TABLE_ID reserved field must be defined in the xml. + * Use PAGED_TABLE_FAST_SEARCH reserved field, it contains the saved value for each table. + * example: + * Ex1. + * + * + * Search + * + * Ex2 (Using type="text"). + * + * + * Search + * + * + * @package gulliver.system + */ +class XmlForm_Field_FastSearch extends XmlForm_Field_Text +{ + public $onkeypress = "if (event.keyCode===13)@#PAGED_TABLE_ID.doFastSearch(this.value);if (event.keyCode===13)return false;"; + public $colAlign = "right"; + public $colWidth = "180"; + public $label = "@G::LoadTranslation(ID_SEARCH)"; +} + diff --git a/workflow/engine/classes/class.serverConfiguration.php b/workflow/engine/classes/class.serverConfiguration.php index 399ca25eb..79fd692e8 100755 --- a/workflow/engine/classes/class.serverConfiguration.php +++ b/workflow/engine/classes/class.serverConfiguration.php @@ -35,13 +35,14 @@ */ class serverConf { - private $_aProperties = array (); - private $_aHeartbeatConfig = array (); - private $_aWSapces = array (); - private $aWSinfo = array (); - private $pluginsA = array (); - private $errors = array (); - private static $instance = NULL; + + private $_aProperties = array(); + private $_aHeartbeatConfig = array(); + private $_aWSapces = array(); + private $aWSinfo = array(); + private $pluginsA = array(); + private $errors = array(); + private static $instance = null; private $haveSetupData = false; private $beatType = 'starting'; private $ip; @@ -57,14 +58,13 @@ class serverConf public $logins; private $lanDirection; private $lanLanguage; - public $workspaces = array (); - public $rtlLang = array ('ar','iw','fa' - ); + public $workspaces = array(); + public $rtlLang = array('ar', 'iw', 'fa'); public $filePath = ''; - public function __construct () + public function __construct() { - if (defined( 'PATH_DATA' )) { + if (defined('PATH_DATA')) { $this->filePath = PATH_DATA . 'srvConf.singleton'; } } @@ -75,12 +75,12 @@ class serverConf * * @return object */ - function &getSingleton () + public function &getSingleton() { - if (self::$instance == NULL) { + if (self::$instance == null) { self::$instance = new serverConf(); - if ((file_exists( self::$instance->filePath )) && (filesize( self::$instance->filePath ) > 0)) { - self::$instance->unSerializeInstance( file_get_contents( self::$instance->filePath ) ); + if ((file_exists(self::$instance->filePath)) && (filesize(self::$instance->filePath) > 0)) { + self::$instance->unSerializeInstance(file_get_contents(self::$instance->filePath)); } } return self::$instance; @@ -92,9 +92,9 @@ class serverConf * * @return void */ - function serializeInstance () + public function serializeInstance() { - return serialize( self::$instance ); + return serialize(self::$instance); } /** @@ -103,13 +103,13 @@ class serverConf * @param string $serialized * @return void */ - function unSerializeInstance ($serialized) + public function unSerializeInstance($serialized) { - if (self::$instance == NULL) { + if (self::$instance == null) { self::$instance = new serverConf(); } - if ($instance = @unserialize( $serialized )) { + if ($instance = @unserialize($serialized)) { self::$instance = $instance; } } @@ -120,12 +120,11 @@ class serverConf * * @return void */ - - function saveSingleton () + public function saveSingleton() { - if (defined( 'PATH_DATA' )) { + if (defined('PATH_DATA')) { $this->filePath = PATH_DATA . 'srvConf.singleton'; - $size = file_put_contents( $this->filePath, $this->serializeInstance() ); + $size = file_put_contents($this->filePath, $this->serializeInstance()); } } @@ -136,7 +135,7 @@ class serverConf * @param string $propertyName * @param string $propertyValue */ - function setProperty ($propertyName, $propertyValue) + public function setProperty($propertyName, $propertyValue) { $this->_aProperties[$propertyName] = $propertyValue; $this->saveSingleton(); @@ -149,10 +148,10 @@ class serverConf * @param string $propertyName * @return void */ - function unsetProperty ($propertyName) + public function unsetProperty($propertyName) { - if (isset( $this->_aProperties[$propertyName] )) { - unset( $this->_aProperties[$propertyName] ); + if (isset($this->_aProperties[$propertyName])) { + unset($this->_aProperties[$propertyName]); $this->saveSingleton(); } } @@ -164,9 +163,9 @@ class serverConf * @param string $propertyName * @return string/null */ - function getProperty ($propertyName) + public function getProperty($propertyName) { - if (isset( $this->_aProperties[$propertyName] )) { + if (isset($this->_aProperties[$propertyName])) { return $this->_aProperties[$propertyName]; } else { return null; @@ -179,19 +178,21 @@ class serverConf * * @return void */ - function sucessfulLogin () + public function sucessfulLogin() { - $this->logins ++; - if (isset( $this->workspaces[SYS_SYS] ) && isset( $this->workspaces[SYS_SYS]['WSP_LOGINS'] )) - $this->workspaces[SYS_SYS]['WSP_LOGINS'] ++; + $this->logins++; + if (isset($this->workspaces[SYS_SYS]) && isset($this->workspaces[SYS_SYS]['WSP_LOGINS'])) { + $this->workspaces[SYS_SYS]['WSP_LOGINS']++; + } - if (isset( $this->workspaces[SYS_SYS] ) && ! isset( $this->workspaces[SYS_SYS]['WSP_LOGINS'] )) + if (isset($this->workspaces[SYS_SYS]) && !isset($this->workspaces[SYS_SYS]['WSP_LOGINS'])) { $this->workspaces[SYS_SYS]['WSP_LOGINS'] = 1; + } $this->saveSingleton(); } - function setWsInfo ($wsname, $info) + public function setWsInfo($wsname, $info) { $this->aWSinfo[$wsname] = $info; } @@ -202,11 +203,12 @@ class serverConf * @param string $wsName * @return void */ - function changeStatusWS ($wsName) + public function changeStatusWS($wsName) { - if (isset( $this->_aWSapces[$wsName] )) { //Enable WS - unset( $this->_aWSapces[$wsName] ); + if (isset($this->_aWSapces[$wsName])) { + //Enable WS + unset($this->_aWSapces[$wsName]); } else { $this->_aWSapces[$wsName] = 'disabled'; } @@ -220,9 +222,9 @@ class serverConf * @param $wsname * @return boolean */ - function isWSDisabled ($wsName) + public function isWSDisabled($wsName) { - return isset( $this->_aWSapces[$wsName] ); + return isset($this->_aWSapces[$wsName]); } /** @@ -232,14 +234,16 @@ class serverConf * * @return boolean */ - function checkIfHostNameHasChanged () + public function checkIfHostNameHasChanged() { //removed the PM_VERSION control, because when an upgrade is done, the haveSetupData has to be changed. - if ($this->ip != getenv( 'SERVER_ADDR' )) + if ($this->ip != getenv('SERVER_ADDR')) { return false; + } - if ($this->host != getenv( 'SERVER_NAME' )) + if ($this->host != getenv('SERVER_NAME')) { return false; + } return $this->haveSetupData; } @@ -251,17 +255,18 @@ class serverConf * param * @return array */ - function getWSList () + public function getWSList() { $dir = PATH_DB; - $wsArray = array (); - if (file_exists( $dir )) { - if ($handle = opendir( $dir )) { - while (false !== ($file = readdir( $handle ))) { + $wsArray = array(); + if (file_exists($dir)) { + if ($handle = opendir($dir)) { + while (false !== ($file = readdir($handle))) { if (($file != ".") && ($file != "..")) { - if (file_exists( PATH_DB . $file . '/db.php' )) { //print $file."/db.php
"; - $statusl = ($this->isWSDisabled( $file )) ? 'DISABLED' : 'ENABLED'; - if (isset( $this->aWSinfo[$file] )) { + if (file_exists(PATH_DB . $file . '/db.php')) { + //print $file."/db.php
"; + $statusl = ($this->isWSDisabled($file)) ? 'DISABLED' : 'ENABLED'; + if (isset($this->aWSinfo[$file])) { $wsInfo = $this->aWSinfo[$file]; } else { $wsInfo['num_processes'] = "not gathered yet"; @@ -269,19 +274,17 @@ class serverConf ; $wsInfo['num_users'] = "not gathered yet"; } - $wsArray[$file] = array ('WSP_ID' => $file,'WSP_NAME' => $file,'WSP_STATUS' => $statusl,'WSP_PROCESS_COUNT' => $wsInfo['num_processes'],'WSP_CASES_COUNT' => $wsInfo['num_cases'],'WSP_USERS_COUNT' => isset( $wsInfo['num_users'] ) ? $wsInfo['num_users'] : "" - ); - if (isset( $this->workspaces[$file]['WSP_LOGINS'] )) + $wsArray[$file] = array ('WSP_ID' => $file,'WSP_NAME' => $file,'WSP_STATUS' => $statusl,'WSP_PROCESS_COUNT' => $wsInfo['num_processes'],'WSP_CASES_COUNT' => $wsInfo['num_cases'],'WSP_USERS_COUNT' => isset( $wsInfo['num_users'] ) ? $wsInfo['num_users'] : ""); + if (isset($this->workspaces[$file]['WSP_LOGINS'])) { $wsArray[$file]['WSP_LOGINS'] = $this->workspaces[$file]['WSP_LOGINS']; - + } } } } - closedir( $handle ); + closedir($handle); } } return $wsArray; - } /** @@ -294,27 +297,27 @@ class serverConf * @param string $wsName * @return array */ - function getWorkspaceInfo ($wsName) + public function getWorkspaceInfo($wsName) { - $aResult = Array ('num_processes' => '0','num_cases' => '0' + $aResult = Array('num_processes' => '0', 'num_cases' => '0' ); - $result = array (); + $result = array(); require_once 'classes/model/Process.php'; require_once 'classes/model/Application.php'; require_once 'classes/model/Users.php'; - $Criteria = new Criteria( 'workflow' ); - $Criteria->add( ProcessPeer::PRO_STATUS, 'ACTIVE', CRITERIA::EQUAL ); - $aResult['num_processes'] = ProcessPeer::doCount( $Criteria ); + $Criteria = new Criteria('workflow'); + $Criteria->add(ProcessPeer::PRO_STATUS, 'ACTIVE', CRITERIA::EQUAL); + $aResult['num_processes'] = ProcessPeer::doCount($Criteria); - $Criteria = new Criteria( 'workflow' ); - $Criteria->add( ApplicationPeer::APP_STATUS, 'COMPLETED', CRITERIA::NOT_EQUAL ); - $aResult['num_cases'] = ApplicationPeer::doCount( $Criteria ); + $Criteria = new Criteria('workflow'); + $Criteria->add(ApplicationPeer::APP_STATUS, 'COMPLETED', CRITERIA::NOT_EQUAL); + $aResult['num_cases'] = ApplicationPeer::doCount($Criteria); - $Criteria = new Criteria( 'workflow' ); - $Criteria->add( UsersPeer::USR_STATUS, array ('DELETED','DISABLED' - ), CRITERIA::NOT_IN ); - $aResult['num_users'] = UsersPeer::doCount( $Criteria ); + $Criteria = new Criteria('workflow'); + $Criteria->add(UsersPeer::USR_STATUS, array('DELETED', 'DISABLED' + ), CRITERIA::NOT_IN); + $aResult['num_users'] = UsersPeer::doCount($Criteria); return $aResult; } @@ -324,7 +327,7 @@ class serverConf * * @return array */ - function getPluginsList () + public function getPluginsList() { return $this->pluginsA; } @@ -333,30 +336,31 @@ class serverConf * * * Register a PLugin */ - function addPlugin ($workspace, $info) + public function addPlugin($workspace, $info) { $this->pluginsA[$workspace] = $info; } - function getDBVersion () + public function getDBVersion() { $sMySQLVersion = '?????'; - if (defined( "DB_HOST" )) { - G::LoadClass( 'net' ); - G::LoadClass( 'dbConnections' ); - $dbNetView = new NET( DB_HOST ); - $dbNetView->loginDbServer( DB_USER, DB_PASS ); + if (defined("DB_HOST")) { + G::LoadClass('net'); + G::LoadClass('dbConnections'); + $dbNetView = new NET(DB_HOST); + $dbNetView->loginDbServer(DB_USER, DB_PASS); - $dbConns = new dbConnections( '' ); + $dbConns = new dbConnections(''); $availdb = ''; foreach ($dbConns->getDbServicesAvailables() as $key => $val) { - if ($availdb != '') + if ($availdb != '') { $availdb .= ', '; + } $availdb .= $val['name']; } try { - $sMySQLVersion = $dbNetView->getDbServerVersion( 'mysql' ); + $sMySQLVersion = $dbNetView->getDbServerVersion('mysql'); } catch (Exception $oException) { $sMySQLVersion = '?????'; } @@ -370,10 +374,10 @@ class serverConf * * @return void */ - function resetLogins () + public function resetLogins() { $this->logins = 0; - if (is_array( $this->workspaces )) { + if (is_array($this->workspaces)) { foreach ($this->workspaces as $wsName => $wsinfo) { $this->workspaces[$wsName]['WSP_LOGINS'] = 0; } @@ -386,25 +390,26 @@ class serverConf * @param void * @return string */ - function getLanDirection () + public function getLanDirection() { - if (! isset( $this->lanDirection )) { + if (!isset($this->lanDirection)) { $this->lanDirection = 'L'; } - if (defined( 'SYS_LANG' )) { + if (defined('SYS_LANG')) { //if we already have the landirection for this language, just return from serverConf - if ($this->lanLanguage == SYS_LANG) + if ($this->lanLanguage == SYS_LANG) { return $this->lanDirection; + } - //if not , we need to query Database, in order to get the direction + //if not , we need to query Database, in order to get the direction $this->lanDirection = 'L'; //default value; $this->lanLanguage = SYS_LANG; require_once 'classes/model/Language.php'; $oLang = new Language(); try { - $aLang = $oLang->load( SYS_LANG ); - if (isset( $aLang['LAN_DIRECTION'] )) { - $this->lanDirection = strtoupper( $aLang['LAN_DIRECTION'] ); + $aLang = $oLang->load(SYS_LANG); + if (isset($aLang['LAN_DIRECTION'])) { + $this->lanDirection = strtoupper($aLang['LAN_DIRECTION']); } $this->saveSingleton(); } catch (Exception $e) { @@ -422,7 +427,7 @@ class serverConf * @param string $propertyValue * @param string $workspace */ - function setHeartbeatProperty ($propertyName, $propertyValue, $workspace) + public function setHeartbeatProperty($propertyName, $propertyValue, $workspace) { $this->_aHeartbeatConfig[$workspace][$propertyName] = $propertyValue; $this->saveSingleton(); @@ -436,10 +441,11 @@ class serverConf * @param string $workspace * @return void */ - function unsetHeartbeatProperty ($propertyName, $workspace) + public function unsetHeartbeatProperty($propertyName, $workspace) { - if (isset( $this->_aHeartbeatConfig[$workspace][$propertyName] )) - unset( $this->_aHeartbeatConfig[$workspace][$propertyName] ); + if (isset($this->_aHeartbeatConfig[$workspace][$propertyName])) { + unset($this->_aHeartbeatConfig[$workspace][$propertyName]); + } $this->saveSingleton(); } @@ -450,19 +456,19 @@ class serverConf * @param string $propertyName * @return string/null */ - function getHeartbeatProperty ($propertyName, $workspace) + public function getHeartbeatProperty($propertyName, $workspace) { - if (isset( $this->_aHeartbeatConfig[$workspace][$propertyName] )) { + if (isset($this->_aHeartbeatConfig[$workspace][$propertyName])) { return $this->_aHeartbeatConfig[$workspace][$propertyName]; } else { return null; } } - function isRtl ($lang = SYS_LANG) + public function isRtl($lang = SYS_LANG) { - $lang = substr( $lang, 0, 2 ); - return in_array( $lang, $this->rtlLang ); + $lang = substr($lang, 0, 2); + return in_array($lang, $this->rtlLang); } - -} \ No newline at end of file +} + \ No newline at end of file diff --git a/workflow/engine/classes/class.tasks.php b/workflow/engine/classes/class.tasks.php index 489fd46aa..1f19bc8f6 100755 --- a/workflow/engine/classes/class.tasks.php +++ b/workflow/engine/classes/class.tasks.php @@ -1,4 +1,5 @@ addJoin( GroupwfPeer::GRP_UID, TaskUserPeer::USR_UID, Criteria::LEFT_JOIN ); - $oCriteria->add( TaskUserPeer::TAS_UID, $sTaskUID ); - $oCriteria->add( TaskUserPeer::TU_TYPE, $iType ); - $oCriteria->add( TaskUserPeer::TU_RELATION, 2 ); - $oCriteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' ); - $oDataset = GroupwfPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aGroups = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->addJoin(GroupwfPeer::GRP_UID, TaskUserPeer::USR_UID, Criteria::LEFT_JOIN); + $oCriteria->add(TaskUserPeer::TAS_UID, $sTaskUID); + $oCriteria->add(TaskUserPeer::TU_TYPE, $iType); + $oCriteria->add(TaskUserPeer::TU_RELATION, 2); + $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); + $oDataset = GroupwfPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aGroups[] = $aRow; @@ -84,28 +83,28 @@ class Tasks * @param string $sProUid * @return array */ - public function getAllTasks ($sProUid) + public function getAllTasks($sProUid) { try { - $aTasks = array (); + $aTasks = array(); $sDelimiter = DBAdapter::getStringDelimiter(); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( TaskPeer::PRO_UID, $sProUid ); - $aConditions = array (); - $aConditions[] = array (TaskPeer::TAS_UID,ContentPeer::CON_ID + $oCriteria = new Criteria('workflow'); + $oCriteria->add(TaskPeer::PRO_UID, $sProUid); + $aConditions = array(); + $aConditions[] = array(TaskPeer::TAS_UID, ContentPeer::CON_ID ); - $aConditions[] = array (ContentPeer::CON_CATEGORY,$sDelimiter . 'TAS_TITLE' . $sDelimiter + $aConditions[] = array(ContentPeer::CON_CATEGORY, $sDelimiter . 'TAS_TITLE' . $sDelimiter ); - $aConditions[] = array (ContentPeer::CON_LANG,$sDelimiter . SYS_LANG . $sDelimiter + $aConditions[] = array(ContentPeer::CON_LANG, $sDelimiter . SYS_LANG . $sDelimiter ); - $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); - $oCriteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE ); - $oDataset = TaskPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN); + $oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE); + $oDataset = TaskPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $oTask = new Task(); - $aTasks[] = $oTask->Load( $aRow['TAS_UID'] ); + $aTasks[] = $oTask->Load($aRow['TAS_UID']); $oDataset->next(); } return $aTasks; @@ -120,13 +119,14 @@ class Tasks * @param string $aTasks * @return array */ - public function createTaskRows ($aTask) + public function createTaskRows($aTask) { foreach ($aTask as $key => $row) { $oTask = new Task(); - if ($oTask->taskExists( $row['TAS_UID'] )) - $oTask->remove( $row['TAS_UID'] ); - $res = $oTask->createRow( $row ); + if ($oTask->taskExists($row['TAS_UID'])) { + $oTask->remove($row['TAS_UID']); + } + $res = $oTask->createRow($row); } return; } @@ -137,14 +137,15 @@ class Tasks * @param string $aTasks * @return array */ - public function updateTaskRows ($aTask) + public function updateTaskRows($aTask) { foreach ($aTask as $key => $row) { $oTask = new Task(); - if ($oTask->taskExists( $row['TAS_UID'] )) - $oTask->remove( $row['TAS_UID'] ); - else - $res = $oTask->update( $row ); + if ($oTask->taskExists($row['TAS_UID'])) { + $oTask->remove($row['TAS_UID']); + } else { + $res = $oTask->update($row); + } } return; } @@ -155,14 +156,14 @@ class Tasks * @param string $sProUid * @return array */ - public function getAllRoutes ($sProUid) + public function getAllRoutes($sProUid) { try { - $aRoutes = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( RoutePeer::PRO_UID, $sProUid ); - $oDataset = RoutePeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aRoutes = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(RoutePeer::PRO_UID, $sProUid); + $oDataset = RoutePeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aRoutes[] = $aRow; @@ -180,10 +181,10 @@ class Tasks * @param string $aTasks * @return array */ - public function createRouteRows ($aRoutes) + public function createRouteRows($aRoutes) { - $routeID = array (); - $aField = array (); + $routeID = array(); + $aField = array(); $taskParallel = ''; $taskSecJoin = ''; $taskEvaluate = ''; @@ -197,8 +198,6 @@ class Tasks $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']; @@ -211,53 +210,54 @@ class Tasks if ($idTask != $taskParallel) { $taskParallel = $idTask; - $sGatewayUID = $oProcessMap->saveNewGateway( $row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK'] ); + $sGatewayUID = $oProcessMap->saveNewGateway($row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK']); } break; case 'SEC-JOIN': if ($nextTask != $taskSecJoin) { $taskSecJoin = $nextTask; - $sGatewayUID = $oProcessMap->saveNewGateway( $row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK'] ); + $sGatewayUID = $oProcessMap->saveNewGateway($row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK']); } break; case 'EVALUATE': if ($idTask != $taskEvaluate) { $taskEvaluate = $idTask; - $sGatewayUID = $oProcessMap->saveNewGateway( $row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK'] ); + $sGatewayUID = $oProcessMap->saveNewGateway($row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK']); } break; case 'PARALLEL-BY-EVALUATION': if ($idTask != $taskParallelEv) { $taskParallelEv = $idTask; - $sGatewayUID = $oProcessMap->saveNewGateway( $row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK'] ); + $sGatewayUID = $oProcessMap->saveNewGateway($row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK']); } break; case 'SELECT': if ($idTask != $taskSelect) { $taskSelect = $idTask; - $sGatewayUID = $oProcessMap->saveNewGateway( $row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK'] ); + $sGatewayUID = $oProcessMap->saveNewGateway($row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK']); } break; case 'DISCRIMINATOR': if ($nextTask != $taskDiscriminator) { $taskDiscriminator = $nextTask; - $sGatewayUID = $oProcessMap->saveNewGateway( $row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK'] ); + $sGatewayUID = $oProcessMap->saveNewGateway($row['PRO_UID'], $row['TAS_UID'], $row['ROU_NEXT_TASK']); } break; } $row['GAT_UID'] = $sGatewayUID; } - if ($oRoute->routeExists( $row['ROU_UID'] )) - $oRoute->remove( $row['ROU_UID'] ); + if ($oRoute->routeExists($row['ROU_UID'])) { + $oRoute->remove($row['ROU_UID']); + } - $routeID = $oRoute->create( $row ); + $routeID = $oRoute->create($row); //saving end event while import old processes - if (isset( $end ) && $end == 1) { - if (! $oEvent->existsByTaskUidFrom( $idTask )) { + if (isset($end) && $end == 1) { + if (!$oEvent->existsByTaskUidFrom($idTask)) { if ($sRouteType == "SEQUENTIAL") { - $aTaskDetails = $oTask->load( $idTask ); + $aTaskDetails = $oTask->load($idTask); $positionX = $aTaskDetails['TAS_POSX'] + $aTaskDetails['TAS_WIDTH'] / 2; $positionY = $aTaskDetails['TAS_POSY'] + $aTaskDetails['TAS_HEIGHT'] + 10; @@ -270,16 +270,15 @@ class Tasks $aData['EVN_RELATED_TO'] = 'MULTIPLE'; $aData['EVN_WHEN'] = '1'; $aData['EVN_ACTION'] = ''; - $sEvn_uid = $oEvent->create( $aData ); + $sEvn_uid = $oEvent->create($aData); $aField['ROU_UID'] = $routeID; $aField['ROU_EVN_UID'] = $sEvn_uid; - $oRoute->update( $aField ); + $oRoute->update($aField); $end = 0; } } } - } return; } @@ -290,15 +289,16 @@ class Tasks * @param string $aTasks * @return array */ - public function updateRouteRows ($aRoutes) + public function updateRouteRows($aRoutes) { foreach ($aRoutes as $key => $row) { $oRoute = new Route(); //krumo ($row); - if (is_array( $oRoute->load( $row['ROU_UID'] ) )) - $oRoute->remove( $row['ROU_UID'] ); - else - $res = $oRoute->update( $row ); + if (is_array($oRoute->load($row['ROU_UID']))) { + $oRoute->remove($row['ROU_UID']); + } else { + $res = $oRoute->update($row); + } } return; } @@ -310,17 +310,17 @@ class Tasks * @param integer $iType * @return array */ - public function getUsersOfTask ($sTaskUID, $iType) + public function getUsersOfTask($sTaskUID, $iType) { try { - $aUsers = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->addJoin( UsersPeer::USR_UID, TaskUserPeer::USR_UID, Criteria::LEFT_JOIN ); - $oCriteria->add( TaskUserPeer::TAS_UID, $sTaskUID ); - $oCriteria->add( TaskUserPeer::TU_TYPE, $iType ); - $oCriteria->add( TaskUserPeer::TU_RELATION, 1 ); - $oDataset = UsersPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aUsers = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->addJoin(UsersPeer::USR_UID, TaskUserPeer::USR_UID, Criteria::LEFT_JOIN); + $oCriteria->add(TaskUserPeer::TAS_UID, $sTaskUID); + $oCriteria->add(TaskUserPeer::TU_TYPE, $iType); + $oCriteria->add(TaskUserPeer::TU_RELATION, 1); + $oDataset = UsersPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aUsers[] = $aRow; @@ -338,7 +338,7 @@ class Tasks * @param string $sTaskUID * @return void */ - function deleteTask ($sTaskUID = '') + public function deleteTask($sTaskUID = '') { try { //Instance classes @@ -348,58 +348,58 @@ class Tasks $oStep = new Step(); $oStepTrigger = new StepTrigger(); //Get task information - $aFields = $oTask->load( $sTaskUID ); + $aFields = $oTask->load($sTaskUID); //Delete routes - $oTasks->deleteAllRoutesOfTask( $aFields['PRO_UID'], $sTaskUID, true ); + $oTasks->deleteAllRoutesOfTask($aFields['PRO_UID'], $sTaskUID, true); //Delete gateways - $oTasks->deleteAllGatewayOfTask( $aFields['PRO_UID'], $sTaskUID, true ); + $oTasks->deleteAllGatewayOfTask($aFields['PRO_UID'], $sTaskUID, true); //Delete the users assigned to task - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( TaskUserPeer::TAS_UID, $sTaskUID ); - $oDataset1 = TaskUserPeer::doSelectRS( $oCriteria ); - $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(TaskUserPeer::TAS_UID, $sTaskUID); + $oDataset1 = TaskUserPeer::doSelectRS($oCriteria); + $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset1->next(); while ($aRow1 = $oDataset1->getRow()) { - $oTaskUser->remove( $aRow1['TAS_UID'], $aRow1['USR_UID'], $aRow1['TU_TYPE'], $aRow1['TU_RELATION'] ); + $oTaskUser->remove($aRow1['TAS_UID'], $aRow1['USR_UID'], $aRow1['TU_TYPE'], $aRow1['TU_RELATION']); $oDataset1->next(); } //Delete the steps of task - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( StepPeer::TAS_UID, $sTaskUID ); - $oDataset1 = StepPeer::doSelectRS( $oCriteria ); - $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(StepPeer::TAS_UID, $sTaskUID); + $oDataset1 = StepPeer::doSelectRS($oCriteria); + $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC); $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'] ); + /* $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(); } //Delete step triggers - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( StepTriggerPeer::TAS_UID, $sTaskUID ); - StepTriggerPeer::doDelete( $oCriteria ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(StepTriggerPeer::TAS_UID, $sTaskUID); + StepTriggerPeer::doDelete($oCriteria); //Delete permissions - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( ObjectPermissionPeer::TAS_UID, $sTaskUID ); - ObjectPermissionPeer::doDelete( $oCriteria ); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( ObjectPermissionPeer::OP_TASK_SOURCE, $sTaskUID ); - ObjectPermissionPeer::doDelete( $oCriteria ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(ObjectPermissionPeer::TAS_UID, $sTaskUID); + ObjectPermissionPeer::doDelete($oCriteria); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(ObjectPermissionPeer::OP_TASK_SOURCE, $sTaskUID); + ObjectPermissionPeer::doDelete($oCriteria); //Delete task - $oTask->remove( $sTaskUID ); + $oTask->remove($sTaskUID); //Delete cases schedulers added by krlos - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( CaseSchedulerPeer::TAS_UID, $sTaskUID ); - CaseSchedulerPeer::doDelete( $oCriteria ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(CaseSchedulerPeer::TAS_UID, $sTaskUID); + CaseSchedulerPeer::doDelete($oCriteria); } catch (Exception $oError) { throw ($oError); } @@ -412,22 +412,22 @@ class Tasks * @param string $sTaskUID * @return boolean */ - public function deleteAllRoutesOfTask ($sProcessUID = '', $sTaskUID = '', $bAll = false) + public function deleteAllRoutesOfTask($sProcessUID = '', $sTaskUID = '', $bAll = false) { try { $oProcess = new Process(); - $aFields = $oProcess->load( $sProcessUID ); + $aFields = $oProcess->load($sProcessUID); $oTask = new Task(); - $aFields = $oTask->load( $sTaskUID ); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( RoutePeer::PRO_UID, $sProcessUID ); - $oCriteria->add( RoutePeer::TAS_UID, $sTaskUID ); - RoutePeer::doDelete( $oCriteria ); + $aFields = $oTask->load($sTaskUID); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(RoutePeer::PRO_UID, $sProcessUID); + $oCriteria->add(RoutePeer::TAS_UID, $sTaskUID); + RoutePeer::doDelete($oCriteria); if ($bAll) { - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( RoutePeer::PRO_UID, $sProcessUID ); - $oCriteria->add( RoutePeer::ROU_NEXT_TASK, $sTaskUID ); - RoutePeer::doDelete( $oCriteria ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(RoutePeer::PRO_UID, $sProcessUID); + $oCriteria->add(RoutePeer::ROU_NEXT_TASK, $sTaskUID); + RoutePeer::doDelete($oCriteria); } return true; } catch (Exception $oError) { @@ -441,18 +441,18 @@ class Tasks * @param string $sProUid * @return array */ - public function getAllGateways ($sProUid) + public function getAllGateways($sProUid) { try { - $aGateways = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( GatewayPeer::PRO_UID, $sProUid ); - $oDataset = GatewayPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aGateways = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(GatewayPeer::PRO_UID, $sProUid); + $oDataset = GatewayPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $oGateway = new Gateway(); - $aGateways[] = $oGateway->load( $aRow['GAT_UID'] ); + $aGateways[] = $oGateway->load($aRow['GAT_UID']); $oDataset->next(); } return $aGateways; @@ -467,17 +467,19 @@ class Tasks * @param string $aTasks * @return array */ - public function createGatewayRows ($aGateway) + public function createGatewayRows($aGateway) { foreach ($aGateway as $key => $row) { $oGateway = new Gateway(); - if ($oGateway->gatewayExists( $row['GAT_UID'] )) - $oGateway->remove( $row['GAT_UID'] ); + if ($oGateway->gatewayExists($row['GAT_UID'])) { + $oGateway->remove($row['GAT_UID']); + } - if ($row['TAS_UID'] != '' && $row['GAT_NEXT_TASK'] != '') + if ($row['TAS_UID'] != '' && $row['GAT_NEXT_TASK'] != '') { continue; - else - $res = $oGateway->createRow( $row ); + } else { + $res = $oGateway->createRow($row); + } } return; } @@ -489,22 +491,22 @@ class Tasks * @param string $sTaskUID * @return boolean */ - public function deleteAllGatewayOfTask ($sProcessUID = '', $sTaskUID = '', $bAll = false) + public function deleteAllGatewayOfTask($sProcessUID = '', $sTaskUID = '', $bAll = false) { try { $oProcess = new Process(); - $aFields = $oProcess->load( $sProcessUID ); + $aFields = $oProcess->load($sProcessUID); $oTask = new Task(); - $aFields = $oTask->load( $sTaskUID ); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( GatewayPeer::PRO_UID, $sProcessUID ); - $oCriteria->add( GatewayPeer::TAS_UID, $sTaskUID ); - GatewayPeer::doDelete( $oCriteria ); + $aFields = $oTask->load($sTaskUID); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(GatewayPeer::PRO_UID, $sProcessUID); + $oCriteria->add(GatewayPeer::TAS_UID, $sTaskUID); + GatewayPeer::doDelete($oCriteria); if ($bAll) { - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( GatewayPeer::PRO_UID, $sProcessUID ); - $oCriteria->add( GatewayPeer::GAT_NEXT_TASK, $sTaskUID ); - GatewayPeer::doDelete( $oCriteria ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(GatewayPeer::PRO_UID, $sProcessUID); + $oCriteria->add(GatewayPeer::GAT_NEXT_TASK, $sTaskUID); + GatewayPeer::doDelete($oCriteria); } return true; } catch (Exception $oError) { @@ -520,12 +522,11 @@ class Tasks * @param string $iType * @return integer */ - public function assignUser ($sTaskUID = '', $sUserUID = '', $iType = '') + public function assignUser($sTaskUID = '', $sUserUID = '', $iType = '') { try { $oTaskUser = new TaskUser(); - return $oTaskUser->create( array ('TAS_UID' => $sTaskUID,'USR_UID' => $sUserUID,'TU_TYPE' => $iType,'TU_RELATION' => 1 - ) ); + return $oTaskUser->create(array('TAS_UID' => $sTaskUID, 'USR_UID' => $sUserUID, 'TU_TYPE' => $iType, 'TU_RELATION' => 1)); } catch (Exception $oError) { throw ($oError); } @@ -539,30 +540,30 @@ class Tasks * @param string $iType * @return integer */ - public function assignGroup ($sTaskUID = '', $sGroupUID = '', $iType = '') + public function assignGroup($sTaskUID = '', $sGroupUID = '', $iType = '') { 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 - ) ); + /* $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) { throw ($oError); } @@ -574,12 +575,12 @@ class Tasks * @param string $sUserUID * @return void */ - public function ofToAssignUserOfAllTasks ($sUserUID = '') + public function ofToAssignUserOfAllTasks($sUserUID = '') { try { - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( TaskUserPeer::USR_UID, $sUserUID ); - TaskUserPeer::doDelete( $oCriteria ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(TaskUserPeer::USR_UID, $sUserUID); + TaskUserPeer::doDelete($oCriteria); } catch (Exception $oError) { throw ($oError); } @@ -593,11 +594,11 @@ class Tasks * @param integer $iType * @return boolean */ - public function ofToAssignUser ($sTaskUID = '', $sUserUID = '', $iType = 0) + public function ofToAssignUser($sTaskUID = '', $sUserUID = '', $iType = 0) { try { $oTaskUser = new TaskUser(); - $oTaskUser->remove( $sTaskUID, $sUserUID, $iType, 1 ); + $oTaskUser->remove($sTaskUID, $sUserUID, $iType, 1); return true; } catch (Exception $oError) { throw ($oError); @@ -612,11 +613,11 @@ class Tasks * @param integer $iType * @return boolean */ - public function ofToAssignGroup ($sTaskUID = '', $sGroupUID = '', $iType = 0) + public function ofToAssignGroup($sTaskUID = '', $sGroupUID = '', $iType = 0) { try { $oTaskUser = new TaskUser(); - return $oTaskUser->remove( $sTaskUID, $sGroupUID, $iType, 2 ); + return $oTaskUser->remove($sTaskUID, $sGroupUID, $iType, 2); } catch (Exception $oError) { throw ($oError); } @@ -628,15 +629,15 @@ class Tasks * @param string $sTaskUID * @return array */ - public function getStepsOfTask ($sTaskUID) + public function getStepsOfTask($sTaskUID) { try { - $aSteps = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( StepPeer::TAS_UID, $sTaskUID ); - $oCriteria->addAscendingOrderByColumn( StepPeer::STEP_POSITION ); - $oDataset = StepPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aSteps = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(StepPeer::TAS_UID, $sTaskUID); + $oCriteria->addAscendingOrderByColumn(StepPeer::STEP_POSITION); + $oDataset = StepPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aSteps[] = $aRow; @@ -654,10 +655,10 @@ class Tasks * @param string $sProcessUID * @return boolean */ - public function existsBuildingElements ($sProcessUID) + public function existsBuildingElements($sProcessUID) { try { - $oCriteria = new Criteria( 'workflow' ); + $oCriteria = new Criteria('workflow'); //$oCriteria->add(StepPeer::PRO_UID, $sProcessUID); //$oDataset = StepPeer::doSelectRS($oCriteria); //$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -674,20 +675,20 @@ class Tasks * @param string $sProUid * @return array */ - public function getStartingTaskForUser ($sProUid, $sUsrUid) + public function getStartingTaskForUser($sProUid, $sUsrUid) { try { - $aTasks = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( TaskPeer::PRO_UID, $sProUid ); + $aTasks = array(); + $oCriteria = new Criteria('workflow'); + $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 ); + $oCriteria->add(TaskPeer::TAS_START, 'TRUE'); + $oDataset = TaskPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $oTask = new Task(); - $aTasks[] = $oTask->Load( $aRow['TAS_UID'] ); + $aTasks[] = $oTask->Load($aRow['TAS_UID']); $oDataset->next(); } return $aTasks; @@ -702,20 +703,21 @@ class Tasks * @param string $sTaskUID * @return array */ - public function assignUsertoTask ($sTaskUID) + public function assignUsertoTask($sTaskUID) { try { - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->addSelectColumn( TaskUserPeer::USR_UID ); - $oCriteria->add( TaskUserPeer::TAS_UID, $sTaskUID ); - $oDataset = TaskUserPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria = new Criteria('workflow'); + $oCriteria->addSelectColumn(TaskUserPeer::USR_UID); + $oCriteria->add(TaskUserPeer::TAS_UID, $sTaskUID); + $oDataset = TaskUserPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); $aRow = $oDataset->getRow(); - if (is_array( $aRow )) + if (is_array($aRow)) { return 1; - else + } else { return 0; + } } catch (Exception $oError) { throw ($oError); } @@ -727,23 +729,24 @@ class Tasks * @param string $sUsrUid, $sTaskUID * @return array */ - public function verifyUsertoTask ($sUsrUid, $sTaskUID) + public function verifyUsertoTask($sUsrUid, $sTaskUID) { try { - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->addSelectColumn( TaskUserPeer::USR_UID ); - $oCriteria->addSelectColumn( TaskUserPeer::TAS_UID ); - $oCriteria->addSelectColumn( TaskUserPeer::TU_RELATION ); - $oCriteria->add( TaskUserPeer::TAS_UID, $sTaskUID ); - $oCriteria->add( TaskUserPeer::USR_UID, $sUsrUid ); - $oDataset = TaskUserPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria = new Criteria('workflow'); + $oCriteria->addSelectColumn(TaskUserPeer::USR_UID); + $oCriteria->addSelectColumn(TaskUserPeer::TAS_UID); + $oCriteria->addSelectColumn(TaskUserPeer::TU_RELATION); + $oCriteria->add(TaskUserPeer::TAS_UID, $sTaskUID); + $oCriteria->add(TaskUserPeer::USR_UID, $sUsrUid); + $oDataset = TaskUserPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); $aRow = $oDataset->getRow(); - if (is_array( $aRow )) + if (is_array($aRow)) { return $aRow; - else + } else { return $aRow; + } } catch (Exception $oError) { throw ($oError); } @@ -755,41 +758,41 @@ class Tasks * @param string $sUsrUID * @return array */ - public function getTasksThatUserIsAssigned ($sUserUID) + public function getTasksThatUserIsAssigned($sUserUID) { try { - $aTasks = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( TaskUserPeer::USR_UID, $sUserUID ); - $oCriteria->add( TaskUserPeer::TU_RELATION, 1 ); - $oDataset = TaskUserPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aTasks = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(TaskUserPeer::USR_UID, $sUserUID); + $oCriteria->add(TaskUserPeer::TU_RELATION, 1); + $oDataset = TaskUserPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aTasks[] = $aRow['TAS_UID']; $oDataset->next(); } - $aGroups = array (); + $aGroups = array(); $oCriteria = new Criteria(); - $oCriteria->add( GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL ); - $oCriteria->add( GroupUserPeer::USR_UID, $sUserUID ); - $oCriteria->add( GroupwfPeer::GRP_STATUS, 'ACTIVE' ); - $oCriteria->addJoin( GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN ); - $oDataset = GroupwfPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria->add(GroupwfPeer::GRP_UID, '', Criteria::NOT_EQUAL); + $oCriteria->add(GroupUserPeer::USR_UID, $sUserUID); + $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); + $oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN); + $oDataset = GroupwfPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aGroups[] = $aRow['GRP_UID']; $oDataset->next(); } - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( TaskUserPeer::USR_UID, $aGroups, Criteria::IN ); - $oCriteria->add( TaskUserPeer::TU_RELATION, 2 ); - $oDataset = TaskUserPeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(TaskUserPeer::USR_UID, $aGroups, Criteria::IN); + $oCriteria->add(TaskUserPeer::TU_RELATION, 2); + $oDataset = TaskUserPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { - if (! in_array( $aRow['TAS_UID'], $aTasks )) { + if (!in_array($aRow['TAS_UID'], $aTasks)) { $aTasks[] = $aRow['TAS_UID']; } $oDataset->next(); @@ -806,15 +809,15 @@ class Tasks * @param string $sProUid, $sTaskUid * @return array by Everth */ - public function getRoute ($sProUid, $sTaskUid) + public function getRoute($sProUid, $sTaskUid) { try { - $aRoutes = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( RoutePeer::PRO_UID, $sProUid ); - $oCriteria->add( RoutePeer::TAS_UID, $sTaskUid ); - $oDataset = RoutePeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aRoutes = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(RoutePeer::PRO_UID, $sProUid); + $oCriteria->add(RoutePeer::TAS_UID, $sTaskUid); + $oDataset = RoutePeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aRoutes[] = $aRow; @@ -833,16 +836,16 @@ class Tasks * @param string $sProUid, $sTaskUid * @return array by Girish */ - public function getRouteByType ($sProUid, $sRouteNextTaskUid, $sRouteType) + public function getRouteByType($sProUid, $sRouteNextTaskUid, $sRouteType) { try { - $aRoutes = array (); - $oCriteria = new Criteria( 'workflow' ); - $oCriteria->add( RoutePeer::PRO_UID, $sProUid ); - $oCriteria->add( RoutePeer::ROU_NEXT_TASK, $sRouteNextTaskUid ); - $oCriteria->add( RoutePeer::ROU_TYPE, $sRouteType ); - $oDataset = RoutePeer::doSelectRS( $oCriteria ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $aRoutes = array(); + $oCriteria = new Criteria('workflow'); + $oCriteria->add(RoutePeer::PRO_UID, $sProUid); + $oCriteria->add(RoutePeer::ROU_NEXT_TASK, $sRouteNextTaskUid); + $oCriteria->add(RoutePeer::ROU_TYPE, $sRouteType); + $oDataset = RoutePeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); while ($aRow = $oDataset->getRow()) { $aRoutes[] = $aRow; @@ -854,6 +857,5 @@ class Tasks throw ($oError); } } - } -?> + \ No newline at end of file diff --git a/workflow/engine/classes/entities/FacetRequest.php b/workflow/engine/classes/entities/FacetRequest.php index f4c9ef772..5c0fbeeb1 100644 --- a/workflow/engine/classes/entities/FacetRequest.php +++ b/workflow/engine/classes/entities/FacetRequest.php @@ -1,43 +1,45 @@ initializeObject ($data); - - $requiredFields = array ( - "workspace" - ); - - $obj->validateRequiredFields ($requiredFields); - - return $obj; - } -} \ No newline at end of file + public $workspace = ''; + public $searchText = ''; + public $facetFields = array(); + public $facetQueries = array(); + public $facetDates = array(); + public $facetDatesStart = ''; + public $facetDatesEnd = ''; + public $facetDateGap = ''; + public $facetRanges = array(); + public $filters = array(); + public $selectedFacetsString = ''; + + private function __construct() + { + } + + public static function createEmpty() + { + $obj = new Entity_FacetRequest (); + return $obj; + } + + public static function createForRequest($data) + { + $obj = new Entity_FacetRequest (); + + $obj->initializeObject($data); + + $requiredFields = array( + "workspace" + ); + + $obj->validateRequiredFields($requiredFields); + + return $obj; + } +} + \ No newline at end of file diff --git a/workflow/engine/classes/entities/SolrRequestData.php b/workflow/engine/classes/entities/SolrRequestData.php index f84bd79e6..4bd43f4be 100644 --- a/workflow/engine/classes/entities/SolrRequestData.php +++ b/workflow/engine/classes/entities/SolrRequestData.php @@ -1,46 +1,48 @@ initializeObject ($data); - - $requiredFields = array ( - 'workspace' - ); - - $obj->validateRequiredFields ($requiredFields); - - return $obj; - } -} \ No newline at end of file + public $workspace = ''; + public $startAfter = 0; + public $pageSize = 10; + public $searchText = '*:*'; + public $filterText = ''; // comma separated list of filters field:value + public $numSortingCols = 0; // number of columns that are sorted + public $sortableCols = array(); // array of booleans indicating if column is + // sortable (true, false) + public $sortCols = array(); // array of indices of sorted columns index + // based in the total number of sorting cols + public $sortDir = array(); // array of direction of sorting for each + // column (desc, asc) + public $includeCols = array(); + public $resultFormat = 'xml'; // json, xml, php + + private function __construct() + { + } + + public static function createEmpty() + { + $obj = new Entity_SolrRequestData (); + return $obj; + } + + public static function createForRequestPagination($data) + { + $obj = new Entity_SolrRequestData (); + + $obj->initializeObject($data); + + $requiredFields = array( + 'workspace' + ); + + $obj->validateRequiredFields($requiredFields); + + return $obj; + } +} + \ No newline at end of file