From 6114f83fed65031491b3b7e88912898a4cbe918e Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 5 Mar 2014 11:07:40 -0400 Subject: [PATCH] Correcion de labels 404 --- .../src/BusinessModel/DataBaseConnection.php | 28 ++++---- workflow/engine/src/BusinessModel/Event.php | 4 +- .../src/BusinessModel/ProcessPermissions.php | 34 +++++----- workflow/engine/src/BusinessModel/Step.php | 12 ++-- workflow/engine/src/BusinessModel/Table.php | 34 +++++----- workflow/engine/src/BusinessModel/Task.php | 68 +++++++++---------- workflow/engine/src/BusinessModel/Trigger.php | 4 +- 7 files changed, 92 insertions(+), 92 deletions(-) diff --git a/workflow/engine/src/BusinessModel/DataBaseConnection.php b/workflow/engine/src/BusinessModel/DataBaseConnection.php index 8f0a2be67..60d885fbb 100644 --- a/workflow/engine/src/BusinessModel/DataBaseConnection.php +++ b/workflow/engine/src/BusinessModel/DataBaseConnection.php @@ -224,9 +224,9 @@ class DataBaseConnection $respTest['0']['test'] = 'Resolving Host Name ' . $dataCon['DBS_SERVER']; if ($Server->getErrno() != 0) { if ($returnArray) { - $respTest['0']['error'] = "Error Testting Connection: Resolving Host Name FAILED : " . $Server->error; + $respTest['0']['error'] = "Error Testing Connection: Resolving Host Name FAILED : " . $Server->error; } else { - $resp['message'] = "Error Testting Connection: Resolving Host Name FAILED : " . $Server->error; + $resp['message'] = "Error Testing Connection: Resolving Host Name FAILED : " . $Server->error; return $resp; } } @@ -237,9 +237,9 @@ class DataBaseConnection $Server->scannPort($dataCon['DBS_PORT']); if ($Server->getErrno() != 0) { if ($returnArray) { - $respTest['1']['error'] = "Error Testting Connection: Checking port FAILED : " . $Server->error; + $respTest['1']['error'] = "Error Testing Connection: Checking port FAILED : " . $Server->error; } else { - $resp['message'] = "Error Testting Connection: Checking port FAILED : " . $Server->error; + $resp['message'] = "Error Testing Connection: Checking port FAILED : " . $Server->error; return $resp; } } @@ -253,17 +253,17 @@ class DataBaseConnection $response = $Server->tryConnectServer($dataCon['DBS_TYPE']); if ($response->status != 'SUCCESS') { if ($returnArray) { - $respTest['2']['error'] = "Error Testting Connection: Trying to connect to host FAILED : " . $Server->error; + $respTest['2']['error'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; } else { - $resp['message'] = "Error Testting Connection: Trying to connect to host FAILED : " . $Server->error; + $resp['message'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; return $resp; } } } else { if ($returnArray) { - $respTest['2']['error'] = "Error Testting Connection: Trying to connect to host FAILED : " . $Server->error; + $respTest['2']['error'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; } else { - $resp['message'] = "Error Testting Connection: Trying to connect to host FAILED : " . $Server->error; + $resp['message'] = "Error Testing Connection: Trying to connect to host FAILED : " . $Server->error; return $resp; } } @@ -279,25 +279,25 @@ class DataBaseConnection $response = $Server->tryOpenDataBase($dataCon['DBS_TYPE']); if ($response->status != 'SUCCESS') { if ($returnArray) { - $respTest['3']['error'] = "Error Testting Connection: Trying to open database FAILED : " . $Server->error; + $respTest['3']['error'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; } else { - $resp['message'] = "Error Testting Connection: Trying to open database FAILED : " . $Server->error; + $resp['message'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; return $resp; } } } else { if ($returnArray) { - $respTest['3']['error'] = "Error Testting Connection: Trying to open database FAILED : " . $Server->error; + $respTest['3']['error'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; } else { - $resp['message'] = "Error Testting Connection: Trying to open database FAILED : " . $Server->error; + $resp['message'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; return $resp; } } } else { if ($returnArray) { - $respTest['3']['error'] = "Error Testting Connection: Trying to open database FAILED : " . $Server->error; + $respTest['3']['error'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; } else { - $resp['message'] = "Error Testting Connection: Trying to open database FAILED : " . $Server->error; + $resp['message'] = "Error Testing Connection: Trying to open database FAILED : " . $Server->error; return $resp; } } diff --git a/workflow/engine/src/BusinessModel/Event.php b/workflow/engine/src/BusinessModel/Event.php index da958c9b3..75b02237a 100644 --- a/workflow/engine/src/BusinessModel/Event.php +++ b/workflow/engine/src/BusinessModel/Event.php @@ -28,7 +28,7 @@ class Event $oProcess = new \Process(); if (!($oProcess->processExists($pro_uid))) { - throw (new \Exception( 'This process doesn\'t exist!' )); + throw (new \Exception( 'This process does not exist!' )); } $sDelimiter = \DBAdapter::getStringDelimiter(); @@ -75,7 +75,7 @@ class Event } if ($evn_uid != '' && empty($eventsArray)) { - throw (new \Exception( 'This row doesn\'t exist!' )); + throw (new \Exception( 'This row does not exist!' )); } elseif ($evn_uid != '' && !empty($eventsArray)) { return current($eventsArray); } diff --git a/workflow/engine/src/BusinessModel/ProcessPermissions.php b/workflow/engine/src/BusinessModel/ProcessPermissions.php index 37884cfa1..51b0db8f3 100644 --- a/workflow/engine/src/BusinessModel/ProcessPermissions.php +++ b/workflow/engine/src/BusinessModel/ProcessPermissions.php @@ -176,7 +176,7 @@ class ProcessPermissions } if ($op_uid != '' && empty($aObjectsPermissions)) { - throw (new \Exception( 'This row doesn\'t exist!' )); + throw (new \Exception( 'This row does not exist!!' )); } elseif ($op_uid != '' && !empty($aObjectsPermissions)) { $aObjectsPermissions = array_change_key_case($aObjectsPermissions, CASE_LOWER); return current($aObjectsPermissions); @@ -308,11 +308,11 @@ class ProcessPermissions { $pro_uid = trim($pro_uid); if ($pro_uid == '') { - throw (new \Exception("The project with prj_uid: '', does not exist.")); + throw (new \Exception("The project with prj_uid: '' does not exist.")); } $oProcess = new \Process(); if (!($oProcess->processExists($pro_uid))) { - throw (new \Exception("The project with prj_uid: '$pro_uid', does not exist.")); + throw (new \Exception("The project with prj_uid: '$pro_uid' does not exist.")); } return $pro_uid; } @@ -330,11 +330,11 @@ class ProcessPermissions { $op_uid = trim($op_uid); if ($op_uid == '') { - throw (new \Exception("The process permission with op_uid: '', does not exist.")); + throw (new \Exception("The process permission with op_uid: '' does not exist.")); } $oObjectPermission = new \ObjectPermission(); if (!($oObjectPermission->Exists($op_uid))) { - throw (new \Exception("The process permission with op_uid: '$op_uid', does not exist.")); + throw (new \Exception("The process permission with op_uid: '$op_uid' does not exist.")); } return $op_uid; } @@ -352,11 +352,11 @@ class ProcessPermissions { $usr_uid = trim($usr_uid); if ($usr_uid == '') { - throw (new \Exception("The user with usr_uid: '', does not exist.")); + throw (new \Exception("The user with usr_uid: '' does not exist.")); } $oUsers = new \Users(); if (!($oUsers->userExists($usr_uid))) { - throw (new \Exception("The user with usr_uid: '$usr_uid', does not exist.")); + throw (new \Exception("The user with usr_uid: '$usr_uid' does not exist.")); } return $usr_uid; } @@ -374,11 +374,11 @@ class ProcessPermissions { $grp_uid = trim($grp_uid); if ($grp_uid == '') { - throw (new \Exception("The group with usr_uid: '', does not exist.")); + throw (new \Exception("The group with usr_uid: '' does not exist.")); } $oGroup = new \Groupwf(); if (!($oGroup->GroupwfExists($grp_uid))) { - throw (new \Exception("The group with usr_uid: '$grp_uid', does not exist.")); + throw (new \Exception("The group with usr_uid: '$grp_uid' does not exist.")); } return $grp_uid; } @@ -396,11 +396,11 @@ class ProcessPermissions { $tas_uid = trim($tas_uid); if ($tas_uid == '') { - throw (new \Exception("The task with tas_uid: '', does not exist.")); + throw (new \Exception("The task with tas_uid: '' does not exist.")); } $oTask = new \Task(); if (!($oTask->taskExists($tas_uid))) { - throw (new \Exception("The task with tas_uid: '$tas_uid', does not exist.")); + throw (new \Exception("The task with tas_uid: '$tas_uid' does not exist.")); } return $tas_uid; } @@ -418,11 +418,11 @@ class ProcessPermissions { $dyn_uid = trim($dyn_uid); if ($dyn_uid == '') { - throw (new \Exception("The dynaform with dynaforms: '', does not exist.")); + throw (new \Exception("The dynaform with dynaforms: '' does not exist.")); } $oDynaform = new \Dynaform(); if (!($oDynaform->dynaformExists($dyn_uid))) { - throw (new \Exception("The dynaform with dynaforms: '$dyn_uid', does not exist.")); + throw (new \Exception("The dynaform with dynaforms: '$dyn_uid' does not exist.")); } return $dyn_uid; } @@ -440,11 +440,11 @@ class ProcessPermissions { $inp_uid = trim($inp_uid); if ($inp_uid == '') { - throw (new \Exception("The input with inputs: '', does not exist.")); + throw (new \Exception("The input with inputs: '' does not exist.")); } $oInputDocument = new \InputDocument(); if (!($oInputDocument->InputExists($inp_uid))) { - throw (new \Exception("The input with inputs: '$inp_uid', does not exist.")); + throw (new \Exception("The input with inputs: '$inp_uid' does not exist.")); } return $inp_uid; } @@ -462,11 +462,11 @@ class ProcessPermissions { $out_uid = trim($out_uid); if ($out_uid == '') { - throw (new \Exception("The output with outputs: '', does not exist.")); + throw (new \Exception("The output with outputs: '' does not exist.")); } $oOutputDocument = new \OutputDocument(); if (!($oOutputDocument->OutputExists($out_uid))) { - throw (new \Exception("The output with outputs: '$out_uid', does not exist.")); + throw (new \Exception("The output with outputs: '$out_uid' does not exist.")); } return $out_uid; } diff --git a/workflow/engine/src/BusinessModel/Step.php b/workflow/engine/src/BusinessModel/Step.php index e811c1539..42e9ae446 100644 --- a/workflow/engine/src/BusinessModel/Step.php +++ b/workflow/engine/src/BusinessModel/Step.php @@ -133,21 +133,21 @@ class Step $dynaform = new \Dynaform(); if (!$dynaform->dynaformExists($objectUid)) { - $msg = str_replace(array("{0}", "{1}"), array($objectUid, "DYNAFORM"), "The UID \"{0}\" doesn't exist in table {1}"); + $msg = str_replace(array("{0}", "{1}"), array($objectUid, "DYNAFORM"), "The UID \"{0}\" does not exist in table {1}"); } break; case "INPUT_DOCUMENT": $inputdoc = new \InputDocument(); if (!$inputdoc->InputExists($objectUid)) { - $msg = str_replace(array("{0}", "{1}"), array($objectUid, "INPUT_DOCUMENT"), "The UID \"{0}\" doesn't exist in table {1}"); + $msg = str_replace(array("{0}", "{1}"), array($objectUid, "INPUT_DOCUMENT"), "The UID \"{0}\" does not exist in table {1}"); } break; case "OUTPUT_DOCUMENT": $outputdoc = new \OutputDocument(); if (!$outputdoc->OutputExists($objectUid)) { - $msg = str_replace(array("{0}", "{1}"), array($objectUid, "OUTPUT_DOCUMENT"), "The UID \"{0}\" doesn't exist in table {1}"); + $msg = str_replace(array("{0}", "{1}"), array($objectUid, "OUTPUT_DOCUMENT"), "The UID \"{0}\" does not exist in table {1}"); } break; } @@ -204,7 +204,7 @@ class Step $field = $this->arrayParamException["stepUid"]; $msg = str_replace(array("{0}"), array($field), "Invalid value specified for \"{0}\"") . " / "; - $msg = $msg . str_replace(array("{0}", "{1}"), array($stepUid, "STEP"), "The UID \"{0}\" doesn't exist in table {1}"); + $msg = $msg . str_replace(array("{0}", "{1}"), array($stepUid, "STEP"), "The UID \"{0}\" does not exist in table {1}"); throw (new \Exception($msg)); } @@ -225,7 +225,7 @@ class Step $field = $this->arrayParamException["taskUid"]; $msg = str_replace(array("{0}"), array($field), "Invalid value specified for \"{0}\"") . " / "; - $msg = $msg . str_replace(array("{0}", "{1}"), array($taskUid, "TASK"), "The UID \"{0}\" doesn't exist in table {1}"); + $msg = $msg . str_replace(array("{0}", "{1}"), array($taskUid, "TASK"), "The UID \"{0}\" does not exist in table {1}"); throw (new \Exception($msg)); } @@ -246,7 +246,7 @@ class Step $field = $this->arrayParamException["processUid"]; $msg = str_replace(array("{0}"), array($field), "Invalid value specified for \"{0}\"") . " / "; - $msg = $msg . str_replace(array("{0}", "{1}"), array($processUid, "PROCESS"), "The UID \"{0}\" doesn't exist in table {1}"); + $msg = $msg . str_replace(array("{0}", "{1}"), array($processUid, "PROCESS"), "The UID \"{0}\" does not exist in table {1}"); throw (new \Exception($msg)); } diff --git a/workflow/engine/src/BusinessModel/Table.php b/workflow/engine/src/BusinessModel/Table.php index dea6e56ce..49bb8a534 100644 --- a/workflow/engine/src/BusinessModel/Table.php +++ b/workflow/engine/src/BusinessModel/Table.php @@ -285,7 +285,7 @@ class Table if (isset($columns[$i]['fld_size'])) { $columns[$i]['field_size'] = $columns[$i]['fld_size']; if (!is_int($columns[$i]['field_size'])) { - throw (new \Exception("The property fld_size: '". $columns[$i]['field_size'] . "', is incorrect numeric value.")); + throw (new \Exception("The property fld_size: '". $columns[$i]['field_size'] . "' is incorrect numeric value.")); } else { $columns[$i]['field_size'] = (int)$columns[$i]['field_size']; } @@ -308,10 +308,10 @@ class Table if (in_array(strtoupper($columns[$i]['field_name']), $reservedWordsSql) || in_array( strtolower( $columns[$i]['field_name']), $reservedWordsPhp ) || $columns[$i]['field_name'] == '') { - throw (new \Exception("The property fld_name: '". $columns[$i]['field_name'] . "', is incorrect value.")); + throw (new \Exception("The property fld_name: '". $columns[$i]['field_name'] . "' is incorrect value.")); } if ($columns[$i]['field_label'] == '') { - throw (new \Exception("The property fld_label: '". $columns[$i]['field_label'] . "', is incorrect value.")); + throw (new \Exception("The property fld_label: '". $columns[$i]['field_label'] . "' is incorrect value.")); } $columns[$i]['field_type'] = $this->validateFldType($columns[$i]['field_type']); if (isset($columns[$i]['field_autoincrement']) && $columns[$i]['field_autoincrement']) { @@ -323,7 +323,7 @@ class Table if (isset($columns[$i]['field_dyn']) && $columns[$i]['field_dyn'] != '') { $res = array_search($columns[$i]['field_dyn'], $fieldsValidate['NAMES']); if ($res === false) { - throw (new \Exception("The property fld_dyn: '".$columns[$i]['field_dyn']."', is incorrect.")); + throw (new \Exception("The property fld_dyn: '".$columns[$i]['field_dyn']."' is incorrect.")); } else { $columns[$i]['_index'] = $fieldsValidate['INDEXS'][$res]; $columns[$i]['field_uid'] = $fieldsValidate['UIDS'][$res]; @@ -549,9 +549,9 @@ class Table $dataValidate['fields'] = $tab_data['fields']; } else { if ($reportFlag) { - throw (new \Exception("The property rep_uid: '$tab_uid', is incorrect.")); + throw (new \Exception("The property rep_uid: '$tab_uid' is incorrect.")); } else { - throw (new \Exception("The property pmt_uid: '$tab_uid', is incorrect.")); + throw (new \Exception("The property pmt_uid: '$tab_uid' is incorrect.")); } } $this->saveTable($dataValidate, $pro_uid, $reportFlag, false); @@ -924,11 +924,11 @@ class Table { $pro_uid = trim($pro_uid); if ($pro_uid == '') { - throw (new \Exception("The project with prj_uid: '', does not exist.")); + throw (new \Exception("The project with prj_uid: '' does not exist.")); } $oProcess = new \Process(); if (!($oProcess->processExists($pro_uid))) { - throw (new \Exception("The project with prj_uid: '$pro_uid', does not exist.")); + throw (new \Exception("The project with prj_uid: '$pro_uid' does not exist.")); } return $pro_uid; } @@ -951,11 +951,11 @@ class Table } $tab_uid = trim($tab_uid); if ($tab_uid == '') { - throw (new \Exception($label . "'', does not exist.")); + throw (new \Exception($label . "'' does not exist.")); } $oAdditionalTables = new \AdditionalTables(); if (!($oAdditionalTables->exists($tab_uid))) { - throw (new \Exception($label . "'$tab_uid', does not exist.")); + throw (new \Exception($label . "'$tab_uid' does not exist.")); } return $tab_uid; } @@ -973,7 +973,7 @@ class Table { $rep_tab_name = trim($rep_tab_name); if ((strpos($rep_tab_name, ' ')) || (strlen($rep_tab_name) < 4)) { - throw (new \Exception("The property rep_tab_name: '$rep_tab_name', is incorrect.")); + throw (new \Exception("The property rep_tab_name: '$rep_tab_name' is incorrect.")); } $rep_tab_name = G::toUpper($rep_tab_name); if (substr($rep_tab_name, 0, 4) != 'PMT_') { @@ -996,7 +996,7 @@ class Table { $rep_tab_connection = trim($rep_tab_connection); if ($rep_tab_connection == '') { - throw (new \Exception("The property rep_tab_connection: '$rep_tab_connection', is incorrect.")); + throw (new \Exception("The property rep_tab_connection: '$rep_tab_connection' is incorrect.")); } $connections = array('workflow', 'rp'); @@ -1011,7 +1011,7 @@ class Table } if (!in_array($rep_tab_connection, $connections)) { - throw (new \Exception("The property rep_tab_connection: '$rep_tab_connection', is incorrect.")); + throw (new \Exception("The property rep_tab_connection: '$rep_tab_connection' is incorrect.")); } return $rep_tab_connection; } @@ -1030,7 +1030,7 @@ class Table { $rep_tab_grid = trim($rep_tab_grid); if ($rep_tab_grid == '') { - throw (new \Exception("The property rep_tab_grid: '$rep_tab_grid', is incorrect.")); + throw (new \Exception("The property rep_tab_grid: '$rep_tab_grid' is incorrect.")); } G::loadSystem('dynaformhandler'); @@ -1064,7 +1064,7 @@ class Table $find = array_search($rep_tab_grid, $grids); if ($find === false) { - throw (new \Exception("The property rep_tab_grid: '$rep_tab_grid', is incorrect.")); + throw (new \Exception("The property rep_tab_grid: '$rep_tab_grid' is incorrect.")); } else { $rep_tab_grid = $namesGrid[$find] . '-' . $rep_tab_grid; } @@ -1084,7 +1084,7 @@ class Table { $fld_type = trim($fld_type); if ($fld_type == '') { - throw (new \Exception("The property fld_type: '$fld_type', is incorrect.")); + throw (new \Exception("The property fld_type: '$fld_type' is incorrect.")); } switch ($fld_type) { @@ -1104,7 +1104,7 @@ class Table $columnsTypes = \PmTable::getPropelSupportedColumnTypes(); $res = array_search($fld_type, $columnsTypes); if ($res === false) { - throw (new \Exception("The property fld_type: '$fld_type', is incorrect.")); + throw (new \Exception("The property fld_type: '$fld_type' is incorrect.")); } return $fld_type; } diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php index 5eaebecba..500bba6b6 100644 --- a/workflow/engine/src/BusinessModel/Task.php +++ b/workflow/engine/src/BusinessModel/Task.php @@ -763,11 +763,11 @@ class Task require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "GroupUser.php"); $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $aUsers = array(); $sDelimiter = \DBAdapter::getStringDelimiter(); @@ -880,14 +880,14 @@ class Task } if ($start) { if ($start < 0) { - throw (new \Exception( 'invalid value specified for `start`.')); + throw (new \Exception( 'Invalid value specified for `start`.')); } } else { $start = 0; } if (isset($limit)) { if ($limit < 0) { - throw (new \Exception( 'invalid value specified for `limit`.')); + throw (new \Exception( 'Invalid value specified for `limit`.')); } else { if ($limit == 0) { return array(); @@ -925,11 +925,11 @@ class Task require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "GroupUser.php"); $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 1; $aUsers = array(); @@ -1035,14 +1035,14 @@ class Task } if ($start) { if ($start < 0) { - throw (new \Exception( 'invalid value specified for `start`.')); + throw (new \Exception( 'Invalid value specified for `start`.')); } } else { $start = 0; } if (isset($limit)) { if ($limit < 0) { - throw (new \Exception( 'invalid value specified for `limit`.')); + throw (new \Exception( 'Invalid value specified for `limit`.')); } else { if ($limit == 0) { return array(); @@ -1074,11 +1074,11 @@ class Task try { $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 1; $aUsers = array(); @@ -1210,11 +1210,11 @@ class Task try { $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 1; $iRelation = ''; @@ -1236,18 +1236,18 @@ class Task $oTypeAssigneeG = \GroupwfPeer::retrieveByPK( $sAssigneeUID ); $oTypeAssigneeU = \UsersPeer::retrieveByPK( $sAssigneeUID ); if (is_null( $oTypeAssigneeG ) && is_null( $oTypeAssigneeU ) ) { - throw (new \Exception( 'This id: '. $sAssigneeUID .' do not correspond to a registered ' .$assType )); + throw (new \Exception( 'This id: '. $sAssigneeUID .' does not correspond to a registered ' .$assType )); } if (is_null( $oTypeAssigneeG ) && ! is_null( $oTypeAssigneeU) ) { $type = "user"; if ( $type != $assType ) { - throw (new \Exception( 'This id: '. $sAssigneeUID .' do not correspond to a registered ' .$assType )); + throw (new \Exception( 'This id: '. $sAssigneeUID .' does not correspond to a registered ' .$assType )); } } if (! is_null( $oTypeAssigneeG ) && is_null( $oTypeAssigneeU ) ) { $type = "group"; if ( $type != $assType ) { - throw (new \Exception( 'This id: '. $sAssigneeUID .' do not correspond to a registered ' .$assType )); + throw (new \Exception( 'This id: '. $sAssigneeUID .' does not correspond to a registered ' .$assType )); } } $oTaskUser = new \TaskUser(); @@ -1282,11 +1282,11 @@ class Task try { $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 1; $iRelation = ''; @@ -1334,11 +1334,11 @@ class Task require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "GroupUser.php"); $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $aUsers = array(); $sDelimiter = \DBAdapter::getStringDelimiter(); @@ -1451,14 +1451,14 @@ class Task } if ($start) { if ($start < 0) { - throw (new \Exception( 'invalid value specified for `start`.')); + throw (new \Exception( 'Invalid value specified for `start`.')); } } else { $start = 0; } if (isset($limit)) { if ($limit < 0) { - throw (new \Exception( 'invalid value specified for `limit`.')); + throw (new \Exception( 'Invalid value specified for `limit`.')); } else { if ($limit == 0) { return array(); @@ -1497,11 +1497,11 @@ class Task $aUsers = array(); $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 2; @@ -1607,14 +1607,14 @@ class Task } if ($start) { if ($start < 0) { - throw (new \Exception( 'invalid value specified for `start`.')); + throw (new \Exception( 'Invalid value specified for `start`.')); } } else { $start = 0; } if (isset($limit)) { if ($limit < 0) { - throw (new \Exception( 'invalid value specified for `limit`.')); + throw (new \Exception( 'Invalid value specified for `limit`.')); } else { if ($limit == 0) { return array(); @@ -1648,11 +1648,11 @@ class Task try { $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 2; $aUsers = array(); @@ -1784,11 +1784,11 @@ class Task try { $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 2; $iRelation = ''; @@ -1810,18 +1810,18 @@ class Task $oTypeAssigneeG = \GroupwfPeer::retrieveByPK( $sAssigneeUID ); $oTypeAssigneeU = \UsersPeer::retrieveByPK( $sAssigneeUID ); if (is_null( $oTypeAssigneeG ) && is_null( $oTypeAssigneeU ) ) { - throw (new \Exception( 'This id: '. $sAssigneeUID .' do not correspond to a registered ' .$assType )); + throw (new \Exception( 'This id: '. $sAssigneeUID .' does not correspond to a registered ' .$assType )); } if (is_null( $oTypeAssigneeG ) && ! is_null( $oTypeAssigneeU) ) { $type = "user"; if ( $type != $assType ) { - throw (new \Exception( 'This id: '. $sAssigneeUID .' do not correspond to a registered ' .$assType )); + throw (new \Exception( 'This id: '. $sAssigneeUID .' does not correspond to a registered ' .$assType )); } } if (! is_null( $oTypeAssigneeG ) && is_null( $oTypeAssigneeU ) ) { $type = "group"; if ( $type != $assType ) { - throw (new \Exception( 'This id: '. $sAssigneeUID .' do not correspond to a registered ' .$assType )); + throw (new \Exception( 'This id: '. $sAssigneeUID .' does not correspond to a registered ' .$assType )); } } $oTaskUser = new \TaskUser(); @@ -1856,11 +1856,11 @@ class Task try { $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { - throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); + throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' does not correspond to a registered process')); } $oActivity = \TaskPeer::retrieveByPK( $sTaskUID ); if (is_null($oActivity)) { - throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity')); + throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 2; $iRelation = ''; diff --git a/workflow/engine/src/BusinessModel/Trigger.php b/workflow/engine/src/BusinessModel/Trigger.php index 8ce07363e..efad0441e 100644 --- a/workflow/engine/src/BusinessModel/Trigger.php +++ b/workflow/engine/src/BusinessModel/Trigger.php @@ -155,7 +155,7 @@ class Trigger if (isset($dataTrigger['TRI_TITLE'])) { if (!$this->verifyNameTrigger($sProcessUID, $dataTrigger['TRI_TITLE'], $sTriggerUid)) { - throw new \Exception('There is a triggers with the same name in this process'); + throw new \Exception('A trigger with the same name already exists in this process'); } } @@ -268,7 +268,7 @@ class Trigger { try { if (!$this->verifyNameTrigger($processUid, $triggerTitle, $triggerUidExclude)) { - $msg = str_replace(array("{0}", "{1}"), array($fieldNameForException, $triggerTitle), "The trigger title with {0}: \"{1}\", already exists"); + $msg = str_replace(array("{0}", "{1}"), array($fieldNameForException, $triggerTitle), "The trigger title with {0}: \"{1}\" already exists"); throw (new \Exception($msg)); }