fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-1227

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-01-17 08:58:49 -04:00
parent 36b325d7a6 f0113ae314
commit 15c9ab54ca
40 changed files with 1648 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -314,40 +314,50 @@ function database_upgrade($command, $args) {
}
}
//There records in table "EMAIL_SERVER"
$criteria = new Criteria("workflow");
//There records in table "EMAIL_SERVER"
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(EmailServerPeer::MESS_UID);
$criteria->setOffset(0);
$criteria->setLimit(1);
$criteria->addSelectColumn(EmailServerPeer::MESS_UID);
$criteria->setOffset(0);
$criteria->setLimit(1);
$rsCriteria = EmailServerPeer::doSelectRS($criteria);
$rsCriteria = EmailServerPeer::doSelectRS($criteria);
if (!$rsCriteria->next()) {
//Insert the first record
$emailConfiguration = System::getEmailConfiguration();
if (!$rsCriteria->next()) {
//Insert the first record
$emailSever = new \ProcessMaker\BusinessModel\EmailServer();
if (count($emailConfiguration) > 0) {
$arrayData = array();
$emailConfiguration = System::getEmailConfiguration();
$arrayData["MESS_ENGINE"] = $emailConfiguration["MESS_ENGINE"];
$arrayData["MESS_SERVER"] = $emailConfiguration["MESS_SERVER"];
$arrayData["MESS_PORT"] = (int)($emailConfiguration["MESS_PORT"]);
$arrayData["MESS_RAUTH"] = (int)($emailConfiguration["MESS_RAUTH"]);
$arrayData["MESS_ACCOUNT"] = $emailConfiguration["MESS_ACCOUNT"];
$arrayData["MESS_PASSWORD"] = $emailConfiguration["MESS_PASSWORD"];
$arrayData["MESS_FROM_MAIL"] = $emailConfiguration["MESS_FROM_MAIL"];
$arrayData["MESS_FROM_NAME"] = $emailConfiguration["MESS_FROM_NAME"];
$arrayData["SMTPSECURE"] = $emailConfiguration["SMTPSecure"];
$arrayData["MESS_TRY_SEND_INMEDIATLY"] = (int)($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"]);
$arrayData["MAIL_TO"] = $emailConfiguration["MAIL_TO"];
$arrayData["MESS_DEFAULT"] = (isset($emailConfiguration["MESS_ENABLED"]) && $emailConfiguration["MESS_ENABLED"] . "" == "1")? 1 : 0;
if (count($emailConfiguration) > 0) {
$arrayData = array();
$emailSever = new ProcessMaker\BusinessModel\EmailServer();
$arrayData["MESS_ENGINE"] = $emailConfiguration["MESS_ENGINE"];
$arrayData["MESS_SERVER"] = $emailConfiguration["MESS_SERVER"];
$arrayData["MESS_PORT"] = (int)($emailConfiguration["MESS_PORT"]);
$arrayData["MESS_RAUTH"] = (int)($emailConfiguration["MESS_RAUTH"]);
$arrayData["MESS_ACCOUNT"] = $emailConfiguration["MESS_ACCOUNT"];
$arrayData["MESS_PASSWORD"] = $emailConfiguration["MESS_PASSWORD"];
$arrayData["MESS_FROM_MAIL"] = $emailConfiguration["MESS_FROM_MAIL"];
$arrayData["MESS_FROM_NAME"] = $emailConfiguration["MESS_FROM_NAME"];
$arrayData["SMTPSECURE"] = $emailConfiguration["SMTPSecure"];
$arrayData["MESS_TRY_SEND_INMEDIATLY"] = (int)($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"]);
$arrayData["MAIL_TO"] = $emailConfiguration["MAIL_TO"];
$arrayData["MESS_DEFAULT"] = (isset($emailConfiguration["MESS_ENABLED"]) && $emailConfiguration["MESS_ENABLED"] . "" == "1")? 1 : 0;
$emailSever->create($arrayData);
}
}
$arrayData = $emailSever->create($arrayData);
} else {
/*----------------------------------********---------------------------------*/
if (true) {
//
} else {
/*----------------------------------********---------------------------------*/
$arrayData = $emailSever->create2(array("MESS_ENGINE" => "MAIL"));
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
}
}
}
function delete_app_from_table($con, $tableName, $appUid, $col="APP_UID") {

11
workflow/engine/classes/class.Installer.php
View File

@@ -224,6 +224,17 @@ class Installer
fclose($fp);
$this->setPartner();
$this->setAdmin();
/*----------------------------------********---------------------------------*/
if (true) {
//
} else {
/*----------------------------------********---------------------------------*/
$querySql = ("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
$this->run_query($querySql);
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
}
return $test;
}

55
workflow/engine/classes/class.processes.php
View File

@@ -202,6 +202,18 @@ class Processes
return $oOutput->outputExists( $sUid );
}
/**
* verify if the object exists
*
* @param string $sUid
* @return boolean
*/
public function processVariableExists ($sUid = '')
{
$oProcessVariable = new ProcessVariables();
return $oProcessVariable->ProcessVariableExists( $sUid );
}
/**
* verify if the object exists
*
@@ -638,6 +650,19 @@ class Processes
}
}
/**
* get an unused process variables GUID
*
* @return $sProUid
*/
public function getUnusedProcessVariableGUID ()
{
do {
$sNewUid = G::generateUniqueID();
} while ($this->processVariableExists( $sNewUid ));
return $sNewUid;
}
/**
* change the GUID for a serialized process
*
@@ -769,6 +794,12 @@ class Processes
}
}
if (isset($oData->processVariables)) {
foreach ($oData->processVariables as $key => $value) {
$oData->processVariables[$key]["PRJ_UID"] = $sNewProUid;
}
}
return true;
}
@@ -2105,6 +2136,29 @@ class Processes
}
}
/**
* Renew all the unique id for "Process User"
*
* @param $data Object with the data
*
* return void
*/
public function renewAllProcessVariableUid(&$data)
{
try {
$map = array ();
foreach ($data->processVariables as $key => $val) {
if (isset( $val['VAR_UID'] )) {
$newGuid = $this->getUnusedProcessVariableGUID();
$map[$val['VAR_UID']] = $newGuid;
$data->processVariables[$key]['VAR_UID'] = $newGuid;
}
}
} catch (Exception $e) {
throw $e;
}
}
/**
* Renew the GUID's for all the Uids for all the elements
*
@@ -2134,6 +2188,7 @@ class Processes
$this->renewAllEvent( $oData );
$this->renewAllCaseScheduler( $oData );
$this->renewAllProcessUserUid($oData);
$this->renewAllProcessVariableUid($oData);
}
/**

2
workflow/engine/classes/class.system.php
View File

@@ -968,7 +968,7 @@ class System
public function getEmailConfiguration ()
{
$emailServer = new ProcessMaker\BusinessModel\EmailServer();
$emailServer = new \ProcessMaker\BusinessModel\EmailServer();
$arrayEmailServerDefault = $emailServer->getEmailServerDefault();

22
workflow/engine/classes/model/ProcessVariables.php Normal file → Executable file
View File

@@ -64,4 +64,26 @@ class ProcessVariables extends BaseProcessVariables {
throw($oError);
}
}
/**
* verify if process variable row specified in [sUid] exists.
*
* @param string $sUid the uid
*/
public function ProcessVariableExists($sUid)
{
$con = Propel::getConnection(ProcessVariablesPeer::DATABASE_NAME);
try {
$oObj = ProcessVariablesPeer::retrieveByPk($sUid);
if (is_object($oObj) && get_class($oObj) == 'ProcessVariables') {
return true;
} else {
return false;
}
} catch (Exception $oError) {
throw ($oError);
}
}
} // ProcessVariables

4
workflow/engine/classes/model/om/BaseEmailServer.php
View File

@@ -85,7 +85,7 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
* The value for the smtpsecure field.
* @var string
*/
protected $smtpsecure = '';
protected $smtpsecure = 'No';
/**
* The value for the mess_try_send_inmediatly field.
@@ -475,7 +475,7 @@ abstract class BaseEmailServer extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->smtpsecure !== $v || $v === '') {
if ($this->smtpsecure !== $v || $v === 'No') {
$this->smtpsecure = $v;
$this->modifiedColumns[] = EmailServerPeer::SMTPSECURE;
}

2
workflow/engine/config/schema.xml
View File

@@ -4204,7 +4204,7 @@
<column name="MESS_PASSWORD" type="VARCHAR" size="256" required="true" default="" />
<column name="MESS_FROM_MAIL" type="VARCHAR" size="256" required="true" default="" />
<column name="MESS_FROM_NAME" type="VARCHAR" size="256" required="true" default="" />
<column name="SMTPSECURE" type="VARCHAR" size="3" required="true" default="" />
<column name="SMTPSECURE" type="VARCHAR" size="3" required="true" default="No" />
<column name="MESS_TRY_SEND_INMEDIATLY" type="INTEGER" required="true" default="0" />
<column name="MAIL_TO" type="VARCHAR" size="256" required="true" default="" />
<column name="MESS_DEFAULT" type="INTEGER" required="true" default="0" />

22
workflow/engine/controllers/installer.php
View File

@@ -784,6 +784,16 @@ class Installer extends Controller
'" . mysql_real_escape_string( serialize( array ('LANG' => 'en','STATUS' => 'active'
) ) ) . "'
)" );
/*----------------------------------********---------------------------------*/
if (true) {
//
} else {
/*----------------------------------********---------------------------------*/
$this->mysqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
}
// Change admin user
@@ -927,7 +937,7 @@ class Installer extends Controller
return $info;
}
}
$this->installLog( G::LoadTranslation('ID_INDEX_FILE_UPDATED', SYS_LANG, Array($indexFileUpdated, $sysConf['default_lang'],$sysConf['default_skin'])));
$this->installLog( G::LoadTranslation('ID_INSTALL_SUCESS') );
@@ -1080,6 +1090,16 @@ class Installer extends Controller
'" . addslashes( serialize( array ('LANG' => 'en','STATUS' => 'active'
) ) ) . "'
)" );
/*----------------------------------********---------------------------------*/
if (true) {
//
} else {
/*----------------------------------********---------------------------------*/
$this->mssqlQuery("INSERT INTO EMAIL_SERVER(MESS_ENGINE) VALUES('MAIL')");
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
}
//change admin user

