diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 21d0dd1a1..94cd171a4 100644 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -207,6 +207,13 @@ try { eprintln('WARNING! No server info found!', 'red'); } + $sSerializedFile = PATH_DATA_SITE . 'plugin.singleton'; + + if (file_exists($sSerializedFile)) { + $pluginRegistry = PMPluginRegistry::loadSingleton($sSerializedFile); + } + G::LoadClass('pmScript'); + //DB $phpCode = ''; @@ -334,10 +341,6 @@ try { G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n" ); } - - - - //Functions function processWorkspace() { diff --git a/workflow/engine/classes/class.ldapAdvanced.php b/workflow/engine/classes/class.ldapAdvanced.php index 8b96f66b4..dfcc91f3a 100644 --- a/workflow/engine/classes/class.ldapAdvanced.php +++ b/workflow/engine/classes/class.ldapAdvanced.php @@ -2817,7 +2817,7 @@ class ldapAdvanced switch ($fieldName) { case 'USR_STATUS': if ($attributeName == 'useraccountcontrol') { - $ldapAttributeValue = (in_array($ldapAttributeValue, array('512', '544', '66048', '66080')))? 'ACTIVE' : 'INACTIVE'; + $ldapAttributeValue = (preg_match('/^(?:' . '512|544|66048|66080' . ')$/', $ldapAttributeValue))? (($arrayUser[$username][$fieldName] == 'VACATION')? 'VACATION' : 'ACTIVE') : 'INACTIVE'; } break; case 'USR_DUE_DATE': @@ -3053,4 +3053,3 @@ class ldapAdvanced } } } - diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index 80a1d6507..ae865ea6a 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -298,7 +298,7 @@ class ListParticipatedLast extends BaseListParticipatedLast $criteria->addSelectColumn(ListParticipatedLastPeer::TAS_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::PRO_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_NUMBER); - $criteria->addSelectColumn(ListParticipatedLastPeer::APP_TITLE); + $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_PRO_TITLE); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS); @@ -341,6 +341,8 @@ class ListParticipatedLast extends BaseListParticipatedLast $criteria->setOffset( $start ); } + $criteria->addJoin(ListParticipatedLastPeer::APP_UID,ApplicationPeer::APP_UID,Criteria::LEFT_JOIN); + $dataset = ListParticipatedLastPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array();