diff --git a/workflow/engine/classes/model/map/EmailServerMapBuilder.php b/workflow/engine/classes/model/map/EmailServerMapBuilder.php index ba474c9dd..d3ceb8f91 100644 --- a/workflow/engine/classes/model/map/EmailServerMapBuilder.php +++ b/workflow/engine/classes/model/map/EmailServerMapBuilder.php @@ -79,9 +79,9 @@ class EmailServerMapBuilder $tMap->addColumn('MESS_PASSWORD', 'MessPassword', 'string', CreoleTypes::VARCHAR, true, 256); - $tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, true, 256); + $tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, false, 256); - $tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, true, 256); + $tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, false, 256); $tMap->addColumn('SMTPSECURE', 'Smtpsecure', 'string', CreoleTypes::VARCHAR, true, 3); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 012edebf3..a72dcc672 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -4030,7 +4030,7 @@ - + @@ -4336,8 +4336,8 @@ - - + + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 9066d054f..79c15e9d7 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -2483,7 +2483,6 @@ CREATE TABLE `MESSAGE_TYPE_VARIABLE` DROP TABLE IF EXISTS `EMAIL_SERVER`; - CREATE TABLE `EMAIL_SERVER` ( `MESS_UID` VARCHAR(32) default '' NOT NULL, @@ -2493,8 +2492,8 @@ CREATE TABLE `EMAIL_SERVER` `MESS_RAUTH` INTEGER default 0 NOT NULL, `MESS_ACCOUNT` VARCHAR(256) default '' NOT NULL, `MESS_PASSWORD` VARCHAR(256) default '' NOT NULL, - `MESS_FROM_MAIL` VARCHAR(256) default '' NOT NULL, - `MESS_FROM_NAME` VARCHAR(256) default '' NOT NULL, + `MESS_FROM_MAIL` VARCHAR(256) default '', + `MESS_FROM_NAME` VARCHAR(256) default '', `SMTPSECURE` VARCHAR(3) default 'No' NOT NULL, `MESS_TRY_SEND_INMEDIATLY` INTEGER default 0 NOT NULL, `MAIL_TO` VARCHAR(256) default '' NOT NULL, diff --git a/workflow/engine/methods/processes/processesList.php b/workflow/engine/methods/processes/processesList.php index f677292ed..354209ce9 100755 --- a/workflow/engine/methods/processes/processesList.php +++ b/workflow/engine/methods/processes/processesList.php @@ -40,16 +40,16 @@ $memcacheUsed = 'not used'; $totalCount = 0; if (isset( $_POST['category'] ) && $_POST['category'] !== '') { if (isset( $_POST['processName'] )) - $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName']); + $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]); else - $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category']); + $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], null, true, false, $_SESSION["USER_LOGGED"]); } else { if (isset( $_POST['processName'] )) { $memkey = 'processList-' . $start . '-' . $limit . '-' . $_POST['processName']; $memcacheUsed = 'yes'; $proData = $memcache->get( $memkey ); if ($proData === false) { - $proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName']); + $proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]); $memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR ); $totalCount = count($proData); $proData = array_splice($proData, $start, $limit);