This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-08-15 12:42:55 -04:00
parent 69840eb649
commit 638b5af7bf
3 changed files with 22 additions and 10 deletions

View File

@@ -232,7 +232,6 @@ try {
processWorkspace(); processWorkspace();
break; break;
case 'ldapcron': case 'ldapcron':
require_once(PATH_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.ldapAdvanced.php');
require_once(PATH_HOME . 'engine' . PATH_SEP . 'methods' . PATH_SEP . 'services' . PATH_SEP . 'ldapadvanced.php'); require_once(PATH_HOME . 'engine' . PATH_SEP . 'methods' . PATH_SEP . 'services' . PATH_SEP . 'ldapadvanced.php');
$ldapadvancedClassCron = new ldapadvancedClassCron(); $ldapadvancedClassCron = new ldapadvancedClassCron();

View File

@@ -6,7 +6,8 @@ use ProcessMaker\Core\System;
* Implementing pmDynaform library in the running case. * Implementing pmDynaform library in the running case.
* *
* @package engine.classes * @package engine.classes
*/class PmDynaform */
class PmDynaform
{ {
public static $instance = null; public static $instance = null;

View File

@@ -44,20 +44,29 @@ class EmailServer
foreach ($this->arrayFieldDefinition as $key => $value) { foreach ($this->arrayFieldDefinition as $key => $value) {
$this->arrayFieldNameForException[$value["fieldNameAux"]] = $key; $this->arrayFieldNameForException[$value["fieldNameAux"]] = $key;
} }
} catch (Exception $e) {
//Define the variables for the logging throw $e;
global $RBAC; }
}
/**
* Get the default information from the context.
*
* @global type $RBAC
* @return void
*/
public function getDefaultContextLog()
{
//Define the variables for the logging
global $RBAC;
if ($RBAC !== null) {
$currentUser = $RBAC->aUserInfo['USER_INFO']; $currentUser = $RBAC->aUserInfo['USER_INFO'];
$info = array( $info = array(
'ip' => G::getIpAddress(), 'ip' => G::getIpAddress(),
'workspace' => (defined("SYS_SYS"))? SYS_SYS : "Workspace undefined", 'workspace' => (defined("SYS_SYS")) ? SYS_SYS : "Workspace undefined",
'usrUid' => $currentUser['USR_UID'] 'usrUid' => $currentUser['USR_UID']
); );
$this->setContextLog($info); $this->setContextLog($info);
} catch (Exception $e) {
throw $e;
} }
} }
@@ -818,6 +827,7 @@ class EmailServer
} }
//Logging the create action //Logging the create action
$this->getDefaultContextLog();
$info = array( $info = array(
'action' => 'Create email server', 'action' => 'Create email server',
'messUid'=> $emailServerUid, 'messUid'=> $emailServerUid,
@@ -988,6 +998,7 @@ class EmailServer
} }
//Logging the update action //Logging the update action
$this->getDefaultContextLog();
$info = array( $info = array(
'action' => 'Update email server', 'action' => 'Update email server',
'messUid' => $emailServerUid, 'messUid' => $emailServerUid,
@@ -1049,6 +1060,7 @@ class EmailServer
\EmailServerPeer::doDelete($criteria); \EmailServerPeer::doDelete($criteria);
//Logging the delete action //Logging the delete action
$this->getDefaultContextLog();
$info = array( $info = array(
'action' => 'Delete email server', 'action' => 'Delete email server',
'messUid' => $emailServerUid 'messUid' => $emailServerUid