10
workflow/engine/data/mssql/insert.sql
View File

@@ -2554,7 +2554,7 @@ SELECT 'LABEL','ID_INFO','en','Info','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_CONFIRM_DELETE_INPUT_AND_HISTORY','en','This action will delete the current document and all its versions','2014-01-15'
UNION ALL
SELECT 'JAVASCRIPT','ID_CONFIRM_DELETE_INPUT_AND_HISTORY','en','This will delete the current document and its past versions.','2014-01-15'
SELECT 'JAVASCRIPT','ID_CONFIRM_DELETE_INPUT_AND_HISTORY','en','This action will delete the current document and its past versions.','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_SETUP_MAILCONF_TITLE','en','Test SMTP Connection','2014-01-15'
UNION ALL
@@ -3154,15 +3154,15 @@ SELECT 'LABEL','ID_NO_SELECTION_WARNING','en','One item should be selected in or
UNION ALL
SELECT 'JAVASCRIPT','ID_REQUIRED_NAME_TRIGGERS','en','You forgot the title of the trigger','2014-01-15'
UNION ALL
SELECT 'JAVASCRIPT','ID_EXIST_PROCESS','en','This process will not be saved, because another process has the same name.','2014-01-15'
SELECT 'JAVASCRIPT','ID_EXIST_PROCESS','en','This process will not be saved because there is a process with the same name.','2014-01-15'
UNION ALL
SELECT 'JAVASCRIPT','ID_EXIST_DYNAFORM','en','There is a Dynaform with the same name in this process. It is not saving','2014-01-15'
SELECT 'JAVASCRIPT','ID_EXIST_DYNAFORM','en','Not saved because there is a DynaForm with the same name','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_CLASS_TABLE_DOESNT_EXIST','en','This Class Table doesn''t exist!','2014-01-15'
UNION ALL
SELECT 'JAVASCRIPT','ID_EXIST_INPUTDOCUMENT','en','Can not save, because there is an Input Document with the same name in this process.','2014-01-15'
SELECT 'JAVASCRIPT','ID_EXIST_INPUTDOCUMENT','en','Not saved because there is an Input Document with the same name in this process.','2014-01-15'
UNION ALL
SELECT 'JAVASCRIPT','ID_EXIST_OUTPUTDOCUMENT','en','Can not save, because, there is an Output Document with the same name in this process.','2014-01-15'
SELECT 'JAVASCRIPT','ID_EXIST_OUTPUTDOCUMENT','en','Not saved because there is an Output Document with the same name in this process.','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_CASE_SCHEDULER_VALIDATE_ALERT','en','User or password is empty.','2014-10-21'
UNION ALL

