';
- $index = 1;
- $__ABE__ .= '';
+ $__ABE__ .= $this->getCustomTemplate();
+ break;
+ case 'RESPONSE':
+ $this->defineReplyTo($dataAbe['ABE_EMAIL_SERVER_RECEIVER_UID']);
+ $__ABE__ .= $this->getResponseTemplate();
break;
case 'LINK':
- $__ABE__ .= 'Please complete this form';
+ $__ABE__ .= $this->getServicePathTemplate();
break;
- // coment
case 'FIELD':
- $variableService = new \ProcessMaker\Services\Api\Project\Variable();
- $variables = $variableService->doGetVariables($caseFields['PRO_UID']);
- $field = new stdClass();
- $field->label = 'Test';
- $field->type = 'dropdown';
- $field->options = array();
- $field->value = '';
- $actionField = str_replace(array('@@','@#','@=','@%','@?','@$'), '', $configuration['ABE_ACTION_FIELD']);
- $dynaform = $configuration['DYN_UID'];
- $variables = G::json_decode($configuration['DYN_CONTENT'], true);
- if(isset($variables['items'][0]['items'])){
- $fields = $variables['items'][0]['items'];
- foreach ($fields as $key => $value) {
- foreach($value as $var){
- if(isset($var['variable'])){
- if ($var['variable'] == $actionField) {
- $field->label = $var['label'];
- $field->type = $var['type'];
- $values = $var['options'];
- foreach ($values as $val){
- $field->options[$val['value']] = $val['value'];
- }
- }
- }
- }
- }
- }
-
- $obj = new PmDynaform($configuration['DYN_UID']);
- $configuration['CURRENT_DYNAFORM'] = $configuration['DYN_UID'];
- $file = $obj->printPmDynaformAbe($configuration);
- $__ABE__ .= $file;
- $__ABE__ .= '' . $field->label . '
';
+ $__ABE__ .= $this->getFieldTemplate();
break;
}
-
- $__ABE__ = preg_replace('/\![](\"\/js\/maborak\/core\/images\/(.+?)\) /', '' , $__ABE__);
- $__ABE__ = preg_replace('/\]*\/>/', '' , $__ABE__);
+ $__ABE__ = preg_replace('/\/', '', $__ABE__);
+ $__ABE__ = preg_replace('/\]*\/>/', '', $__ABE__);
$__ABE__ = preg_replace('/]*>(.*?)<\/select>/is', "", $__ABE__);
- $__ABE__ = preg_replace('/align=\"center\"/', '' , $__ABE__);
- $__ABE__ = preg_replace('/class="tableGrid_view" /', 'class="tableGrid_view" width="100%" ', $__ABE__);
+ $__ABE__ = preg_replace('/align=\"center\"/', '', $__ABE__);
+ $__ABE__ = preg_replace('/class="tableGrid_view" /', 'class="tableGrid_view" width="100%" ',
+ $__ABE__);
$caseFields['APP_DATA']['__ABE__'] = $__ABE__;
- $user = new Users();
-
- $emailFrom = '';
- if (!$configuration['ABE_MAILSERVER_OR_MAILCURRENT'] && $configuration['ABE_TYPE'] !== '') {
- if ($data->PREVIOUS_USR_UID !== '') {
- $userDetails = $user->loadDetails($data->PREVIOUS_USR_UID);
- $emailFrom = ($userDetails["USR_FULLNAME"] . ' <' . $userDetails["USR_EMAIL"] . '>');
- } else {
- global $RBAC;
- if ($RBAC != null && is_array($RBAC->aUserInfo['USER_INFO'])) {
- $currentUser = $RBAC->aUserInfo['USER_INFO'];
- $emailFrom = ($currentUser["USR_FIRSTNAME"] . ' ' . $currentUser["USR_LASTNAME"] . ' <' . $currentUser["USR_EMAIL"] . '>');
- } else {
- $usersPeer = UsersPeer::retrieveByPK($data->USR_UID);
- if (!empty($usersPeer)) {
- $emailFrom = ($usersPeer->getUsrFirstname() . ' ' . $usersPeer->getUsrLastname() . ' <' . $usersPeer->getUsrEmail() . '>');
- }
- }
- }
- } else {
- if (isset($emailSetup["MESS_FROM_NAME"]) && isset($emailSetup["MESS_FROM_MAIL"])) {
- $emailFrom = ($emailSetup["MESS_FROM_NAME"] . ' <' . $emailSetup["MESS_FROM_MAIL"] . '>');
- } else {
- $emailFrom = ((isset($emailSetup["MESS_FROM_NAME"])) ? $emailSetup["MESS_FROM_NAME"] : $emailSetup["MESS_FROM_MAIL"]);
- }
- }
-
- $wsBaseInstance = new WsBase();
- $result = $wsBaseInstance->sendMessage(
- $data->APP_UID,
- $emailFrom,
- $email,
- '',
- '',
- $subject,
- $configuration['ABE_TEMPLATE'],
+ $this->defineEmailFrom($emailServerSetup);
+ $result = $this->abeSendMessage(
+ $this->getItemAbeProperties('ABE_TEMPLATE'),
$caseFields['APP_DATA'],
- null,
- true,
- $data->DEL_INDEX,
- $emailSetup,
- 0,
- WsBase::MESSAGE_TYPE_ACTIONS_BY_EMAIL
+ $emailServerSetup
);
- $abeRequest['ABE_REQ_STATUS'] = ($result->status_code == 0 ? 'SENT' : 'ERROR');
+ $request = [];
+ $request['ABE_REQ_STATUS'] = ($result->status_code == 0 ? 'SENT' : 'ERROR');
- $body = '';
- $messageSent = executeQuery('SELECT `APP_MSG_BODY` FROM `APP_MESSAGE` ORDER BY `APP_MSG_SEND_DATE` DESC LIMIT 1');
-
- if (!empty($messageSent) && is_array($messageSent)) {
- $body = $messageSent[1]['APP_MSG_BODY'];
- }
-
- $abeRequest['ABE_REQ_BODY'] = $body;
-
- // Update
- try {
- $abeRequestsInstance = new AbeRequests();
- $abeRequestsInstance->createOrUpdate($abeRequest);
- } catch (Exception $error) {
- throw $error;
- }
+ $request['ABE_REQ_BODY'] = empty($result->getAppMessUid()) ? '' : AppMessage::getAppMsgBodyByKey($result->getAppMessUid());
+ $this->addItemAbeRequest($request);
+ $this->registerRequest();
}
}
+ } else {
+ throw new Exception('Task does not have an action by email configuration.');
}
}
} catch (Exception $error) {
throw $error;
}
}
+
+ /**
+ * Get the html template for email response
+ *
+ * @return string
+ */
+ private function getResponseTemplate()
+ {
+ $noReply = $this->getReplyTo();
+ $customGrid = unserialize($this->getItemAbeProperties('ABE_CUSTOM_GRID'));
+ $field = new stdClass();
+ $field->label = '';
+ $html = '' . $field->label . '';
+ $html .= '';
+ $index = 1;
+ foreach ($customGrid as $key => $value) {
+ // Get the subject
+ $emailSubject = $this->getSubjectByResponse($value['abe_custom_label']);
+ $emailBody = $this->getBodyByResponse($value['abe_custom_value']);
+ // Define the html for the actions
+ $html .= '| ';
+ $html .= $value['abe_custom_label'];
+ $html .= ' | ' . (($index % 5 == 0) ? ' ' : ' ');
+ $index++;
+ }
+ $html .= '
';
+
+ return $html;
+ }
+
+ /**
+ * Get the subject for response the action by email
+ *
+ * @param string $fieldLabel
+ *
+ * @return string
+ */
+ private function getSubjectByResponse($fieldLabel)
+ {
+ $subject = G::LoadTranslation('ID_CASE') . ' ' . $this->getCasePropertiesKey('APP_TITLE');
+ $subject .= $this->delimiter . ' ' . $fieldLabel;
+
+ return urlencode($subject);
+ }
+
+ /**
+ * Get the body for response the action by email
+ *
+ * @param string $fieldValue
+ *
+ * @return string
+ */
+ private function getBodyByResponse($fieldValue)
+ {
+ $abeRequest = $this->getAbeRequest();
+ $bodyToCrypt = [
+ 'workspace' => $this->getWorkspace(),
+ 'appUid' => $this->getAppUid(),
+ 'delIndex' => $this->getIndex(),
+ 'fieldValue' => $fieldValue,
+ 'ABE_REQ_UID' => $abeRequest['ABE_REQ_UID']
+ ];
+ $bodyToCrypt = G::json_encode($bodyToCrypt);
+
+ $body = str_repeat(self::BODY_REPLY_LF, 4);
+ $body .= '/' . str_repeat("=", 24) . self::BODY_REPLY_LF;
+ $body .= G::LoadTranslation('ID_ABE_EMAIL_RESPONSE_BODY_NOTE') . self::BODY_REPLY_LF;
+ $body .= '{' . Crypt::encryptString($bodyToCrypt) . '}' . self::BODY_REPLY_LF;
+ $body .= str_repeat("=", 24) . '/';
+ return $body;
+ }
+
+ /**
+ * Get the html template for custom actions
+ * @todo we need to revise this function
+ *
+ * @return string
+ */
+ private function getCustomTemplate()
+ {
+ $abeRequest = $this->getAbeRequest();
+ $customGrid = unserialize($this->getItemAbeProperties('ABE_CUSTOM_GRID'));
+ $variableService = new Variable();
+ $variables = $variableService->doGetVariables($this->getCasePropertiesKey('PRO_UID'));
+ $field = new stdClass();
+ $field->label = '';
+ $actionField = str_replace(
+ $this->getPrefix(),
+ '',
+ $this->getItemAbeProperties('ABE_ACTION_FIELD')
+ );
+
+ $itemDynUid = $this->getItemAbeProperties('DYN_UID');
+ $obj = new PmDynaform($itemDynUid);
+ $this->addItemAbeProperties(['CURRENT_DYNAFORM' => $itemDynUid]);
+ $file = $obj->printPmDynaformAbe($this->getTaskAbeProperties());
+ $html = $file;
+ $html .= '' . $field->label . '';
+ $index = 1;
+ $html .= '';
+ foreach ($customGrid as $key => $value) {
+ $html .= '| getServicePath())) . '?ACTION=' . G::encrypt('processABE',
+ URL_KEY, true) . '&APP_UID=';
+ $html .= G::encrypt($this->getAppUid(), URL_KEY,
+ true) . '&DEL_INDEX=' . G::encrypt($this->getindex(), URL_KEY);
+ $html .= '&FIELD=' . G::encrypt($actionField, URL_KEY,
+ true) . '&VALUE=' . G::encrypt($value['abe_custom_value'], URL_KEY,
+ true);
+ $html .= '&ABER=' . G::encrypt($abeRequest['ABE_REQ_UID'], URL_KEY,
+ true) . '" target="_blank" >' . $value['abe_custom_label'];
+ $html .= ' | ' . (($index % 5 == 0) ? ' ' : ' ');
+ $index++;
+ }
+ $html .= '
';
+
+ return $html;
+ }
+
+ /**
+ * Get the html template for link to fill a form
+ * @todo we need to revise this function
+ *
+ * @return string
+ */
+ private function getServicePathTemplate()
+ {
+ $abeRequest = $this->getAbeRequest();
+ $html = 'Please complete this form';
+
+ return $html;
+ }
+
+ /**
+ * Get the html template for use a field to generate actions links
+ * @todo we need to revise this function
+ *
+ * @return string
+ */
+ private function getFieldTemplate()
+ {
+ $abeRequest = $this->getAbeRequest();
+ $variableService = new Variable();
+ $variables = $variableService->doGetVariables($this->getCasePropertiesKey('PRO_UID'));
+ $field = new stdClass();
+ $field->label = 'Test';
+ $field->type = 'dropdown';
+ $field->options = [];
+ $field->value = '';
+ $actionField = str_replace(
+ $this->getPrefix(),
+ '',
+ $this->getItemAbeProperties('ABE_ACTION_FIELD')
+ );
+ $dynUid = $this->getItemAbeProperties('DYN_UID');
+ $variables = G::json_decode($this->getItemAbeProperties('DYN_CONTENT'), true);
+ if (isset($variables['items'][0]['items'])) {
+ $fields = $variables['items'][0]['items'];
+ foreach ($fields as $key => $value) {
+ foreach ($value as $var) {
+ if (isset($var['variable'])) {
+ if ($var['variable'] == $actionField) {
+ $field->label = $var['label'];
+ $field->type = $var['type'];
+ $values = $var['options'];
+ foreach ($values as $val) {
+ $field->options[$val['value']] = $val['value'];
+ }
+ }
+ }
+ }
+ }
+ }
+
+ $obj = new PmDynaform($dynUid);
+ $this->addItemAbeProperties(['CURRENT_DYNAFORM' => $dynUid]);
+ $file = $obj->printPmDynaformAbe($this->getTaskAbeProperties());
+ $html = $file;
+ $html .= '' . $field->label . '
';
+
+ return $html;
+ }
+
+ /**
+ * Register the request in the table ABE_REQUEST
+ *
+ * @return void
+ * @throws Exception
+ */
+ private function registerRequest()
+ {
+ try {
+ $requestInstance = new AbeRequests();
+ $abeRequest['ABE_REQ_UID'] = $requestInstance->createOrUpdate($this->getAbeRequest());
+ $this->setAbeRequest($abeRequest);
+ } catch (Exception $error) {
+ throw $error;
+ }
+ }
+
+ /**
+ * Send the message
+ *
+ * @param string $template
+ * @param array $caseData
+ * @param array $configEmail
+ *
+ * @return object
+ * @throws Exception
+ */
+ private function abeSendMessage($template, array $caseData, array $configEmail)
+ {
+ try {
+ $wsBaseInstance = new WsBase();
+ $result = $wsBaseInstance->sendMessage(
+ $this->getAppUid(),
+ $this->getEmailFrom(),
+ $this->getEmailTo(),
+ '',
+ '',
+ $this->getSubject(),
+ $template,
+ $caseData,
+ null,
+ true,
+ $this->getIndex(),
+ $configEmail,
+ 0,
+ WsBase::MESSAGE_TYPE_ACTIONS_BY_EMAIL
+ );
+
+ return $result;
+ } catch (Exception $error) {
+ throw $error;
+ }
+ }
}
diff --git a/workflow/engine/classes/MultipleFilesBackup.php b/workflow/engine/classes/MultipleFilesBackup.php
index 8e06e5852..a3ee55cba 100644
--- a/workflow/engine/classes/MultipleFilesBackup.php
+++ b/workflow/engine/classes/MultipleFilesBackup.php
@@ -94,11 +94,21 @@ class MultipleFilesBackup
}
}
- /* Restore from file(s) commpressed by letsBackup function, into a temporary directory
- * @ filename got the name and path of the compressed file(s), if there are many files with file extention as a numerical series, the extention should be discriminated.
- * @ srcWorkspace contains the workspace to be restored.
- * @ dstWorkspace contains the workspace to be overwriting.
- * @ overwrite got the option true if the workspace will be overwrite.
+ /**
+ * Restore from file(s) compressed by letsBackup function, into a temporary directory
+ *
+ * @param string $filename Got the name and path of the compressed file(s), if there are many files with file extention as a numerical series, the extention should be discriminated.
+ * @param string $srcWorkspace Contains the workspace to be restored.
+ * @param bool $dstWorkspace Contains the workspace to be overwriting.
+ * @param bool $overwrite Got the option true if the workspace will be overwrite.
+ *
+ * @throws Exception
+ *
+ * @see workflow/engine/bin/tasks/cliWorkspaces.php::run_workspace_restore()
+ *
+ * @link https://wiki.processmaker.com/3.0/Backing_up_and_Restoring_ProcessMaker#RestoringWorkspaces
+ *
+ * @deprecated Method outdated, only run the upgrade of APP_CACHE_VIEW table
*/
public static function letsRestore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true)
{
diff --git a/workflow/engine/classes/PmDynaform.php b/workflow/engine/classes/PmDynaform.php
old mode 100644
new mode 100755
index a0e52da02..c8946e72f
--- a/workflow/engine/classes/PmDynaform.php
+++ b/workflow/engine/classes/PmDynaform.php
@@ -15,27 +15,65 @@ class PmDynaform
{
use SuggestTrait;
- public static $instance = null;
- public $fields = null;
- public $record = null;
- public $records = null;
+ private $cache = [];
+ private $context = [];
+ private $databaseProviders = null;
+ private $dataSources = null;
+ private $lastQueryError = null;
+ private $propertiesToExclude = [];
+ private $sysSys = null;
public $credentials = null;
+ public $displayMode = null;
+ public $fields = null;
+ public $isRTL = false;
public $lang = SYS_LANG;
public $langs = null;
- public $displayMode = null;
public $onPropertyRead = "onPropertyReadFormInstance";
- public $isRTL = false;
public $pathRTLCss = '';
+ public $record = null;
+ public $records = null;
public $serverConf = null;
- private $cache = array();
- private $sysSys = null;
- private $context = array();
- private $dataSources = null;
- private $databaseProviders = null;
- private $propertiesToExclude = array();
- public static $prefixs = array("@@", "@#", "@%", "@?", "@$", "@=");
+ public static $instance = null;
+ public static $prefixs = ["@@", "@#", "@%", "@?", "@$", "@="];
- public function __construct($fields = array())
+ /**
+ * Constructor
+ *
+ * @param array $fields
+ * @see workflow/engine/classes/class.pmFunctions.php PMFDynaFormFields()
+ * @see workflow/engine/classes/class.pmFunctions.php PMFgetLabelOption()
+ * @see \ConsolidatedCases->processConsolidated()
+ * @see \WorkspaceTools->syncFormsWithInputDocumentInfo()
+ * @see workflow/engine/methods/cases/ajaxListener.php Ajax->dynaformViewFromHistory()
+ * @see workflow/engine/methods/cases/caseConsolidated.php
+ * @see workflow/engine/methods/cases/cases_SaveData.php
+ * @see workflow/engine/methods/cases/cases_Step.php
+ * @see workflow/engine/methods/cases/cases_StepToRevise.php
+ * @see workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
+ * @see workflow/engine/methods/cases/pmDynaform.php
+ * @see workflow/engine/methods/cases/summary.php
+ * @see workflow/engine/methods/services/ActionsByEmailDataForm.php
+ * @see workflow/engine/plugins/EnterpriseSearch/display_dynaform.php
+ * @see workflow/engine/plugins/EnterpriseSearch/dynaform_view1.php
+ * @see \ProcessMaker\BusinessModel\ActionsByEmail->viewFormBpmn()
+ * @see \ProcessMaker\BusinessModel\Cases->getCaseVariables()
+ * @see \ProcessMaker\BusinessModel\Consolidated->getDataGenerate()
+ * @see \ProcessMaker\BusinessModel\InputDocument->update()
+ * @see \ProcessMaker\BusinessModel\Light\Tracker->showObjects()
+ * @see \ProcessMaker\BusinessModel\Variable->delete()
+ * @see \ProcessMaker\BusinessModel\Variable->executeSqlControl()
+ * @see \ProcessMaker\BusinessModel\Variable->update()
+ * @see \ProcessMaker\Core\System\ActionsByEmailCoreClass->sendActionsByEmail()
+ * @see \ProcessMaker\Services\Api\Light->doGetDynaForm()
+ * @see \ProcessMaker\Services\Api\Light->doGetDynaformProcessed()
+ * @see \ProcessMaker\Services\Api\Light->doGetDynaForms()
+ * @see \ProcessMaker\Services\Api\Light->doGetDynaFormsId()
+ * @see \ProcessMaker\Services\Api\Project\DynaForm->doDeleteDynaFormLanguage()
+ * @see \ProcessMaker\Services\Api\Project\DynaForm->doGetDynaFormLanguage()
+ * @see \ProcessMaker\Services\Api\Project\DynaForm->doGetListDynaFormLanguage()
+ * @see \ProcessMaker\Services\Api\Project\DynaForm->doPostDynaFormLanguage()
+ */
+ public function __construct($fields = [])
{
$this->sysSys = (!empty(config("system.workspace"))) ? config("system.workspace") : "Undefined";
$this->context = \Bootstrap::getDefaultContextLog();
@@ -280,16 +318,7 @@ class PmDynaform
}
}
if ($value === "suggest" && isset($json->queryField) && $json->queryField == true) {
- $json->queryOutputData = array();
- foreach ($json->optionsSql as $option) {
- if ($json->queryFilter !== '') {
- if (stripos($option->label, $json->queryFilter) !== false) {
- $json->queryOutputData[] = $option;
- }
- } else {
- $json->queryOutputData[] = $option;
- }
- }
+ $this->searchResultInDataSource($json);
}
}
}
@@ -642,6 +671,8 @@ class PmDynaform
}
$json->rows = count($rows);
$json->data = $rows;
+
+ $this->setDataSchema($json, $this->fields["APP_DATA"][$json->name]);
}
}
//languages
@@ -685,6 +716,59 @@ class PmDynaform
}
}
+ /**
+ * This function will be search in the dataSource and will be add the new row in the queryOutputData property
+ *
+ * @param object $json
+ *
+ * @return void
+ */
+ private function searchResultInDataSource($json)
+ {
+ $json->queryOutputData = [];
+ foreach ($json->optionsSql as $option) {
+ //We will to check the limit parameter
+ if (count($json->queryOutputData) < $json->queryLimit) {
+ //Searching by filter parameter
+ if ($json->queryFilter !== '') {
+ if (stripos($option->label, $json->queryFilter) !== false) {
+ $json->queryOutputData[] = $option;
+ }
+ } elseif (isset($json->querySearch) && is_array($json->querySearch) && !empty($json->querySearch)) {
+ //Searching by query parameter
+ $dataSearch = $json->querySearch;
+ $valueAdded = false;
+ //The match has priority
+ //We will to search match in the dataSource
+ if (isset($dataSearch['match'])) {
+ $value = isset($dataSearch['match']['value']) ? $dataSearch['match']['value'] : '';
+ $label = isset($dataSearch['match']['text']) ? $dataSearch['match']['text'] : '';
+ if (!empty($value) && $option->value === $value) {
+ $valueAdded = true;
+ $json->queryOutputData[] = $option;
+ }
+ if (!empty($label) && $option->label === $label && !$valueAdded) {
+ $json->queryOutputData[] = $option;
+ }
+ } elseif (isset($dataSearch['term'])) {
+ //We will to search term in the dataSource
+ $value = isset($dataSearch['term']['value']) ? $dataSearch['term']['value'] : '';
+ $label = isset($dataSearch['term']['text']) ? $dataSearch['term']['text'] : '';
+ if (!empty($value) && stripos($option->value, $value) !== false) {
+ $valueAdded = true;
+ $json->queryOutputData[] = $option;
+ }
+ if (!empty($label) && stripos($option->label, $label) !== false && !$valueAdded) {
+ $json->queryOutputData[] = $option;
+ }
+ }
+ } else {
+ $json->queryOutputData[] = $option;
+ }
+ }
+ }
+ }
+
private function getValuesDependentFields($json)
{
if (!isset($this->record["DYN_CONTENT"])) {
@@ -736,6 +820,17 @@ class PmDynaform
return $data;
}
+ /**
+ * Get data from cache query.
+ *
+ * @param string $connection
+ * @param string $sql
+ * @param string $type
+ * @param boolean $clearCache
+ * @return array
+ * @see \PmDynaform->jsonr()
+ * @see \PmDynaform->getValuesDependentFields()
+ */
private function getCacheQueryData($connection, $sql, $type = "", $clearCache = false)
{
$data = [];
@@ -764,6 +859,7 @@ class PmDynaform
} catch (Exception $e) {
$this->context["action"] = "execute-sql" . $type;
$this->context["exception"] = (array) $e;
+ $this->lastQueryError = $e;
\Bootstrap::registerMonolog("sqlExecution",
400,
"Sql Execution",
@@ -2215,6 +2311,27 @@ class PmDynaform
$googleMaps->signature = $config['google_map_signature'];
$result = 'var googleMaps = ' . G::json_encode($googleMaps) . ';';
return $result;
+ }
+
+ /**
+ * Get last query error.
+ *
+ * @return object
+ * @see ProcessMaker\BusinessModel\Variable->executeSqlControl()
+ */
+ public function getLastQueryError()
+ {
+ return $this->lastQueryError;
+ }
+
+ /**
+ * Clear last query error.
+ *
+ * @see ProcessMaker\BusinessModel\Variable->executeSqlControl()
+ */
+ public function clearLastQueryError()
+ {
+ $this->lastQueryError = null;
}
/**
@@ -2265,4 +2382,32 @@ class PmDynaform
}
return $message;
}
+
+ /**
+ * This adds a new definition on the json dynaform
+ * @param json $json
+ *
+ * @link https://wiki.processmaker.com/3.0/Grid_Control
+ * @see workflow/engine/classes/PmDynaform->jsonr
+ */
+ public function setDataSchema($json, $appDataVariables)
+ {
+ foreach ($json->data as $key => $value) {
+ $columnsData = [];
+ foreach ($json->columns as $keyData => $valueData) {
+ foreach ($appDataVariables as $keyAppData => $valueAppData) {
+ if (array_key_exists($valueData->id, $valueAppData) || array_key_exists($valueData->id . "_label",
+ $valueAppData) || array_key_exists($valueData->name,
+ $valueAppData) || array_key_exists($valueData->name . "_label", $valueAppData)) {
+ array_push($columnsData, ["defined" => true]);
+ break;
+ } else {
+ array_push($columnsData, ["defined" => false]);
+ break;
+ }
+ }
+ }
+ $json->dataSchema[$key] = $columnsData;
+ }
+ }
}
diff --git a/workflow/engine/classes/SpoolRun.php b/workflow/engine/classes/SpoolRun.php
index 1b5ac211c..f5b1054fa 100644
--- a/workflow/engine/classes/SpoolRun.php
+++ b/workflow/engine/classes/SpoolRun.php
@@ -91,6 +91,26 @@ class SpoolRun
$this->appMsgUid = $v;
}
+ /**
+ * Set the $spoolId
+ *
+ * @param string
+ */
+ public function setSpoolId($v)
+ {
+ $this->spoolId = $v;
+ }
+
+ /**
+ * Get the $spoolId
+ *
+ * @return string
+ */
+ public function getSpoolId()
+ {
+ return $this->spoolId;
+ }
+
/**
* Get the fileData property
*
@@ -489,11 +509,13 @@ class SpoolRun
switch ($this->config['MESS_ENGINE']) {
case 'MAIL':
case 'PHPMAILER':
+ case 'IMAP':
switch ($this->config['MESS_ENGINE']) {
case 'MAIL':
$phpMailer = new PHPMailer();
$phpMailer->Mailer = 'mail';
break;
+ case 'IMAP':
case 'PHPMAILER':
$phpMailer = new PHPMailer(true);
$phpMailer->Mailer = 'smtp';
@@ -505,6 +527,7 @@ class SpoolRun
switch ($this->config['MESS_ENGINE']) {
case 'MAIL':
break;
+ case 'IMAP':
case 'PHPMAILER':
//Posible Options for SMTPSecure are: "", "ssl" or "tls"
if (isset($this->config['SMTPSecure']) && preg_match('/^(ssl|tls)$/', $this->config['SMTPSecure'])) {
diff --git a/workflow/engine/classes/Upgrade.php b/workflow/engine/classes/Upgrade.php
deleted file mode 100644
index 67fa51dcf..000000000
--- a/workflow/engine/classes/Upgrade.php
+++ /dev/null
@@ -1,128 +0,0 @@
-addon = $addon;
- }
-
- public function install()
- {
-
- $filter = new InputFilter();
- $start = microtime(1);
- $filename = $this->addon->getDownloadFilename();
- $time = microtime(1);
-
- $archive = new Archive_Tar ($filename);
- $time = microtime(1);
- $extractDir = dirname($this->addon->getDownloadFilename()) . "/extract";
- $extractDir = $filter->xssFilterHard($extractDir);
- $backupDir = dirname($this->addon->getDownloadFilename()) . "/backup";
- $backupDir = $filter->xssFilterHard($backupDir);
- if (file_exists($extractDir)) {
- G::rm_dir($extractDir);
- }
- if (file_exists($backupDir)) {
- G::rm_dir($backupDir);
- }
- if (!is_dir($backupDir)) {
- mkdir($backupDir);
- }
-
- $time = microtime(1);
- echo "Extracting files...\n";
- $archive->extractModify($extractDir, 'processmaker');
- $checksumFile = file_get_contents("$extractDir/checksum.txt");
- $time = microtime(1);
- $checksums = array();
- foreach (explode("\n", $checksumFile) as $line) {
- $checksums[trim(substr($line, 33))] = substr($line, 0, 32);
- }
-
- $checksum = array();
- $changedFiles = array();
- $time = microtime(1);
- $files = $this->ls_dir($extractDir);
-
- echo "Updating ProcessMaker files...\n";
- $time = microtime(1);
- $checksumTime = 0;
- foreach ($checksums as $filename => $checksum) {
- if (is_dir("$extractDir/$filename")) {
- $filename = $filter->xssFilterHard($filename);
- print $filename;
- continue;
- }
- $installedFile = PATH_TRUNK . "/$filename";
- if (!file_exists($installedFile)) {
- $installedMD5 = "";
- } else {
- $time = microtime(1);
- $installedMD5 = G::encryptFileOld($installedFile);
- $checksumTime += microtime(1) - $time;
- }
- $archiveMD5 = $checksum;
- if (strcasecmp($archiveMD5, $installedMD5) != 0) {
- $changedFiles[] = $filename;
- if (!is_dir(dirname($backupDir.'/'.$filename))) {
- mkdir(dirname($backupDir.'/'.$filename), 0777, true);
- }
- if (file_exists($installedFile) && is_file($installedFile)) {
- copy($installedFile, $backupDir.'/'.$filename);
- }
- if (!is_dir(dirname($installedFile))) {
- mkdir(dirname($installedFile), 0777, true);
- }
- if (!copy("$extractDir/$filename", $installedFile)) {
- throw new Exception("Could not overwrite '$filename'");
- }
- }
- }
-
- printf("Updated %d files\n", count($changedFiles));
- printf("Clearing cache...\n");
- if (defined('PATH_C')) {
- G::rm_dir(PATH_C);
- mkdir(PATH_C, 0777, true);
- }
- $workspaces = System::listWorkspaces();
- $count = count($workspaces);
- $first = true;
- $num = 0;
- foreach ($workspaces as $index => $workspace) {
- try {
- $num += 1;
- printf("Upgrading workspaces ($num/$count): {$workspace->name}\n");
- $workspace->upgrade(false, config("system.workspace"), false, 'en', ['updateXml' => $first, 'updateMafe' => $first]);
- $workspace->close();
- $first = false;
- } catch (Exception $e) {
- printf("Errors upgrading workspace {$workspace->name}: {$e->getMessage()}\n");
- }
- }
- }
-
- private function ls_dir($dir, $basename = null)
- {
- $files = array();
- if ($basename == null) {
- $basename = $dir;
- }
- foreach (glob("$dir/*") as $filename) {
- if (is_dir($filename)) {
- $files = array_merge($files, $this->ls_dir($filename, $basename));
- } else {
- $files[] = substr($filename, strlen($basename) + 1);
- }
- }
- return $files;
- }
-
-}
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index 2f37b70d2..f4badbba6 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -7,9 +7,11 @@ use ProcessMaker\BusinessModel\Process as BmProcess;
use ProcessMaker\ChangeLog\ChangeLog;
/*----------------------------------********---------------------------------*/
use ProcessMaker\Core\Installer;
+use ProcessMaker\Core\ProcessesManager;
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\Adapters\PluginAdapter;
use ProcessMaker\Project\Adapter\BpmnWorkflow;
+use ProcessMaker\Upgrade\RunProcessUpgradeQuery;
use ProcessMaker\Util\FixReferencePath;
/**
@@ -64,6 +66,23 @@ class WorkspaceTools
'UPDATE LIST_UNASSIGNED_GROUP SET
USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)',
);
+ public static $triggers = [
+ 'APP_DELEGATION_UPDATE',
+ 'APPLICATION_UPDATE',
+ 'CONTENT_UPDATE'
+ ];
+ public static $bigTables = [
+ 'APPLICATION',
+ 'APP_ASSIGN_SELF_SERVICE_VALUE_GROUP',
+ 'APP_CACHE_VIEW',
+ 'APP_DELEGATION',
+ 'APP_DELAY',
+ 'APP_DOCUMENT',
+ 'APP_HISTORY',
+ 'APP_MESSAGE',
+ 'GROUP_USER',
+ 'LOGIN_LOG'
+ ];
private $lastContentMigrateTable = false;
private $listContentMigrateTable = [];
@@ -218,160 +237,130 @@ class WorkspaceTools
/**
* Upgrade this workspace to the latest system version
*
- * @param bool $buildCacheView
- * @param string $workSpace
- * @param bool $onedb
+ * @param string $workspace
* @param string $lang
* @param array $arrayOptTranslation
+ * @param array $optionMigrateHistoryData
*
* @return void
*/
- public function upgrade($buildCacheView = false, $workSpace = null, $onedb = false, $lang = 'en', array $arrayOptTranslation = null, $optionMigrateHistoryData = [])
+ public function upgrade($workspace, $lang = 'en', array $arrayOptTranslation = null, $optionMigrateHistoryData = [])
{
- if ($workSpace === null) {
- $workSpace = config("system.workspace");
- }
if (is_null($arrayOptTranslation)) {
$arrayOptTranslation = ['updateXml' => true, 'updateMafe' => true];
}
+ CLI::logging("* Start updating database schema...\n");
$start = microtime(true);
- CLI::logging("> Remove deprecated files...\n");
- $this->removeDeprecatedFiles();
- $stop = microtime(true);
- CLI::logging("<*> Remove deprecated files took " . ($stop - $start) . " seconds.\n");
+ $this->upgradeDatabase();
+ CLI::logging("* End updating database schema...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start updating translations...\n");
$start = microtime(true);
- CLI::logging("> Updating database...\n");
- $this->upgradeDatabase($onedb);
- $stop = microtime(true);
- CLI::logging("<*> Database Upgrade Process took " . ($stop - $start) . " seconds.\n");
-
- $start = microtime(true);
- CLI::logging("> Check Intermediate Email Event...\n");
- $this->checkIntermediateEmailEvent();
- $stop = microtime(true);
- CLI::logging("<*> Database Upgrade Process took " . ($stop - $start) . " seconds.\n");
-
- $start = microtime(true);
- CLI::logging("> Verify enterprise old...\n");
- $this->verifyFilesOldEnterprise($workSpace);
- $stop = microtime(true);
- CLI::logging("<*> Verify took " . ($stop - $start) . " seconds.\n");
-
- $start = microtime(true);
- CLI::logging("> Updating translations...\n");
$this->upgradeTranslation($arrayOptTranslation['updateXml'], $arrayOptTranslation['updateMafe']);
- $stop = microtime(true);
- $final = $stop - $start;
- CLI::logging("<*> Updating Translations Process took $final seconds.\n");
+ CLI::logging("* End updating translations...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start checking MAFE requirements...\n");
$start = microtime(true);
- CLI::logging("> Updating Content...\n");
- $this->upgradeContent($workSpace);
- $stop = microtime(true);
- $final = $stop - $start;
- CLI::logging("<*> Updating Content Process took $final seconds.\n");
+ $this->checkMafeRequirements($workspace, $lang);
+ CLI::logging("* End checking MAFE requirements...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start deleting MySQL triggers: " . implode(', ', self::$triggers) . "...\n");
$start = microtime(true);
- CLI::logging("> Check Mafe Requirements...\n");
- $this->checkMafeRequirements($workSpace, $lang);
- $stop = microtime(true);
- $final = $stop - $start;
- CLI::logging("<*> Check Mafe Requirements Process took $final seconds.\n");
+ $this->deleteTriggersMySQL(self::$triggers);
+ CLI::logging("* End deleting MySQL triggers: " . implode(', ', self::$triggers) . "... (Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start deleting indexes from big tables: " . implode(', ', self::$bigTables) . "...\n");
$start = microtime(true);
- CLI::logging("> Updating Triggers...\n");
- $this->updateTriggers(true, $lang);
- $stop = microtime(true);
- $final = $stop - $start;
- CLI::logging("<*> Updating Triggers Process took $final seconds.\n");
+ $this->deleteIndexes(self::$bigTables);
+ CLI::logging("* End deleting indexes from big tables: " . implode(', ', self::$bigTables) . "... (Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start to update CONTENT table...\n");
$start = microtime(true);
- CLI::logging("> Backup log files...\n");
- $this->backupLogFiles();
- $stop = microtime(true);
- $final = $stop - $start;
- CLI::logging("<*> Backup log files Process took $final seconds.\n");
+ $this->upgradeContent($workspace);
+ CLI::logging("* End to update CONTENT table... (Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start to migrate texts/values from 'CONTENT' table to the corresponding object tables...\n");
$start = microtime(true);
- CLI::logging("> Optimizing content data...\n");
- $this->migrateContent($workSpace, $lang);
- $stop = microtime(true);
- CLI::logging("<*> Optimizing content data took " . ($stop - $start) . " seconds.\n");
+ $this->migrateContent($lang);
+ CLI::logging("* End to migrate texts/values from 'CONTENT' table to the corresponding object tables... (Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start updating rows in Web Entry table for classic processes...\n");
$start = microtime(true);
- CLI::logging("> Migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW...\n");
- $this->migratePopulateIndexingACV($workSpace);
- $stop = microtime(true);
- CLI::logging("<*> Migrating an populating indexing for avoiding the use of table APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
+ $this->updatingWebEntryClassicModel(true);
+ CLI::logging("* End updating rows in Web Entry table for classic processes...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
- /*----------------------------------********---------------------------------*/
+ CLI::logging("* Start to update Files Manager...\n");
$start = microtime(true);
- CLI::logging("> Migrate new lists...\n");
- $this->migrateList($workSpace, false, $lang);
- $stop = microtime(true);
- $final = $stop - $start;
- CLI::logging("<*> Migrate new lists Process took $final seconds.\n");
- /*----------------------------------********---------------------------------*/
+ $this->processFilesUpgrade($workspace);
+ CLI::logging("* End to update Files Manager... (Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start migrating and populating plugin singleton data...\n");
$start = microtime(true);
- CLI::logging("> Updating Files Manager...\n");
- $this->processFilesUpgrade();
- $stop = microtime(true);
- CLI::logging("<*> Updating Files Manager took " . ($stop - $start) . " seconds.\n");
+ $this->migrateSingleton($workspace);
+ CLI::logging("* End migrating and populating plugin singleton data...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start cleaning expired tokens...\n");
$start = microtime(true);
- CLI::logging("> Clean access and refresh tokens...\n");
- $this->cleanTokens($workSpace);
- $stop = microtime(true);
- CLI::logging("<*> Clean access and refresh tokens took " . ($stop - $start) . " seconds.\n");
+ $this->cleanTokens();
+ CLI::logging("* End cleaning expired tokens...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start to check Intermediate Email Event...\n");
$start = microtime(true);
- CLI::logging("> Optimizing Self-Service data...\n");
- $this->migrateSelfServiceRecordsRun($workSpace);
- $stop = microtime(true);
- CLI::logging("<*> Migrating Self-Service records Process took " . ($stop - $start) . " seconds.\n");
+ $this->checkIntermediateEmailEvent();
+ CLI::logging("* End to check Intermediate Email Event... (Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start cleaning DYN_CONTENT in APP_HISTORY...\n");
$start = microtime(true);
- CLI::logging("> Updating rows in Web Entry table for classic processes...\n");
- $this->updatingWebEntryClassicModel($workSpace);
- $stop = microtime(true);
- CLI::logging("<*> Updating rows in Web Entry table for classic processes took " . ($stop - $start) . " seconds.\n");
-
- $start = microtime(true);
- CLI::logging("> Update framework paths...\n");
- $this->updateFrameworkPaths($workSpace);
- $stop = microtime(true);
- CLI::logging("<*> Update framework paths took " . ($stop - $start) . " seconds.\n");
-
- $start = microtime(true);
- CLI::logging("> Migrating and populating plugin singleton data...\n");
- $this->migrateSingleton($workSpace);
- $stop = microtime(true);
- CLI::logging("<*> Migrating and populating plugin singleton data took " . ($stop - $start) . " seconds.\n");
-
$keepDynContent = isset($optionMigrateHistoryData['keepDynContent']) && $optionMigrateHistoryData['keepDynContent'] === true;
- //Review if we need to remove the 'History of use' from APP_HISTORY
- $start = microtime(true);
- CLI::logging("> Clearing History of Use from APP_HISTORY table...\n");
$this->clearDynContentHistoryData(false, $keepDynContent);
- $stop = microtime(true);
- CLI::logging("<*> Clearing History of Use from APP_HISTORY table took " . ($stop - $start) . " seconds.\n");
+ CLI::logging("* End cleaning DYN_CONTENT in APP_HISTORY...(Completed on " . (microtime(true) - $start) . " seconds)\n");
/*----------------------------------********---------------------------------*/
+ CLI::logging("* Start migrating history data...\n");
$start = microtime(true);
- CLI::logging("> Migrating history data...\n");
- $this->migrateAppHistoryToAppDataChangeLog(false);
- $stop = microtime(true);
- CLI::logging("<*> Migrating history data took " . ($stop - $start) . " seconds.\n");
+ $this->migrateAppHistoryToAppDataChangeLog(true);
+ CLI::logging("* End migrating history data...(Completed on " . (microtime(true) - $start) . " seconds)\n");
/*----------------------------------********---------------------------------*/
+ CLI::logging("* Start migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW...\n");
+ $start = microtime(true);
+ $this->migratePopulateIndexingACV();
+ CLI::logging("* End migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP....\n");
+ $start = microtime(true);
+ $this->migrateSelfServiceRecordsRun();
+ CLI::logging("* End optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP....(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start adding new fields and populating values in tables related to feature self service by value...\n");
$start = microtime(true);
- CLI::logging("> Optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP....\n");
$this->upgradeSelfServiceData();
- $stop = microtime(true);
- CLI::logging("<*> Optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP took " . ($stop - $start) . " seconds.\n");
+ CLI::logging("* End adding new fields and populating values in tables related to feature self service by value...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start adding/replenishing all indexes...\n");
+ $start = microtime(true);
+ $systemSchema = System::getSystemSchema($this->dbAdapter);
+ $this->upgradeSchema($systemSchema);
+ CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start migrating to new list tables...\n");
+ $start = microtime(true);
+ $this->migrateList(true, $lang);
+ CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start updating MySQL triggers...\n");
+ $start = microtime(true);
+ $this->updateTriggers(true, $lang);
+ CLI::logging("* End updating MySQL triggers...(" . (microtime(true) - $start) . " seconds)\n");
}
/**
@@ -391,6 +380,9 @@ class WorkspaceTools
CLI::logging("<*> Database Upgrade Structure Process took $final seconds.\n");
}
+ /**
+ * Update the email events with the current email server
+ */
public function checkIntermediateEmailEvent()
{
$oEmailEvent = new \ProcessMaker\BusinessModel\EmailEvent();
@@ -629,9 +621,11 @@ class WorkspaceTools
}
/**
- * Upgrade this workspace Content.
+ * Upgrade this workspace Content
+ *
* @param string $workspace
* @param boolean $executeRegenerateContent
+ *
* @return void
*/
public function upgradeContent($workspace = null, $executeRegenerateContent = false)
@@ -683,7 +677,7 @@ class WorkspaceTools
}
/**
- * Upgrade this workspace translations from all avaliable languages.
+ * Upgrade the workspace translations from all available languages
*
* @param bool $flagXml Update XML
* @param bool $flagMafe Update MAFE
@@ -1055,26 +1049,22 @@ class WorkspaceTools
}
/**
- * Upgrade this workspace database to the latest system schema
- *
- * @param bool $checkOnly only check if the upgrade is needed if true
- * @return array bool upgradeSchema for more information
+ * Upgrade the workspace database to the latest system schema
*/
- public function upgradeDatabase($onedb = false, $checkOnly = false)
+ public function upgradeDatabase()
{
$this->initPropel(true);
P11835::$dbAdapter = $this->dbAdapter;
P11835::isApplicable();
$systemSchema = System::getSystemSchema($this->dbAdapter);
- $systemSchemaRbac = System::getSystemSchemaRbac($this->dbAdapter);// get the Rbac Schema
+ $systemSchemaRbac = System::getSystemSchemaRbac($this->dbAdapter);// Get the RBAC Schema
$this->registerSystemTables(array_merge($systemSchema, $systemSchemaRbac));
- $this->upgradeSchema($systemSchema);
- $this->upgradeSchema($systemSchemaRbac, false, true, $onedb); // perform Upgrade to Rbac
+ $this->upgradeSchema($systemSchema, false, false, false); // Without add indexes
+ $this->upgradeSchema($systemSchemaRbac, false, true); // Perform upgrade to RBAC
$this->upgradeData();
$this->checkRbacPermissions();//check or add new permissions
$this->checkSequenceNumber();
$this->migrateIteeToDummytask($this->name);
- $this->upgradeConfiguration();
/*----------------------------------********---------------------------------*/
$this->upgradeAuditLog($this->name);
/*----------------------------------********---------------------------------*/
@@ -1137,10 +1127,7 @@ class WorkspaceTools
$arrayData = $emailSever->create2($arrayData);
}
}
-
P11835::execute();
-
- return true;
}
private function setFormatRows()
@@ -1161,14 +1148,18 @@ class WorkspaceTools
}
/**
- * Upgrade this workspace database from a schema
+ * Upgrade the workspace database according to the schema
*
- * @param array $schema the schema information, such as returned from getSystemSchema
- * @param bool $checkOnly only check if the upgrade is needed if true
- * @return array bool the changes if checkOnly is true, else return
- * true on success
+ * @param array $schema The schema information, such as returned from getSystemSchema
+ * @param bool $checkOnly Only return the diff between current database and the schema
+ * @param bool $rbac Is RBAC database?
+ * @param bool $includeIndexes Include or no indexes in new tables
+ *
+ * @return bool|array
+ *
+ * @throws Exception
*/
- public function upgradeSchema($schema, $checkOnly = false, $rbac = false, $onedb = false)
+ public function upgradeSchema($schema, $checkOnly = false, $rbac = false, $includeIndexes = true)
{
$dbInfo = $this->getDBInfo();
@@ -1223,11 +1214,11 @@ class WorkspaceTools
CLI::logging("-> " . count($changes['tablesToAdd']) . " tables to add\n");
}
- foreach ($changes['tablesToAdd'] as $sTable => $aColumns) {
- $database->executeQuery($database->generateCreateTableSQL($sTable, $aColumns));
- if (isset($changes['tablesToAdd'][$sTable]['INDEXES'])) {
- foreach ($changes['tablesToAdd'][$sTable]['INDEXES'] as $indexName => $aIndex) {
- $database->executeQuery($database->generateAddKeysSQL($sTable, $indexName, $aIndex));
+ foreach ($changes['tablesToAdd'] as $tableName => $columns) {
+ $database->executeQuery($database->generateCreateTableSQL($tableName, $columns));
+ if (isset($changes['tablesToAdd'][$tableName]['INDEXES']) && $includeIndexes) {
+ foreach ($changes['tablesToAdd'][$tableName]['INDEXES'] as $indexName => $keys) {
+ $database->executeQuery($database->generateAddKeysSQL($tableName, $indexName, $keys));
}
}
}
@@ -1236,46 +1227,93 @@ class WorkspaceTools
CLI::logging("-> " . count($changes['tablesToAlter']) . " tables to alter\n");
}
- foreach ($changes['tablesToAlter'] as $sTable => $aActions) {
- foreach ($aActions as $sAction => $aAction) {
- foreach ($aAction as $sColumn => $vData) {
- switch ($sAction) {
- case 'DROP':
- $database->executeQuery($database->generateDropColumnSQL($sTable, $vData));
- break;
- case 'ADD':
- if ($database->checkPatchHor1787($sTable, $sColumn, $vData)) {
- $database->executeQuery($database->generateCheckAddColumnSQL($sTable, $sColumn, $vData));
- $database->executeQuery($database->deleteAllIndexesIntable($sTable, $sColumn, $vData));
- }
- $database->executeQuery($database->generateAddColumnSQL($sTable, $sColumn, $vData));
- break;
- case 'CHANGE':
- $database->executeQuery($database->generateChangeColumnSQL($sTable, $sColumn, $vData));
- break;
+ $tablesToAddColumns = [];
+
+ foreach ($changes['tablesToAlter'] as $tableName => $actions) {
+ foreach ($actions as $action => $actionData) {
+ if ($action == 'ADD') {
+ $tablesToAddColumns[$tableName] = $actionData;
+
+ // In a very old schema the primary key for table "LOGIN_LOG" was changed and we need to delete the
+ // primary index to avoid errors in the database upgrade
+ // TO DO: The change of a Primary Key in a table should be generic
+ if ($tableName == 'LOGIN_LOG' && array_key_exists('LOG_ID', $actionData)) {
+ $database->executeQuery('DROP INDEX `PRIMARY` ON LOGIN_LOG;');
+ }
+ } else {
+ foreach ($actionData as $columnName => $meta) {
+ switch ($action) {
+ case 'DROP':
+ $database->executeQuery($database->generateDropColumnSQL($tableName, $meta));
+ break;
+ case 'CHANGE':
+ $database->executeQuery($database->generateChangeColumnSQL($tableName, $columnName, $meta));
+ break;
+ }
}
}
}
}
- if (!empty($changes['tablesWithNewIndex'])) {
- CLI::logging("-> " . count($changes['tablesWithNewIndex']) . " indexes to add\n");
- }
- foreach ($changes['tablesWithNewIndex'] as $sTable => $aIndexes) {
- foreach ($aIndexes as $sIndexName => $aIndexFields) {
- $database->executeQuery($database->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields));
+ if (!empty($tablesToAddColumns)) {
+ $upgradeQueries = [];
+ foreach ($tablesToAddColumns as $tableName => $tableColumn) {
+ $indexes = [];
+ if (!empty($changes['tablesWithNewIndex'][$tableName]) && $includeIndexes) {
+ $indexes = $changes['tablesWithNewIndex'][$tableName];
+ unset($changes['tablesWithNewIndex'][$tableName]);
+ }
+
+ // Instantiate the class to execute the query in background
+ $upgradeQueries[] = new RunProcessUpgradeQuery($this->name, $database->generateAddColumnsSql($tableName, $tableColumn, $indexes), $rbac);
+ }
+
+ // Run queries in multiple threads
+ $processesManager = new ProcessesManager($upgradeQueries);
+ $processesManager->run();
+
+ // If exists an error throw an exception
+ if (!empty($processesManager->getErrors())) {
+ $errorMessage = '';
+ foreach ($processesManager->getErrors() as $error) {
+ $errorMessage .= $error['rawAnswer'] . PHP_EOL;
+ }
+ throw new Exception($errorMessage);
}
}
- if (!empty($changes['tablesToAlterIndex'])) {
- CLI::logging("-> " . count($changes['tablesToAlterIndex']) . " indexes to alter\n");
- }
- foreach ($changes['tablesToAlterIndex'] as $sTable => $aIndexes) {
- foreach ($aIndexes as $sIndexName => $aIndexFields) {
- $database->executeQuery($database->generateDropKeySQL($sTable, $sIndexName));
- $database->executeQuery($database->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields));
+ if (!empty($changes['tablesWithNewIndex']) && $includeIndexes) {
+ CLI::logging("-> " . count($changes['tablesWithNewIndex']) . " tables with indexes to add\n");
+ $upgradeQueries = [];
+ foreach ($changes['tablesWithNewIndex'] as $tableName => $indexes) {
+ // Instantiate the class to execute the query in background
+ $upgradeQueries[] = new RunProcessUpgradeQuery($this->name, $database->generateAddColumnsSql($tableName, [], $indexes), $rbac);
+ }
+
+ // Run queries in multiple threads
+ $processesManager = new ProcessesManager($upgradeQueries);
+ $processesManager->run();
+
+ // If exists an error throw an exception
+ if (!empty($processesManager->getErrors())) {
+ $errorMessage = '';
+ foreach ($processesManager->getErrors() as $error) {
+ $errorMessage .= $error['rawAnswer'] . PHP_EOL;
+ }
+ throw new Exception($errorMessage);
}
}
+
+ if (!empty($changes['tablesToAlterIndex']) && $includeIndexes) {
+ CLI::logging("-> " . count($changes['tablesToAlterIndex']) . " tables with indexes to alter\n");
+ foreach ($changes['tablesToAlterIndex'] as $tableName => $indexes) {
+ foreach ($indexes as $indexName => $indexFields) {
+ $database->executeQuery($database->generateDropKeySQL($tableName, $indexName));
+ $database->executeQuery($database->generateAddKeysSQL($tableName, $indexName, $indexFields));
+ }
+ }
+ }
+
$this->closeDatabase();
return true;
}
@@ -1828,7 +1866,7 @@ class WorkspaceTools
}
/**
- * restore an archive into a workspace
+ * Restore a workspace
*
* Restores any database and files included in the backup, either as a new
* workspace, or overwriting a previous one
@@ -1839,8 +1877,13 @@ class WorkspaceTools
* @param boolean $overwrite if you need overwrite the database
* @param string $lang for define the language
* @param string $port of database if is empty take 3306
+ * @param array $optionMigrateHistoryData
*
* @throws Exception
+ *
+ * @see workflow/engine/bin/tasks/cliWorkspaces.php::run_workspace_restore()
+ *
+ * @link https://wiki.processmaker.com/3.0/Backing_up_and_Restoring_ProcessMaker#RestoringWorkspaces
*/
public static function restore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true, $lang = 'en', $port = '', $optionMigrateHistoryData = [])
{
@@ -2008,115 +2051,122 @@ class WorkspaceTools
}
}
- $start = microtime(true);
- CLI::logging("> Remove deprecated files...\n");
- $workspace->removeDeprecatedFiles();
- $stop = microtime(true);
- CLI::logging("<*> Remove deprecated files took " . ($stop - $start) . " seconds.\n");
-
- if (($pmVersionWorkspaceToRestore != '') && (version_compare(
- $pmVersionWorkspaceToRestore . "",
- $pmVersion . "",
- "<"
- ) || $pmVersion == "")
- ) {
- $start = microtime(true);
- CLI::logging("> Updating database...\n");
- $workspace->upgradeDatabase($onedb);
- $stop = microtime(true);
- CLI::logging("<*> Database Upgrade Process took " . ($stop - $start) . " seconds.\n");
- }
-
- $start = microtime(true);
- CLI::logging("> Verify files enterprise old...\n");
- $workspace->verifyFilesOldEnterprise($workspaceName);
- $stop = microtime(true);
- CLI::logging("<*> Verify took " . ($stop - $start) . " seconds.\n");
-
- $start = microtime(true);
- CLI::logging("> Verify License Enterprise...\n");
- $workspace->verifyLicenseEnterprise($workspaceName);
- $stop = microtime(true);
- CLI::logging("<*> Verify took " . ($stop - $start) . " seconds.\n");
-
- $start = microtime(true);
- CLI::logging("> Check Mafe Requirements...\n");
- $workspace->checkMafeRequirements($workspaceName, $lang);
- $stop = microtime(true);
- CLI::logging("<*> Check Mafe Requirements Process took " . ($stop - $start) . " seconds.\n");
-
- if (($pmVersionWorkspaceToRestore != '') && (version_compare(
- $pmVersionWorkspaceToRestore . "",
- $pmVersion . "",
- "<"
- ) || $pmVersion == "")
- ) {
- $start = microtime(true);
- CLI::logging("> Updating cache view...\n");
- $workspace->upgradeCacheView(true, true, $lang);
- $stop = microtime(true);
- CLI::logging("<*> Updating cache view Process took " . ($stop - $start) . " seconds.\n");
- } else {
- $workspace->upgradeTriggersOfTables(true, $lang);
- }
-
- if ($pmVersion == '' && strpos(strtoupper($version), 'BRANCH')) {
+ if (empty($pmVersion) && strpos(strtoupper($version), 'BRANCH')) {
$pmVersion = 'dev-version-backup';
}
- //Move the labels of content to the corresponding table
- $start = microtime(true);
- CLI::logging("> Optimizing content data...\n");
- $workspace->migrateContent($workspace->name, $lang);
- $stop = microtime(true);
- CLI::logging("<*> Optimizing content data took " . ($stop - $start) . " seconds.\n");
+ if (!empty($pmVersionWorkspaceToRestore) && (version_compare(
+ $pmVersionWorkspaceToRestore . "",
+ $pmVersion . "",
+ "<"
+ ) || empty($pmVersion)) || $pmVersion == "dev-version-backup"
+ ) {
+ // Upgrade the database schema and data
+ CLI::logging("* Start updating database schema...\n");
+ $start = microtime(true);
+ $workspace->upgradeDatabase();
+ CLI::logging("* End updating database schema...(Completed on " . (microtime(true) - $start) . " seconds)\n");
- //Populate the new fields for replace string UID to Interger ID
- $start = microtime(true);
- CLI::logging("> Migrating and populating indexing for APP_CACHE_VIEW...\n");
- $workspace->migratePopulateIndexingACV($workspace->name);
- $stop = microtime(true);
- CLI::logging("<*> Migrating an populating indexing for APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
+ CLI::logging("* Start checking MAFE requirements...\n");
+ $start = microtime(true);
+ $workspace->checkMafeRequirements($workspaceName, $lang);
+ CLI::logging("* End checking MAFE requirements...(Completed on " . (microtime(true) - $start) . " seconds)\n");
- //Move the data of cases to the corresponding List
- /*----------------------------------********---------------------------------*/
- $start = microtime(true);
- CLI::logging("> Updating List tables...\n");
- $workspace->migrateList($workspace->name, false, $lang);
- $stop = microtime(true);
- CLI::logging("<*> Updating List Process took " . ($stop - $start) . " seconds.\n");
- /*----------------------------------********---------------------------------*/
+ CLI::logging("* Start deleting MySQL triggers: " . implode(', ', self::$triggers) . "...\n");
+ $start = microtime(true);
+ $workspace->deleteTriggersMySQL(self::$triggers);
+ CLI::logging("* End deleting MySQL triggers: " . implode(', ', self::$triggers) . "... (Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
- $start = microtime(true);
- CLI::logging("> Updating Files Manager...\n");
- $workspace->processFilesUpgrade();
- $stop = microtime(true);
- CLI::logging("<*> Updating Files Manager took " . ($stop - $start) . " seconds.\n");
+ CLI::logging("* Start deleting indexes from big tables: " . implode(', ', self::$bigTables) . "...\n");
+ $start = microtime(true);
+ $workspace->deleteIndexes(self::$bigTables);
+ CLI::logging("* End deleting indexes from big tables: " . implode(', ', self::$bigTables) . "... (Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
- //Updating generated class files for PM Tables
- passthru(PHP_BINARY . ' processmaker regenerate-pmtable-classes ' . $workspace->name);
+ CLI::logging("* Start to migrate texts/values from 'CONTENT' table to the corresponding object tables...\n");
+ $start = microtime(true);
+ $workspace->migrateContent($lang);
+ CLI::logging("* End to migrate texts/values from 'CONTENT' table to the corresponding object tables... (Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
- $keepDynContent = isset($optionMigrateHistoryData['keepDynContent']) && $optionMigrateHistoryData['keepDynContent'] === true;
- //Review if we need to remove the 'History of use' from APP_HISTORY
- $start = microtime(true);
- CLI::logging("> Clearing History of Use from APP_HISTORY table...\n");
- $workspace->clearDynContentHistoryData(false, $keepDynContent);
- $stop = microtime(true);
- CLI::logging("<*> Clearing History of Use from APP_HISTORY table took " . ($stop - $start) . " seconds.\n");
+ CLI::logging("* Start updating rows in Web Entry table for classic processes...\n");
+ $start = microtime(true);
+ $workspace->updatingWebEntryClassicModel(true);
+ CLI::logging("* End updating rows in Web Entry table for classic processes...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
- /*----------------------------------********---------------------------------*/
- $start = microtime(true);
- CLI::logging("> Migrating history data...\n");
- $workspace->migrateAppHistoryToAppDataChangeLog(false);
- $stop = microtime(true);
- CLI::logging("<*> Migrating history data took " . ($stop - $start) . " seconds.\n");
- /*----------------------------------********---------------------------------*/
+ CLI::logging("* Start to update Files Manager...\n");
+ $start = microtime(true);
+ $workspace->processFilesUpgrade($workspaceName);
+ CLI::logging("* End to update Files Manager... (Completed on " . (microtime(true) - $start) . " seconds)\n");
+ CLI::logging("* Start migrating and populating plugin singleton data...\n");
+ $start = microtime(true);
+ $workspace->migrateSingleton($workspaceName);
+ CLI::logging("* End migrating and populating plugin singleton data...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start to check Intermediate Email Event...\n");
+ $start = microtime(true);
+ $workspace->checkIntermediateEmailEvent();
+ CLI::logging("* End to check Intermediate Email Event... (Completed on " . (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start cleaning DYN_CONTENT in APP_HISTORY...\n");
+ $start = microtime(true);
+ $keepDynContent = isset($optionMigrateHistoryData['keepDynContent']) && $optionMigrateHistoryData['keepDynContent'] === true;
+ $workspace->clearDynContentHistoryData(false, $keepDynContent);
+ CLI::logging("* End cleaning DYN_CONTENT in APP_HISTORY...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+
+ /*----------------------------------********---------------------------------*/
+ CLI::logging("* Start migrating history data...\n");
+ $start = microtime(true);
+ $workspace->migrateAppHistoryToAppDataChangeLog(false);
+ CLI::logging("* End migrating history data...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+ /*----------------------------------********---------------------------------*/
+
+ CLI::logging("* Start migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW...\n");
+ $start = microtime(true);
+ $workspace->migratePopulateIndexingACV();
+ CLI::logging("* End migrating and populating indexing for avoiding the use of table APP_CACHE_VIEW...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP....\n");
+ $start = microtime(true);
+ $workspace->migrateSelfServiceRecordsRun();
+ CLI::logging("* End optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP....(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start adding new fields and populating values in tables related to feature self service by value...\n");
+ $start = microtime(true);
+ $workspace->upgradeSelfServiceData();
+ CLI::logging("* End adding new fields and populating values in tables related to feature self service by value...(Completed on " .
+ (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start adding/replenishing all indexes...\n");
+ $start = microtime(true);
+ $systemSchema = System::getSystemSchema($workspace->dbAdapter);
+ $workspace->upgradeSchema($systemSchema);
+ CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start migrating to new list tables...\n");
+ $start = microtime(true);
+ $workspace->migrateList(true, $lang);
+ CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
+
+ CLI::logging("* Start updating MySQL triggers...\n");
+ $start = microtime(true);
+ $workspace->updateTriggers(true, $lang);
+ CLI::logging("* End updating MySQL triggers...(" . (microtime(true) - $start) . " seconds)\n");
+ }
+
+ CLI::logging("> Start To Verify License Enterprise...\n");
$start = microtime(true);
- CLI::logging("> Optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP....\n");
- $workspace->upgradeSelfServiceData();
- $stop = microtime(true);
- CLI::logging("<*> Optimizing Self-Service data in table APP_ASSIGN_SELF_SERVICE_VALUE_GROUP took " . ($stop - $start) . " seconds.\n");
+ $workspace->verifyLicenseEnterprise($workspaceName);
+ CLI::logging("* End To Verify License Enterprise...(" . (microtime(true) - $start) . " seconds)\n");
+
+ // Updating generated class files for PM Tables
+ passthru(PHP_BINARY . ' processmaker regenerate-pmtable-classes ' . $workspaceName);
}
CLI::logging("Removing temporary files\n");
@@ -2174,6 +2224,9 @@ class WorkspaceTools
return $result;
}
+ /**
+ * Backup the log files
+ */
public function backupLogFiles()
{
$config = System::getSystemConfiguration();
@@ -2190,6 +2243,12 @@ class WorkspaceTools
}
}
+ /**
+ * Check if the workspace have the clients used by MAFE registered
+ *
+ * @param string $workspace
+ * @param string $lang
+ */
public function checkMafeRequirements($workspace, $lang)
{
$this->initPropel(true);
@@ -2266,9 +2325,8 @@ class WorkspaceTools
return true;
}
- public function verifyFilesOldEnterprise($workspace)
+ public function verifyFilesOldEnterprise()
{
- $this->initPropel(true);
$pathBackup = PATH_DATA . 'backups';
if (!file_exists($pathBackup)) {
G::mk_dir($pathBackup, 0777);
@@ -2284,7 +2342,7 @@ class WorkspaceTools
CLI::logging(" Migrating Enterprise Core version...\n");
if (!file_exists($pathNewFile)) {
CLI::logging(" Creating folder in $pathNewFile\n");
- G::mk_dir($newDiretory, 0777);
+ G::mk_dir($pathNewFile, 0777);
}
$shared_stat = stat(PATH_DATA);
if (file_exists($pathDirectoryEnterprise)) {
@@ -2382,12 +2440,19 @@ class WorkspaceTools
/**
* Migrate all cases to New list
*
- * @param string $workSpace Workspace
* @param bool $flagReinsert Flag that specifies the re-insertion
+ * @param string $lang
*
* @return void
+ *
+ * @throws Exception
+ *
+ * @see \WorkspaceTools->upgrade
+ * @see \WorkspaceTools->restore
+ * @see workflow/engine/bin/tasks/cliWorkspaces.php:migrate_new_cases_lists()
+ * @link https://wiki.processmaker.com/3.3/processmaker_command#migrate-new-cases-lists
*/
- public function migrateList($workSpace, $flagReinsert = false, $lang = 'en')
+ public function migrateList($flagReinsert = false, $lang = 'en')
{
$this->initPropel(true);
@@ -2398,8 +2463,8 @@ class WorkspaceTools
return;
}
- $arrayTable1 = ['ListInbox', 'ListMyInbox', 'ListCanceled', 'ListParticipatedLast', 'ListParticipatedHistory', 'ListPaused'];
- $arrayTable2 = ['ListUnassigned', 'ListUnassignedGroup'];
+ $arrayTable1 = ['ListCanceled', 'ListInbox', 'ListParticipatedLast', 'ListPaused'];
+ $arrayTable2 = ['ListUnassigned'];
$arrayTable = array_merge($arrayTable1, $arrayTable2);
if ($flagReinsert) {
@@ -2423,26 +2488,89 @@ class WorkspaceTools
}
}
+ // Initialize queries array
+ $listQueries = [];
+
if ($flagReinsert || !$flagListAll) {
- $this->regenerateListCanceled($lang);
- $this->regenerateListMyInbox(); //This list require no translation
- $this->regenerateListInbox(); //This list require no translation
- $this->regenerateListParticipatedHistory(); //This list require no translation
- $this->regenerateListParticipatedLast(); //This list require no translation
- $this->regenerateListPaused(); //This list require no translation
+ // Regenerate lists
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->regenerateListCanceled($lang));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->regenerateListInbox());
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->regenerateListParticipatedLast());
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->regenerateListPaused());
}
if ($flagReinsert || !$flagListUnassigned) {
- $this->regenerateListUnassigned(); //This list require no translation
+ // This list always is truncated
+ $con = Propel::getConnection("workflow");
+ $stmt = $con->createStatement();
+ $stmt->executeQuery('TRUNCATE ' . $this->dbName . '.LIST_UNASSIGNED');
+
+ // Regenerate list
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->regenerateListUnassigned());
+ }
+
+ // Run queries in multiple threads for populate the list tables
+ $processesManager = new ProcessesManager($listQueries);
+ $processesManager->run();
+
+ // If exists an error throw an exception
+ if (!empty($processesManager->getErrors())) {
+ $errorMessage = '';
+ foreach ($processesManager->getErrors() as $error) {
+ $errorMessage .= $error['rawAnswer'] . PHP_EOL;
+ }
+ throw new Exception($errorMessage);
+ }
+
+ // Clean the queries array
+ $listQueries = [];
+ // Canceled List
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_CANCELED'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListUsrId('LIST_CANCELED'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_CANCELED'));
+ // Inbox List
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_INBOX'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListUsrId('LIST_INBOX'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_INBOX'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListAppStatusId('LIST_INBOX'));
+ // Participated List
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_PARTICIPATED_LAST'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListUsrId('LIST_PARTICIPATED_LAST'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_PARTICIPATED_LAST'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListAppStatusId('LIST_PARTICIPATED_LAST'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListParticipatedLastCurrentUser());
+ // Unassigned List
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_UNASSIGNED'));
+ $listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_UNASSIGNED'));
+
+ // Run queries in multiple threads for update the list tables
+ $processesManager = new ProcessesManager($listQueries);
+ $processesManager->run();
+
+ // If exists an error throw an exception
+ if (!empty($processesManager->getErrors())) {
+ $errorMessage = '';
+ foreach ($processesManager->getErrors() as $error) {
+ $errorMessage .= $error['rawAnswer'] . PHP_EOL;
+ }
+ throw new Exception($errorMessage);
}
$this->listFirstExecution('insert');
$this->listFirstExecution('insert', 'unassigned');
}
+ /**
+ * Return query to populate canceled list
+ *
+ * @param string $lang
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
public function regenerateListCanceled($lang = 'en')
{
- $this->initPropel(true);
$query = 'INSERT INTO ' . $this->dbName . '.LIST_CANCELED
(APP_UID,
USR_UID,
@@ -2502,85 +2630,19 @@ class WorkspaceTools
WHERE
ACV.APP_STATUS = \'CANCELLED\'
AND ACV.DEL_LAST_INDEX = 1';
- $con = Propel::getConnection("workflow");
- $stmt = $con->createStatement();
- $stmt->executeQuery($query);
- CLI::logging("> Completed table LIST_CANCELED\n");
- }
-
- public function regenerateListMyInbox()
- {
- $this->initPropel(true);
- $query = 'INSERT INTO ' . $this->dbName . '.LIST_MY_INBOX
- (APP_UID,
- USR_UID,
- TAS_UID,
- PRO_UID,
- APP_NUMBER,
- APP_TITLE,
- APP_PRO_TITLE,
- APP_TAS_TITLE,
- APP_CREATE_DATE,
- APP_UPDATE_DATE,
- APP_FINISH_DATE,
- APP_STATUS,
- DEL_INDEX,
- DEL_PREVIOUS_USR_UID,
- DEL_PREVIOUS_USR_USERNAME,
- DEL_PREVIOUS_USR_FIRSTNAME,
- DEL_PREVIOUS_USR_LASTNAME,
- DEL_CURRENT_USR_UID,
- DEL_CURRENT_USR_USERNAME,
- DEL_CURRENT_USR_FIRSTNAME,
- DEL_CURRENT_USR_LASTNAME,
- DEL_DELEGATE_DATE,
- DEL_INIT_DATE,
- DEL_DUE_DATE,
- DEL_PRIORITY)
-
- SELECT
- ACV.APP_UID,
- ACV.USR_UID,
- ACV.TAS_UID,
- ACV.PRO_UID,
- ACV.APP_NUMBER,
- ACV.APP_TITLE,
- ACV.APP_PRO_TITLE,
- ACV.APP_TAS_TITLE,
- ACV.APP_CREATE_DATE,
- ACV.APP_UPDATE_DATE,
- ACV.APP_FINISH_DATE,
- ACV.APP_STATUS,
- ACV.DEL_INDEX,
- ACV.PREVIOUS_USR_UID AS DEL_PREVIOUS_USR_UID,
- PRE_USR.USR_USERNAME AS DEL_PREVIOUS_USR_USERNAME,
- PRE_USR.USR_FIRSTNAME AS DEL_PREVIOUS_USR_FIRSTNAME,
- PRE_USR.USR_LASTNAME AS DEL_PREVIOUS_USR_LASTNAME,
- ACV.USR_UID AS DEL_CURRENT_USR_UID,
- CUR_USR.USR_USERNAME AS DEL_CURRENT_USR_USERNAME,
- CUR_USR.USR_FIRSTNAME AS DEL_CURRENT_USR_FIRSTNAME,
- CUR_USR.USR_LASTNAME AS DEL_CURRENT_USR_LASTNAME,
- ACV.DEL_DELEGATE_DATE AS DEL_DELEGATE_DATE,
- ACV.DEL_INIT_DATE AS DEL_INIT_DATE,
- ACV.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
- ACV.DEL_PRIORITY
- FROM
- ' . $this->dbName . '.APP_CACHE_VIEW ACV
- LEFT JOIN
- ' . $this->dbName . '.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID
- LEFT JOIN
- ' . $this->dbName . '.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID
- WHERE ACV.DEL_INDEX=1';
-
- $con = Propel::getConnection("workflow");
- $stmt = $con->createStatement();
- $stmt->executeQuery($query);
- CLI::logging("> Completed table LIST_MY_INBOX\n");
+
+ return $query;
}
+ /**
+ * Return query to populate inbox list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
public function regenerateListInbox()
{
- $this->initPropel(true);
$query = 'INSERT INTO ' . $this->dbName . '.LIST_INBOX
(APP_UID,
DEL_INDEX,
@@ -2630,190 +2692,19 @@ class WorkspaceTools
' . $this->dbName . '.USERS USR ON ACV.PREVIOUS_USR_UID = USR.USR_UID
WHERE
ACV.DEL_THREAD_STATUS = \'OPEN\'';
- $con = Propel::getConnection("workflow");
- $stmt = $con->createStatement();
- $stmt->executeQuery($query);
- CLI::logging("> Completed table LIST_INBOX\n");
- }
- public function regenerateListParticipatedHistory()
- {
- $this->initPropel(true);
- $query = 'INSERT INTO ' . $this->dbName . '.LIST_PARTICIPATED_HISTORY
- (APP_UID,
- DEL_INDEX,
- USR_UID,
- TAS_UID,
- PRO_UID,
- APP_NUMBER,
- APP_TITLE,
- APP_PRO_TITLE,
- APP_TAS_TITLE,
- DEL_PREVIOUS_USR_UID,
- DEL_PREVIOUS_USR_USERNAME,
- DEL_PREVIOUS_USR_FIRSTNAME,
- DEL_PREVIOUS_USR_LASTNAME,
- DEL_CURRENT_USR_USERNAME,
- DEL_CURRENT_USR_FIRSTNAME,
- DEL_CURRENT_USR_LASTNAME,
- DEL_DELEGATE_DATE,
- DEL_INIT_DATE,
- DEL_DUE_DATE,
- DEL_PRIORITY)
-
- SELECT
- ACV.APP_UID,
- ACV.DEL_INDEX,
- ACV.USR_UID,
- ACV.TAS_UID,
- ACV.PRO_UID,
- ACV.APP_NUMBER,
- ACV.APP_TITLE,
- ACV.APP_PRO_TITLE,
- ACV.APP_TAS_TITLE,
- ACV.PREVIOUS_USR_UID AS DEL_PREVIOUS_USR_UID,
- PRE_USR.USR_USERNAME AS DEL_PREVIOUS_USR_USERNAME,
- PRE_USR.USR_FIRSTNAME AS DEL_PREVIOUS_USR_FIRSTNAME,
- PRE_USR.USR_LASTNAME AS DEL_PREVIOUS_USR_LASTNAME,
- CUR_USR.USR_USERNAME AS DEL_CURRENT_USR_USERNAME,
- CUR_USR.USR_FIRSTNAME AS DEL_CURRENT_USR_FIRSTNAME,
- CUR_USR.USR_LASTNAME AS DEL_CURRENT_USR_LASTNAME,
- ACV.DEL_DELEGATE_DATE AS DEL_DELEGATE_DATE,
- ACV.DEL_INIT_DATE AS DEL_INIT_DATE,
- ACV.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
- ACV.DEL_PRIORITY
- FROM
- ' . $this->dbName . '.APP_CACHE_VIEW ACV
- LEFT JOIN
- ' . $this->dbName . '.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID
- LEFT JOIN
- ' . $this->dbName . '.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID';
- $con = Propel::getConnection("workflow");
- $stmt = $con->createStatement();
- $stmt->executeQuery($query);
- CLI::logging("> Completed table LIST_PARTICIPATED_HISTORY\n");
- }
-
- public function regenerateListParticipatedLast()
- {
- $this->initPropel(true);
- $query = 'INSERT INTO ' . $this->dbName . '.LIST_PARTICIPATED_LAST
- (
- APP_UID,
- USR_UID,
- DEL_INDEX,
- TAS_UID,
- PRO_UID,
- APP_NUMBER,
- APP_TITLE,
- APP_PRO_TITLE,
- APP_TAS_TITLE,
- APP_STATUS,
- DEL_PREVIOUS_USR_UID,
- DEL_PREVIOUS_USR_USERNAME,
- DEL_PREVIOUS_USR_FIRSTNAME,
- DEL_PREVIOUS_USR_LASTNAME,
- DEL_CURRENT_USR_USERNAME,
- DEL_CURRENT_USR_FIRSTNAME,
- DEL_CURRENT_USR_LASTNAME,
- DEL_DELEGATE_DATE,
- DEL_INIT_DATE,
- DEL_DUE_DATE,
- DEL_CURRENT_TAS_TITLE,
- DEL_PRIORITY,
- DEL_THREAD_STATUS)
-
- SELECT
- ACV.APP_UID,
- IF(ACV.USR_UID=\'\', \'SELF_SERVICES\', ACV.USR_UID),
- ACV.DEL_INDEX,
- ACV.TAS_UID,
- ACV.PRO_UID,
- ACV.APP_NUMBER,
- ACV.APP_TITLE,
- ACV.APP_PRO_TITLE,
- ACV.APP_TAS_TITLE,
- ACV.APP_STATUS,
- DEL_PREVIOUS_USR_UID,
- IFNULL(PRE_USR.USR_USERNAME, CUR_USR.USR_USERNAME) AS DEL_PREVIOUS_USR_USERNAME,
- IFNULL(PRE_USR.USR_FIRSTNAME, CUR_USR.USR_FIRSTNAME) AS DEL_PREVIOUS_USR_USERNAME,
- IFNULL(PRE_USR.USR_LASTNAME, CUR_USR.USR_LASTNAME) AS DEL_PREVIOUS_USR_USERNAME,
- CUR_USR.USR_USERNAME AS DEL_CURRENT_USR_USERNAME,
- CUR_USR.USR_FIRSTNAME AS DEL_CURRENT_USR_FIRSTNAME,
- CUR_USR.USR_LASTNAME AS DEL_CURRENT_USR_LASTNAME,
- ACV.DEL_DELEGATE_DATE AS DEL_DELEGATE_DATE,
- ACV.DEL_INIT_DATE AS DEL_INIT_DATE,
- ACV.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
- ACV.APP_TAS_TITLE AS DEL_CURRENT_TAS_TITLE,
- ACV.DEL_PRIORITY,
- ACV.DEL_THREAD_STATUS
- FROM
- (
- SELECT
- CASE WHEN ACV1.PREVIOUS_USR_UID = \'\' AND ACV1.DEL_INDEX = 1
- THEN ACV1.USR_UID
- ELSE ACV1.PREVIOUS_USR_UID END AS DEL_PREVIOUS_USR_UID,
- ACV1.*
- FROM ' . $this->dbName . '.APP_CACHE_VIEW ACV1
- JOIN
- (SELECT
- ACV_INT.APP_UID,
- MAX(ACV_INT.DEL_INDEX) MAX_DEL_INDEX
- FROM
- ' . $this->dbName . '.APP_CACHE_VIEW ACV_INT
- GROUP BY
- ACV_INT.USR_UID,
- ACV_INT.APP_UID
- ) ACV2
- ON ACV2.APP_UID = ACV1.APP_UID AND ACV2.MAX_DEL_INDEX = ACV1.DEL_INDEX
- ) ACV
- LEFT JOIN ' . $this->dbName . '.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID
- LEFT JOIN ' . $this->dbName . '.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID';
- $con = Propel::getConnection("workflow");
- $stmt = $con->createStatement();
- $stmt->executeQuery($query);
- CLI::logging("> Inserted data into table LIST_PARTICIPATED_LAST\n");
- $query = 'UPDATE ' . $this->dbName . '.LIST_PARTICIPATED_LAST LPL, (
- SELECT
- TASK.TAS_TITLE,
- CUR_USER.APP_UID,
- USERS.USR_UID,
- USERS.USR_USERNAME,
- USERS.USR_FIRSTNAME,
- USERS.USR_LASTNAME
- FROM (
- SELECT
- APP_UID,
- TAS_UID,
- DEL_INDEX,
- USR_UID
- FROM ' . $this->dbName . '.APP_DELEGATION
- WHERE DEL_LAST_INDEX = 1
- ) CUR_USER
- LEFT JOIN ' . $this->dbName . '.USERS ON CUR_USER.USR_UID = USERS.USR_UID
- LEFT JOIN ' . $this->dbName . '.TASK ON CUR_USER.TAS_UID = TASK.TAS_UID) USERS_VALUES
- SET
- LPL.DEL_CURRENT_USR_USERNAME = IFNULL(USERS_VALUES.USR_USERNAME, \'\'),
- LPL.DEL_CURRENT_USR_FIRSTNAME = IFNULL(USERS_VALUES.USR_FIRSTNAME, \'\'),
- LPL.DEL_CURRENT_USR_LASTNAME = IFNULL(USERS_VALUES.USR_LASTNAME, \'\'),
- LPL.DEL_CURRENT_TAS_TITLE = IFNULL(USERS_VALUES.TAS_TITLE, \'\')
- WHERE LPL.APP_UID = USERS_VALUES.APP_UID';
- $con = Propel::getConnection("workflow");
- $stmt = $con->createStatement();
- CLI::logging("> Updating the current users data on table LIST_PARTICIPATED_LAST\n");
- $stmt->executeQuery($query);
- CLI::logging("> Completed table LIST_PARTICIPATED_LAST\n");
+ return $query;
}
/**
- * This function overwrite the table LIST_PAUSED
- * Get the principal information in the tables appDelay, appDelegation
- * For the labels we use the tables user, process, task and application
- * @return void
+ * Return query to populate paused list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
*/
public function regenerateListPaused()
{
- $this->initPropel(true);
$query = 'INSERT INTO ' . $this->dbName . '.LIST_PAUSED
(
APP_UID,
@@ -2888,18 +2779,104 @@ class WorkspaceTools
APP_DELAY.APP_DISABLE_ACTION_USER = "0" AND
APP_DELAY.APP_TYPE = "PAUSE"
';
- $con = Propel::getConnection("workflow");
- $stmt = $con->createStatement();
- $stmt->executeQuery($query);
- CLI::logging("> Completed table LIST_PAUSED\n");
+
+ return $query;
}
- /*----------------------------------********---------------------------------*/
+ /**
+ * Return query to populate participated last list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
+ public function regenerateListParticipatedLast()
+ {
+ $query = 'INSERT INTO ' . $this->dbName . '.LIST_PARTICIPATED_LAST
+ (
+ APP_UID,
+ USR_UID,
+ DEL_INDEX,
+ TAS_UID,
+ PRO_UID,
+ APP_NUMBER,
+ APP_TITLE,
+ APP_PRO_TITLE,
+ APP_TAS_TITLE,
+ APP_STATUS,
+ DEL_PREVIOUS_USR_UID,
+ DEL_PREVIOUS_USR_USERNAME,
+ DEL_PREVIOUS_USR_FIRSTNAME,
+ DEL_PREVIOUS_USR_LASTNAME,
+ DEL_CURRENT_USR_USERNAME,
+ DEL_CURRENT_USR_FIRSTNAME,
+ DEL_CURRENT_USR_LASTNAME,
+ DEL_DELEGATE_DATE,
+ DEL_INIT_DATE,
+ DEL_DUE_DATE,
+ DEL_CURRENT_TAS_TITLE,
+ DEL_PRIORITY,
+ DEL_THREAD_STATUS)
+
+ SELECT
+ ACV.APP_UID,
+ IF(ACV.USR_UID=\'\', \'SELF_SERVICES\', ACV.USR_UID),
+ ACV.DEL_INDEX,
+ ACV.TAS_UID,
+ ACV.PRO_UID,
+ ACV.APP_NUMBER,
+ ACV.APP_TITLE,
+ ACV.APP_PRO_TITLE,
+ ACV.APP_TAS_TITLE,
+ ACV.APP_STATUS,
+ DEL_PREVIOUS_USR_UID,
+ IFNULL(PRE_USR.USR_USERNAME, CUR_USR.USR_USERNAME) AS DEL_PREVIOUS_USR_USERNAME,
+ IFNULL(PRE_USR.USR_FIRSTNAME, CUR_USR.USR_FIRSTNAME) AS DEL_PREVIOUS_USR_USERNAME,
+ IFNULL(PRE_USR.USR_LASTNAME, CUR_USR.USR_LASTNAME) AS DEL_PREVIOUS_USR_USERNAME,
+ CUR_USR.USR_USERNAME AS DEL_CURRENT_USR_USERNAME,
+ CUR_USR.USR_FIRSTNAME AS DEL_CURRENT_USR_FIRSTNAME,
+ CUR_USR.USR_LASTNAME AS DEL_CURRENT_USR_LASTNAME,
+ ACV.DEL_DELEGATE_DATE AS DEL_DELEGATE_DATE,
+ ACV.DEL_INIT_DATE AS DEL_INIT_DATE,
+ ACV.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
+ ACV.APP_TAS_TITLE AS DEL_CURRENT_TAS_TITLE,
+ ACV.DEL_PRIORITY,
+ ACV.DEL_THREAD_STATUS
+ FROM
+ (
+ SELECT
+ CASE WHEN ACV1.PREVIOUS_USR_UID = \'\' AND ACV1.DEL_INDEX = 1
+ THEN ACV1.USR_UID
+ ELSE ACV1.PREVIOUS_USR_UID END AS DEL_PREVIOUS_USR_UID,
+ ACV1.*
+ FROM ' . $this->dbName . '.APP_CACHE_VIEW ACV1
+ JOIN
+ (SELECT
+ ACV_INT.APP_UID,
+ MAX(ACV_INT.DEL_INDEX) MAX_DEL_INDEX
+ FROM
+ ' . $this->dbName . '.APP_CACHE_VIEW ACV_INT
+ GROUP BY
+ ACV_INT.USR_UID,
+ ACV_INT.APP_UID
+ ) ACV2
+ ON ACV2.APP_UID = ACV1.APP_UID AND ACV2.MAX_DEL_INDEX = ACV1.DEL_INDEX
+ ) ACV
+ LEFT JOIN ' . $this->dbName . '.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID
+ LEFT JOIN ' . $this->dbName . '.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID';
+
+ return $query;
+ }
+
+ /**
+ * Return query to populate unassigned list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
public function regenerateListUnassigned()
{
- $this->initPropel(true);
- $truncate = 'TRUNCATE ' . $this->dbName . '.LIST_UNASSIGNED';
- //This executeQuery is very fast than Propel
$query = 'INSERT INTO ' . $this->dbName . '.LIST_UNASSIGNED
(APP_UID,
DEL_INDEX,
@@ -2942,13 +2919,154 @@ class WorkspaceTools
WHERE
ACV.DEL_THREAD_STATUS = \'OPEN\'
AND ACV.USR_UID = \'\' ';
+
+ return $query;
+ }
+
+ /**
+ * Re-populate only the unassigned list
+ */
+ public function runRegenerateListUnassigned()
+ {
+ // Init Propel
+ $this->initPropel(true);
+
+ // Initialize Propel objects
$con = Propel::getConnection("workflow");
$stmt = $con->createStatement();
- $stmt->executeQuery($truncate);
- $stmt->executeQuery($query);
- CLI::logging("> Completed table LIST_UNASSIGNED\n");
+
+ // Clean table
+ $stmt->executeQuery('TRUNCATE ' . $this->dbName . '.LIST_UNASSIGNED;');
+
+ // Populate table
+ $stmt->executeQuery($this->regenerateListUnassigned());
+
+ // Update some fields
+ $stmt->executeQuery($this->updateListProId('LIST_UNASSIGNED'));
+ $stmt->executeQuery($this->updateListTasId('LIST_UNASSIGNED'));
+ }
+
+ /**
+ * Return query to update PRO_ID in list table
+ *
+ * @param string $list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
+ public function updateListProId($list) {
+ $query = 'UPDATE ' . $list . ' AS LT
+ INNER JOIN (
+ SELECT PROCESS.PRO_UID, PROCESS.PRO_ID
+ FROM PROCESS
+ ) AS PRO
+ ON (LT.PRO_UID = PRO.PRO_UID)
+ SET LT.PRO_ID = PRO.PRO_ID
+ WHERE LT.PRO_ID = 0';
+ return $query;
+ }
+
+ /**
+ * Return query to update USR_ID in list table
+ *
+ * @param string $list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
+ public function updateListUsrId($list) {
+ $query = 'UPDATE ' . $list . ' AS LT
+ INNER JOIN (
+ SELECT USERS.USR_UID, USERS.USR_ID
+ FROM USERS
+ ) AS USR
+ ON (LT.USR_UID = USR.USR_UID)
+ SET LT.USR_ID = USR.USR_ID
+ WHERE LT.USR_ID = 0';
+ return $query;
+ }
+
+ /**
+ * Return query to update TAS_ID in list table
+ *
+ * @param string $list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
+ public function updateListTasId($list) {
+ $query = 'UPDATE ' . $list . ' AS LT
+ INNER JOIN (
+ SELECT TASK.TAS_UID, TASK.TAS_ID
+ FROM TASK
+ ) AS TAS
+ ON (LT.TAS_UID = TAS.TAS_UID)
+ SET LT.TAS_ID = TAS.TAS_ID
+ WHERE LT.TAS_ID = 0';
+ return $query;
+ }
+
+ /**
+ * Return query to update APP_STATUS_ID in list table
+ *
+ * @para string $list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
+ public function updateListAppStatusId($list) {
+ $query = "UPDATE " . $list . "
+ SET APP_STATUS_ID = (case
+ when APP_STATUS = 'DRAFT' then 1
+ when APP_STATUS = 'TO_DO' then 2
+ when APP_STATUS = 'COMPLETED' then 3
+ when APP_STATUS = 'CANCELLED' then 4
+ end)
+ WHERE APP_STATUS in ('DRAFT', 'TO_DO', 'COMPLETED', 'CANCELLED') AND APP_STATUS_ID = 0";
+ return $query;
+ }
+
+ /**
+ * Return query to update participated last list
+ *
+ * @return string
+ *
+ * @see \WorkspaceTools->migrateList()
+ */
+ public function updateListParticipatedLastCurrentUser()
+ {
+ $query = 'UPDATE ' . $this->dbName . '.LIST_PARTICIPATED_LAST LPL, (
+ SELECT
+ TASK.TAS_TITLE,
+ CUR_USER.APP_UID,
+ USERS.USR_UID,
+ USERS.USR_USERNAME,
+ USERS.USR_FIRSTNAME,
+ USERS.USR_LASTNAME
+ FROM (
+ SELECT
+ APP_UID,
+ TAS_UID,
+ DEL_INDEX,
+ USR_UID
+ FROM ' . $this->dbName . '.APP_DELEGATION
+ WHERE DEL_LAST_INDEX = 1
+ ) CUR_USER
+ LEFT JOIN ' . $this->dbName . '.USERS ON CUR_USER.USR_UID = USERS.USR_UID
+ LEFT JOIN ' . $this->dbName . '.TASK ON CUR_USER.TAS_UID = TASK.TAS_UID) USERS_VALUES
+ SET
+ LPL.DEL_CURRENT_USR_USERNAME = IFNULL(USERS_VALUES.USR_USERNAME, \'\'),
+ LPL.DEL_CURRENT_USR_FIRSTNAME = IFNULL(USERS_VALUES.USR_FIRSTNAME, \'\'),
+ LPL.DEL_CURRENT_USR_LASTNAME = IFNULL(USERS_VALUES.USR_LASTNAME, \'\'),
+ LPL.DEL_CURRENT_TAS_TITLE = IFNULL(USERS_VALUES.TAS_TITLE, \'\')
+ WHERE LPL.APP_UID = USERS_VALUES.APP_UID';
+
+ return $query;
}
- /*----------------------------------********---------------------------------*/
/**
* This function checks if List tables are going to migrated
@@ -3035,19 +3153,21 @@ class WorkspaceTools
}
/**
- * Process-Files upgrade
+ * Process files upgrade, store the information in the DB
+ *
+ * @param string $workspace
*
* return void
*/
- public function processFilesUpgrade()
+ public function processFilesUpgrade($workspace)
{
try {
if (!defined("PATH_DATA_MAILTEMPLATES")) {
- define("PATH_DATA_MAILTEMPLATES", PATH_DATA_SITE . "mailTemplates" . PATH_SEP);
+ define("PATH_DATA_MAILTEMPLATES", PATH_DATA . 'sites' . PATH_SEP . $workspace . PATH_SEP . "mailTemplates" . PATH_SEP);
}
if (!defined("PATH_DATA_PUBLIC")) {
- define("PATH_DATA_PUBLIC", PATH_DATA_SITE . "public" . PATH_SEP);
+ define("PATH_DATA_PUBLIC", PATH_DATA . 'sites' . PATH_SEP . $workspace . PATH_SEP . "public" . PATH_SEP);
}
$this->initPropel(true);
@@ -3560,8 +3680,12 @@ class WorkspaceTools
return $response;
}
-
- public function migrateContent($workspace, $lang = SYS_LANG)
+ /**
+ * Migrate texts/values from "CONTENT" table to the corresponding object tables
+ *
+ * @param string $lang
+ */
+ public function migrateContent($lang = SYS_LANG)
{
if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
define('MEMCACHED_ENABLED', false);
@@ -3574,7 +3698,7 @@ class WorkspaceTools
$blackList = $oConfig['CFG_VALUE'] == 'true' ? array('Groupwf', 'Process', 'Department', 'Task', 'InputDocument', 'Application') : unserialize($oConfig['CFG_VALUE']);
}
- $blackList = $this->migrateContentRun($workspace, $lang, $blackList);
+ $blackList = $this->migrateContentRun($lang, $blackList);
$data["CFG_UID"] = 'MIGRATED_CONTENT';
$data["OBJ_UID"] = 'content';
$data["CFG_VALUE"] = serialize($blackList);
@@ -3585,85 +3709,95 @@ class WorkspaceTools
}
/**
- * Migrate this workspace table Content.
+ * Generate update rows from Content sentence
*
- * @param $className
- * @param $fields
- * @param mixed|string $lang
- * @throws Exception
+ * @param string $tableName
+ * @param array $fields
+ * @param string $lang
+ *
+ * @return string
*/
- public function migrateContentWorkspace($className, $fields, $lang = SYS_LANG)
+ public function generateUpdateFromContent($tableName, array $fields, $lang = SYS_LANG)
{
- try {
- $this->initPropel(true);
- $fieldUidName = $fields['uid'];
- $oCriteria = new Criteria();
- $oCriteria->clearSelectColumns();
- $oCriteria->addAsColumn($fieldUidName, ContentPeer::CON_ID);
- $oCriteria->addSelectColumn(ContentPeer::CON_PARENT);
- $oCriteria->addSelectColumn(ContentPeer::CON_CATEGORY);
- $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
- $oCriteria->add(ContentPeer::CON_CATEGORY, $fields['fields'], Criteria::IN);
- $oCriteria->add(ContentPeer::CON_LANG, $lang);
- $oDataset = ContentPeer::doSelectRS($oCriteria);
- $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
- $methods = $fields['methods'];
- while ($oDataset->next()) {
- $row = $oDataset->getRow();
- $fieldName = $row['CON_CATEGORY'];
- $fieldName = isset($fields['alias']) && isset($fields['alias'][$fieldName]) ? $fields['alias'][$fieldName] : $fieldName;
- unset($row['CON_CATEGORY']);
- $row[$fieldName] = $row['CON_VALUE'];
- unset($row['CON_VALUE']);
- $oTable = new $className();
- $that = array($oTable, $methods['exists']);
- $params = array($row[$fieldUidName]);
- if (isset($row['CON_PARENT']) && $row['CON_PARENT'] != '') {
- array_push($params, $row['CON_PARENT']);
- $fieldName = isset($fields['alias']) && isset($fields['alias']['CON_PARENT']) ? $fields['alias']['CON_PARENT'] : 'CON_PARENT';
- $row[$fieldName] = $row['CON_PARENT'];
- }
- unset($row['CON_PARENT']);
- if (call_user_func_array($that, $params)) {
- if (isset($methods['update'])) {
- $fn = $methods['update'];
- $fn($row);
- } else {
- $oTable->update($row);
- }
- }
- }
- $classNamePeer = class_exists($className . 'Peer') ? $className . 'Peer' : $fields['peer'];
- CLI::logging("|--> Add content data in table " . $classNamePeer::TABLE_NAME . "\n");
- } catch (Exception $e) {
- throw ($e);
+ $sql = "UPDATE " . $tableName . " AS T";
+ $i = 0;
+ foreach ($fields['fields'] as $field) {
+ $i++;
+ $tableAlias = "C" . $i;
+ $sql .= " LEFT JOIN CONTENT " . $tableAlias . " ON (";
+ $sql .= $tableAlias . ".CON_CATEGORY = '" . $field . "' AND ";
+ $sql .= $tableAlias . ".CON_ID = T." . $fields['uid'] . " AND ";
+ $sql .= $tableAlias . ".CON_LANG = '" . $lang . "')";
}
+ $sql .= ' SET ';
+ $i = 0;
+ foreach ($fields['fields'] as $field) {
+ $i++;
+ $tableAlias = "C" . $i;
+ $fieldName = !empty($fields['alias'][$field]) ? $fields['alias'][$field] : $field;
+ $sql .= $fieldName . " = " . $tableAlias . ".CON_VALUE, ";
+ }
+ $sql = rtrim($sql, ', ');
+ return $sql;
}
/**
- * Migration
+ * Migrate from "CONTENT" table to the corresponding object tables
+ *
+ * @param string $lang
+ * @param array $blackList
*
- * @param $workspace
- * @param mixed|string $lang
* @return array
+ *
+ * @throws Exception
*/
- public function migrateContentRun($workspace, $lang = SYS_LANG, $blackList = array())
+ public function migrateContentRun($lang = SYS_LANG, $blackList = [])
{
if ((!class_exists('Memcache') || !class_exists('Memcached')) && !defined('MEMCACHED_ENABLED')) {
define('MEMCACHED_ENABLED', false);
}
$content = $this->getListContentMigrateTable();
+ $contentQueries = [];
foreach ($content as $className => $fields) {
if (!in_array($className, $blackList)) {
- $this->migrateContentWorkspace($className, $fields, $lang);
+ // Build class peer name
+ if (class_exists($className . 'Peer')) {
+ $classNamePeer = $className . 'Peer';
+ } else {
+ $classNamePeer = $fields['peer'];
+ }
+
+ // Build the query
+ $query = $this->generateUpdateFromContent($classNamePeer::TABLE_NAME, $fields, $lang);
+
+ // Instantiate the class to execute the query in background
+ $contentQueries[] = new RunProcessUpgradeQuery($this->name, $query);
+
+ // Add class to the control array
$blackList[] = $className;
}
}
+ // Run queries in multiple threads
+ $processesManager = new ProcessesManager($contentQueries);
+ $processesManager->run();
+
+ // If exists an error throw an exception
+ if (!empty($processesManager->getErrors())) {
+ $errorMessage = '';
+ foreach ($processesManager->getErrors() as $error) {
+ $errorMessage .= $error['rawAnswer'] . PHP_EOL;
+ }
+ throw new Exception($errorMessage);
+ }
+
return $blackList;
}
- public function cleanTokens($workspace, $lang = SYS_LANG)
+ /**
+ * Clean the expired access and refresh tokens
+ */
+ public function cleanTokens()
{
$this->initPropel(true);
$oCriteria = new Criteria();
@@ -3739,13 +3873,6 @@ class WorkspaceTools
CLI::logging($message);
}
- public function upgradeConfiguration()
- {
- $conf = new Configurations();
- $conf->aConfig = 'neoclassic';
- $conf->saveConfig('SKIN_CRON', '');
- }
-
public function upgradeAuditLog($workspace)
{
$conf = new Configurations();
@@ -3758,7 +3885,10 @@ class WorkspaceTools
}
}
- public function migrateSelfServiceRecordsRun($workspace)
+ /**
+ * Migrate the concatenated strings with UIDs from groups to the table "APP_ASSIGN_SELF_SERVICE_VALUE_GROUP"
+ */
+ public function migrateSelfServiceRecordsRun()
{
// Initializing
$this->initPropel(true);
@@ -3805,7 +3935,10 @@ class WorkspaceTools
CLI::logging(" Migrating Self-Service by Value Cases Done \n");
}
- public function migratePopulateIndexingACV($workspace)
+ /**
+ * Populate new fields used for avoiding the use of the "APP_CACHE_VIEW" table
+ */
+ public function migratePopulateIndexingACV()
{
// Migrating and populating new indexes
CLI::logging("-> Migrating an populating indexing for avoiding the use of table APP_CACHE_VIEW Start \n");
@@ -4070,9 +4203,10 @@ class WorkspaceTools
* It populates the WEB_ENTRY table for the classic processes, this procedure
* is done to verify the execution of php files generated when the WebEntry
* is configured.
- * @param type $workSpace
+ *
+ * @param bool $force
*/
- public function updatingWebEntryClassicModel($workSpace, $force = false)
+ public function updatingWebEntryClassicModel($force = false)
{
//We obtain from the configuration the list of proUids obtained so that
//we do not go through again.
@@ -4168,8 +4302,9 @@ class WorkspaceTools
/**
* Updating triggers
- * @param $flagRecreate
- * @param $lang
+ *
+ * @param bool $flagRecreate
+ * @param string $lang
*/
public function updateTriggers($flagRecreate, $lang)
{
@@ -4178,6 +4313,8 @@ class WorkspaceTools
}
/**
+ * Migrate the data of the "plugin.singleton" file to the "PLUGIN_REGISTRY" table
+ *
* @param $workspace
*/
public function migrateSingleton($workspace)
@@ -4223,14 +4360,11 @@ class WorkspaceTools
}
/**
- * Updating framework directory structure
+ * Check/Create framework's directories
*
*/
- private function updateFrameworkPaths($workSpace = null)
+ public function checkFrameworkPaths()
{
- if ($workSpace === null) {
- $workSpace = config("system.workspace");
- }
$paths = [
PATH_DATA . 'framework' => 0770,
PATH_DATA . 'framework' . DIRECTORY_SEPARATOR . 'cache' => 0770,
@@ -4565,4 +4699,63 @@ class WorkspaceTools
}
}
}
+
+ /**
+ * Delete the triggers MySQL that causes performance issues in the upgrade process
+ */
+ public function deleteTriggersMySql($triggersToDelete)
+ {
+ // Initialize Propel
+ $this->initPropel(true);
+ $con = Propel::getConnection('workflow');
+
+ // Get statement instance
+ $stmt = $con->createStatement();
+
+ // Get MySQL DB instance class
+ $dbInstance = $this->getDatabase();
+
+ // Remove triggers MySQL
+ foreach ($triggersToDelete as $triggerName) {
+ $stmt->executeQuery($dbInstance->getDropTrigger($triggerName));
+ }
+ }
+
+ /**
+ * Delete indexes of specific tables
+ *
+ * @param array $tables
+ */
+ public function deleteIndexes($tables)
+ {
+ // Get MySQL DB instance class
+ $database = $this->getDatabase();
+
+ foreach ($tables as $table) {
+ // Get all indexes of the table
+ $indexes = $database->executeQuery($database->generateTableIndexSQL($table));
+ $indexesDeleted = [];
+ foreach ($indexes as $index) {
+ if ($index['Key_name'] != 'PRIMARY') {
+ if (!in_array($index['Key_name'], $indexesDeleted)) {
+ // Remove index
+ $database->executeQuery($database->generateDropKeySQL($table, $index['Key_name']));
+ $indexesDeleted[] = $index['Key_name'];
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Execute a query, used internally for the upgrade process
+ *
+ * @param string $query
+ * @param bool $rbac
+ */
+ public function upgradeQuery($query, $rbac)
+ {
+ $database = $this->getDatabase($rbac);
+ $database->executeQuery($query, true);
+ }
}
diff --git a/workflow/engine/classes/WsBase.php b/workflow/engine/classes/WsBase.php
index afedb88ec..072b684b8 100644
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -5,6 +5,7 @@ use ProcessMaker\BusinessModel\EmailServer;
use ProcessMaker\ChangeLog\ChangeLog;
/*----------------------------------********---------------------------------*/
use ProcessMaker\Core\System;
+use ProcessMaker\Util\WsMessageResponse;
class WsBase
{
@@ -1010,7 +1011,8 @@ class WsBase
$spool->sendMail();
if ($spool->status == 'sent') {
- $result = new WsResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
+ $result = new WsMessageResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
+ $result->setAppMessUid($spool->getSpoolId());
} else {
$result = new WsResponse(29, $spool->status . ' ' . $spool->error . print_r($setup, 1));
}
diff --git a/workflow/engine/classes/model/AbeConfiguration.php b/workflow/engine/classes/model/AbeConfiguration.php
index 66b6cf0d0..90679a92e 100644
--- a/workflow/engine/classes/model/AbeConfiguration.php
+++ b/workflow/engine/classes/model/AbeConfiguration.php
@@ -26,6 +26,7 @@ class AbeConfiguration extends BaseAbeConfiguration
'DYN_UID',
'ABE_EMAIL_FIELD',
'ABE_ACTION_FIELD',
+ 'ABE_ACTION_BODY_FIELD',
'ABE_CASE_NOTE_IN_RESPONSE',
'ABE_FORCE_LOGIN',
'ABE_CREATE_DATE',
@@ -33,7 +34,8 @@ class AbeConfiguration extends BaseAbeConfiguration
'ABE_SUBJECT_FIELD',
'ABE_MAILSERVER_OR_MAILCURRENT',
'ABE_CUSTOM_GRID',
- 'ABE_EMAIL_SERVER_UID'
+ 'ABE_EMAIL_SERVER_UID',
+ 'ABE_EMAIL_SERVER_RECEIVER_UID'
];
public function load($abeUid)
@@ -152,6 +154,7 @@ class AbeConfiguration extends BaseAbeConfiguration
$criteria->addSelectColumn(AbeConfigurationPeer::DYN_UID);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_FIELD);
+ $criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_SUBJECT_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_CUSTOM_GRID);
diff --git a/workflow/engine/classes/model/AddonsManager.php b/workflow/engine/classes/model/AddonsManager.php
index 06d16fedb..10691d3ac 100644
--- a/workflow/engine/classes/model/AddonsManager.php
+++ b/workflow/engine/classes/model/AddonsManager.php
@@ -385,13 +385,7 @@ class AddonsManager extends BaseAddonsManager
$this->setState();
} else {
- if ($this->getAddonType() == "core") {
- $upgrade = new Upgrade($this);
-
- $upgrade->install();
- } else {
- throw new Exception("Addon type {$this->getAddonType()} not supported.");
- }
+ throw new Exception("Addon type {$this->getAddonType()} not supported.");
}
}
diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php
index 45a669b02..32b3ab3d7 100644
--- a/workflow/engine/classes/model/AppCacheView.php
+++ b/workflow/engine/classes/model/AppCacheView.php
@@ -288,7 +288,10 @@ class AppCacheView extends BaseAppCacheView
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
- $c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
+ $c->add(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, '')->addOr(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, null, Criteria::ISNULL))
+ );
$c->add(TaskUserPeer::USR_UID, $userUid);
$rs = TaskPeer::doSelectRS($c);
@@ -314,7 +317,10 @@ class AppCacheView extends BaseAppCacheView
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
- $c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
+ $c->add(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, '')->addOr(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, null, Criteria::ISNULL))
+ );
$c->add(TaskUserPeer::USR_UID, $aGroups, Criteria::IN);
$rs = TaskPeer::doSelectRS($c);
diff --git a/workflow/engine/classes/model/AppDelay.php b/workflow/engine/classes/model/AppDelay.php
index 06d9d269c..6157d6907 100644
--- a/workflow/engine/classes/model/AppDelay.php
+++ b/workflow/engine/classes/model/AppDelay.php
@@ -199,6 +199,8 @@ class AppDelay extends BaseAppDelay
if (empty($usrUid)) {
global $RBAC;
$usrUid = $RBAC->aUserInfo['USER_INFO']['USR_UID'];
+ }
+ if (empty($usrId)) {
$u = new Users();
$usrId = $u->load($usrUid)['USR_ID'];
}
diff --git a/workflow/engine/classes/model/AppMessage.php b/workflow/engine/classes/model/AppMessage.php
index 8758937b3..4b2659c56 100644
--- a/workflow/engine/classes/model/AppMessage.php
+++ b/workflow/engine/classes/model/AppMessage.php
@@ -300,5 +300,24 @@ class AppMessage extends BaseAppMessage
return $messages;
}
+
+ /**
+ * Get the APP_MSG_BODY related to the key
+ *
+ * @param string $key
+ *
+ * @return string
+ * @throws Exception
+ */
+ public static function getAppMsgBodyByKey($key)
+ {
+ try {
+ $appMessage = AppMessagePeer::retrieveByPk($key);
+
+ return $appMessage->getAppMsgBody();
+ } catch (Exception $error) {
+ throw $error;
+ }
+ }
}
diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php
index a073a8c7b..4cafc2681 100644
--- a/workflow/engine/classes/model/ListUnassigned.php
+++ b/workflow/engine/classes/model/ListUnassigned.php
@@ -398,7 +398,10 @@ class ListUnassigned extends BaseListUnassigned implements ListInterface
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
- $c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
+ $c->add(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, '')->addOr(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, null, Criteria::ISNULL))
+ );
$c->add(TaskUserPeer::USR_UID, $userUid);
//TU_TYPE = 2 is a AdHoc task
if (!$adHocUsers) {
@@ -430,7 +433,10 @@ class ListUnassigned extends BaseListUnassigned implements ListInterface
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
- $c->add(TaskPeer::TAS_GROUP_VARIABLE, '');
+ $c->add(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, '')->addOr(
+ $c->getNewCriterion(TaskPeer::TAS_GROUP_VARIABLE, null, Criteria::ISNULL))
+ );
$c->add(TaskUserPeer::USR_UID, $groupsList, Criteria::IN);
//TU_TYPE = 2 is a AdHoc task
if (!$adHocUsers) {
diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php
index 69c59feec..5c97dc6a8 100644
--- a/workflow/engine/classes/model/Process.php
+++ b/workflow/engine/classes/model/Process.php
@@ -746,7 +746,13 @@ class Process extends BaseProcess
return $aProcesses;
}
- public function getCasesCountForProcess($pro_uid)
+ /**
+ * This returns the number of cases for the process.
+ * @param string $pro_uid
+ * @return integer
+ * @see ProcessMaker\Project\Bpmn::canRemove()
+ */
+ public static function getCasesCountForProcess($pro_uid)
{
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn('COUNT(*) AS TOTAL_CASES');
diff --git a/workflow/engine/classes/model/map/AbeConfigurationMapBuilder.php b/workflow/engine/classes/model/map/AbeConfigurationMapBuilder.php
index 8652ef90a..c74d98fa0 100644
--- a/workflow/engine/classes/model/map/AbeConfigurationMapBuilder.php
+++ b/workflow/engine/classes/model/map/AbeConfigurationMapBuilder.php
@@ -83,6 +83,8 @@ class AbeConfigurationMapBuilder
$tMap->addColumn('ABE_ACTION_FIELD', 'AbeActionField', 'string', CreoleTypes::VARCHAR, false, 255);
+ $tMap->addColumn('ABE_ACTION_BODY_FIELD', 'AbeActionBodyField', 'string', CreoleTypes::VARCHAR, false, 255);
+
$tMap->addColumn('ABE_CASE_NOTE_IN_RESPONSE', 'AbeCaseNoteInResponse', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('ABE_FORCE_LOGIN', 'AbeForceLogin', 'int', CreoleTypes::INTEGER, false, null);
@@ -99,6 +101,8 @@ class AbeConfigurationMapBuilder
$tMap->addColumn('ABE_EMAIL_SERVER_UID', 'AbeEmailServerUid', 'string', CreoleTypes::VARCHAR, false, 32);
+ $tMap->addColumn('ABE_EMAIL_SERVER_RECEIVER_UID', 'AbeEmailServerReceiverUid', 'string', CreoleTypes::VARCHAR, false, 32);
+
} // doBuild()
} // AbeConfigurationMapBuilder
diff --git a/workflow/engine/classes/model/map/EmailServerMapBuilder.php b/workflow/engine/classes/model/map/EmailServerMapBuilder.php
index ab8fd959a..b9e5729a0 100644
--- a/workflow/engine/classes/model/map/EmailServerMapBuilder.php
+++ b/workflow/engine/classes/model/map/EmailServerMapBuilder.php
@@ -73,6 +73,10 @@ class EmailServerMapBuilder
$tMap->addColumn('MESS_PORT', 'MessPort', 'int', CreoleTypes::INTEGER, true, null);
+ $tMap->addColumn('MESS_INCOMING_SERVER', 'MessIncomingServer', 'string', CreoleTypes::VARCHAR, true, 256);
+
+ $tMap->addColumn('MESS_INCOMING_PORT', 'MessIncomingPort', 'int', CreoleTypes::INTEGER, true, null);
+
$tMap->addColumn('MESS_RAUTH', 'MessRauth', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('MESS_ACCOUNT', 'MessAccount', 'string', CreoleTypes::VARCHAR, true, 256);
diff --git a/workflow/engine/classes/model/map/UsersPropertiesMapBuilder.php b/workflow/engine/classes/model/map/UsersPropertiesMapBuilder.php
index 90743a86a..d391036bc 100644
--- a/workflow/engine/classes/model/map/UsersPropertiesMapBuilder.php
+++ b/workflow/engine/classes/model/map/UsersPropertiesMapBuilder.php
@@ -75,6 +75,8 @@ class UsersPropertiesMapBuilder
$tMap->addColumn('USR_SETTING_DESIGNER', 'UsrSettingDesigner', 'string', CreoleTypes::LONGVARCHAR, false, null);
+ $tMap->addColumn('PMDYNAFORM_FIRST_TIME', 'PmdynaformFirstTime', 'string', CreoleTypes::CHAR, false, 1);
+
} // doBuild()
} // UsersPropertiesMapBuilder
diff --git a/workflow/engine/classes/model/om/BaseAbeConfiguration.php b/workflow/engine/classes/model/om/BaseAbeConfiguration.php
index 7de6b6b1a..a83b0448d 100644
--- a/workflow/engine/classes/model/om/BaseAbeConfiguration.php
+++ b/workflow/engine/classes/model/om/BaseAbeConfiguration.php
@@ -81,6 +81,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
*/
protected $abe_action_field = '';
+ /**
+ * The value for the abe_action_body_field field.
+ * @var string
+ */
+ protected $abe_action_body_field = '';
+
/**
* The value for the abe_case_note_in_response field.
* @var int
@@ -129,6 +135,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
*/
protected $abe_email_server_uid = '';
+ /**
+ * The value for the abe_email_server_receiver_uid field.
+ * @var string
+ */
+ protected $abe_email_server_receiver_uid = '';
+
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -242,6 +254,17 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->abe_action_field;
}
+ /**
+ * Get the [abe_action_body_field] column value.
+ *
+ * @return string
+ */
+ public function getAbeActionBodyField()
+ {
+
+ return $this->abe_action_body_field;
+ }
+
/**
* Get the [abe_case_note_in_response] column value.
*
@@ -372,6 +395,17 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->abe_email_server_uid;
}
+ /**
+ * Get the [abe_email_server_receiver_uid] column value.
+ *
+ * @return string
+ */
+ public function getAbeEmailServerReceiverUid()
+ {
+
+ return $this->abe_email_server_receiver_uid;
+ }
+
/**
* Set the value of [abe_uid] column.
*
@@ -570,6 +604,28 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
} // setAbeActionField()
+ /**
+ * Set the value of [abe_action_body_field] column.
+ *
+ * @param string $v new value
+ * @return void
+ */
+ public function setAbeActionBodyField($v)
+ {
+
+ // Since the native PHP type for this column is string,
+ // we will cast the input to a string (if it is not).
+ if ($v !== null && !is_string($v)) {
+ $v = (string) $v;
+ }
+
+ if ($this->abe_action_body_field !== $v || $v === '') {
+ $this->abe_action_body_field = $v;
+ $this->modifiedColumns[] = AbeConfigurationPeer::ABE_ACTION_BODY_FIELD;
+ }
+
+ } // setAbeActionBodyField()
+
/**
* Set the value of [abe_case_note_in_response] column.
*
@@ -760,6 +816,28 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
} // setAbeEmailServerUid()
+ /**
+ * Set the value of [abe_email_server_receiver_uid] column.
+ *
+ * @param string $v new value
+ * @return void
+ */
+ public function setAbeEmailServerReceiverUid($v)
+ {
+
+ // Since the native PHP type for this column is string,
+ // we will cast the input to a string (if it is not).
+ if ($v !== null && !is_string($v)) {
+ $v = (string) $v;
+ }
+
+ if ($this->abe_email_server_receiver_uid !== $v || $v === '') {
+ $this->abe_email_server_receiver_uid = $v;
+ $this->modifiedColumns[] = AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID;
+ }
+
+ } // setAbeEmailServerReceiverUid()
+
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -795,28 +873,32 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$this->abe_action_field = $rs->getString($startcol + 8);
- $this->abe_case_note_in_response = $rs->getInt($startcol + 9);
+ $this->abe_action_body_field = $rs->getString($startcol + 9);
- $this->abe_force_login = $rs->getInt($startcol + 10);
+ $this->abe_case_note_in_response = $rs->getInt($startcol + 10);
- $this->abe_create_date = $rs->getTimestamp($startcol + 11, null);
+ $this->abe_force_login = $rs->getInt($startcol + 11);
- $this->abe_update_date = $rs->getTimestamp($startcol + 12, null);
+ $this->abe_create_date = $rs->getTimestamp($startcol + 12, null);
- $this->abe_subject_field = $rs->getString($startcol + 13);
+ $this->abe_update_date = $rs->getTimestamp($startcol + 13, null);
- $this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 14);
+ $this->abe_subject_field = $rs->getString($startcol + 14);
- $this->abe_custom_grid = $rs->getString($startcol + 15);
+ $this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 15);
- $this->abe_email_server_uid = $rs->getString($startcol + 16);
+ $this->abe_custom_grid = $rs->getString($startcol + 16);
+
+ $this->abe_email_server_uid = $rs->getString($startcol + 17);
+
+ $this->abe_email_server_receiver_uid = $rs->getString($startcol + 18);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
- return $startcol + 17; // 17 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
+ return $startcol + 19; // 19 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating AbeConfiguration object", $e);
@@ -1048,29 +1130,35 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
return $this->getAbeActionField();
break;
case 9:
- return $this->getAbeCaseNoteInResponse();
+ return $this->getAbeActionBodyField();
break;
case 10:
- return $this->getAbeForceLogin();
+ return $this->getAbeCaseNoteInResponse();
break;
case 11:
- return $this->getAbeCreateDate();
+ return $this->getAbeForceLogin();
break;
case 12:
- return $this->getAbeUpdateDate();
+ return $this->getAbeCreateDate();
break;
case 13:
- return $this->getAbeSubjectField();
+ return $this->getAbeUpdateDate();
break;
case 14:
- return $this->getAbeMailserverOrMailcurrent();
+ return $this->getAbeSubjectField();
break;
case 15:
- return $this->getAbeCustomGrid();
+ return $this->getAbeMailserverOrMailcurrent();
break;
case 16:
+ return $this->getAbeCustomGrid();
+ break;
+ case 17:
return $this->getAbeEmailServerUid();
break;
+ case 18:
+ return $this->getAbeEmailServerReceiverUid();
+ break;
default:
return null;
break;
@@ -1100,14 +1188,16 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$keys[6] => $this->getDynUid(),
$keys[7] => $this->getAbeEmailField(),
$keys[8] => $this->getAbeActionField(),
- $keys[9] => $this->getAbeCaseNoteInResponse(),
- $keys[10] => $this->getAbeForceLogin(),
- $keys[11] => $this->getAbeCreateDate(),
- $keys[12] => $this->getAbeUpdateDate(),
- $keys[13] => $this->getAbeSubjectField(),
- $keys[14] => $this->getAbeMailserverOrMailcurrent(),
- $keys[15] => $this->getAbeCustomGrid(),
- $keys[16] => $this->getAbeEmailServerUid(),
+ $keys[9] => $this->getAbeActionBodyField(),
+ $keys[10] => $this->getAbeCaseNoteInResponse(),
+ $keys[11] => $this->getAbeForceLogin(),
+ $keys[12] => $this->getAbeCreateDate(),
+ $keys[13] => $this->getAbeUpdateDate(),
+ $keys[14] => $this->getAbeSubjectField(),
+ $keys[15] => $this->getAbeMailserverOrMailcurrent(),
+ $keys[16] => $this->getAbeCustomGrid(),
+ $keys[17] => $this->getAbeEmailServerUid(),
+ $keys[18] => $this->getAbeEmailServerReceiverUid(),
);
return $result;
}
@@ -1167,29 +1257,35 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$this->setAbeActionField($value);
break;
case 9:
- $this->setAbeCaseNoteInResponse($value);
+ $this->setAbeActionBodyField($value);
break;
case 10:
- $this->setAbeForceLogin($value);
+ $this->setAbeCaseNoteInResponse($value);
break;
case 11:
- $this->setAbeCreateDate($value);
+ $this->setAbeForceLogin($value);
break;
case 12:
- $this->setAbeUpdateDate($value);
+ $this->setAbeCreateDate($value);
break;
case 13:
- $this->setAbeSubjectField($value);
+ $this->setAbeUpdateDate($value);
break;
case 14:
- $this->setAbeMailserverOrMailcurrent($value);
+ $this->setAbeSubjectField($value);
break;
case 15:
- $this->setAbeCustomGrid($value);
+ $this->setAbeMailserverOrMailcurrent($value);
break;
case 16:
+ $this->setAbeCustomGrid($value);
+ break;
+ case 17:
$this->setAbeEmailServerUid($value);
break;
+ case 18:
+ $this->setAbeEmailServerReceiverUid($value);
+ break;
} // switch()
}
@@ -1250,35 +1346,43 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
}
if (array_key_exists($keys[9], $arr)) {
- $this->setAbeCaseNoteInResponse($arr[$keys[9]]);
+ $this->setAbeActionBodyField($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
- $this->setAbeForceLogin($arr[$keys[10]]);
+ $this->setAbeCaseNoteInResponse($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
- $this->setAbeCreateDate($arr[$keys[11]]);
+ $this->setAbeForceLogin($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
- $this->setAbeUpdateDate($arr[$keys[12]]);
+ $this->setAbeCreateDate($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
- $this->setAbeSubjectField($arr[$keys[13]]);
+ $this->setAbeUpdateDate($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
- $this->setAbeMailserverOrMailcurrent($arr[$keys[14]]);
+ $this->setAbeSubjectField($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
- $this->setAbeCustomGrid($arr[$keys[15]]);
+ $this->setAbeMailserverOrMailcurrent($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
- $this->setAbeEmailServerUid($arr[$keys[16]]);
+ $this->setAbeCustomGrid($arr[$keys[16]]);
+ }
+
+ if (array_key_exists($keys[17], $arr)) {
+ $this->setAbeEmailServerUid($arr[$keys[17]]);
+ }
+
+ if (array_key_exists($keys[18], $arr)) {
+ $this->setAbeEmailServerReceiverUid($arr[$keys[18]]);
}
}
@@ -1328,6 +1432,10 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$criteria->add(AbeConfigurationPeer::ABE_ACTION_FIELD, $this->abe_action_field);
}
+ if ($this->isColumnModified(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD)) {
+ $criteria->add(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD, $this->abe_action_body_field);
+ }
+
if ($this->isColumnModified(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE)) {
$criteria->add(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, $this->abe_case_note_in_response);
}
@@ -1360,6 +1468,10 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$criteria->add(AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, $this->abe_email_server_uid);
}
+ if ($this->isColumnModified(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID)) {
+ $criteria->add(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID, $this->abe_email_server_receiver_uid);
+ }
+
return $criteria;
}
@@ -1430,6 +1542,8 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$copyObj->setAbeActionField($this->abe_action_field);
+ $copyObj->setAbeActionBodyField($this->abe_action_body_field);
+
$copyObj->setAbeCaseNoteInResponse($this->abe_case_note_in_response);
$copyObj->setAbeForceLogin($this->abe_force_login);
@@ -1446,6 +1560,8 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
$copyObj->setAbeEmailServerUid($this->abe_email_server_uid);
+ $copyObj->setAbeEmailServerReceiverUid($this->abe_email_server_receiver_uid);
+
$copyObj->setNew(true);
diff --git a/workflow/engine/classes/model/om/BaseAbeConfigurationPeer.php b/workflow/engine/classes/model/om/BaseAbeConfigurationPeer.php
index 213759db2..07f5b2bf0 100644
--- a/workflow/engine/classes/model/om/BaseAbeConfigurationPeer.php
+++ b/workflow/engine/classes/model/om/BaseAbeConfigurationPeer.php
@@ -25,7 +25,7 @@ abstract class BaseAbeConfigurationPeer
const CLASS_DEFAULT = 'classes.model.AbeConfiguration';
/** The total number of columns. */
- const NUM_COLUMNS = 17;
+ const NUM_COLUMNS = 19;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -58,6 +58,9 @@ abstract class BaseAbeConfigurationPeer
/** the column name for the ABE_ACTION_FIELD field */
const ABE_ACTION_FIELD = 'ABE_CONFIGURATION.ABE_ACTION_FIELD';
+ /** the column name for the ABE_ACTION_BODY_FIELD field */
+ const ABE_ACTION_BODY_FIELD = 'ABE_CONFIGURATION.ABE_ACTION_BODY_FIELD';
+
/** the column name for the ABE_CASE_NOTE_IN_RESPONSE field */
const ABE_CASE_NOTE_IN_RESPONSE = 'ABE_CONFIGURATION.ABE_CASE_NOTE_IN_RESPONSE';
@@ -82,6 +85,9 @@ abstract class BaseAbeConfigurationPeer
/** the column name for the ABE_EMAIL_SERVER_UID field */
const ABE_EMAIL_SERVER_UID = 'ABE_CONFIGURATION.ABE_EMAIL_SERVER_UID';
+ /** the column name for the ABE_EMAIL_SERVER_RECEIVER_UID field */
+ const ABE_EMAIL_SERVER_RECEIVER_UID = 'ABE_CONFIGURATION.ABE_EMAIL_SERVER_RECEIVER_UID';
+
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -93,10 +99,10 @@ abstract class BaseAbeConfigurationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
- BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeCaseNoteInResponse', 'AbeForceLogin', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', 'AbeEmailServerUid', ),
- BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_FORCE_LOGIN, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, ),
- BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_FORCE_LOGIN', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', 'ABE_EMAIL_SERVER_UID', ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+ BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeActionBodyField', 'AbeCaseNoteInResponse', 'AbeForceLogin', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', 'AbeEmailServerUid', 'AbeEmailServerReceiverUid', ),
+ BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_ACTION_BODY_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_FORCE_LOGIN, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID, ),
+ BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_ACTION_BODY_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_FORCE_LOGIN', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', 'ABE_EMAIL_SERVER_UID', 'ABE_EMAIL_SERVER_RECEIVER_UID', ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
);
/**
@@ -106,10 +112,10 @@ abstract class BaseAbeConfigurationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeCaseNoteInResponse' => 9, 'AbeForceLogin' => 10, 'AbeCreateDate' => 11, 'AbeUpdateDate' => 12, 'AbeSubjectField' => 13, 'AbeMailserverOrMailcurrent' => 14, 'AbeCustomGrid' => 15, 'AbeEmailServerUid' => 16, ),
- BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 9, AbeConfigurationPeer::ABE_FORCE_LOGIN => 10, AbeConfigurationPeer::ABE_CREATE_DATE => 11, AbeConfigurationPeer::ABE_UPDATE_DATE => 12, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 13, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 14, AbeConfigurationPeer::ABE_CUSTOM_GRID => 15, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID => 16, ),
- BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_CASE_NOTE_IN_RESPONSE' => 9, 'ABE_FORCE_LOGIN' => 10, 'ABE_CREATE_DATE' => 11, 'ABE_UPDATE_DATE' => 12, 'ABE_SUBJECT_FIELD' => 13, 'ABE_MAILSERVER_OR_MAILCURRENT' => 14, 'ABE_CUSTOM_GRID' => 15, 'ABE_EMAIL_SERVER_UID' => 16, ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+ BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeActionBodyField' => 9, 'AbeCaseNoteInResponse' => 10, 'AbeForceLogin' => 11, 'AbeCreateDate' => 12, 'AbeUpdateDate' => 13, 'AbeSubjectField' => 14, 'AbeMailserverOrMailcurrent' => 15, 'AbeCustomGrid' => 16, 'AbeEmailServerUid' => 17, 'AbeEmailServerReceiverUid' => 18, ),
+ BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_ACTION_BODY_FIELD => 9, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 10, AbeConfigurationPeer::ABE_FORCE_LOGIN => 11, AbeConfigurationPeer::ABE_CREATE_DATE => 12, AbeConfigurationPeer::ABE_UPDATE_DATE => 13, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 14, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 15, AbeConfigurationPeer::ABE_CUSTOM_GRID => 16, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID => 17, AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID => 18, ),
+ BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_ACTION_BODY_FIELD' => 9, 'ABE_CASE_NOTE_IN_RESPONSE' => 10, 'ABE_FORCE_LOGIN' => 11, 'ABE_CREATE_DATE' => 12, 'ABE_UPDATE_DATE' => 13, 'ABE_SUBJECT_FIELD' => 14, 'ABE_MAILSERVER_OR_MAILCURRENT' => 15, 'ABE_CUSTOM_GRID' => 16, 'ABE_EMAIL_SERVER_UID' => 17, 'ABE_EMAIL_SERVER_RECEIVER_UID' => 18, ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
);
/**
@@ -228,6 +234,8 @@ abstract class BaseAbeConfigurationPeer
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_FIELD);
+ $criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD);
+
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_FORCE_LOGIN);
@@ -244,6 +252,8 @@ abstract class BaseAbeConfigurationPeer
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_SERVER_UID);
+ $criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID);
+
}
const COUNT = 'COUNT(ABE_CONFIGURATION.ABE_UID)';
diff --git a/workflow/engine/classes/model/om/BaseEmailServer.php b/workflow/engine/classes/model/om/BaseEmailServer.php
index 111488080..82716bab4 100644
--- a/workflow/engine/classes/model/om/BaseEmailServer.php
+++ b/workflow/engine/classes/model/om/BaseEmailServer.php
@@ -51,6 +51,18 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
*/
protected $mess_port = 0;
+ /**
+ * The value for the mess_incoming_server field.
+ * @var string
+ */
+ protected $mess_incoming_server = '';
+
+ /**
+ * The value for the mess_incoming_port field.
+ * @var int
+ */
+ protected $mess_incoming_port = 0;
+
/**
* The value for the mess_rauth field.
* @var int
@@ -163,6 +175,28 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
return $this->mess_port;
}
+ /**
+ * Get the [mess_incoming_server] column value.
+ *
+ * @return string
+ */
+ public function getMessIncomingServer()
+ {
+
+ return $this->mess_incoming_server;
+ }
+
+ /**
+ * Get the [mess_incoming_port] column value.
+ *
+ * @return int
+ */
+ public function getMessIncomingPort()
+ {
+
+ return $this->mess_incoming_port;
+ }
+
/**
* Get the [mess_rauth] column value.
*
@@ -350,6 +384,50 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
} // setMessPort()
+ /**
+ * Set the value of [mess_incoming_server] column.
+ *
+ * @param string $v new value
+ * @return void
+ */
+ public function setMessIncomingServer($v)
+ {
+
+ // Since the native PHP type for this column is string,
+ // we will cast the input to a string (if it is not).
+ if ($v !== null && !is_string($v)) {
+ $v = (string) $v;
+ }
+
+ if ($this->mess_incoming_server !== $v || $v === '') {
+ $this->mess_incoming_server = $v;
+ $this->modifiedColumns[] = EmailServerPeer::MESS_INCOMING_SERVER;
+ }
+
+ } // setMessIncomingServer()
+
+ /**
+ * Set the value of [mess_incoming_port] column.
+ *
+ * @param int $v new value
+ * @return void
+ */
+ public function setMessIncomingPort($v)
+ {
+
+ // Since the native PHP type for this column is integer,
+ // we will cast the input value to an int (if it is not).
+ if ($v !== null && !is_int($v) && is_numeric($v)) {
+ $v = (int) $v;
+ }
+
+ if ($this->mess_incoming_port !== $v || $v === 0) {
+ $this->mess_incoming_port = $v;
+ $this->modifiedColumns[] = EmailServerPeer::MESS_INCOMING_PORT;
+ }
+
+ } // setMessIncomingPort()
+
/**
* Set the value of [mess_rauth] column.
*
@@ -573,30 +651,34 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$this->mess_port = $rs->getInt($startcol + 3);
- $this->mess_rauth = $rs->getInt($startcol + 4);
+ $this->mess_incoming_server = $rs->getString($startcol + 4);
- $this->mess_account = $rs->getString($startcol + 5);
+ $this->mess_incoming_port = $rs->getInt($startcol + 5);
- $this->mess_password = $rs->getString($startcol + 6);
+ $this->mess_rauth = $rs->getInt($startcol + 6);
- $this->mess_from_mail = $rs->getString($startcol + 7);
+ $this->mess_account = $rs->getString($startcol + 7);
- $this->mess_from_name = $rs->getString($startcol + 8);
+ $this->mess_password = $rs->getString($startcol + 8);
- $this->smtpsecure = $rs->getString($startcol + 9);
+ $this->mess_from_mail = $rs->getString($startcol + 9);
- $this->mess_try_send_inmediatly = $rs->getInt($startcol + 10);
+ $this->mess_from_name = $rs->getString($startcol + 10);
- $this->mail_to = $rs->getString($startcol + 11);
+ $this->smtpsecure = $rs->getString($startcol + 11);
- $this->mess_default = $rs->getInt($startcol + 12);
+ $this->mess_try_send_inmediatly = $rs->getInt($startcol + 12);
+
+ $this->mail_to = $rs->getString($startcol + 13);
+
+ $this->mess_default = $rs->getInt($startcol + 14);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
- return $startcol + 13; // 13 = EmailServerPeer::NUM_COLUMNS - EmailServerPeer::NUM_LAZY_LOAD_COLUMNS).
+ return $startcol + 15; // 15 = EmailServerPeer::NUM_COLUMNS - EmailServerPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating EmailServer object", $e);
@@ -813,30 +895,36 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
return $this->getMessPort();
break;
case 4:
- return $this->getMessRauth();
+ return $this->getMessIncomingServer();
break;
case 5:
- return $this->getMessAccount();
+ return $this->getMessIncomingPort();
break;
case 6:
- return $this->getMessPassword();
+ return $this->getMessRauth();
break;
case 7:
- return $this->getMessFromMail();
+ return $this->getMessAccount();
break;
case 8:
- return $this->getMessFromName();
+ return $this->getMessPassword();
break;
case 9:
- return $this->getSmtpsecure();
+ return $this->getMessFromMail();
break;
case 10:
- return $this->getMessTrySendInmediatly();
+ return $this->getMessFromName();
break;
case 11:
- return $this->getMailTo();
+ return $this->getSmtpsecure();
break;
case 12:
+ return $this->getMessTrySendInmediatly();
+ break;
+ case 13:
+ return $this->getMailTo();
+ break;
+ case 14:
return $this->getMessDefault();
break;
default:
@@ -863,15 +951,17 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$keys[1] => $this->getMessEngine(),
$keys[2] => $this->getMessServer(),
$keys[3] => $this->getMessPort(),
- $keys[4] => $this->getMessRauth(),
- $keys[5] => $this->getMessAccount(),
- $keys[6] => $this->getMessPassword(),
- $keys[7] => $this->getMessFromMail(),
- $keys[8] => $this->getMessFromName(),
- $keys[9] => $this->getSmtpsecure(),
- $keys[10] => $this->getMessTrySendInmediatly(),
- $keys[11] => $this->getMailTo(),
- $keys[12] => $this->getMessDefault(),
+ $keys[4] => $this->getMessIncomingServer(),
+ $keys[5] => $this->getMessIncomingPort(),
+ $keys[6] => $this->getMessRauth(),
+ $keys[7] => $this->getMessAccount(),
+ $keys[8] => $this->getMessPassword(),
+ $keys[9] => $this->getMessFromMail(),
+ $keys[10] => $this->getMessFromName(),
+ $keys[11] => $this->getSmtpsecure(),
+ $keys[12] => $this->getMessTrySendInmediatly(),
+ $keys[13] => $this->getMailTo(),
+ $keys[14] => $this->getMessDefault(),
);
return $result;
}
@@ -916,30 +1006,36 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$this->setMessPort($value);
break;
case 4:
- $this->setMessRauth($value);
+ $this->setMessIncomingServer($value);
break;
case 5:
- $this->setMessAccount($value);
+ $this->setMessIncomingPort($value);
break;
case 6:
- $this->setMessPassword($value);
+ $this->setMessRauth($value);
break;
case 7:
- $this->setMessFromMail($value);
+ $this->setMessAccount($value);
break;
case 8:
- $this->setMessFromName($value);
+ $this->setMessPassword($value);
break;
case 9:
- $this->setSmtpsecure($value);
+ $this->setMessFromMail($value);
break;
case 10:
- $this->setMessTrySendInmediatly($value);
+ $this->setMessFromName($value);
break;
case 11:
- $this->setMailTo($value);
+ $this->setSmtpsecure($value);
break;
case 12:
+ $this->setMessTrySendInmediatly($value);
+ break;
+ case 13:
+ $this->setMailTo($value);
+ break;
+ case 14:
$this->setMessDefault($value);
break;
} // switch()
@@ -982,39 +1078,47 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
}
if (array_key_exists($keys[4], $arr)) {
- $this->setMessRauth($arr[$keys[4]]);
+ $this->setMessIncomingServer($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
- $this->setMessAccount($arr[$keys[5]]);
+ $this->setMessIncomingPort($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
- $this->setMessPassword($arr[$keys[6]]);
+ $this->setMessRauth($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
- $this->setMessFromMail($arr[$keys[7]]);
+ $this->setMessAccount($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
- $this->setMessFromName($arr[$keys[8]]);
+ $this->setMessPassword($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
- $this->setSmtpsecure($arr[$keys[9]]);
+ $this->setMessFromMail($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
- $this->setMessTrySendInmediatly($arr[$keys[10]]);
+ $this->setMessFromName($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
- $this->setMailTo($arr[$keys[11]]);
+ $this->setSmtpsecure($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
- $this->setMessDefault($arr[$keys[12]]);
+ $this->setMessTrySendInmediatly($arr[$keys[12]]);
+ }
+
+ if (array_key_exists($keys[13], $arr)) {
+ $this->setMailTo($arr[$keys[13]]);
+ }
+
+ if (array_key_exists($keys[14], $arr)) {
+ $this->setMessDefault($arr[$keys[14]]);
}
}
@@ -1044,6 +1148,14 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$criteria->add(EmailServerPeer::MESS_PORT, $this->mess_port);
}
+ if ($this->isColumnModified(EmailServerPeer::MESS_INCOMING_SERVER)) {
+ $criteria->add(EmailServerPeer::MESS_INCOMING_SERVER, $this->mess_incoming_server);
+ }
+
+ if ($this->isColumnModified(EmailServerPeer::MESS_INCOMING_PORT)) {
+ $criteria->add(EmailServerPeer::MESS_INCOMING_PORT, $this->mess_incoming_port);
+ }
+
if ($this->isColumnModified(EmailServerPeer::MESS_RAUTH)) {
$criteria->add(EmailServerPeer::MESS_RAUTH, $this->mess_rauth);
}
@@ -1140,6 +1252,10 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$copyObj->setMessPort($this->mess_port);
+ $copyObj->setMessIncomingServer($this->mess_incoming_server);
+
+ $copyObj->setMessIncomingPort($this->mess_incoming_port);
+
$copyObj->setMessRauth($this->mess_rauth);
$copyObj->setMessAccount($this->mess_account);
diff --git a/workflow/engine/classes/model/om/BaseEmailServerPeer.php b/workflow/engine/classes/model/om/BaseEmailServerPeer.php
index c78d96808..a020a0763 100644
--- a/workflow/engine/classes/model/om/BaseEmailServerPeer.php
+++ b/workflow/engine/classes/model/om/BaseEmailServerPeer.php
@@ -25,7 +25,7 @@ abstract class BaseEmailServerPeer
const CLASS_DEFAULT = 'classes.model.EmailServer';
/** The total number of columns. */
- const NUM_COLUMNS = 13;
+ const NUM_COLUMNS = 15;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -43,6 +43,12 @@ abstract class BaseEmailServerPeer
/** the column name for the MESS_PORT field */
const MESS_PORT = 'EMAIL_SERVER.MESS_PORT';
+ /** the column name for the MESS_INCOMING_SERVER field */
+ const MESS_INCOMING_SERVER = 'EMAIL_SERVER.MESS_INCOMING_SERVER';
+
+ /** the column name for the MESS_INCOMING_PORT field */
+ const MESS_INCOMING_PORT = 'EMAIL_SERVER.MESS_INCOMING_PORT';
+
/** the column name for the MESS_RAUTH field */
const MESS_RAUTH = 'EMAIL_SERVER.MESS_RAUTH';
@@ -81,10 +87,10 @@ abstract class BaseEmailServerPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
- BasePeer::TYPE_PHPNAME => array ('MessUid', 'MessEngine', 'MessServer', 'MessPort', 'MessRauth', 'MessAccount', 'MessPassword', 'MessFromMail', 'MessFromName', 'Smtpsecure', 'MessTrySendInmediatly', 'MailTo', 'MessDefault', ),
- BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID, EmailServerPeer::MESS_ENGINE, EmailServerPeer::MESS_SERVER, EmailServerPeer::MESS_PORT, EmailServerPeer::MESS_RAUTH, EmailServerPeer::MESS_ACCOUNT, EmailServerPeer::MESS_PASSWORD, EmailServerPeer::MESS_FROM_MAIL, EmailServerPeer::MESS_FROM_NAME, EmailServerPeer::SMTPSECURE, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY, EmailServerPeer::MAIL_TO, EmailServerPeer::MESS_DEFAULT, ),
- BasePeer::TYPE_FIELDNAME => array ('MESS_UID', 'MESS_ENGINE', 'MESS_SERVER', 'MESS_PORT', 'MESS_RAUTH', 'MESS_ACCOUNT', 'MESS_PASSWORD', 'MESS_FROM_MAIL', 'MESS_FROM_NAME', 'SMTPSECURE', 'MESS_TRY_SEND_INMEDIATLY', 'MAIL_TO', 'MESS_DEFAULT', ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
+ BasePeer::TYPE_PHPNAME => array ('MessUid', 'MessEngine', 'MessServer', 'MessPort', 'MessIncomingServer', 'MessIncomingPort', 'MessRauth', 'MessAccount', 'MessPassword', 'MessFromMail', 'MessFromName', 'Smtpsecure', 'MessTrySendInmediatly', 'MailTo', 'MessDefault', ),
+ BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID, EmailServerPeer::MESS_ENGINE, EmailServerPeer::MESS_SERVER, EmailServerPeer::MESS_PORT, EmailServerPeer::MESS_INCOMING_SERVER, EmailServerPeer::MESS_INCOMING_PORT, EmailServerPeer::MESS_RAUTH, EmailServerPeer::MESS_ACCOUNT, EmailServerPeer::MESS_PASSWORD, EmailServerPeer::MESS_FROM_MAIL, EmailServerPeer::MESS_FROM_NAME, EmailServerPeer::SMTPSECURE, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY, EmailServerPeer::MAIL_TO, EmailServerPeer::MESS_DEFAULT, ),
+ BasePeer::TYPE_FIELDNAME => array ('MESS_UID', 'MESS_ENGINE', 'MESS_SERVER', 'MESS_PORT', 'MESS_INCOMING_SERVER', 'MESS_INCOMING_PORT', 'MESS_RAUTH', 'MESS_ACCOUNT', 'MESS_PASSWORD', 'MESS_FROM_MAIL', 'MESS_FROM_NAME', 'SMTPSECURE', 'MESS_TRY_SEND_INMEDIATLY', 'MAIL_TO', 'MESS_DEFAULT', ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
);
/**
@@ -94,10 +100,10 @@ abstract class BaseEmailServerPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('MessUid' => 0, 'MessEngine' => 1, 'MessServer' => 2, 'MessPort' => 3, 'MessRauth' => 4, 'MessAccount' => 5, 'MessPassword' => 6, 'MessFromMail' => 7, 'MessFromName' => 8, 'Smtpsecure' => 9, 'MessTrySendInmediatly' => 10, 'MailTo' => 11, 'MessDefault' => 12, ),
- BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID => 0, EmailServerPeer::MESS_ENGINE => 1, EmailServerPeer::MESS_SERVER => 2, EmailServerPeer::MESS_PORT => 3, EmailServerPeer::MESS_RAUTH => 4, EmailServerPeer::MESS_ACCOUNT => 5, EmailServerPeer::MESS_PASSWORD => 6, EmailServerPeer::MESS_FROM_MAIL => 7, EmailServerPeer::MESS_FROM_NAME => 8, EmailServerPeer::SMTPSECURE => 9, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY => 10, EmailServerPeer::MAIL_TO => 11, EmailServerPeer::MESS_DEFAULT => 12, ),
- BasePeer::TYPE_FIELDNAME => array ('MESS_UID' => 0, 'MESS_ENGINE' => 1, 'MESS_SERVER' => 2, 'MESS_PORT' => 3, 'MESS_RAUTH' => 4, 'MESS_ACCOUNT' => 5, 'MESS_PASSWORD' => 6, 'MESS_FROM_MAIL' => 7, 'MESS_FROM_NAME' => 8, 'SMTPSECURE' => 9, 'MESS_TRY_SEND_INMEDIATLY' => 10, 'MAIL_TO' => 11, 'MESS_DEFAULT' => 12, ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, )
+ BasePeer::TYPE_PHPNAME => array ('MessUid' => 0, 'MessEngine' => 1, 'MessServer' => 2, 'MessPort' => 3, 'MessIncomingServer' => 4, 'MessIncomingPort' => 5, 'MessRauth' => 6, 'MessAccount' => 7, 'MessPassword' => 8, 'MessFromMail' => 9, 'MessFromName' => 10, 'Smtpsecure' => 11, 'MessTrySendInmediatly' => 12, 'MailTo' => 13, 'MessDefault' => 14, ),
+ BasePeer::TYPE_COLNAME => array (EmailServerPeer::MESS_UID => 0, EmailServerPeer::MESS_ENGINE => 1, EmailServerPeer::MESS_SERVER => 2, EmailServerPeer::MESS_PORT => 3, EmailServerPeer::MESS_INCOMING_SERVER => 4, EmailServerPeer::MESS_INCOMING_PORT => 5, EmailServerPeer::MESS_RAUTH => 6, EmailServerPeer::MESS_ACCOUNT => 7, EmailServerPeer::MESS_PASSWORD => 8, EmailServerPeer::MESS_FROM_MAIL => 9, EmailServerPeer::MESS_FROM_NAME => 10, EmailServerPeer::SMTPSECURE => 11, EmailServerPeer::MESS_TRY_SEND_INMEDIATLY => 12, EmailServerPeer::MAIL_TO => 13, EmailServerPeer::MESS_DEFAULT => 14, ),
+ BasePeer::TYPE_FIELDNAME => array ('MESS_UID' => 0, 'MESS_ENGINE' => 1, 'MESS_SERVER' => 2, 'MESS_PORT' => 3, 'MESS_INCOMING_SERVER' => 4, 'MESS_INCOMING_PORT' => 5, 'MESS_RAUTH' => 6, 'MESS_ACCOUNT' => 7, 'MESS_PASSWORD' => 8, 'MESS_FROM_MAIL' => 9, 'MESS_FROM_NAME' => 10, 'SMTPSECURE' => 11, 'MESS_TRY_SEND_INMEDIATLY' => 12, 'MAIL_TO' => 13, 'MESS_DEFAULT' => 14, ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
);
/**
@@ -206,6 +212,10 @@ abstract class BaseEmailServerPeer
$criteria->addSelectColumn(EmailServerPeer::MESS_PORT);
+ $criteria->addSelectColumn(EmailServerPeer::MESS_INCOMING_SERVER);
+
+ $criteria->addSelectColumn(EmailServerPeer::MESS_INCOMING_PORT);
+
$criteria->addSelectColumn(EmailServerPeer::MESS_RAUTH);
$criteria->addSelectColumn(EmailServerPeer::MESS_ACCOUNT);
diff --git a/workflow/engine/classes/model/om/BaseUsersProperties.php b/workflow/engine/classes/model/om/BaseUsersProperties.php
index d7da23a8b..eb160481c 100644
--- a/workflow/engine/classes/model/om/BaseUsersProperties.php
+++ b/workflow/engine/classes/model/om/BaseUsersProperties.php
@@ -57,6 +57,12 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
*/
protected $usr_setting_designer;
+ /**
+ * The value for the pmdynaform_first_time field.
+ * @var string
+ */
+ protected $pmdynaform_first_time = '0';
+
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -147,6 +153,17 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
return $this->usr_setting_designer;
}
+ /**
+ * Get the [pmdynaform_first_time] column value.
+ *
+ * @return string
+ */
+ public function getPmdynaformFirstTime()
+ {
+
+ return $this->pmdynaform_first_time;
+ }
+
/**
* Set the value of [usr_uid] column.
*
@@ -264,6 +281,28 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
} // setUsrSettingDesigner()
+ /**
+ * Set the value of [pmdynaform_first_time] column.
+ *
+ * @param string $v new value
+ * @return void
+ */
+ public function setPmdynaformFirstTime($v)
+ {
+
+ // Since the native PHP type for this column is string,
+ // we will cast the input to a string (if it is not).
+ if ($v !== null && !is_string($v)) {
+ $v = (string) $v;
+ }
+
+ if ($this->pmdynaform_first_time !== $v || $v === '0') {
+ $this->pmdynaform_first_time = $v;
+ $this->modifiedColumns[] = UsersPropertiesPeer::PMDYNAFORM_FIRST_TIME;
+ }
+
+ } // setPmdynaformFirstTime()
+
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -291,12 +330,14 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
$this->usr_setting_designer = $rs->getString($startcol + 4);
+ $this->pmdynaform_first_time = $rs->getString($startcol + 5);
+
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
- return $startcol + 5; // 5 = UsersPropertiesPeer::NUM_COLUMNS - UsersPropertiesPeer::NUM_LAZY_LOAD_COLUMNS).
+ return $startcol + 6; // 6 = UsersPropertiesPeer::NUM_COLUMNS - UsersPropertiesPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating UsersProperties object", $e);
@@ -515,6 +556,9 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
case 4:
return $this->getUsrSettingDesigner();
break;
+ case 5:
+ return $this->getPmdynaformFirstTime();
+ break;
default:
return null;
break;
@@ -540,6 +584,7 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
$keys[2] => $this->getUsrLoggedNextTime(),
$keys[3] => $this->getUsrPasswordHistory(),
$keys[4] => $this->getUsrSettingDesigner(),
+ $keys[5] => $this->getPmdynaformFirstTime(),
);
return $result;
}
@@ -586,6 +631,9 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
case 4:
$this->setUsrSettingDesigner($value);
break;
+ case 5:
+ $this->setPmdynaformFirstTime($value);
+ break;
} // switch()
}
@@ -629,6 +677,10 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
$this->setUsrSettingDesigner($arr[$keys[4]]);
}
+ if (array_key_exists($keys[5], $arr)) {
+ $this->setPmdynaformFirstTime($arr[$keys[5]]);
+ }
+
}
/**
@@ -660,6 +712,10 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
$criteria->add(UsersPropertiesPeer::USR_SETTING_DESIGNER, $this->usr_setting_designer);
}
+ if ($this->isColumnModified(UsersPropertiesPeer::PMDYNAFORM_FIRST_TIME)) {
+ $criteria->add(UsersPropertiesPeer::PMDYNAFORM_FIRST_TIME, $this->pmdynaform_first_time);
+ }
+
return $criteria;
}
@@ -722,6 +778,8 @@ abstract class BaseUsersProperties extends BaseObject implements Persistent
$copyObj->setUsrSettingDesigner($this->usr_setting_designer);
+ $copyObj->setPmdynaformFirstTime($this->pmdynaform_first_time);
+
$copyObj->setNew(true);
diff --git a/workflow/engine/classes/model/om/BaseUsersPropertiesPeer.php b/workflow/engine/classes/model/om/BaseUsersPropertiesPeer.php
index 2636ff64a..ffac1caf2 100644
--- a/workflow/engine/classes/model/om/BaseUsersPropertiesPeer.php
+++ b/workflow/engine/classes/model/om/BaseUsersPropertiesPeer.php
@@ -25,7 +25,7 @@ abstract class BaseUsersPropertiesPeer
const CLASS_DEFAULT = 'classes.model.UsersProperties';
/** The total number of columns. */
- const NUM_COLUMNS = 5;
+ const NUM_COLUMNS = 6;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -46,6 +46,9 @@ abstract class BaseUsersPropertiesPeer
/** the column name for the USR_SETTING_DESIGNER field */
const USR_SETTING_DESIGNER = 'USERS_PROPERTIES.USR_SETTING_DESIGNER';
+ /** the column name for the PMDYNAFORM_FIRST_TIME field */
+ const PMDYNAFORM_FIRST_TIME = 'USERS_PROPERTIES.PMDYNAFORM_FIRST_TIME';
+
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -57,10 +60,10 @@ abstract class BaseUsersPropertiesPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
- BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrLastUpdateDate', 'UsrLoggedNextTime', 'UsrPasswordHistory', 'UsrSettingDesigner', ),
- BasePeer::TYPE_COLNAME => array (UsersPropertiesPeer::USR_UID, UsersPropertiesPeer::USR_LAST_UPDATE_DATE, UsersPropertiesPeer::USR_LOGGED_NEXT_TIME, UsersPropertiesPeer::USR_PASSWORD_HISTORY, UsersPropertiesPeer::USR_SETTING_DESIGNER, ),
- BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_LAST_UPDATE_DATE', 'USR_LOGGED_NEXT_TIME', 'USR_PASSWORD_HISTORY', 'USR_SETTING_DESIGNER', ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
+ BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrLastUpdateDate', 'UsrLoggedNextTime', 'UsrPasswordHistory', 'UsrSettingDesigner', 'PmdynaformFirstTime', ),
+ BasePeer::TYPE_COLNAME => array (UsersPropertiesPeer::USR_UID, UsersPropertiesPeer::USR_LAST_UPDATE_DATE, UsersPropertiesPeer::USR_LOGGED_NEXT_TIME, UsersPropertiesPeer::USR_PASSWORD_HISTORY, UsersPropertiesPeer::USR_SETTING_DESIGNER, UsersPropertiesPeer::PMDYNAFORM_FIRST_TIME, ),
+ BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_LAST_UPDATE_DATE', 'USR_LOGGED_NEXT_TIME', 'USR_PASSWORD_HISTORY', 'USR_SETTING_DESIGNER', 'PMDYNAFORM_FIRST_TIME', ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, )
);
/**
@@ -70,10 +73,10 @@ abstract class BaseUsersPropertiesPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrLastUpdateDate' => 1, 'UsrLoggedNextTime' => 2, 'UsrPasswordHistory' => 3, 'UsrSettingDesigner' => 4, ),
- BasePeer::TYPE_COLNAME => array (UsersPropertiesPeer::USR_UID => 0, UsersPropertiesPeer::USR_LAST_UPDATE_DATE => 1, UsersPropertiesPeer::USR_LOGGED_NEXT_TIME => 2, UsersPropertiesPeer::USR_PASSWORD_HISTORY => 3, UsersPropertiesPeer::USR_SETTING_DESIGNER => 4, ),
- BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_LAST_UPDATE_DATE' => 1, 'USR_LOGGED_NEXT_TIME' => 2, 'USR_PASSWORD_HISTORY' => 3, 'USR_SETTING_DESIGNER' => 4, ),
- BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
+ BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrLastUpdateDate' => 1, 'UsrLoggedNextTime' => 2, 'UsrPasswordHistory' => 3, 'UsrSettingDesigner' => 4, 'PmdynaformFirstTime' => 5, ),
+ BasePeer::TYPE_COLNAME => array (UsersPropertiesPeer::USR_UID => 0, UsersPropertiesPeer::USR_LAST_UPDATE_DATE => 1, UsersPropertiesPeer::USR_LOGGED_NEXT_TIME => 2, UsersPropertiesPeer::USR_PASSWORD_HISTORY => 3, UsersPropertiesPeer::USR_SETTING_DESIGNER => 4, UsersPropertiesPeer::PMDYNAFORM_FIRST_TIME => 5, ),
+ BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_LAST_UPDATE_DATE' => 1, 'USR_LOGGED_NEXT_TIME' => 2, 'USR_PASSWORD_HISTORY' => 3, 'USR_SETTING_DESIGNER' => 4, 'PMDYNAFORM_FIRST_TIME' => 5, ),
+ BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, )
);
/**
@@ -184,6 +187,8 @@ abstract class BaseUsersPropertiesPeer
$criteria->addSelectColumn(UsersPropertiesPeer::USR_SETTING_DESIGNER);
+ $criteria->addSelectColumn(UsersPropertiesPeer::PMDYNAFORM_FIRST_TIME);
+
}
const COUNT = 'COUNT(USERS_PROPERTIES.USR_UID)';
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 2419ba032..fc5497564 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -2399,6 +2399,7 @@
+
|
@@ -4866,6 +4867,8 @@
+
+
@@ -5094,6 +5097,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -5141,6 +5154,7 @@
+
@@ -5769,7 +5783,7 @@
-
+
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index 8564fb1fe..05cf5e71a 100644
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -1699,6 +1699,30 @@ msgstr "3 days at least"
msgid "The answer has been submitted. Thank you."
msgstr "The answer has been submitted. Thank you."
+# TRANSLATION
+# LABEL/ID_ABE_EMAIL_RESPONSE_BODY_NOTE
+#: LABEL/ID_ABE_EMAIL_RESPONSE_BODY_NOTE
+msgid "Please add your comments above this section. Don't modify or delete this section."
+msgstr "Please add your comments above this section. Don't modify or delete this section."
+
+# TRANSLATION
+# LABEL/ID_ABE_CASE_NOTE_ANSWER
+#: LABEL/ID_ABE_CASE_NOTE_ANSWER
+msgid "Answer: {optionLabel}"
+msgstr "Answer: {optionLabel}"
+
+# TRANSLATION
+# LABEL/ID_ABE_CASE_NOTE_COMMENT
+#: LABEL/ID_ABE_CASE_NOTE_COMMENT
+msgid "Comment: {emailBody}"
+msgstr "Comment: {emailBody}"
+
+# TRANSLATION
+# LABEL/ID_ABE_CASE_NOTE_HEADER
+#: LABEL/ID_ABE_CASE_NOTE_HEADER
+msgid "{emailAccount} has completed a task from Actions by Email."
+msgstr "{emailAccount} has completed a task from Actions by Email."
+
# TRANSLATION
# LABEL/ID_ABE_FORM_ALREADY_FILLED
#: LABEL/ID_ABE_FORM_ALREADY_FILLED
@@ -1711,6 +1735,54 @@ msgstr "The form has already been filled and sent."
msgid "The information was submitted. Thank you."
msgstr "The information was submitted. Thank you."
+# TRANSLATION
+# LABEL/ID_ABE_LOG_ALREADY_ROUTED
+#: LABEL/ID_ABE_LOG_ALREADY_ROUTED
+msgid "The case was identified correctly but it was already routed."
+msgstr "The case was identified correctly but it was already routed."
+
+# TRANSLATION
+# LABEL/ID_ABE_LOG_CANNOT_BE_IDENTIFIED
+#: LABEL/ID_ABE_LOG_CANNOT_BE_IDENTIFIED
+msgid "The case cannot be identified."
+msgstr "The case cannot be identified."
+
+# TRANSLATION
+# LABEL/ID_ABE_LOG_CANNOT_READ
+#: LABEL/ID_ABE_LOG_CANNOT_READ
+msgid "The application cannot read the email receiver account."
+msgstr "The application cannot read the email receiver account."
+
+# TRANSLATION
+# LABEL/ID_ABE_LOG_PROCESSED_OK
+#: LABEL/ID_ABE_LOG_PROCESSED_OK
+msgid "The answer was processed correctly."
+msgstr "The answer was processed correctly."
+
+# TRANSLATION
+# LABEL/ID_ABE_LOG_ROUTING_FAILED
+#: LABEL/ID_ABE_LOG_ROUTING_FAILED
+msgid "The case was identified correctly but the routing process has failed."
+msgstr "The case was identified correctly but the routing process has failed."
+
+# TRANSLATION
+# LABEL/ID_ABE_RESPONSE_ALREADY_ROUTED
+#: LABEL/ID_ABE_RESPONSE_ALREADY_ROUTED
+msgid "Your answer cannot be processed because the case was already routed or is no longer assigned to you."
+msgstr "Your answer cannot be processed because the case was already routed or is no longer assigned to you."
+
+# TRANSLATION
+# LABEL/ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED
+#: LABEL/ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED
+msgid "Your answer cannot be processed, please try again and make sure to keep the subject code untouched."
+msgstr "Your answer cannot be processed, please try again and make sure to keep the subject code untouched."
+
+# TRANSLATION
+# LABEL/ID_ABE_RESPONSE_ROUTING_FAILED
+#: LABEL/ID_ABE_RESPONSE_ROUTING_FAILED
+msgid "Your answer cannot be processed because there is an error in the flow definition, please notify to this issue to the system administrator."
+msgstr "Your answer cannot be processed because there is an error in the flow definition, please notify to this issue to the system administrator."
+
# TRANSLATION
# LABEL/ID_ABE_RESPONSE_SENT
#: LABEL/ID_ABE_RESPONSE_SENT
@@ -4247,6 +4319,12 @@ msgstr "Close Editor"
msgid "[LABEL/ID_CODE] Code"
msgstr "Code"
+# TRANSLATION
+# LABEL/ID_CODE_CRYPT
+#: LABEL/ID_CODE_CRYPT
+msgid "Code:"
+msgstr "Code:"
+
# TRANSLATION
# LABEL/ID_COLLAPSE_ALL
#: LABEL/ID_COLLAPSE_ALL
@@ -7475,6 +7553,12 @@ msgstr "There was a problem installing this add-on."
msgid "Error in server"
msgstr "Error in server"
+# TRANSLATION
+# LABEL/ID_ERROR_IN_THE_QUERY
+#: LABEL/ID_ERROR_IN_THE_QUERY
+msgid "Error in the query"
+msgstr "Error in the query"
+
# TRANSLATION
# LABEL/ID_ERROR_JS_NOT_AVAILABLE
#: LABEL/ID_ERROR_JS_NOT_AVAILABLE
@@ -13625,6 +13709,12 @@ msgstr "Execute a trigger when a case is deleted"
msgid "Please press the \"Generate Link\" button."
msgstr "Please press the \"Generate Link\" button."
+# TRANSLATION
+# LABEL/ID_MAFE_660cfca112471f69246e9942f5e8afd1
+#: LABEL/ID_MAFE_660cfca112471f69246e9942f5e8afd1
+msgid "Store email body in"
+msgstr "Store email body in"
+
# TRANSLATION
# LABEL/ID_MAFE_66285b36f894a5439af5a98e3e1a36d2
#: LABEL/ID_MAFE_66285b36f894a5439af5a98e3e1a36d2
@@ -14555,6 +14645,12 @@ msgstr "January"
msgid "[LABEL/ID_MAFE_86fd9a7abc9f357e7fa206b2d42ec5ba] Destination Path"
msgstr "Destination Path"
+# TRANSLATION
+# LABEL/ID_MAFE_8738321e65db027ee6476c0ab12d8cd5
+#: LABEL/ID_MAFE_8738321e65db027ee6476c0ab12d8cd5
+msgid "Store option in"
+msgstr "Store option in"
+
# TRANSLATION
# LABEL/ID_MAFE_87557f11575c0ad78e4e28abedc13b6e
#: LABEL/ID_MAFE_87557f11575c0ad78e4e28abedc13b6e
@@ -15371,6 +15467,12 @@ msgstr "Properties"
msgid "[LABEL/ID_MAFE_9fced129522f128b2445a41fb0b6ef9f] checkbox"
msgstr "checkbox"
+# TRANSLATION
+# LABEL/ID_MAFE_a036226d97d1d0d725d494a1431f322c
+#: LABEL/ID_MAFE_a036226d97d1d0d725d494a1431f322c
+msgid "Receiver account"
+msgstr "Receiver account"
+
# TRANSLATION
# LABEL/ID_MAFE_a05ac4341235111bd2cba5c3c105ba81
#: LABEL/ID_MAFE_a05ac4341235111bd2cba5c3c105ba81
@@ -17945,6 +18047,12 @@ msgstr "Users"
msgid "validate"
msgstr "validate"
+# TRANSLATION
+# LABEL/ID_MAFE_fa2b5b7c9bccd35e42cb74042690a091
+#: LABEL/ID_MAFE_fa2b5b7c9bccd35e42cb74042690a091
+msgid "Email response"
+msgstr "Email response"
+
# TRANSLATION
# LABEL/ID_MAFE_fa3c608c8fc755543f0d37afd6a42651
#: LABEL/ID_MAFE_fa3c608c8fc755543f0d37afd6a42651
@@ -23549,6 +23657,18 @@ msgstr "Sent By"
msgid "[LABEL/ID_SERVER] Server"
msgstr "Server"
+# TRANSLATION
+# LABEL/ID_OUTGOING_SERVER
+#: LABEL/ID_OUTGOING_SERVER
+msgid "Outgoing Server"
+msgstr "Outgoing Server"
+
+# TRANSLATION
+# LABEL/ID_INCOMING_SERVER
+#: LABEL/ID_INCOMING_SERVER
+msgid "Incoming Server"
+msgstr "Incoming Server"
+
# TRANSLATION
# LABEL/ID_SERVER_ADDRESS
#: LABEL/ID_SERVER_ADDRESS
@@ -26033,18 +26153,6 @@ msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini"
msgid "The file has not been attached because the extension is not allowed or because the content doesn't correspond."
msgstr "The file has not been attached because the extension is not allowed or because the content doesn't correspond."
-# TRANSLATION
-# LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
-#: LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
-msgid "File size exceeds the allowable limit of {0}"
-msgstr "File size exceeds the allowable limit of {0}"
-
-# TRANSLATION
-# LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
-#: LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
-msgid "Invalid file format, please upload a file with one of the following formats {0}"
-msgstr "Invalid file format, please upload a file with one of the following formats {0}"
-
# TRANSLATION
# LABEL/ID_UPLOAD_ERR_NO_FILE
#: LABEL/ID_UPLOAD_ERR_NO_FILE
@@ -26093,6 +26201,18 @@ msgstr "Upload from file"
msgid "Upload image"
msgstr "Upload image"
+# TRANSLATION
+# LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
+#: LABEL/ID_UPLOAD_INVALID_DOC_MAX_FILESIZE
+msgid "File size exceeds the allowable limit of {0}"
+msgstr "File size exceeds the allowable limit of {0}"
+
+# TRANSLATION
+# LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
+#: LABEL/ID_UPLOAD_INVALID_DOC_TYPE_FILE
+msgid "Invalid file format, please upload a file with one of the following formats {0}"
+msgstr "Invalid file format, please upload a file with one of the following formats {0}"
+
# TRANSLATION
# LABEL/ID_UPLOAD_LANGUAGE
#: LABEL/ID_UPLOAD_LANGUAGE
@@ -28013,6 +28133,18 @@ msgstr "Photo gallery"
msgid "Port (default 25)"
msgstr "Port (default 25)"
+# TRANSLATION
+# LABEL/INCOMING_PORT_DEFAULT
+#: LABEL/INCOMING_PORT_DEFAULT
+msgid "Incoming Port (default 143)"
+msgstr "Incoming Port (default 143)"
+
+# TRANSLATION
+# LABEL/OUTGOING_PORT_DEFAULT
+#: LABEL/OUTGOING_PORT_DEFAULT
+msgid "Outgoing Port (default 25)"
+msgstr "Outgoing Port (default 25)"
+
# TRANSLATION
# LABEL/REQUIRE_AUTHENTICATION
#: LABEL/REQUIRE_AUTHENTICATION
diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index 8f5efd29f..ee76774c3 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -33,6 +33,7 @@ class Designer extends Controller
*/
public function index($httpData)
{
+ global $RBAC;
$proUid = isset($httpData->prj_uid) ? $httpData->prj_uid : '';
$appUid = isset($httpData->app_uid) ? $httpData->app_uid : '';
$proReadOnly = isset($httpData->prj_readonly) ? $httpData->prj_readonly : 'false';
@@ -44,6 +45,9 @@ class Designer extends Controller
$enterprise = 0;
$distribution = 0;
+ $usrUid = $RBAC->userObj->getUsrUid();
+ $userProperties = UsersPropertiesPeer::retrieveByPk($usrUid);
+
/*----------------------------------********---------------------------------*/
$licensedFeatures = PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
@@ -68,6 +72,7 @@ class Designer extends Controller
$this->setVar("SYS_LANG", SYS_LANG);
$this->setVar("SYS_SKIN", SYS_SKIN);
$this->setVar('HTTP_SERVER_HOSTNAME', System::getHttpServerHostnameRequestsFrontEnd());
+ $this->setVar('PMDYNAFORM_FIRST_TIME', $userProperties->getPmdynaformFirstTime());
$inpuDocument = new InputDocument();
$this->setVar('maxFileSizeInformation', G::json_encode($inpuDocument->getMaxFileSize()));
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index c0b36405b..8cbe9feaa 100644
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -57081,9 +57081,21 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','HTML_FILES','en','You can open only files with the .html extension','2014-01-15') ,
( 'LABEL','ID_3DAYSMINIMUM','en','3 days at least','2014-01-15') ,
( 'LABEL','ID_ABE_ANSWER_SUBMITTED','en','The answer has been submitted. Thank you.','2017-06-19') ,
+( 'LABEL','ID_ABE_EMAIL_RESPONSE_BODY_NOTE','en','Please add your comments above this section. Don''t modify or delete this section.','2018-11-16') ,
( 'LABEL','ID_ABE_FORM_ALREADY_FILLED','en','The form has already been filled and sent.','2017-06-09') ,
( 'LABEL','ID_ABE_INFORMATION_SUBMITTED','en','The information was submitted. Thank you.','2017-06-19') ,
( 'LABEL','ID_ABE_RESPONSE_SENT','en','The response has already been sent.','2017-06-19') ,
+( 'LABEL','ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED','en','Your answer cannot be processed, please try again and make sure to keep the subject code untouched.','2018-11-20') ,
+( 'LABEL','ID_ABE_RESPONSE_ALREADY_ROUTED','en','Your answer cannot be processed because the case was already routed or is no longer assigned to you.','2018-11-20') ,
+( 'LABEL','ID_ABE_RESPONSE_ROUTING_FAILED','en','Your answer cannot be processed because there is an error in the flow definition, please notify to this issue to the system administrator.','2018-11-20') ,
+( 'LABEL','ID_ABE_CASE_NOTE_ANSWER','en','Answer: {optionLabel}','2018-11-20') ,
+( 'LABEL','ID_ABE_CASE_NOTE_COMMENT','en','Comment: {emailBody}','2018-11-20') ,
+( 'LABEL','ID_ABE_CASE_NOTE_HEADER','en','{emailAccount} has completed a task from Actions by Email.','2018-11-20') ,
+( 'LABEL','ID_ABE_LOG_CANNOT_READ','en','The application cannot read the email receiver account.','2018-11-20') ,
+( 'LABEL','ID_ABE_LOG_PROCESSED_OK','en','The answer was processed correctly.','2018-11-20') ,
+( 'LABEL','ID_ABE_LOG_CANNOT_BE_IDENTIFIED','en','The case cannot be identified.','2018-11-20') ,
+( 'LABEL','ID_ABE_LOG_ALREADY_ROUTED','en','The case was identified correctly but it was already routed.','2018-11-20') ,
+( 'LABEL','ID_ABE_LOG_ROUTING_FAILED','en','The case was identified correctly but the routing process has failed.','2018-11-20') ,
( 'LABEL','ID_ACCEPT','en','Accept','2014-01-15') ,
( 'LABEL','ID_ACCESS_DENIED','en','Access Denied!','2015-12-03') ,
( 'LABEL','ID_ACCOUNT','en','Account','2014-01-15') ,
@@ -57515,6 +57527,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CLOSE','en','Close','2014-01-15') ,
( 'LABEL','ID_CLOSE_EDITOR','en','Close Editor','2014-01-15') ,
( 'LABEL','ID_CODE','en','Code','2014-01-15') ,
+( 'LABEL','ID_CODE_CRYPT','en','Code:','2018-11-16') ,
( 'LABEL','ID_COLLAPSE_ALL','en','Collapse All','2014-01-15') ,
( 'LABEL','ID_COLOSA_AND_CERTIFIED_PARTNERS','en','Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners.','2014-10-21') ,
( 'LABEL','ID_COLUMNS','en','columns','2014-01-15') ,
@@ -58067,6 +58080,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_ERROR_INSERT_LINE','en','Error trying to insert the line','2014-01-15') ,
( 'LABEL','ID_ERROR_INSTALLING_ADDON','en','There was a problem installing this add-on.','2014-10-21') ,
( 'LABEL','ID_ERROR_IN_SERVER','en','Error in server','2015-09-15') ,
+( 'LABEL','ID_ERROR_IN_THE_QUERY','en','Error in the query','2019-03-12') ,
( 'LABEL','ID_ERROR_JS_NOT_AVAILABLE','en','Your browser doesn''t support JavaScript or it may be disabled. Please use a different browser or enable JavaScript. Dynaforms won''t entirely work because JavaScript is required.','2014-10-21') ,
( 'LABEL','ID_ERROR_MESSAGE','en','Error Message','2017-02-22') ,
( 'LABEL','ID_ERROR_OBJECT_NOT_EXISTS','en','Error: Object does not exist.','2014-01-15') ,
@@ -58425,6 +58439,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_INACTIVE','en','Inactive','2014-01-15') ,
( 'LABEL','ID_INBOX','en','Inbox','2014-01-15') ,
( 'LABEL','ID_INBOX_EMPTY','en','Your Inbox is empty...','2015-05-06') ,
+( 'LABEL','ID_INCOMING_SERVER','en','Incoming Server','2018-11-23') ,
( 'LABEL','ID_INCORRECT_EMAIL','en','Your E-mail address is not valid.','2014-01-15') ,
( 'LABEL','ID_INCORRECT_USERNAME_PASSWORD','en','Incorrect username or password','2014-01-15') ,
( 'LABEL','ID_INCORRECT_VALUE_ACTION','en','The value for $action is incorrect.','2014-05-29') ,
@@ -60206,6 +60221,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_ORIGIN_TASK','en','Origin Task','2014-01-15') ,
( 'LABEL','ID_OTHER','en','Other','2014-01-15') ,
( 'LABEL','ID_OUTBOX','en','Outbox','2014-01-15') ,
+( 'LABEL','ID_OUTGOING_SERVER','en','Outgoing Server','2018-11-23') ,
( 'LABEL','ID_OUTPUT_DB','en','Output','2014-10-08') ,
( 'LABEL','ID_OUTPUT_DOCUMENT','en','Output Document','2014-01-15') ,
( 'LABEL','ID_OUTPUT_DOCUMENTS','en','Output Documents','2014-01-15') ,
@@ -61476,6 +61492,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','IMPORT_PROCESS_DISABLE','en','Disable the current process and create a new version of the process','2014-01-15') ,
( 'LABEL','IMPORT_PROCESS_NEW','en','Create a completely new process without changing the current process','2014-01-15') ,
( 'LABEL','IMPORT_PROCESS_OVERWRITING','en','Update the current process, overwriting all tasks and steps','2014-01-15') ,
+( 'LABEL','INCOMING_PORT_DEFAULT','en','Incoming Port (default 143)','2018-11-23') ,
( 'LABEL','INVALID_FILE','en','Invalid file!','2014-01-15') ,
( 'LABEL','IS_USER_NAME_DISPLAY_FORMAT','en','User Name Display Format','2014-01-15') ,
( 'LABEL','LOGIN','en','Login','2014-01-15') ,
@@ -61543,6 +61560,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','NEW_SITE_SUCCESS_CONFIRM','en','Do you want open the new site?','2014-01-15') ,
( 'LABEL','NEW_SITE_SUCCESS_CONFIRMNOTE','en','Note.- If you open the new site your current session will be closed.','2014-01-15') ,
( 'LABEL','OPEN_NEW_WS','en','Open new site','2014-01-15') ,
+( 'LABEL','OUTGOING_PORT_DEFAULT','en','Outgoing Port (default 25)','2018-11-26') ,
( 'LABEL','OUTPUT_CREATE','en','Output document has been created successfully','2014-01-15') ,
( 'LABEL','PASSWORD_HISTORY','en','Password history','2014-01-15') ,
( 'LABEL','PAUSED','en','Pause','2014-01-15') ,
@@ -61616,8 +61634,7 @@ INSERT INTO CONFIGURATION (CFG_UID,OBJ_UID,CFG_VALUE,PRO_UID,USR_UID,APP_UID) VA
('MIGRATED_APP_HISTORY', 'history', 'a:1:{s:7:\"updated\";b:1;}', '', '', ''),
('MIGRATED_CONTENT','content','a:12:{i:0;s:7:"Groupwf";i:1;s:7:"Process";i:2;s:10:"Department";i:3;s:4:"Task";i:4;s:13:"InputDocument";i:5;s:11:"Application";i:6;s:11:"AppDocument";i:7;s:8:"Dynaform";i:8;s:14:"OutputDocument";i:9;s:11:"ReportTable";i:10;s:8:"Triggers";i:11;s:41:"\\ProcessMaker\\BusinessModel\\WebEntryEvent";}','','',''),
('MIGRATED_LIST','list','true','list','list','list'),
-('MIGRATED_LIST_UNASSIGNED','list','true','list','list','list'),
-('SKIN_CRON','','s:10:\"neoclassic\";','','','');
+('MIGRATED_LIST_UNASSIGNED','list','true','list','list','list');
INSERT INTO CATALOG (CAT_UID,CAT_LABEL_ID,CAT_TYPE,CAT_FLAG,CAT_OBSERVATION,CAT_CREATE_DATE,CAT_UPDATE_DATE) VALUES
('10','ID_BARS','GRAPHIC','','','2015-03-04 00:00:00','2015-03-04 00:00:00'),
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index f78a95cd0..44f18b54b 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -1115,6 +1115,7 @@ CREATE TABLE `USERS_PROPERTIES`
`USR_LOGGED_NEXT_TIME` INTEGER default 0,
`USR_PASSWORD_HISTORY` MEDIUMTEXT,
`USR_SETTING_DESIGNER` MEDIUMTEXT,
+ `PMDYNAFORM_FIRST_TIME` CHAR(1) default '0',
PRIMARY KEY (`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
@@ -2744,6 +2745,8 @@ CREATE TABLE `EMAIL_SERVER`
`MESS_ENGINE` VARCHAR(256) default '' NOT NULL,
`MESS_SERVER` VARCHAR(256) default '' NOT NULL,
`MESS_PORT` INTEGER default 0 NOT NULL,
+ `MESS_INCOMING_SERVER` VARCHAR(256) default '' NOT NULL,
+ `MESS_INCOMING_PORT` INTEGER default 0 NOT NULL,
`MESS_RAUTH` INTEGER default 0 NOT NULL,
`MESS_ACCOUNT` VARCHAR(256) default '' NOT NULL,
`MESS_PASSWORD` VARCHAR(256) default '' NOT NULL,
@@ -2865,6 +2868,7 @@ CREATE TABLE `ABE_CONFIGURATION`
`DYN_UID` VARCHAR(32) default '' NOT NULL,
`ABE_EMAIL_FIELD` VARCHAR(255) default '' NOT NULL,
`ABE_ACTION_FIELD` VARCHAR(255) default '',
+ `ABE_ACTION_BODY_FIELD` VARCHAR(255) default '',
`ABE_CASE_NOTE_IN_RESPONSE` INTEGER default 0,
`ABE_FORCE_LOGIN` INTEGER default 0,
`ABE_CREATE_DATE` DATETIME NOT NULL,
@@ -2873,6 +2877,7 @@ CREATE TABLE `ABE_CONFIGURATION`
`ABE_MAILSERVER_OR_MAILCURRENT` INTEGER default 0,
`ABE_CUSTOM_GRID` MEDIUMTEXT,
`ABE_EMAIL_SERVER_UID` VARCHAR(32) default '',
+ `ABE_EMAIL_SERVER_RECEIVER_UID` VARCHAR(32) default '',
PRIMARY KEY (`ABE_UID`),
KEY `indexAbeProcess`(`PRO_UID`),
KEY `indexAbeProcessTask`(`PRO_UID`, `TAS_UID`)
diff --git a/workflow/engine/methods/emailServer/emailServerAjax.php b/workflow/engine/methods/emailServer/emailServerAjax.php
index 6f3c246e3..59a454f52 100644
--- a/workflow/engine/methods/emailServer/emailServerAjax.php
+++ b/workflow/engine/methods/emailServer/emailServerAjax.php
@@ -9,6 +9,8 @@ switch ($option) {
$server = "";
$port = "";
+ $incomingServer = "";
+ $incomingPort = "";
$reqAuthentication = 0;
$password = "";
$smtpSecure = "";
@@ -27,6 +29,14 @@ switch ($option) {
$reqAuthentication = (int)($_POST["reqAuthentication"]);
$password = ($reqAuthentication == 1)? $_POST["password"] : "";
$smtpSecure = $_POST["smtpSecure"];
+ } elseif ($cboEmailEngine == "IMAP") {
+ $server = $_POST["server"];
+ $port = (int)($_POST["port"]);
+ $incomingServer = $_POST["incomingServer"];
+ $incomingPort = (int)($_POST["incomingPort"]);
+ $reqAuthentication = (int)($_POST["reqAuthentication"]);
+ $password = ($reqAuthentication == 1)? $_POST["password"] : "";
+ $smtpSecure = $_POST["smtpSecure"];
}
try {
@@ -34,6 +44,8 @@ switch ($option) {
"MESS_ENGINE" => $cboEmailEngine,
"MESS_SERVER" => $server,
"MESS_PORT" => $port,
+ "MESS_INCOMING_SERVER" => $incomingServer,
+ "MESS_INCOMING_PORT" => $incomingPort,
"MESS_RAUTH" => $reqAuthentication,
"MESS_ACCOUNT" => $accountFrom,
"MESS_PASSWORD" => $password,
@@ -63,6 +75,8 @@ switch ($option) {
$server = "";
$port = "";
+ $incomingServer = "";
+ $incomingPort = "";
$reqAuthentication = 0;
$password = "";
$smtpSecure = "";
@@ -81,6 +95,14 @@ switch ($option) {
$reqAuthentication = (int)($_POST["reqAuthentication"]);
$password = ($reqAuthentication == 1)? $_POST["password"] : "";
$smtpSecure = $_POST["smtpSecure"];
+ } elseif ($cboEmailEngine == "IMAP") {
+ $server = $_POST["server"];
+ $port = (int)($_POST["port"]);
+ $incomingServer = $_POST["incomingServer"];
+ $incomingPort = (int)($_POST["incomingPort"]);
+ $reqAuthentication = (int)($_POST["reqAuthentication"]);
+ $password = ($reqAuthentication == 1)? $_POST["password"] : "";
+ $smtpSecure = $_POST["smtpSecure"];
}
try {
@@ -88,6 +110,8 @@ switch ($option) {
"MESS_ENGINE" => $cboEmailEngine,
"MESS_SERVER" => $server,
"MESS_PORT" => $port,
+ "MESS_INCOMING_SERVER" => $incomingServer,
+ "MESS_INCOMING_PORT" => $incomingPort,
"MESS_RAUTH" => $reqAuthentication,
"MESS_ACCOUNT" => $accountFrom,
"MESS_PASSWORD" => $password,
@@ -153,6 +177,8 @@ switch ($option) {
$server = "";
$port = "";
+ $incomingServer = "";
+ $incomingPort = "";
$reqAuthentication = 0;
$password = "";
$smtpSecure = "";
@@ -165,7 +191,7 @@ switch ($option) {
$mailTo = ($sendTestMail == 1)? $_POST["mailTo"] : "";
$emailServerDefault = (int)($_POST["emailServerDefault"]);
- if ($cboEmailEngine == "PHPMAILER") {
+ if ($cboEmailEngine == "PHPMAILER" || $cboEmailEngine == "IMAP") {
$server = $_POST["server"];
$port = (int)($_POST["port"]);
$reqAuthentication = (int)($_POST["reqAuthentication"]);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php
new file mode 100644
index 000000000..c0fe78ccb
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail/ResponseReader.php
@@ -0,0 +1,355 @@
+messageResponseError;
+ }
+
+ /**
+ * @param string $messageResponseError
+ */
+ public function setMessageResponseError($messageResponseError)
+ {
+ $this->messageResponseError = $messageResponseError;
+ }
+
+ /**
+ * Read the Action by Email listener inbox looking for new messages
+ */
+ public function actionsByEmailEmailResponse()
+ {
+ try {
+ if (!extension_loaded('imap')) {
+ G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", ['php_imap']) . "\n");
+ exit;
+ }
+ if (PMLicensedFeatures
+ ::getSingleton()
+ ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
+ $criteriaAbe = new Criteria();
+ $criteriaAbe->add(AbeConfigurationPeer::ABE_TYPE, "RESPONSE");
+ $resultAbe = AbeConfigurationPeer::doSelectRS($criteriaAbe);
+ $resultAbe->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+ while ($resultAbe->next()) {
+ $dataAbe = $resultAbe->getRow();
+ $this->getAllEmails($dataAbe);
+ }
+ }
+ } catch (Exception $e) {
+ Bootstrap::registerMonolog(
+ $this->channel,
+ $e->getCode() != 0 ? $e->getCode() : 300,
+ $e->getMessage(),
+ $this->case,
+ config("system.workspace"),
+ 'processmaker.log'
+ );
+ }
+ }
+
+ /**
+ * Decrypt password of Email Server
+ * @param array $emailSetup
+ * @return mixed|string
+ */
+ private function decryptPassword(array $emailSetup)
+ {
+ $pass = isset($emailSetup['MESS_PASSWORD']) ? $emailSetup['MESS_PASSWORD'] : '';
+ $passDec = G::decrypt($pass, 'EMAILENCRYPT');
+ $auxPass = explode('hash:', $passDec);
+ if (count($auxPass) > 1) {
+ if (count($auxPass) == 2) {
+ $pass = $auxPass[1];
+ } else {
+ array_shift($auxPass);
+ $pass = implode('', $auxPass);
+ }
+ }
+ return $pass;
+ }
+
+ /**
+ * Get all Email of server listener
+ * @param array $dataAbe
+ */
+ public function getAllEmails(array $dataAbe)
+ {
+ try {
+ $emailServer = new EmailServer();
+ $emailSetup = (!is_null(EmailServerPeer::retrieveByPK($dataAbe['ABE_EMAIL_SERVER_RECEIVER_UID']))) ?
+ $emailServer->getEmailServer($dataAbe['ABE_EMAIL_SERVER_RECEIVER_UID'], true) :
+ $emailServer->getEmailServerDefault();
+ if (empty($emailSetup) || (empty($emailSetup['MESS_INCOMING_SERVER']) && $emailSetup['MESS_INCOMING_PORT'] == 0)) {
+ throw (new Exception(G::LoadTranslation('ID_ABE_LOG_CANNOT_READ'), 500));
+ }
+ $mailbox = new Mailbox(
+ '{'. $emailSetup['MESS_INCOMING_SERVER'] . ':' . $emailSetup['MESS_INCOMING_PORT'] . '/imap/ssl/novalidate-cert}INBOX',
+ $emailSetup['MESS_ACCOUNT'],
+ $this->decryptPassword($emailSetup)
+ );
+
+ // Read all messages into an array
+ $mailsIds = $mailbox->searchMailbox('UNSEEN');
+ if ($mailsIds) {
+ // Get the first message and save its attachment(s) to disk:
+ foreach ($mailsIds as $key => $mailId) {
+ /** @var IncomingMail $mail */
+ $mail = $mailbox->getMail($mailId, false);
+ if (!empty($mail->textPlain)) {
+ preg_match("/{(.*)}/", $mail->textPlain, $matches);
+ if ($matches) {
+ $dataEmail = G::json_decode(Crypt::decryptString($matches[1]), true);
+ $dataAbeReq = loadAbeRequest($dataEmail['ABE_REQ_UID']);
+ if (config("system.workspace") === $dataEmail['workspace']
+ && (array_key_exists('ABE_UID', $dataAbeReq) && $dataAbeReq['ABE_UID'] == $dataAbe['ABE_UID'])) {
+ $this->case = $dataEmail;
+ try {
+ $appDelegate = new AppDelegation();
+ $alreadyRouted = $appDelegate->alreadyRouted($this->case["appUid"], $this->case["delIndex"]);
+ //Verify if the current case is already routed.
+ if ($alreadyRouted) {
+ $this->setMessageResponseError(G::LoadTranslation('ID_ABE_RESPONSE_ALREADY_ROUTED'));
+ throw (new Exception(G::LoadTranslation('ID_CASE_DELEGATION_ALREADY_CLOSED'), 400));
+ }
+ $this->processABE($this->case, $mail, $dataAbe);
+ $mailbox->markMailAsRead($mailId);
+ Bootstrap::registerMonolog(
+ $this->channel,
+ 100, // DEBUG
+ G::LoadTranslation('ID_ABE_LOG_PROCESSED_OK'),
+ $this->case,
+ config("system.workspace"),
+ 'processmaker.log'
+ );
+ } catch (Exception $e) {
+ $this->sendMessageError(
+ $this->getMessageResponseError() ? $this->getMessageResponseError() : $e->getMessage(),
+ $this->case,
+ $mail,
+ $emailSetup
+ );
+ Bootstrap::registerMonolog(
+ $this->channel,
+ $e->getCode() != 0 ? $e->getCode() : 400,
+ $e->getMessage(),
+ $this->case,
+ config("system.workspace"),
+ 'processmaker.log'
+ );
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception $e) {
+ Bootstrap::registerMonolog(
+ $this->channel,
+ $e->getCode() != 0 ? $e->getCode() : 500,
+ $e->getMessage(),
+ $this->case,
+ config("system.workspace"),
+ 'processmaker.log'
+ );
+ }
+ }
+
+ /**
+ * Derivation of the case with the mail information
+ * @param array $caseInfo
+ * @param IncomingMail $mail
+ * @param array $dataAbe
+ * @throws Exception
+ */
+ public function processABE(array $caseInfo, IncomingMail $mail, array $dataAbe = [])
+ {
+ try {
+ $actionsByEmail = new ActionsByEmail();
+ $actionsByEmail->verifyLogin($caseInfo['appUid'], $caseInfo['delIndex']);
+
+ $case = new Cases();
+ $caseFieldsABE = $case->loadCase($caseInfo['appUid'], $caseInfo['delIndex']);
+
+ $actionsByEmailCore = new ActionsByEmailCoreClass();
+ $actionField = str_replace(
+ $actionsByEmailCore->getPrefix(),
+ '',
+ $dataAbe['ABE_ACTION_FIELD']
+ );
+ $dataField = [];
+ $dataField[$actionField] = $caseInfo['fieldValue'];
+ $actionBodyField = str_replace(
+ $actionsByEmailCore->getPrefix(),
+ '',
+ $dataAbe['ABE_ACTION_BODY_FIELD']
+ );
+ $textPlain = $mail->textPlain;
+ $textPlain = substr($textPlain, 0, strpos($textPlain, "/="));
+ $dataField[$actionBodyField] = $textPlain;
+ $caseFieldsABE['APP_DATA'] = array_merge($caseFieldsABE['APP_DATA'], $dataField);
+
+ $dataResponses = [];
+ $dataResponses['ABE_REQ_UID'] = $caseInfo['ABE_REQ_UID'];
+ $dataResponses['ABE_RES_CLIENT_IP'] = 'localhost';
+ $dataResponses['ABE_RES_DATA'] = serialize($dataField);
+ $dataResponses['ABE_RES_STATUS'] = 'PENDING';
+ $dataResponses['ABE_RES_MESSAGE'] = '';
+
+ try {
+ $abeAbeResponsesInstance = new AbeResponses();
+ $dataResponses['ABE_RES_UID'] = $abeAbeResponsesInstance->createOrUpdate($dataResponses);
+ } catch (Exception $e) {
+ Bootstrap::registerMonolog(
+ $this->channel,
+ 300,
+ $e->getMessage(),
+ $this->case,
+ config("system.workspace"),
+ 'processmaker.log'
+ );
+ }
+
+ ChangeLog::getChangeLog()
+ ->getUsrIdByUsrUid($caseFieldsABE['CURRENT_USER_UID'], true)
+ ->setSourceId(ChangeLog::FromABE);
+
+ $caseFieldsABE['CURRENT_DYNAFORM'] = '';
+ $caseFieldsABE['USER_UID'] = $caseFieldsABE['CURRENT_USER_UID'];
+ $caseFieldsABE['OBJECT_TYPE'] = '';
+
+ $case->updateCase($caseInfo['appUid'], $caseFieldsABE);
+
+ try {
+ $ws = new WsBase();
+ $result = $ws->derivateCase(
+ $caseFieldsABE['CURRENT_USER_UID'],
+ $caseInfo['appUid'],
+ $caseInfo['delIndex'],
+ true
+ );
+ $code = (is_array($result)) ? $result['status_code'] : $result->status_code;
+ if ($code != 0) {
+ throw new Exception(
+ "An error occurred while the application was being processed\n" .
+ "Error code: " . $result->status_code . "\nError message: " . $result->message
+ );
+ }
+ } catch (Exception $e) {
+ $this->setMessageResponseError(G::LoadTranslation('ID_ABE_RESPONSE_ROUTING_FAILED'));
+ throw (new Exception(G::LoadTranslation('ID_ABE_LOG_ROUTING_FAILED'), 400));
+ }
+
+ //Update AbeResponses
+ $dataResponses['ABE_RES_STATUS'] = ($code == 0)? 'SENT' : 'ERROR';
+ $dataResponses['ABE_RES_MESSAGE'] = ($code == 0)? '-' : $result->message;
+
+ try {
+ $abeAbeResponsesInstance = new AbeResponses();
+ $abeAbeResponsesInstance->createOrUpdate($dataResponses);
+ } catch (Exception $e) {
+ Bootstrap::registerMonolog(
+ $this->channel,
+ 300,
+ $e->getMessage(),
+ $this->case,
+ config("system.workspace"),
+ 'processmaker.log'
+ );
+ }
+ $dataAbeRequests = loadAbeRequest($caseInfo['ABE_REQ_UID']);
+ //Save Cases Notes
+ if ($dataAbe['ABE_CASE_NOTE_IN_RESPONSE'] == 1) {
+ $customGrid = unserialize($dataAbe['ABE_CUSTOM_GRID']);
+ $fieldLabel = null;
+ foreach ($customGrid as $key => $value) {
+ if ($value['abe_custom_value'] == $caseInfo['fieldValue']) {
+ $fieldLabel = $value['abe_custom_label'];
+ break;
+ }
+ }
+ $appNotes = new AppNotes();
+ $noteText = G::LoadTranslation('ID_ABE_CASE_NOTE_HEADER', ['emailAccount' => $mail->toString]) . "\n\n";
+ $noteText .= G::LoadTranslation('ID_ABE_CASE_NOTE_ANSWER', ['optionLabel' => $fieldLabel ? $fieldLabel : $caseInfo['fieldValue']]) . "\n\n";
+ $noteText .= G::LoadTranslation('ID_ABE_CASE_NOTE_COMMENT', ['emailBody' => $textPlain]);
+ $noteContent = addslashes($noteText);
+ $appNotes->postNewNote($caseInfo['appUid'], $caseFieldsABE['APP_DATA']['USER_LOGGED'], $noteContent, false);
+ }
+ $dataAbeRequests['ABE_REQ_ANSWERED'] = 1;
+ $code == 0 ? uploadAbeRequest($dataAbeRequests) : '';
+ } catch (Exception $e) {
+ if ($e->getCode() == 400) {
+ throw (new Exception($e->getMessage(), $e->getCode()));
+ } else {
+ $this->setMessageResponseError(G::LoadTranslation('ID_ABE_RESPONSE_CANNOT_BE_IDENTIFIED'));
+ throw (new Exception(G::LoadTranslation('ID_ABE_LOG_CANNOT_BE_IDENTIFIED'), 300));
+ }
+ }
+ }
+
+ /**
+ * Send an error message to the sender
+ * @param string $msgError
+ * @param array $caseInf
+ * @param IncomingMail $mail
+ * @param array $emailSetup
+ * @return \ProcessMaker\Util\Response|string|\WsResponse
+ */
+ public function sendMessageError($msgError, array $caseInf, IncomingMail $mail, array $emailSetup)
+ {
+ $wsBase = new WsBase();
+ $result = $wsBase->sendMessage(
+ $caseInf['appUid'],
+ $mail->toString,
+ $mail->fromAddress,
+ '',
+ '',
+ $mail->subject,
+ 'actionsByEmailErrorReply.html',
+ ['ACTIONS_BY_EMAIL_ERROR_MESSAGE' => $msgError],
+ null,
+ true,
+ $caseInf['delIndex'],
+ $emailSetup,
+ 0
+ );
+ return $result;
+ }
+ /*----------------------------------********---------------------------------*/
+}
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/SuggestTrait.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/SuggestTrait.php
index 0fca7fb69..bce94ea09 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/SuggestTrait.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm/SuggestTrait.php
@@ -54,13 +54,71 @@ trait SuggestTrait
$where = $isWhere ? "WHERE " . $col . "='" . $dv . "'" : $where . " AND " . $col . "='" . $dv . "'";
}
}
- if (isset($json->queryField) && isset($dt[0]["base_expr"])) {
- $col = isset($dt[1]["base_expr"]) ? $dt[1]["base_expr"] : $dt[0]["base_expr"];
- $qf = str_replace("'", "''", $json->queryFilter);
- $where = $isWhere ? "WHERE " . $col . " LIKE '%" . $qf . "%'" : $where . " AND " . $col . " LIKE '%" . $qf . "%'";
+ if (isset($json->querySearch) && is_array($json->querySearch) && !empty($json->querySearch)) {
+ $dataSearch = $json->querySearch;
+ $sqlWildcard = "";
+ //We will to search term in the query
+ if (isset($dataSearch['term'])) {
+ $value = isset($dataSearch['term']['value']) ? $dataSearch['term']['value'] : '';
+ $label = isset($dataSearch['term']['text']) ? $dataSearch['term']['text'] : '';
+ $sqlWildcard = "%";
+ }
+ //The match has priority
+ //We will to search match in the query
+ if (isset($dataSearch['match'])) {
+ $value = isset($dataSearch['match']['value']) ? $dataSearch['match']['value'] : '';
+ $label = isset($dataSearch['match']['text']) ? $dataSearch['match']['text'] : '';
+ $sqlWildcard = "";
+ }
+ if (!empty($value) && !empty($label)){
+ //We need to search in the firstColumn and secondColumn
+ //Ex: SELECT COL1, COL2 FROM TABLE WHERE COL1 LIKE 'querySearch' OR COL2 LIKE 'querySearch'
+ //Ex: SELECT COL1, COL2 FROM TABLE WHERE COL1 LIKE '%querySearch%' OR COL2 LIKE '%querySearch%'
+ $col1 = $dt[0]["base_expr"];
+ $col2 = isset($dt[1]["base_expr"]) ? $dt[1]["base_expr"] : $dt[0]["base_expr"];
+ $qfValue = str_replace("'", "''", $value);
+ $qfLabel = str_replace("'", "''", $label);
+ $search = $col1 . " LIKE '" . $sqlWildcard . $qfValue . $sqlWildcard . "' OR " . $col2 . " LIKE '" . $sqlWildcard . $qfLabel . $sqlWildcard . "'";
+ $where = $isWhere ? "WHERE " . $search : $where . " AND (" . $search . ")";
+ } else {
+ $valueOrLabel = '';
+ $column = $dt[0]["base_expr"];
+ if (!empty($value)) {
+ //We need to search in the firstColumn
+ //Ex: SELECT COL1, COL2 FROM TABLE WHERE COL1 LIKE 'querySearch'
+ //Ex: SELECT COL1, COL2 FROM TABLE WHERE COL1 LIKE '%querySearch%'
+ $valueOrLabel = $value;
+ }
+ if (!empty($label)) {
+ //We need to search in the secondColumn
+ //Ex: SELECT COL1, COL2 FROM TABLE WHERE COL2 LIKE 'querySearch'
+ //Ex: SELECT COL1, COL2 FROM TABLE WHERE COL2 LIKE '%querySearch%'
+ $column = isset($dt[1]["base_expr"]) ? $dt[1]["base_expr"] : $column;
+ $valueOrLabel = $label;
+ }
+ $where = $this->buildWhere(
+ $column,
+ $valueOrLabel,
+ $sqlWildcard,
+ $isWhere,
+ $where
+ );
+ }
+ } else {
+ //If the property querySearch does not exist we need to search in the secondColumn
+ //Ex: SELECT COL1, COL2 FROM TABLE WHERE COL2 LIKE '%queryFilter%'
+ if (isset($json->queryField) && isset($dt[0]["base_expr"])) {
+ $where = $this->buildWhere(
+ isset($dt[1]["base_expr"]) ? $dt[1]["base_expr"] : $dt[0]["base_expr"],
+ $json->queryFilter,
+ "%",
+ $isWhere,
+ $where
+ );
+ }
}
- if ($optionsLimit > 0) {
+ if ($optionsLimit >= 0) {
$this->addSuggestLimit($json, $select, $limit, $where);
} else {
$this->addSuggestWhere($json, $parsed, $select, $where, $having);
@@ -69,6 +127,26 @@ trait SuggestTrait
);
}
+ /**
+ * This function will be define the WHERE clause
+ *
+ * @param string $col, name of column
+ * @param string $value, value to search in the column
+ * @param string $sqlWildcard, if we to search term or correct match
+ * @param boolean $isWhere, if the we need to concat other condition
+ * @param string $where, initial where to add the concat
+ *
+ * @return string
+ *
+ */
+ private function buildWhere($col, $value, $sqlWildcard = "", $isWhere = false, $where = "")
+ {
+ $qf = str_replace("'", "''", $value);
+ $searchValue = $col . " LIKE '" . $sqlWildcard . $qf . $sqlWildcard;
+ $where = ($isWhere) ? "WHERE " . $searchValue . "'" : $where . " AND " . $searchValue . "'";
+ return $where;
+ }
+
/**
* Add the limit sentence to the suggest query.
*
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
index 0f6dfaf45..b278810f8 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
@@ -14,9 +14,11 @@ class EmailServer
{
private $arrayFieldDefinition = array(
"MESS_UID" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "emailServerUid"),
- "MESS_ENGINE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array("PHPMAILER", "MAIL"), "fieldNameAux" => "emailServerEngine"),
+ "MESS_ENGINE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array("PHPMAILER", "MAIL", "IMAP"), "fieldNameAux" => "emailServerEngine"),
"MESS_SERVER" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerServer"),
"MESS_PORT" => array("type" => "int", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerPort"),
+ "MESS_INCOMING_SERVER" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerIncomingServer"),
+ "MESS_INCOMING_PORT" => array("type" => "int", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerIncomingPort"),
"MESS_RAUTH" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "emailServerRauth"),
"MESS_ACCOUNT" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerUserName"),
"MESS_PASSWORD" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerPassword"),
@@ -52,10 +54,10 @@ class EmailServer
throw $e;
}
}
-
+
/**
* Get the default information from the context.
- *
+ *
* @global type $RBAC
* @return void
*/
@@ -527,6 +529,7 @@ class EmailServer
}
break;
case "PHPMAILER":
+ case "IMAP":
$numSteps = ($arrayData['MAIL_TO'] != '') ? count($arrayPhpMailerTestName) :
count($arrayPhpMailerTestName) - 1;
for ($step = 1; $step <= $numSteps; $step++) {
@@ -831,6 +834,8 @@ class EmailServer
'engine'=> $arrayData["MESS_ENGINE"],
'server' => $arrayData["MESS_SERVER"],
'port' => $arrayData["MESS_PORT"],
+ 'incomingServer' => $arrayData["MESS_INCOMING_SERVER"],
+ 'incomingPort' => $arrayData["MESS_INCOMING_PORT"],
'requireAuthentication' => $arrayData["MESS_RAUTH"],
'account' => $arrayData["MESS_ACCOUNT"],
'senderEmail' => $arrayData["MESS_FROM_MAIL"],
@@ -1002,6 +1007,8 @@ class EmailServer
'engine' => $arrayData["MESS_ENGINE"],
'server' => $arrayData["MESS_SERVER"],
'port' => $arrayData["MESS_PORT"],
+ 'incomingServer' => $arrayData["MESS_INCOMING_SERVER"],
+ 'incomingPort' => $arrayData["MESS_INCOMING_PORT"],
'requireAuthentication' => $arrayData["MESS_RAUTH"],
'account' => $arrayData["MESS_ACCOUNT"],
'senderEmail' => $arrayData["MESS_FROM_MAIL"],
@@ -1088,6 +1095,8 @@ class EmailServer
$criteria->addSelectColumn(\EmailServerPeer::MESS_ENGINE);
$criteria->addSelectColumn(\EmailServerPeer::MESS_SERVER);
$criteria->addSelectColumn(\EmailServerPeer::MESS_PORT);
+ $criteria->addSelectColumn(\EmailServerPeer::MESS_INCOMING_SERVER);
+ $criteria->addSelectColumn(\EmailServerPeer::MESS_INCOMING_PORT);
$criteria->addSelectColumn(\EmailServerPeer::MESS_RAUTH);
$criteria->addSelectColumn(\EmailServerPeer::MESS_ACCOUNT);
$criteria->addSelectColumn(\EmailServerPeer::MESS_PASSWORD);
@@ -1120,6 +1129,8 @@ class EmailServer
$this->getFieldNameByFormatFieldName("MESS_ENGINE") => $record["MESS_ENGINE"],
$this->getFieldNameByFormatFieldName("MESS_SERVER") => $record["MESS_SERVER"],
$this->getFieldNameByFormatFieldName("MESS_PORT") => $record["MESS_PORT"],
+ $this->getFieldNameByFormatFieldName("MESS_INCOMING_SERVER") => $record["MESS_INCOMING_SERVER"],
+ $this->getFieldNameByFormatFieldName("MESS_INCOMING_PORT") => $record["MESS_INCOMING_PORT"],
$this->getFieldNameByFormatFieldName("MESS_RAUTH") => $record["MESS_RAUTH"],
$this->getFieldNameByFormatFieldName("MESS_ACCOUNT") => $record["MESS_ACCOUNT"],
$this->getFieldNameByFormatFieldName("MESS_PASSWORD") => $record["MESS_PASSWORD"],
@@ -1165,6 +1176,8 @@ class EmailServer
$arrayData["MESS_ENGINE"] = $row["MESS_ENGINE"];
$arrayData["MESS_SERVER"] = $row["MESS_SERVER"];
$arrayData["MESS_PORT"] = (int)($row["MESS_PORT"]);
+ $arrayData["MESS_INCOMING_SERVER"] = $row["MESS_INCOMING_SERVER"];
+ $arrayData["MESS_INCOMING_PORT"] = (int)($row["MESS_INCOMING_PORT"]);
$arrayData["MESS_RAUTH"] = (int)($row["MESS_RAUTH"]);
$arrayData["MESS_ACCOUNT"] = $row["MESS_ACCOUNT"];
$arrayData["MESS_PASSWORD"] = $row["MESS_PASSWORD"];
@@ -1221,6 +1234,7 @@ class EmailServer
$criteria->add(
$criteria->getNewCriterion(\EmailServerPeer::MESS_ENGINE, "%" . $arrayFilterData["filter"] . "%", \Criteria::LIKE)->addOr(
$criteria->getNewCriterion(\EmailServerPeer::MESS_SERVER, "%" . $arrayFilterData["filter"] . "%", \Criteria::LIKE))->addOr(
+ $criteria->getNewCriterion(\EmailServerPeer::MESS_INCOMING_SERVER,"%" . $arrayFilterData["filter"] . "%", \Criteria::LIKE))->addOr(
$criteria->getNewCriterion(\EmailServerPeer::MESS_ACCOUNT, "%" . $arrayFilterData["filter"] . "%", \Criteria::LIKE))->addOr(
$criteria->getNewCriterion(\EmailServerPeer::MESS_FROM_NAME, "%" . $arrayFilterData["filter"] . "%", \Criteria::LIKE))->addOr(
$criteria->getNewCriterion(\EmailServerPeer::SMTPSECURE, "%" . $arrayFilterData["filter"] . "%", \Criteria::LIKE))
@@ -1245,7 +1259,7 @@ class EmailServer
if (!is_null($sortField) && trim($sortField) != "") {
$sortField = strtoupper($sortField);
- if (in_array($sortField, array("MESS_ENGINE", "MESS_SERVER", "MESS_ACCOUNT", "MESS_FROM_NAME", "SMTPSECURE"))) {
+ if (in_array($sortField, array("MESS_ENGINE", "MESS_SERVER", "MESS_INCOMING_SERVER", "MESS_ACCOUNT", "MESS_FROM_NAME", "SMTPSECURE"))) {
$sortField = \EmailServerPeer::TABLE_NAME . "." . $sortField;
} else {
$sortField = \EmailServerPeer::MESS_ENGINE;
@@ -1318,6 +1332,7 @@ class EmailServer
$row = $rsCriteria->getRow();
$row["MESS_PORT"] = (int)($row["MESS_PORT"]);
+ $row["MESS_INCOMING_PORT"] = (int)($row["MESS_INCOMING_PORT"]);
$row["MESS_RAUTH"] = (int)($row["MESS_RAUTH"]);
$row["MESS_TRY_SEND_INMEDIATLY"] = (int)($row["MESS_TRY_SEND_INMEDIATLY"]);
$row["MESS_DEFAULT"] = (int)($row["MESS_DEFAULT"]);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
index 90dc0a288..e7f82eba5 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
@@ -8,6 +8,7 @@ use G;
use PMmemcached;
use ProcessPeer;
use ResultSet;
+use UsersPropertiesPeer;
class Process
{
@@ -2160,4 +2161,21 @@ class Process
return $processes;
}
+
+ /**
+ * Set for the first time the user opened the dynaform editor.
+ *
+ * @param string $usrUid
+ * @param string $seen
+ */
+ public function setIfFirstTimeConsumed($usrUid, $seen)
+ {
+ if ($seen === '1') {
+ $userProperties = UsersPropertiesPeer::retrieveByPk($usrUid);
+ if ($userProperties) {
+ $userProperties->setPmDynaformFirstTime('1');
+ $userProperties->save();
+ }
+ }
+ }
}
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
index 4ebb70939..086451bf3 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
@@ -749,6 +749,8 @@ class Variable
*
* @return array
* @throws Exception
+ * @see ProcessMaker\BusinessModel\Variable->executeSql()
+ * @see ProcessMaker\BusinessModel\Variable->executeSqlSuggest()
*/
public function executeSqlControl($proUid, array $params = [])
{
@@ -758,6 +760,7 @@ class Variable
$dynUid = $params["dyn_uid"];
$fieldId = $params["field_id"];
$filter = isset($params["filter"]) ? $params["filter"] : "";
+ $query = isset($params["query"]) ? $params["query"] : [];
$start = isset($params["start"]) ? $params["start"] : 0;
$limit = isset($params["limit"]) ? $params["limit"] : 10;
$appUid = empty($params["app_uid"]) ? null : $params["app_uid"];
@@ -767,6 +770,7 @@ class Variable
unset($params["app_uid"]);
unset($params["del_index"]);
unset($params["filter"]);
+ unset($params["query"]);
unset($params["start"]);
unset($params["limit"]);
@@ -797,6 +801,7 @@ class Variable
$field->queryField = true;
$field->queryInputData = $params;
$field->queryFilter = $filter;
+ $field->querySearch = $query;
$field->queryStart = $start;
$field->queryLimit = $limit;
//Grids only access the global variables of 'ProcessMaker', other variables are removed.
@@ -809,7 +814,12 @@ class Variable
}
//Populate control data
+ $pmDynaform->clearLastQueryError();
$pmDynaform->jsonr($field);
+ $error = $pmDynaform->getLastQueryError();
+ if (!empty($error) && is_object($error)) {
+ throw new Exception(G::LoadTranslation("ID_ERROR_IN_THE_QUERY"));
+ }
$result = [];
if (isset($field->queryOutputData) && is_array($field->queryOutputData)) {
foreach ($field->queryOutputData as $item) {
diff --git a/workflow/engine/src/ProcessMaker/Core/ProcessesManager.php b/workflow/engine/src/ProcessMaker/Core/ProcessesManager.php
new file mode 100644
index 000000000..bff0c5d96
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Core/ProcessesManager.php
@@ -0,0 +1,98 @@
+processes = $processes;
+ }
+
+ /**
+ * Get the list of terminated processes
+ *
+ * @return array
+ */
+ public function getTerminated()
+ {
+ return $this->terminated;
+ }
+
+ /**
+ * Get the list of processes with errors
+ *
+ * @return array
+ */
+ public function getErrors()
+ {
+ return $this->errors;
+ }
+
+ /**
+ * Set the sleep time after each statuses revision
+ *
+ * @param int $sleepTime
+ */
+ public function setSleepTime($sleepTime)
+ {
+ $this->sleepTime = $sleepTime;
+ }
+
+ /**
+ * Run the processes
+ */
+ public function run()
+ {
+ // Start all processes
+ foreach ($this->processes as $process) {
+ $process->run();
+ }
+
+ // Manage the processes
+ $this->manage();
+ }
+
+ /**
+ * Manage all started processes
+ */
+ private function manage()
+ {
+ do {
+ // Check all remaining processes
+ foreach ($this->processes as $index => $process) {
+ // If the process has finished, save the info and destroy it
+ if ($process->getStatus() === RunProcess::TERMINATED || $process->getStatus() === RunProcess::ERROR) {
+ $processInfo = ['command' => $process->getCommand(), 'rawAnswer' => $process->getRawAnswer()];
+ if ($process->getStatus() === RunProcess::TERMINATED) {
+ // Processes completed successfully
+ $this->terminated[] = $processInfo;
+ } else {
+ // Processes completed with errors
+ $this->errors[] = $processInfo;
+ }
+
+ // Destroy the process
+ unset($this->processes[$index]);
+ }
+ }
+
+ // Waiting...
+ sleep($this->sleepTime);
+ } while (!empty($this->processes));
+ }
+}
diff --git a/workflow/engine/src/ProcessMaker/Core/RunProcess.php b/workflow/engine/src/ProcessMaker/Core/RunProcess.php
new file mode 100644
index 000000000..8f2a0287f
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Core/RunProcess.php
@@ -0,0 +1,146 @@
+command = $command;
+ }
+
+ /**
+ * Class destructor, the resource created should be closed
+ */
+ public function __destruct()
+ {
+ if (is_resource($this->resource)) {
+ proc_close($this->resource);
+ }
+ }
+
+ /**
+ * Get the command
+ *
+ * @return string
+ */
+ public function getCommand()
+ {
+ return $this->command;
+ }
+
+ /**
+ * Get the raw response
+ *
+ * @return string|null
+ */
+ public function getRawAnswer()
+ {
+ return $this->rawAnswer;
+ }
+
+ /**
+ * Get the status
+ *
+ * @return string
+ */
+ public function getStatus()
+ {
+ // If already exist a status return this value
+ if ($this->status !== null) {
+ return $this->status;
+ }
+
+ // If doesn't exists a resource the process is not running
+ if (!is_resource($this->resource)) {
+ return self::NOT_RUNNING;
+ }
+
+ // If the process is running return this value
+ if ($this->isRunning()) {
+ return self::RUNNING;
+ }
+
+ // If the process is not running, parse the response to determine the status
+ $this->rawAnswer = stream_get_contents($this->pipes[1]);
+ $this->status = $this->parseAnswer();
+
+ return $this->status;
+ }
+
+ /**
+ * Get the exit code
+ *
+ * @return string|null
+ */
+ public function getExitCode()
+ {
+ return $this->exitCode;
+ }
+
+ /**
+ * Run the command
+ */
+ public function run()
+ {
+ $this->resource = proc_open($this->command, $this->descriptors, $this->pipes);
+ }
+
+ /**
+ * Process is running?
+ *
+ * @return bool
+ */
+ public function isRunning()
+ {
+ // Get the process status
+ $status = proc_get_status($this->resource);
+
+ // If process is not running get the exit code
+ if ($status['running'] === false) {
+ $this->exitCode = $status['exitcode'];
+ }
+
+ return $status['running'];
+ }
+
+ /**
+ * Process the raw response and compare with the expected answer in order to determine the status
+ *
+ * @return string
+ */
+ public function parseAnswer()
+ {
+ return $this->rawAnswer === self::EXPECTED_ANSWER ? self::TERMINATED : self::ERROR;
+ }
+}
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index e0e469a32..15e957e7d 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -9,6 +9,7 @@ use Faker;
use G;
use GzipFile;
use Illuminate\Database\QueryException;
+use Illuminate\Foundation\Http\Kernel;
use Illuminate\Support\Facades\DB;
use InputFilter;
use InstallerModule;
@@ -242,39 +243,6 @@ class System
return $items;
}
- /**
- * Review the checksum.txt
- *
- * @return array $result
- */
- public static function verifyChecksum()
- {
- if (!file_exists(PATH_TRUNK . "checksum.txt")) {
- return false;
- }
- $lines = explode("\n", file_get_contents(PATH_TRUNK . "checksum.txt"));
- $result = array("diff" => array(), "missing" => array()
- );
- foreach ($lines as $line) {
- if (empty($line)) {
- continue;
- }
- list ($checksum, $empty, $filename) = explode(" ", $line);
- //Skip xmlform because these files always change.
- if (strpos($filename, "/xmlform/") !== false) {
- continue;
- }
- if (file_exists(realpath($filename))) {
- if (strcmp($checksum, G::encryptFileOld(realpath($filename))) != 0) {
- $result['diff'][] = $filename;
- }
- } else {
- $result['missing'][] = $filename;
- }
- }
- return $result;
- }
-
/**
* This function checks files to do updated to pm
*
@@ -1629,5 +1597,21 @@ class System
{
return !empty(self::getServerHostname()) ? self::getServerHostname() : 'processmaker.com';
}
+
+ /**
+ * Initialize laravel database configuration
+ * @see workflow/engine/bin/tasks/cliWorkspaces.php->check_queries_incompatibilities()
+ */
+ public static function initLaravel()
+ {
+ config(['database.connections.workflow.host' => DB_HOST]);
+ config(['database.connections.workflow.database' => DB_NAME]);
+ config(['database.connections.workflow.username' => DB_USER]);
+ config(['database.connections.workflow.password' => DB_PASS]);
+
+ app()->useStoragePath(realpath(PATH_DATA));
+ app()->make(Kernel::class)->bootstrap();
+ restore_error_handler();
+ }
}
// end System class
diff --git a/workflow/engine/src/ProcessMaker/Model/Dynaform.php b/workflow/engine/src/ProcessMaker/Model/Dynaform.php
index 550d3c2e5..e7b40a950 100644
--- a/workflow/engine/src/ProcessMaker/Model/Dynaform.php
+++ b/workflow/engine/src/ProcessMaker/Model/Dynaform.php
@@ -66,4 +66,16 @@ class Dynaform extends Model
->where('DYNAFORM.DYN_UID', '!=', $dynUid)
->get();
}
+
+ /**
+ * Scope a query to filter an specific process
+ *
+ * @param \Illuminate\Database\Eloquent\Builder $query
+ * @param string $columns
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ public function scopeProcess($query, string $proUID)
+ {
+ return $query->where('PRO_UID', $proUID);
+ }
}
diff --git a/workflow/engine/src/ProcessMaker/Model/ProcessVariables.php b/workflow/engine/src/ProcessMaker/Model/ProcessVariables.php
new file mode 100644
index 000000000..9170390a7
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Model/ProcessVariables.php
@@ -0,0 +1,27 @@
+where('PRJ_UID', $proUID);
+ }
+}
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Model/Triggers.php b/workflow/engine/src/ProcessMaker/Model/Triggers.php
new file mode 100644
index 000000000..88947dee8
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Model/Triggers.php
@@ -0,0 +1,27 @@
+where('PRO_UID', $proUID);
+ }
+}
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php
index 339b5bb27..63045f2ec 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/ActionsByEmail.php
@@ -154,6 +154,13 @@ class ActionsByEmail extends Api
$arrayData = $filesManager->addProcessFilesManager($proId, $userUid, $data);
@copy(PATH_TPL . 'actionsByEmail' . PATH_SEP . 'actionsByEmail.html', $path . 'actionsByEmail.html');
}
+ /*----------------------------------********---------------------------------*/
+ if (!file_exists($path . 'actionsByEmailErrorReply.html')) {
+ $data = array('prf_content' => '', 'prf_filename' => 'actionsByEmailErrorReply.html', 'prf_path' => 'templates');
+ $arrayData = $filesManager->addProcessFilesManager($proId, $userUid, $data);
+ @copy(PATH_TPL . 'actionsByEmail' . PATH_SEP . 'actionsByEmailErrorReply.html', $path . 'actionsByEmailErrorReply.html');
+ }
+ /*----------------------------------********---------------------------------*/
}
$directory = dir($path);
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project.php b/workflow/engine/src/ProcessMaker/Services/Api/Project.php
index ce382e49a..65c3938da 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project.php
@@ -366,8 +366,9 @@ class Project extends Api
*
* @url GET /:prj_uid/dynaforms
* @param string $prj_uid {@min 32}{@max 32}
+ * @param string $seen
*/
- public function doGetDynaForms($prj_uid)
+ public function doGetDynaForms($prj_uid, $seen = '0')
{
try {
$process = new \ProcessMaker\BusinessModel\Process();
@@ -375,7 +376,7 @@ class Project extends Api
$process->setArrayFieldNameForException(array("processUid" => "prj_uid"));
$response = $process->getDynaForms($prj_uid);
-
+ $process->setIfFirstTimeConsumed($this->getUserId(), $seen);
return DateTime::convertUtcToIso8601($response, $this->arrayFieldIso8601);
} catch (Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
diff --git a/workflow/engine/src/ProcessMaker/Upgrade/RunProcessUpgradeQuery.php b/workflow/engine/src/ProcessMaker/Upgrade/RunProcessUpgradeQuery.php
new file mode 100644
index 000000000..e1295c0e4
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Upgrade/RunProcessUpgradeQuery.php
@@ -0,0 +1,61 @@
+workspace = $workspace;
+ $this->sql = $sql;
+ $this->isRbac = $isRbac;
+
+ // Build the command and send to the parent class
+ parent::__construct($this->buildCommand());
+ }
+
+ /**
+ * Override the parent method in order to compare the raw response with the SUCCESS value
+ *
+ * @return string
+ */
+ public function parseAnswer()
+ {
+ return $this->getRawAnswer() === self::SUCCESS ? parent::TERMINATED : parent::ERROR;
+ }
+
+ /**
+ * Build the command to execute a query for the upgrade process
+ *
+ * @return string
+ */
+ private function buildCommand()
+ {
+ return sprintf(self::CMD, $this->workspace, base64_encode($this->sql),
+ ($this->isRbac ? self::RBAC : self::NO_RBAC));
+ }
+}
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Util/WsMessageResponse.php b/workflow/engine/src/ProcessMaker/Util/WsMessageResponse.php
new file mode 100644
index 000000000..ec6a1f92c
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Util/WsMessageResponse.php
@@ -0,0 +1,32 @@
+appMessUid;
+ }
+
+ /**
+ * Set the appMessUid
+ *
+ * @param string $v
+ * @return void
+ */
+ public function setAppMessUid($v)
+ {
+ $this->appMessUid = $v;
+ }
+}
+
diff --git a/workflow/engine/src/ProcessMaker/Validation/MySQL57.php b/workflow/engine/src/ProcessMaker/Validation/MySQL57.php
new file mode 100644
index 000000000..a6a2f3be0
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Validation/MySQL57.php
@@ -0,0 +1,110 @@
+check_queries_incompatibilities()
+ * @param array $processes
+ * @return array
+ */
+ public function checkIncompatibilityTriggers($processes)
+ {
+ $result = [];
+
+ foreach ($processes as $process) {
+ $triggerQuery = Triggers::query()->select();
+ //Call the scope method to filter by process
+ $triggerQuery->process($process['PRO_UID']);
+ $triggers = $triggerQuery->get()->values()->toArray();
+ foreach ($triggers as $trigger) {
+ $resultIncompatibility = $this->analyzeQuery($trigger['TRI_WEBBOT']);
+ if ($resultIncompatibility) {
+ $aux = array_merge($process, $trigger);
+ array_push($result, $aux);
+ }
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Checks the queries inside dynaforms that could have possible incompatibilities with MySQL 5.7
+ *
+ * @see workflow/engine/bin/tasks/cliWorkspaces.php->check_queries_incompatibilities()
+ * @param array $processes
+ * @return array
+ */
+ public function checkIncompatibilityDynaforms($processes)
+ {
+ $result = [];
+
+ foreach ($processes as $process) {
+ $dynaformQuery = Dynaform::query()->select();
+ //Call the scope method to filter by process
+ $dynaformQuery->process($process['PRO_UID']);
+ $dynaforms = $dynaformQuery->get()->values()->toArray();
+ foreach ($dynaforms as $dynaform) {
+ $resultIncompatibility = $this->analyzeQuery($dynaform['DYN_CONTENT']);
+ if ($resultIncompatibility) {
+ $aux = array_merge($process, $dynaform);
+ array_push($result, $aux);
+ }
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Checks the queries inside variables that could have possible incompatibilities with MySQL 5.7
+ *
+ * @see workflow/engine/bin/tasks/cliWorkspaces.php->check_queries_incompatibilities()
+ * @param array $processes
+ * @return array
+ */
+ public function checkIncompatibilityVariables($processes)
+ {
+ $result = [];
+
+ foreach ($processes as $process) {
+ $variablesQuery = ProcessVariables::query()->select();
+ //Call the scope method to filter by process
+ $variablesQuery->process($process['PRO_UID']);
+ $variables = $variablesQuery->get()->values()->toArray();
+ foreach ($variables as $variable) {
+ $resultIncompatibility = $this->analyzeQuery($variable['VAR_SQL']);
+ if ($resultIncompatibility) {
+ $aux = array_merge($process, $variable);
+ array_push($result, $aux);
+ }
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Analyze the query using the regular expression
+ *
+ * @param string $query
+ * @return bool
+ */
+ public function analyzeQuery($query)
+ {
+ preg_match_all($this::REGEX, $query, $matches, PREG_SET_ORDER, 0);
+
+ return !empty($matches);
+ }
+}
\ No newline at end of file
diff --git a/workflow/engine/templates/actionsByEmail/actionsByEmailErrorReply.html b/workflow/engine/templates/actionsByEmail/actionsByEmailErrorReply.html
new file mode 100644
index 000000000..c8584c420
--- /dev/null
+++ b/workflow/engine/templates/actionsByEmail/actionsByEmailErrorReply.html
@@ -0,0 +1,20 @@
+
+
+ | ACTIONS BY EMAIL |
+
+
+
+
+
+ @#ACTIONS_BY_EMAIL_ERROR_MESSAGE
+
+
+
+ This is an automated email, please do not replay to it.
+
+ www.processmaker.com
+
+ |
+
+
\ No newline at end of file
diff --git a/workflow/engine/templates/cases/pmdynaform.html b/workflow/engine/templates/cases/pmdynaform.html
index fd91d6578..03f7151c5 100644
--- a/workflow/engine/templates/cases/pmdynaform.html
+++ b/workflow/engine/templates/cases/pmdynaform.html
@@ -11,16 +11,21 @@
+
+
+
+
+
diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html
index da5100749..8c899c42c 100644
--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -1,5 +1,6 @@
+
@@ -29,6 +30,7 @@
var SYS_LANG = "{$SYS_LANG}";
var SYS_SKIN = "{$SYS_SKIN}";
var HTTP_SERVER_HOSTNAME = "{$HTTP_SERVER_HOSTNAME}";
+ var PMDYNAFORM_FIRST_TIME = "{$PMDYNAFORM_FIRST_TIME}" === "1";
var maxFileSizeInformation = {$maxFileSizeInformation};
@@ -87,6 +89,7 @@
var SYS_LANG = "{$SYS_LANG}";
var SYS_SKIN = "{$SYS_SKIN}";
var HTTP_SERVER_HOSTNAME = "{$HTTP_SERVER_HOSTNAME}";
+ var PMDYNAFORM_FIRST_TIME = "{$PMDYNAFORM_FIRST_TIME}" === "1";
var maxFileSizeInformation = {$maxFileSizeInformation};
@@ -96,7 +99,6 @@
{/if}
-
diff --git a/workflow/engine/templates/emailServer/emailServer.js b/workflow/engine/templates/emailServer/emailServer.js
index 91bed9ee9..dc72cd436 100644
--- a/workflow/engine/templates/emailServer/emailServer.js
+++ b/workflow/engine/templates/emailServer/emailServer.js
@@ -48,83 +48,69 @@ emailServer.application = {
}
/*----------------------------------********---------------------------------*/
+ var typeEmailEngine = Ext.getCmp("cboEmailEngine").getValue();
+
+ if (typeEmailEngine === "PHPMAILER") {
+ var rdoGrpOption = Ext.getCmp("rdoGrpSmtpSecure").getValue();
+ var smtpSecure = rdoGrpOption.getGroupValue();
+
+ p = {
+ option: option,
+
+ cboEmailEngine: typeEmailEngine,
+ server: Ext.getCmp("txtServer").getValue(),
+ port: Ext.getCmp("txtPort").getValue(),
+ reqAuthentication: (Ext.getCmp("chkReqAuthentication").checked) ? 1 : 0,
+ accountFrom: Ext.getCmp("txtAccountFrom").getValue(),
+ password: Ext.getCmp("txtPassword").getValue(),
+ fromMail: Ext.getCmp("txtFromMail").getValue(),
+ fromName: Ext.getCmp("txtFromName").getValue(),
+ smtpSecure: smtpSecure,
+ sendTestMail: (Ext.getCmp("chkSendTestMail").checked) ? 1 : 0,
+ mailTo: Ext.getCmp("txtMailTo").getValue(),
+ emailServerDefault: emailDefault
+ };
+ } else if (typeEmailEngine === "IMAP") {
+ /*----------------------------------********---------------------------------*/
+ var rdoGrpOption = Ext.getCmp("rdoGrpSmtpSecure").getValue();
+ var smtpSecure = rdoGrpOption.getGroupValue();
+
+ p = {
+ option: option,
+
+ cboEmailEngine: typeEmailEngine,
+ server: Ext.getCmp("txtServer").getValue(),
+ port: Ext.getCmp("txtPort").getValue(),
+ incomingServer: Ext.getCmp("txtIncomingServer").getValue(),
+ incomingPort: Ext.getCmp("txtIncomingPort").getValue(),
+ reqAuthentication: (Ext.getCmp("chkReqAuthentication").checked) ? 1 : 0,
+ accountFrom: Ext.getCmp("txtAccountFrom").getValue(),
+ password: Ext.getCmp("txtPassword").getValue(),
+ fromMail: Ext.getCmp("txtFromMail").getValue(),
+ fromName: Ext.getCmp("txtFromName").getValue(),
+ smtpSecure: smtpSecure,
+ sendTestMail: (Ext.getCmp("chkSendTestMail").checked) ? 1 : 0,
+ mailTo: Ext.getCmp("txtMailTo").getValue(),
+ emailServerDefault: emailDefault
+ };
+ /*----------------------------------********---------------------------------*/
+ } else {
+ //MAIL
+ p = {
+ option: option,
+
+ cboEmailEngine: typeEmailEngine,
+ fromMail: Ext.getCmp("txtFromMail").getValue(),
+ fromName: Ext.getCmp("txtFromName").getValue(),
+ sendTestMail: (Ext.getCmp("chkSendTestMail").checked)? 1 : 0,
+ mailTo: Ext.getCmp("txtMailTo").getValue(),
+ emailServerDefault: emailDefault
+ };
+ }
+
switch (option) {
- case "INS":
- var typeEmailEngine = Ext.getCmp("cboEmailEngine").getValue();
-
-
- if (typeEmailEngine == "PHPMAILER") {
- var rdoGrpOption = Ext.getCmp("rdoGrpSmtpSecure").getValue();
- var smtpSecure = rdoGrpOption.getGroupValue();
-
- p = {
- option: option,
-
- cboEmailEngine: typeEmailEngine,
- server: Ext.getCmp("txtServer").getValue(),
- port: Ext.getCmp("txtPort").getValue(),
- reqAuthentication: (Ext.getCmp("chkReqAuthentication").checked)? 1 : 0,
- accountFrom: Ext.getCmp("txtAccountFrom").getValue(),
- password: Ext.getCmp("txtPassword").getValue(),
- fromMail: Ext.getCmp("txtFromMail").getValue(),
- fromName: Ext.getCmp("txtFromName").getValue(),
- smtpSecure: smtpSecure,
- sendTestMail: (Ext.getCmp("chkSendTestMail").checked)? 1 : 0,
- mailTo: Ext.getCmp("txtMailTo").getValue(),
- emailServerDefault: emailDefault
- };
- } else {
- //MAIL
- p = {
- option: option,
-
- cboEmailEngine: typeEmailEngine,
- fromMail: Ext.getCmp("txtFromMail").getValue(),
- fromName: Ext.getCmp("txtFromName").getValue(),
- sendTestMail: (Ext.getCmp("chkSendTestMail").checked)? 1 : 0,
- mailTo: Ext.getCmp("txtMailTo").getValue(),
- emailServerDefault: emailDefault
- };
- }
- break;
case "UPD":
- var typeEmailEngine = Ext.getCmp("cboEmailEngine").getValue();
-
- if (typeEmailEngine == "PHPMAILER") {
- var rdoGrpOption = Ext.getCmp("rdoGrpSmtpSecure").getValue();
- var smtpSecure = rdoGrpOption.getGroupValue();
-
- p = {
- option: option,
- emailServerUid: emailServerUid,
-
- cboEmailEngine: typeEmailEngine,
- server: Ext.getCmp("txtServer").getValue(),
- port: Ext.getCmp("txtPort").getValue(),
- reqAuthentication: (Ext.getCmp("chkReqAuthentication").checked)? 1 : 0,
- accountFrom: Ext.getCmp("txtAccountFrom").getValue(),
- password: Ext.getCmp("txtPassword").getValue(),
- fromMail: Ext.getCmp("txtFromMail").getValue(),
- fromName: Ext.getCmp("txtFromName").getValue(),
- smtpSecure: smtpSecure,
- sendTestMail: (Ext.getCmp("chkSendTestMail").checked)? 1 : 0,
- mailTo: Ext.getCmp("txtMailTo").getValue(),
- emailServerDefault: emailDefault
- };
- } else {
- //MAIL
- p = {
- option: option,
- emailServerUid: emailServerUid,
-
- cboEmailEngine: typeEmailEngine,
- fromMail: Ext.getCmp("txtFromMail").getValue(),
- fromName: Ext.getCmp("txtFromName").getValue(),
- sendTestMail: (Ext.getCmp("chkSendTestMail").checked)? 1 : 0,
- mailTo: Ext.getCmp("txtMailTo").getValue(),
- emailServerDefault: emailDefault
- };
- }
+ p.emailServerUid = emailServerUid;
break;
case "DEL":
p = {
@@ -132,45 +118,6 @@ emailServer.application = {
emailServerUid: emailServerUid
};
break;
- //case "LST":
- // break;
- case "TEST":
- var typeEmailEngine = Ext.getCmp("cboEmailEngine").getValue();
-
- if (typeEmailEngine == "PHPMAILER") {
- var rdoGrpOption = Ext.getCmp("rdoGrpSmtpSecure").getValue();
- var smtpSecure = rdoGrpOption.getGroupValue();
-
- p = {
- option: option,
-
- cboEmailEngine: typeEmailEngine,
- server: Ext.getCmp("txtServer").getValue(),
- port: Ext.getCmp("txtPort").getValue(),
- reqAuthentication: (Ext.getCmp("chkReqAuthentication").checked)? 1 : 0,
- accountFrom: Ext.getCmp("txtAccountFrom").getValue(),
- password: Ext.getCmp("txtPassword").getValue(),
- fromMail: Ext.getCmp("txtFromMail").getValue(),
- fromName: Ext.getCmp("txtFromName").getValue(),
- smtpSecure: smtpSecure,
- sendTestMail: (Ext.getCmp("chkSendTestMail").checked)? 1 : 0,
- mailTo: Ext.getCmp("txtMailTo").getValue(),
- emailServerDefault: emailDefault
- };
- } else {
- //MAIL
- p = {
- option: option,
-
- cboEmailEngine: typeEmailEngine,
- fromMail: Ext.getCmp("txtFromMail").getValue(),
- fromName: Ext.getCmp("txtFromName").getValue(),
- sendTestMail: (Ext.getCmp("chkSendTestMail").checked)? 1 : 0,
- mailTo: Ext.getCmp("txtMailTo").getValue(),
- emailServerDefault: emailDefault
- };
- }
- break;
}
Ext.Ajax.request({
@@ -240,11 +187,16 @@ emailServer.application = {
Ext.getCmp("txtServer").allowBlank = true;
Ext.getCmp("txtPort").allowBlank = true;
+ Ext.getCmp("txtIncomingServer").allowBlank = true;
+ Ext.getCmp("txtIncomingPort").allowBlank = true;
Ext.getCmp("txtAccountFrom").allowBlank = true;
Ext.getCmp("txtServer").setValue("");
Ext.getCmp("txtPort").setValue("");
+ Ext.getCmp("txtIncomingServer").setValue("");
+ Ext.getCmp("txtIncomingPort").setValue("");
+
Ext.getCmp("chkReqAuthentication").setValue(false);
emailServerSetPassword(Ext.getCmp("chkReqAuthentication").checked);
@@ -286,6 +238,9 @@ emailServer.application = {
Ext.getCmp("txtServer").setValue(record.get("MESS_SERVER"));
Ext.getCmp("txtPort").setValue((record.get("MESS_PORT") != 0)? record.get("MESS_PORT") : "");
+ Ext.getCmp("txtIncomingServer").setValue(record.get("MESS_INCOMING_SERVER"));
+ Ext.getCmp("txtIncomingPort").setValue((record.get("MESS_INCOMING_PORT") !== 0)? record.get("MESS_INCOMING_PORT") : "");
+
Ext.getCmp("chkReqAuthentication").setValue((parseInt(record.get("MESS_RAUTH")) == 1)? true : false);
emailServerSetPassword(Ext.getCmp("chkReqAuthentication").checked);
@@ -323,10 +278,21 @@ emailServer.application = {
{
Ext.getCmp("frmEmailServer").getForm().clearInvalid();
- if (cboEmailEngine == "PHPMAILER") {
+ if (cboEmailEngine === "PHPMAILER") {
Ext.getCmp("txtServer").setVisible(true);
Ext.getCmp("txtPort").setVisible(true);
+ try {
+ Ext.getCmp("txtServer").label.update(_("ID_SERVER"));
+ Ext.getCmp("txtPort").label.update(_("PORT_DEFAULT"));
+ } catch (err) {
+ Ext.getCmp("txtServer").fieldLabel = _("ID_SERVER");
+ Ext.getCmp("txtPort").fieldLabel = _("PORT_DEFAULT");
+ }
+
+ Ext.getCmp("txtIncomingServer").setVisible(false);
+ Ext.getCmp("txtIncomingPort").setVisible(false);
+
Ext.getCmp("chkReqAuthentication").setVisible(true);
emailServerSetPassword(Ext.getCmp("chkReqAuthentication").checked);
@@ -336,12 +302,46 @@ emailServer.application = {
Ext.getCmp("txtServer").allowBlank = false;
Ext.getCmp("txtPort").allowBlank = false;
+ Ext.getCmp("txtIncomingServer").allowBlank = true;
+ Ext.getCmp("txtIncomingPort").allowBlank = true;
Ext.getCmp("txtAccountFrom").allowBlank = false;
+ } else if (cboEmailEngine === "IMAP") {
+ /*----------------------------------********---------------------------------*/
+ Ext.getCmp("txtServer").setVisible(true);
+ Ext.getCmp("txtPort").setVisible(true);
+
+ try {
+ Ext.getCmp("txtServer").label.update(_("ID_OUTGOING_SERVER"));
+ Ext.getCmp("txtPort").label.update(_("OUTGOING_PORT_DEFAULT"));
+ } catch (err) {
+ Ext.getCmp("txtServer").fieldLabel = _("ID_OUTGOING_SERVER");
+ Ext.getCmp("txtPort").fieldLabel = _("OUTGOING_PORT_DEFAULT");
+ }
+
+ Ext.getCmp("txtIncomingServer").setVisible(true);
+ Ext.getCmp("txtIncomingPort").setVisible(true);
+
+ Ext.getCmp("chkReqAuthentication").setVisible(true);
+
+ emailServerSetPassword(Ext.getCmp("chkReqAuthentication").checked);
+
+ Ext.getCmp("txtAccountFrom").setVisible(true);
+ Ext.getCmp("rdoGrpSmtpSecure").setVisible(true);
+
+ Ext.getCmp("txtServer").allowBlank = false;
+ Ext.getCmp("txtPort").allowBlank = false;
+ Ext.getCmp("txtIncomingServer").allowBlank = false;
+ Ext.getCmp("txtIncomingPort").allowBlank = false;
+ Ext.getCmp("txtAccountFrom").allowBlank = false;
+ /*----------------------------------********---------------------------------*/
} else {
//MAIL
Ext.getCmp("txtServer").setVisible(false);
Ext.getCmp("txtPort").setVisible(false);
+ Ext.getCmp("txtIncomingServer").setVisible(false);
+ Ext.getCmp("txtIncomingPort").setVisible(false);
+
Ext.getCmp("chkReqAuthentication").setVisible(false);
emailServerSetPassword(false);
@@ -351,6 +351,8 @@ emailServer.application = {
Ext.getCmp("txtServer").allowBlank = true;
Ext.getCmp("txtPort").allowBlank = true;
+ Ext.getCmp("txtIncomingServer").allowBlank = true;
+ Ext.getCmp("txtIncomingPort").allowBlank = true;
Ext.getCmp("txtAccountFrom").allowBlank = true;
Ext.getCmp("txtPassword").allowBlank = true;
}
@@ -384,7 +386,7 @@ emailServer.application = {
FLAGTEST = 1;
- if (option == "PHPMAILER") {
+ if (option === "PHPMAILER" || option === "IMAP") {
if (typeof(testData.resolving_name) != "undefined") {
if (testData.resolving_name.result) {
msg = msg + "![](\"/images/select-icon.png\") " + testData.resolving_name.title + "
";
@@ -492,6 +494,8 @@ emailServer.application = {
{name: "MESS_ENGINE", type: "string"},
{name: "MESS_SERVER", type: "string"},
{name: "MESS_PORT", type: "int"},
+ {name: "MESS_INCOMING_SERVER", type: "string"},
+ {name: "MESS_INCOMING_PORT", type: "int"},
{name: "MESS_RAUTH", type: "int"},
{name: "MESS_ACCOUNT", type: "string"},
{name: "MESS_PASSWORD", type: "string"},
@@ -548,6 +552,9 @@ emailServer.application = {
data: [
["PHPMAILER", "SMTP (PHPMailer)"],
+ /*----------------------------------********---------------------------------*/
+ ["IMAP", "SMTP - IMAP (PHPMailer)"],
+ /*----------------------------------********---------------------------------*/
["MAIL", "Mail (PHP)"]
]
});
@@ -597,6 +604,24 @@ emailServer.application = {
emptyText: null
});
+ var txtIncomingServer = new Ext.form.TextField({
+ id: "txtIncomingServer",
+ name: "txtIncomingServer",
+
+ fieldLabel: _("ID_INCOMING_SERVER") //Server
+ });
+
+ var txtIncomingPort = new Ext.form.NumberField({
+ id: "txtIncomingPort",
+ name: "txtIncomingPort",
+
+ fieldLabel: _("INCOMING_PORT_DEFAULT"), //Port (default 993)
+
+ anchor: "36%",
+ maxLength: 3,
+ emptyText: null
+ });
+
var chkReqAuthentication = new Ext.form.Checkbox({
id: "chkReqAuthentication",
name: "chkReqAuthentication",
@@ -745,7 +770,7 @@ emailServer.application = {
var winData = new Ext.Window({
layout: "fit",
width: 550,
- height: 388,
+ height: 450,
//title: "",
modal: true,
resizable: false,
@@ -772,6 +797,8 @@ emailServer.application = {
cboEmailEngine,
txtServer,
txtPort,
+ txtIncomingServer,
+ txtIncomingPort,
chkReqAuthentication,
txtAccountFrom,
txtPassword,
@@ -997,6 +1024,16 @@ emailServer.application = {
return (value != 0)? value : "-";
};
+ var rendererMessIncomingServer = function (value)
+ {
+ return (value !== "")? value : "-";
+ };
+
+ var rendererMessIncomingPort = function (value)
+ {
+ return (value !== 0)? value : "-";
+ };
+
var rendererMessSmtpSecure = function (value)
{
return (value != "")? value : "-";
@@ -1017,6 +1054,8 @@ emailServer.application = {
{id: "MESS_ENGINE", dataIndex: "MESS_ENGINE", hidden: false, header: _("EMAIL_ENGINE"), width: 80, hideable: true, align: "left"},
{id: "MESS_SERVER", dataIndex: "MESS_SERVER", hidden: false, header: _("ID_SERVER"), width: 150, hideable: true, align: "center", renderer: rendererMessServer},
{id: "MESS_PORT", dataIndex: "MESS_PORT", hidden: false, header: _("ID_EMAIL_SERVER_PORT"), width: 50, hideable: true, align: "center", renderer: rendererMessPort},
+ {id: "MESS_INCOMING_SERVER", dataIndex: "MESS_INCOMING_SERVER", hidden: true, header: _("ID_INCOMING_SERVER"), width: 150, hideable: true, align: "center", renderer: rendererMessIncomingServer},
+ {id: "MESS_INCOMING_PORT", dataIndex: "MESS_INCOMING_PORT", hidden: true, header: _("ID_EMAIL_SERVER_PORT"), width: 50, hideable: true, align: "center", renderer: rendererMessIncomingPort},
{id: "MESS_RAUTH", dataIndex: "MESS_RAUTH", hidden: true, header: _("REQUIRE_AUTHENTICATION"), width: 50, hideable: false, align: "left"},
{id: "MESS_ACCOUNT", dataIndex: "MESS_ACCOUNT", hidden: false, header: _("ID_EMAIL_SERVER_ACCOUNT_FROM"), width: 130, hideable: true, align: "left"},
{id: "MESS_PASSWORD", dataIndex: "MESS_PASSWORD", hidden: true, header: _("ID_PASSWORD"), width: 130, hideable: false, align: "left"},
|
|