10
workflow/engine/data/mysql/insert.sql
View File

@@ -1979,7 +1979,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_EXTERNAL_FILE','en','External','2014-01-15') ,
( 'LABEL','ID_INFO','en','Info','2014-01-15') ,
( 'LABEL','ID_CONFIRM_DELETE_INPUT_AND_HISTORY','en','This action will delete the current document and all its versions','2014-01-15') ,
( 'JAVASCRIPT','ID_CONFIRM_DELETE_INPUT_AND_HISTORY','en','This will delete the current document and its past versions.','2014-01-15') ,
( 'JAVASCRIPT','ID_CONFIRM_DELETE_INPUT_AND_HISTORY','en','This action will delete the current document and its past versions.','2014-01-15') ,
( 'LABEL','ID_SETUP_MAILCONF_TITLE','en','Test SMTP Connection','2014-01-15') ,
( 'LABEL','DBCONNECTIONS_TITLE','en','Testing database server configuration','2014-01-15') ,
( 'LABEL','ID_DBCNN_TITLE','en','Checking server configuration','2014-01-15') ,
@@ -2282,11 +2282,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_OFF','en','Off','2014-01-15') ,
( 'LABEL','ID_NO_SELECTION_WARNING','en','One item should be selected in order to execute the action.','2014-01-15') ,
( 'JAVASCRIPT','ID_REQUIRED_NAME_TRIGGERS','en','You forgot the title of the trigger','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_PROCESS','en','This process will not be saved, because another process has the same name.','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_DYNAFORM','en','There is a Dynaform with the same name in this process. It is not saving','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_PROCESS','en','This process will not be saved because there is a process with the same name.','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_DYNAFORM','en','Not saved because there is a DynaForm with the same name','2014-01-15') ,
( 'LABEL','ID_CLASS_TABLE_DOESNT_EXIST','en','This Class Table doesn''t exist!','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_INPUTDOCUMENT','en','Can not save, because there is an Input Document with the same name in this process.','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_OUTPUTDOCUMENT','en','Can not save, because, there is an Output Document with the same name in this process.','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_INPUTDOCUMENT','en','Not saved because there is an Input Document with the same name in this process.','2014-01-15') ,
( 'JAVASCRIPT','ID_EXIST_OUTPUTDOCUMENT','en','Not saved because there is an Output Document with the same name in this process.','2014-01-15') ,
( 'LABEL','ID_CASE_SCHEDULER_VALIDATE_ALERT','en','User or password is empty.','2014-10-21') ,
( 'LABEL','ID_DELEGATE_DATE_FROM','en','Delegated date from','2014-01-15') ,
( 'JAVASCRIPT','ID_DUPLICATE_CATEGORY_NAME','en','Duplicate category name.','2014-01-15') ;

2
workflow/engine/data/mysql/schema.sql
View File

@@ -2427,7 +2427,7 @@ CREATE TABLE `EMAIL_SERVER`
`MESS_PASSWORD` VARCHAR(256) default '' NOT NULL,
`MESS_FROM_MAIL` VARCHAR(256) default '' NOT NULL,
`MESS_FROM_NAME` VARCHAR(256) default '' NOT NULL,
`SMTPSECURE` VARCHAR(3) default 'NO' NOT NULL,
`SMTPSECURE` VARCHAR(3) default 'No' NOT NULL,
`MESS_TRY_SEND_INMEDIATLY` INTEGER default 0 NOT NULL,
`MAIL_TO` VARCHAR(256) default '' NOT NULL,
`MESS_DEFAULT` INTEGER default 0 NOT NULL,

4
workflow/engine/menus/setup.php
View File

@@ -36,7 +36,7 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1 ) {
//settings options
// $G_TMP_MENU->AddIdRawOption('LOGO', 'uplogo', G::LoadTranslation('ID_LOGO'), 'icon-pmlogo.png', '', 'settings');
$G_TMP_MENU->AddIdRawOption('LOGO', '../admin/pmLogo', G::LoadTranslation('ID_LOGO'), 'icon-pmlogo.png','', 'settings');
$G_TMP_MENU->AddIdRawOption('EMAILS','../admin/emails', G::LoadTranslation('ID_EMAIL'), 'icon-email-settings1.png', '', 'settings');
$G_TMP_MENU->AddIdRawOption("EMAIL_SERVER", "../emailServer/emailServer", G::LoadTranslation("ID_EMAIL_SERVER_TITLE"), "icon-email-settings1.png", "", "settings");
$G_TMP_MENU->AddIdRawOption('CALENDAR', 'calendarList', G::LoadTranslation('ID_CALENDAR'), 'icon-calendar.png', '', 'settings' );
//if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1)
// $G_TMP_MENU->AddIdRawOption('CASES_LIST_SETUP', '../cases/casesListSetup', G::LoadTranslation('ID_CASES_LIST_SETUP'), "",'', 'settings');
@@ -103,7 +103,7 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) {
$G_TMP_MENU->AddIdRawOption('EMAILS', '../mails/emailList', ucfirst (strtolower ( G::LoadTranslation('ID_EMAILS'))), '', '', 'logs');
/*----------------------------------********---------------------------------*/
if (isset($sAudit) && $sAudit != false && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
$G_TMP_MENU->AddIdRawOption('AUDIT_LOG', '../setup/auditLog', ucfirst (G::LoadTranslation('ID_AUDITLOG_DISPLAY')), '', '', 'logs');
$G_TMP_MENU->AddIdRawOption('AUDIT_LOG', '../setup/auditLog', ucfirst (G::LoadTranslation('ID_AUDITLOG_DISPLAY')), '', '', 'logs');
}
/*----------------------------------********---------------------------------*/
}

22
workflow/engine/methods/emailServer/emailServer.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
global $RBAC;
if ($RBAC->userCanAccess("PM_SETUP") != 1) {
G::SendTemporalMessage("ID_USER_HAVENT_RIGHTS_PAGE", "error", "labels");
exit(0);
}
//Data
$configuration = new Configurations();
$arrayConfigPage = $configuration->getConfiguration("emailServerList", "pageSize", null, $_SESSION["USER_LOGGED"]);
$arrayConfig = array();
$arrayConfig["pageSize"] = (isset($arrayConfigPage["pageSize"]))? $arrayConfigPage["pageSize"] : 20;
$headPublisher = &headPublisher::getSingleton();
$headPublisher->addContent("emailServer/emailServer"); //Adding a HTML file
$headPublisher->addExtJsScript("emailServer/emailServer", false); //Adding a JavaScript file
$headPublisher->assign("CONFIG", $arrayConfig);
G::RenderPage("publish", "extJs");

205
workflow/engine/methods/emailServer/emailServerAjax.php Normal file
View File

@@ -0,0 +1,205 @@
<?php
$option = (isset($_POST["option"]))? $_POST["option"] : "";
$response = array();
switch ($option) {
case "INS":
$arrayData = array();
$server = "";
$port = "";
$reqAuthentication = 0;
$password = "";
$smtpSecure = "";
$cboEmailEngine = $_POST["cboEmailEngine"];
$accountFrom = (isset($_POST["accountFrom"]))? $_POST["accountFrom"] : "";
$fromName = $_POST["fromName"];
$fromMail = $_POST["fromMail"];
$sendTestMail = (int)($_POST["sendTestMail"]);
$mailTo = ($sendTestMail == 1)? $_POST["mailTo"] : "";
$emailServerDefault = (int)($_POST["emailServerDefault"]);
if ($cboEmailEngine == "PHPMAILER") {
$server = $_POST["server"];
$port = (int)($_POST["port"]);
$reqAuthentication = (int)($_POST["reqAuthentication"]);
$password = ($reqAuthentication == 1)? $_POST["password"] : "";
$smtpSecure = $_POST["smtpSecure"];
}
try {
$arrayData = array(
"MESS_ENGINE" => $cboEmailEngine,
"MESS_SERVER" => $server,
"MESS_PORT" => $port,
"MESS_RAUTH" => $reqAuthentication,
"MESS_ACCOUNT" => $accountFrom,
"MESS_PASSWORD" => $password,
"MESS_FROM_MAIL" => $fromMail,
"MESS_FROM_NAME" => $fromName,
"SMTPSECURE" => $smtpSecure,
"MESS_TRY_SEND_INMEDIATLY" => $sendTestMail,
"MAIL_TO" => $mailTo,
"MESS_DEFAULT" => $emailServerDefault
);
$emailSever = new \ProcessMaker\BusinessModel\EmailServer();
$arrayEmailServerData = $emailSever->create($arrayData);
$response["status"] = "OK";
$response["data"] = $arrayEmailServerData;
} catch (Exception $e) {
$response["status"] = "ERROR";
$response["message"] = $e->getMessage();
}
break;
case "UPD":
$arrayData = array();
$emailServerUid = $_POST["emailServerUid"];
$server = "";
$port = "";
$reqAuthentication = 0;
$password = "";
$smtpSecure = "";
$cboEmailEngine = $_POST["cboEmailEngine"];
$accountFrom = (isset($_POST["accountFrom"]))? $_POST["accountFrom"] : "";
$fromName = $_POST["fromName"];
$fromMail = $_POST["fromMail"];
$sendTestMail = (int)($_POST["sendTestMail"]);
$mailTo = ($sendTestMail == 1)? $_POST["mailTo"] : "";
$emailServerDefault = (int)($_POST["emailServerDefault"]);
if ($cboEmailEngine == "PHPMAILER") {
$server = $_POST["server"];
$port = (int)($_POST["port"]);
$reqAuthentication = (int)($_POST["reqAuthentication"]);
$password = ($reqAuthentication == 1)? $_POST["password"] : "";
$smtpSecure = $_POST["smtpSecure"];
}
try {
$arrayData = array(
"MESS_ENGINE" => $cboEmailEngine,
"MESS_SERVER" => $server,
"MESS_PORT" => $port,
"MESS_RAUTH" => $reqAuthentication,
"MESS_ACCOUNT" => $accountFrom,
"MESS_PASSWORD" => $password,
"MESS_FROM_MAIL" => $fromMail,
"MESS_FROM_NAME" => $fromName,
"SMTPSECURE" => $smtpSecure,
"MESS_TRY_SEND_INMEDIATLY" => $sendTestMail,
"MAIL_TO" => $mailTo,
"MESS_DEFAULT" => $emailServerDefault
);
$emailSever = new \ProcessMaker\BusinessModel\EmailServer();
$arrayEmailServerData = $emailSever->update($emailServerUid, $arrayData);
$response["status"] = "OK";
$response["data"] = $arrayEmailServerData;
} catch (Exception $e) {
$response["status"] = "ERROR";
$response["message"] = $e->getMessage();
}
break;
case "DEL":
$emailServerUid = $_POST["emailServerUid"];
try {
$emailSever = new \ProcessMaker\BusinessModel\EmailServer();
$result = $emailSever->delete($emailServerUid);
$response["status"] = "OK";
} catch (Exception $e) {
$response["status"] = "ERROR";
$response["message"] = $e->getMessage();
}
break;
case "LST":
$pageSize = $_POST["pageSize"];
$search = $_POST["search"];
$sortField = (isset($_POST["sort"]))? $_POST["sort"]: "";
$sortDir = (isset($_POST["dir"]))? $_POST["dir"]: "";
$start = (isset($_POST["start"]))? $_POST["start"]: 0;
$limit = (isset($_POST["limit"]))? $_POST["limit"]: $pageSize;
try {
$emailSever = new \ProcessMaker\BusinessModel\EmailServer();
$result = $emailSever->getEmailServers(array("filter" => $search), $sortField, $sortDir, $start, $limit);
$response["status"] = "OK";
$response["success"] = true;
$response["resultTotal"] = $result["total"];
$response["resultRoot"] = $result["data"];
} catch (Exception $e) {
$response["status"] = "ERROR";
$response["message"] = $e->getMessage();
}
break;
case "TEST":
$arrayData = array();
$server = "";
$port = "";
$reqAuthentication = 0;
$password = "";
$smtpSecure = "";
$cboEmailEngine = $_POST["cboEmailEngine"];
$accountFrom = (isset($_POST["accountFrom"]))? $_POST["accountFrom"] : "";
$fromName = $_POST["fromName"];
$fromMail = $_POST["fromMail"];
$sendTestMail = (int)($_POST["sendTestMail"]);
$mailTo = ($sendTestMail == 1)? $_POST["mailTo"] : "";
$emailServerDefault = (int)($_POST["emailServerDefault"]);
if ($cboEmailEngine == "PHPMAILER") {
$server = $_POST["server"];
$port = (int)($_POST["port"]);
$reqAuthentication = (int)($_POST["reqAuthentication"]);
$password = ($reqAuthentication == 1)? $_POST["password"] : "";
$smtpSecure = $_POST["smtpSecure"];
}
try {
$arrayData = array(
"MESS_ENGINE" => $cboEmailEngine,
"MESS_SERVER" => $server,
"MESS_PORT" => $port,
"MESS_RAUTH" => $reqAuthentication,
"MESS_ACCOUNT" => $accountFrom,
"MESS_PASSWORD" => $password,
"MESS_FROM_MAIL" => $fromMail,
"MESS_FROM_NAME" => $fromName,
"SMTPSECURE" => $smtpSecure,
"MESS_TRY_SEND_INMEDIATLY" => $sendTestMail,
"MAIL_TO" => $mailTo,
"MESS_DEFAULT" => $emailServerDefault
);
$emailSever = new \ProcessMaker\BusinessModel\EmailServer();
$arrayEmailServerData = $emailSever->testConnection($arrayData);
$response["data"] = $arrayEmailServerData;
} catch (Exception $e) {
$response["status"] = "ERROR";
$response["message"] = $e->getMessage();
}
break;
}
echo G::json_encode($response);

115
workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
View File

@@ -5,21 +5,16 @@ 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_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_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"),
"MESS_FROM_MAIL" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerFromMail"),
"MESS_FROM_NAME" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerFromName"),
"SMTPSECURE" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("No", "tls", "ssl"), "fieldNameAux" => "emailServerSecureConnection"),
"MESS_TRY_SEND_INMEDIATLY" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "emailServerSendTestMail"),
"MAIL_TO" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "emailServerMailTo"),
"MESS_DEFAULT" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "emailServerDefault")
);
@@ -732,6 +727,80 @@ class EmailServer
//Create
$cnn = \Propel::getConnection("workflow");
try {
$emailServer = new \EmailServer();
$passwd = $arrayData["MESS_PASSWORD"];
$passwdDec = \G::decrypt($passwd, "EMAILENCRYPT");
$auxPass = explode("hash:", $passwdDec);
if (count($auxPass) > 1) {
if (count($auxPass) == 2) {
$passwd = $auxPass[1];
} else {
array_shift($auxPass);
$passwd = implode("", $auxPass);
}
}
$arrayData["MESS_PASSWORD"] = $passwd;
if ($arrayData["MESS_PASSWORD"] != "") {
$arrayData["MESS_PASSWORD"] = "hash:" . $arrayData["MESS_PASSWORD"];
$arrayData["MESS_PASSWORD"] = \G::encrypt($arrayData["MESS_PASSWORD"], "EMAILENCRYPT");
}
$emailServer->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
$emailServerUid = \ProcessMaker\Util\Common::generateUID();
$emailServer->setMessUid($emailServerUid);
if ($emailServer->validate()) {
$cnn->begin();
$result = $emailServer->save();
$cnn->commit();
if (isset($arrayData["MESS_DEFAULT"]) && (int)($arrayData["MESS_DEFAULT"]) == 1) {
$this->setEmailServerDefaultByUid($emailServerUid);
}
//Return
return $this->getEmailServer($emailServerUid);
} else {
$msg = "";
foreach ($emailServer->getValidationFailures() as $validationFailure) {
$msg = $msg . (($msg != "")? "\n" : "") . $validationFailure->getMessage();
}
throw new \Exception(\G::LoadTranslation("ID_RECORD_CANNOT_BE_CREATED") . (($msg != "")? "\n" . $msg : ""));
}
} catch (\Exception $e) {
$cnn->rollback();
throw $e;
}
} catch (\Exception $e) {
throw $e;
}
}
/**
* Create Email Server by data
*
* @param array $arrayData Data
*
* return array Return data of the new Email Server created
*/
public function create2(array $arrayData)
{
try {
//Create
$cnn = \Propel::getConnection("workflow");
try {
$emailServer = new \EmailServer();
@@ -804,6 +873,27 @@ class EmailServer
try {
$emailServer = \EmailServerPeer::retrieveByPK($emailServerUid);
$passwd = $arrayData["MESS_PASSWORD"];
$passwdDec = \G::decrypt($passwd, "EMAILENCRYPT");
$auxPass = explode("hash:", $passwdDec);
if (count($auxPass) > 1) {
if (count($auxPass) == 2) {
$passwd = $auxPass[1];
} else {
array_shift($auxPass);
$passwd = implode("", $auxPass);
}
}
$arrayData["MESS_PASSWORD"] = $passwd;
if ($arrayData["MESS_PASSWORD"] != "") {
$arrayData["MESS_PASSWORD"] = "hash:" . $arrayData["MESS_PASSWORD"];
$arrayData["MESS_PASSWORD"] = \G::encrypt($arrayData["MESS_PASSWORD"], "EMAILENCRYPT");
}
$emailServer->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
if ($emailServer->validate()) {
@@ -1056,6 +1146,21 @@ class EmailServer
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$passwd = $row["MESS_PASSWORD"];
$passwdDec = \G::decrypt($passwd, "EMAILENCRYPT");
$auxPass = explode("hash:", $passwdDec);
if (count($auxPass) > 1) {
if (count($auxPass) == 2) {
$passwd = $auxPass[1];
} else {
array_shift($auxPass);
$passwd = implode("", $auxPass);
}
}
$row["MESS_PASSWORD"] = $passwd;
$arrayEmailServer[] = $this->getEmailServerDataFromRecord($row);
}

2
workflow/engine/templates/emailServer/emailServer.html Normal file
View File

@@ -0,0 +1,2 @@
<div></div>

1120
workflow/engine/templates/emailServer/emailServer.js Normal file
View File

File diff suppressed because it is too large Load Diff

2
workflow/engine/xmlform/cases/cases_ListAll.xml
View File

@@ -55,7 +55,7 @@
<pt>Data Final</pt>
</DEL_FINISH_DATE>
<APP_STATUS type="dropdown">
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<es>Estado<option name="DRAFT">Borrador</option><option name="TO_DO">Pendientes</option><option name="CANCELLED">Cancelado</option><option name="COMPLETED">Completado</option></es>
<pt>Estado<option name="DRAFT">Rascunho</option><option name="TO_DO">A Fazer</option><option name="CANCELLED">Cancelado</option><option name="COMPLETED">Completado</option></pt>
</APP_STATUS>

2
workflow/engine/xmlform/cases/cases_ListAllDelete.xml
View File

@@ -55,7 +55,7 @@
<pt>Data Final</pt>
</DEL_FINISH_DATE>
<APP_STATUS type="dropdown">
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<es>Estado<option name="DRAFT">Borrador</option><option name="TO_DO">Pendientes</option><option name="CANCELLED">Cancelado</option><option name="COMPLETED">Completado</option></es>
<pt>Estado<option name="DRAFT">Rascunho</option><option name="TO_DO">A Fazer</option><option name="CANCELLED">Cancelado</option><option name="COMPLETED">Completado</option></pt>
</APP_STATUS>

2
workflow/engine/xmlform/cases/cases_ListAll_Reassign.xml
View File

@@ -46,7 +46,7 @@
<es>Finalizar fecha</es>
</DEL_FINISH_DATE>
<APP_STATUS type="dropdown">
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<es>Estado<option name="DRAFT">Borrador</option><option name="TO_DO">Pendientes</option><option name="CANCELLED">Cancelado</option><option name="COMPLETED">Completado</option></es>
</APP_STATUS>
<MARK2 type="cellMark" className="RowLink1" classNameAlt="RowLink2" defaultValue="1"/>

2
workflow/engine/xmlform/cases/cases_ListStarted.xml
View File

@@ -35,7 +35,7 @@
<en><![CDATA[Finish Date]]></en>
</DEL_FINISH_DATE>
<APP_STATUS type="dropdown">
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
</APP_STATUS>
<MARK2 type="cellMark" className="RowLink1" classNameAlt="RowLink2" defaultValue="1"/>
<OPEN type="link" value="@G::LoadTranslation(ID_OPEN)" link="@G::encryptlink(@#cases_Open)?APP_UID=@#APP_UID&amp;DEL_INDEX=@#DEL_INDEX" colWidth="40" titleAlign="left" align="left" dataCompareField="APP_TITLE.CON_VALUE" dataCompareType="contains">

2
workflow/engine/xmlform/cases/cases_ListToRevise.xml
View File

@@ -35,7 +35,7 @@
<en><![CDATA[Start Date]]></en>
</DEL_INIT_DATE>
<APP_STATUS type="dropdown">
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
</APP_STATUS>
<MARK2 type="cellMark" className="RowLink1" classNameAlt="RowLink2" defaultValue="1"/>
<!--<EDIT type="link" colWidth="40" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="casesEdit(@QAPP_UID);return false;"/>-->

2
workflow/engine/xmlform/cases/cases_OptionsSent.xml
View File

@@ -12,7 +12,7 @@
<en><![CDATA[Process]]><option name="0"><![CDATA[All]]></option></en>
</PROCESS_FILTER>
<APP_STATUS_FILTER type="dropdown" colWidth="200" colAlign="left">
<en><![CDATA[Status]]><option name="ALL"><![CDATA[All]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name="ALL"><![CDATA[All]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
</APP_STATUS_FILTER>
<MINE type="link" link="#" onclick="javascript:applyAdditionalFilter('MINE'); return false" value="" colWidth="2%" colAlign="bottom">
<en><![CDATA[Started by me]]></en>

2
workflow/engine/xmlform/cases/cases_TransferHistory.xml
View File

@@ -22,7 +22,7 @@
<en><![CDATA[End Date]]></en>
</DEL_FINISH_DATE>
<APP_TYPE type="dropdown" colWidth="100" colAlign="center" titleAlign="center">
<en><![CDATA[Action]]><option name="PAUSE"><![CDATA[Paused]]></option><option name="CANCEL"><![CDATA[Cancelled]]></option><option name="IN_PROGRESS"><![CDATA[In Progress]]></option><option name=""><![CDATA[Routed]]></option><option name="REASSIGN"><![CDATA[Reassigned]]></option></en>
<en><![CDATA[Action]]><option name="PAUSE"><![CDATA[Paused]]></option><option name="CANCEL"><![CDATA[Canceled]]></option><option name="IN_PROGRESS"><![CDATA[In Progress]]></option><option name=""><![CDATA[Routed]]></option><option name="REASSIGN"><![CDATA[Reassigned]]></option></en>
</APP_TYPE>
<APP_ENABLE_ACTION_DATE type="text" colWidth="100" colAlign="center" titleAlign="center">
<en><![CDATA[Enable Action]]></en>

2
workflow/engine/xmlform/cases/cases_advancedSearch.xml
View File

@@ -55,7 +55,7 @@
<pt>Data Final</pt>
</DEL_FINISH_DATE>
<APP_STATUS type="dropdown">
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<es>Estado<option name="DRAFT">Borrador</option><option name="TO_DO">Pendientes</option><option name="CANCELLED">Cancelado</option><option name="COMPLETED">Completado</option></es>
<pt>Estado<option name="DRAFT">Rascunho</option><option name="TO_DO">A Fazer</option><option name="CANCELLED">Cancelado</option><option name="COMPLETED">Completado</option></pt>
</APP_STATUS>

2
workflow/engine/xmlform/cases/cases_advancedSearchFilter.xml
View File

@@ -29,7 +29,7 @@
<en><![CDATA[To]]></en>
</LAST_MODIFICATION_T>
<APP_STATUS type="dropdown">
<en><![CDATA[Status]]><option name=""><![CDATA[All]]></option><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Cancelled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
<en><![CDATA[Status]]><option name=""><![CDATA[All]]></option><option name="DRAFT"><![CDATA[Draft]]></option><option name="TO_DO"><![CDATA[To Do]]></option><option name="CANCELLED"><![CDATA[Canceled]]></option><option name="COMPLETED"><![CDATA[Completed]]></option></en>
</APP_STATUS>
<FILTER type="submit">
<en><![CDATA[Filter]]></en>

2
workflow/engine/xmlform/events/eventsEdit.xml
View File

@@ -7,7 +7,7 @@
<en><![CDATA[]]></en>
</TITLE>
<NOTE type="subtitle">
<en><![CDATA[Events execution is related to the due date of the cases or the estimated duration if you select "Multiple Tasks"]]></en>
<en><![CDATA[Event execution is related to the due date of the cases or the estimated duration if you select "Multiple Tasks"]]></en>
</NOTE>
<EVN_DESCRIPTION type="text" size="36" maxlength="255" required="1">
<en><![CDATA[Description]]></en>

2
workflow/engine/xmlform/events/eventsNew.xml
View File

@@ -7,7 +7,7 @@
<en><![CDATA[]]></en>
</TITLE>
<NOTE type="subtitle">
<en><![CDATA[Events execution is related to the due date of the cases or the estimated duration if you select "Multiple Tasks"]]></en>
<en><![CDATA[Event execution is related to the due date of the cases or the estimated duration if you select "Multiple Tasks"]]></en>
</NOTE>
<EVN_DESCRIPTION type="text" size="36" maxlength="255" required="1">
<en><![CDATA[Description]]></en>

4
workflow/engine/xmlform/groups/groups_AvailableUsers.xml
View File

@@ -4,10 +4,10 @@
<en/>
</USR_UID>
<USR_FIRSTNAME type="text" colWidth="150" titleAlign="left" align="left" enableHtml="1">
<en><![CDATA[Firstname]]></en>
<en><![CDATA[First name]]></en>
</USR_FIRSTNAME>
<USR_LASTNAME type="text" colWidth="150" titleAlign="left" align="left" enableHtml="1">
<en><![CDATA[Lastname]]></en>
<en><![CDATA[Last name]]></en>
</USR_LASTNAME>
<PAGED_TABLE_ID type="private" showInTable="0"/>
<JSFILTER type="javascript" replaceTags="1" showInTable="0">

2
workflow/engine/xmlform/patterns/patterns_GridDiscriminator.xml
View File

@@ -4,7 +4,7 @@
SELECT TAS_UID, CON_VALUE FROM TASK LEFT JOIN CONTENT ON (TAS_UID = CON_ID AND CON_CATEGORY = 'TAS_TITLE' AND CON_LANG = '@#LANG') WHERE PRO_UID = '@#PROCESS'
]]><en><![CDATA[Next Task]]></en></ROU_NEXT_TASK>
<ROU_CONDITION type="text" size="20" maxlength="2" showVars="1" validate="Int" process="@#PROCESS">
<en><![CDATA[No of Task to be Discriminated]]></en>
<en><![CDATA[Number of tasks to be discriminated]]></en>
</ROU_CONDITION>
<ROU_OPTIONAL type="dropdown" required="1" readonly="0" savelabel="0" mode="edit" options="Array" btn_cancel="Cancel">
<en><![CDATA[Type of Discriminator]]><option name="FALSE"><![CDATA[Structured]]></option><option name="TRUE"><![CDATA[Cancelling]]></option></en>

2
workflow/engine/xmlform/processes/processes_DeleteCases.xml
View File

@@ -20,6 +20,6 @@
<en><![CDATA[Draft]]></en>
</DRAFT>
<CANCELLED type="text" mode="view">
<en><![CDATA[Cancelled]]></en>
<en><![CDATA[Canceled]]></en>
</CANCELLED>
</dynaForm>

2
workflow/engine/xmlform/processes/processes_Edit.xml
View File

@@ -40,7 +40,7 @@ WHERE
<en><![CDATA[This a sub process]]></en>
</PRO_SUBPROCESS>
<PRO_TRI_DELETED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is deleted]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_DELETED>
<PRO_TRI_CANCELED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is cancelled]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_CANCELED>
<PRO_TRI_CANCELED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is canceled]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_CANCELED>
<PRO_TRI_PAUSED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is paused]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_PAUSED>
<PRO_TRI_REASSIGNED type="dropdown"><![CDATA[SELECT TRI_UID, CON_VALUE FROM `TRIGGERS` LEFT JOIN CONTENT ON (TRI_UID = CON_ID AND CON_CATEGORY = 'TRI_TITLE' AND CON_LANG = '@#SYS_LANG') WHERE PRO_UID = '@#PRO_UID' ORDER BY CON_VALUE ASC]]><en><![CDATA[Execute a trigger when a case is reassigned]]><option name=""><![CDATA[- Don't execute anything -]]></option></en></PRO_TRI_REASSIGNED>
<!--//////////////////////////////////********//////////////////////////////////-->

2
workflow/engine/xmlform/processes/processes_ImportExisting.xml
View File

@@ -7,7 +7,7 @@
<en><![CDATA[The process you are trying to import already exists. Please select one of the following options to continue:]]></en>
</TITLE1>
<IMPORT_OPTION type="radiogroup">
<en><![CDATA[]]><option name="1"><![CDATA[Update the current process, overwriting all tasks and steps]]></option><option name="2"><![CDATA[Disable the current process and create a new version of the process]]></option><option name="3"><![CDATA[Create a completely new process without changing the current process]]></option></en>
<en><![CDATA[]]><option name="1"><![CDATA[Update the current process overwriting all tasks and steps]]></option><option name="2"><![CDATA[Disable the current process and create a new version of the process]]></option><option name="3"><![CDATA[Create a completely new process without changing the current process]]></option></en>
</IMPORT_OPTION>
<PRO_FILENAME type="hidden">
</PRO_FILENAME>

4
workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml
View File

@@ -4,10 +4,10 @@
<en><![CDATA[<div align="center">Importing Existing Process</div>]]></en>
</title>
<TITLE1 type="subtitle">
<en><![CDATA[The process you are trying to import already exists. Please select one of the following options to continue:]]></en>
<en><![CDATA[The process you are trying to import already exists. Please select one of the following options to continue]]></en>
</TITLE1>
<IMPORT_OPTION type="radiogroup">
<en><![CDATA[]]><option name="1"><![CDATA[Update the current process, overwriting all tasks and steps]]></option><option name="2"><![CDATA[Disable the current process and create a new version of the process]]></option><option name="3"><![CDATA[Create a completely new process without changing the current process]]></option></en>
<en><![CDATA[]]><option name="1"><![CDATA[Update the current process overwriting all tasks and steps]]></option><option name="2"><![CDATA[Disable the current process and create a new version of the process]]></option><option name="3"><![CDATA[Create a completely new process without changing the current process]]></option></en>
</IMPORT_OPTION>
<PRO_FILENAME type="hidden">
</PRO_FILENAME>

4
workflow/engine/xmlform/processes/processes_ValidatingGroups.xml
View File

@@ -4,7 +4,7 @@
<en><![CDATA[<div align="center">Importing Groups</div>]]></en>
</title>
<TITLE1 type="subtitle">
<en><![CDATA[Some of the groups that are you trying to import, already exist. Please select one of the following options to continue:]]></en>
<en><![CDATA[Some of the groups that you are trying to import already exist. Please select one of the following options to continue:]]></en>
</TITLE1>
<IMPORT_OPTION type="hidden">
</IMPORT_OPTION>
@@ -15,7 +15,7 @@
<PRO_PATH type="hidden">
</PRO_PATH>
<GROUP_IMPORT_OPTION type="radiogroup" defaultvalue="rename">
<en><![CDATA[]]><option name="rename"><![CDATA[Rename the imported groups]]></option><option name="merge"><![CDATA[Merge the imported groups, with the preexistent local groups (no changes will be made to the local groups)]]></option></en>
<en><![CDATA[]]><option name="rename"><![CDATA[Rename the imported groups]]></option><option name="merge"><![CDATA[Merge the imported groups with the pre-existing local groups (no changes will be made to the local groups)]]></option></en>
</GROUP_IMPORT_OPTION>
<OBJ_UID type="hidden">
</OBJ_UID>

2
workflow/engine/xmlform/setup/emails.xml
View File

@@ -47,7 +47,7 @@
<en><![CDATA[Maximun number of mails sended by attempt]]></en>
</MESS_SEND_MAX>
<MESS_TRY_SEND_INMEDIATLY type="checkbox" value="1">
<en><![CDATA[Try send mails inmediatly]]></en>
<en><![CDATA[Try to send emails immediately]]></en>
</MESS_TRY_SEND_INMEDIATLY>
<TEST type="button" onclick="javascript:verifyFields();">
<en><![CDATA[Test]]></en>

2
workflow/engine/xmlform/setup/showMessage.xml
View File

@@ -5,6 +5,6 @@
<es>Error</es>
</TITLE>
<MESSAGE type="caption" enableHTML="1">
<en><![CDATA[you can't delete it is in use.]]></en>
<en><![CDATA[You can't delete this while it is in use.]]></en>
</MESSAGE>
</dynaForm>

2
workflow/engine/xmlform/setup/uplogoList.xml
View File

@@ -4,7 +4,7 @@
<en><![CDATA[No.]]></en>
</id>
<LOG0_IMACE type="text" size="36" maxlength="12" enableHTML="1">
<en><![CDATA[imagen]]></en>
<en><![CDATA[Imagen]]></en>
</LOG0_IMACE>
<LOG0_NAME type="text" size="15" maxlength="12">
<en><![CDATA[name]]></en>

2
workflow/engine/xmlform/tracker/tracker_TransferHistory.xml
View File

@@ -22,6 +22,6 @@
<en><![CDATA[End Date]]></en>
</DEL_FINISH_DATE>
<APP_TYPE type="dropdown" colWidth="100" colAlign="center" titleAlign="center">
<en><![CDATA[Action]]><option name="PAUSE"><![CDATA[Paused]]></option><option name="CANCEL"><![CDATA[Cancelled]]></option><option name=""><![CDATA[Routed]]></option></en>
<en><![CDATA[Action]]><option name="PAUSE"><![CDATA[Paused]]></option><option name="CANCEL"><![CDATA[Canceled]]></option><option name=""><![CDATA[Routed]]></option></en>
</APP_TYPE>
</dynaForm>

2
workflow/engine/xmlform/users/users_DeleteAssign.xml
View File

@@ -16,6 +16,6 @@
<en><![CDATA[Completed]]></en>
</COMPLETED>
<CANCELLED type="text" mode="view">
<en><![CDATA[Cancelled]]></en>
<en><![CDATA[Canceled]]></en>
</CANCELLED>
</dynaForm>