diff --git a/CRM/Civirules/Action.php b/CRM/Civirules/Action.php
index aa27b8600116ad2bbb5c89e77f7afa58f707446e..e1a202ad9ae8a05536b3fce9acc96048edca9733 100644
--- a/CRM/Civirules/Action.php
+++ b/CRM/Civirules/Action.php
@@ -15,10 +15,10 @@ abstract class CRM_Civirules_Action {
/**
* Process the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*/
- abstract public function processAction(CRM_Civirules_EventData_EventData $eventData);
+ abstract public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData);
/**
* You could override this method to create a delay for your action
diff --git a/CRM/Civirules/BAO/Event.php b/CRM/Civirules/BAO/Event.php
deleted file mode 100755
index becae7f7995c5b73e42fb0d1c3d006089748cc7c..0000000000000000000000000000000000000000
--- a/CRM/Civirules/BAO/Event.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * BAO Event for CiviRule Event
- *
- * @author Erik Hommel (CiviCooP) <erik.hommel@civicoop.org>
- * @license http://www.gnu.org/licenses/agpl-3.0.html
- */
-class CRM_Civirules_BAO_Event extends CRM_Civirules_DAO_Event {
-
- /**
- * Function to get values
- *
- * @return array $result found rows with data
- * @access public
- * @static
- */
- public static function getValues($params) {
- $result = array();
- $event = new CRM_Civirules_BAO_Event();
- if (!empty($params)) {
- $fields = self::fields();
- foreach ($params as $key => $value) {
- if (isset($fields[$key])) {
- $event->$key = $value;
- }
- }
- }
- $event->find();
- while ($event->fetch()) {
- $row = array();
- self::storeValues($event, $row);
- $result[$row['id']] = $row;
- }
- return $result;
- }
-
- /**
- * Function to add or update event
- *
- * @param array $params
- * @return array $result
- * @access public
- * @throws Exception when params is empty
- * @static
- */
- public static function add($params) {
- $result = array();
- if (empty($params)) {
- throw new Exception('Params can not be empty when adding or updating a civirule event');
- }
- $event = new CRM_Civirules_BAO_Event();
- $fields = self::fields();
- foreach ($params as $key => $value) {
- if (isset($fields[$key])) {
- $event->$key = $value;
- }
- }
- if (!isset($event->name) || empty($event->name)) {
- $event->name = CRM_Civirules_Utils::buildNameFromLabel($event->label);
- }
- $event->save();
- self::storeValues($event, $result);
- return $result;
- }
-
- /**
- * Function to delete an event with id
- *
- * @param int $eventId
- * @throws Exception when eventId is empty
- * @access public
- * @static
- */
- public static function deleteWithId($eventId) {
- if (empty($eventId)) {
- throw new Exception('event id can not be empty when attempting to delete a civirule event');
- }
- $event = new CRM_Civirules_BAO_Event();
- $event->id = $eventId;
- $event->delete();
- return;
- }
-
- /**
- * Function to disable an event
- *
- * @param int $eventId
- * @throws Exception when eventId is empty
- * @access public
- * @static
- */
- public static function disable($eventId) {
- if (empty($eventId)) {
- throw new Exception('event id can not be empty when attempting to disable a civirule event');
- }
- $event = new CRM_Civirules_BAO_Event();
- $event->id = $eventId;
- $event->find(true);
- self::add(array('id' => $event->id, 'is_active' => 0));
- }
-
- /**
- * Function to enable an event
- *
- * @param int $eventId
- * @throws Exception when eventId is empty
- * @access public
- * @static
- */
- public static function enable($eventId) {
- if (empty($eventId)) {
- throw new Exception('event id can not be empty when attempting to enable a civirule event');
- }
- $event = new CRM_Civirules_BAO_Event();
- $event->id = $eventId;
- $event->find(true);
- self::add(array('id' => $event->id, 'is_active' => 1));
- }
-
- /**
- * Function to retrieve the label of an event with eventId
- *
- * @param int $eventId
- * @return string $event->label
- * @access public
- * @static
- */
- public static function getEventLabelWithId($eventId) {
- if (empty($eventId)) {
- return '';
- }
- $event = new CRM_Civirules_BAO_Event();
- $event->id = $eventId;
- $event->find(true);
- return $event->label;
- }
-
- /**
- * Get the event class based on class name or on objectName
- *
- * @param $className
- * @param bool $abort
- * @return CRM_Civirules_Event
- * @throws Exception if abort is set to true and class does not exist or is not valid
- */
- public static function getPostEventObjectByClassName($className, $abort=true) {
- if (empty($className)) {
- $className = 'CRM_Civirules_Event_Post';
- }
- return self::getEventObjectByClassName($className, $abort);
- }
-
- /**
- * Get the event class for this event
- *
- * @param $className
- * @param bool $abort if true this function will throw an exception if class could not be instanciated
- * @return CRM_Civirules_Event
- * @throws Exception if abort is set to true and class does not exist or is not valid
- */
- public static function getEventObjectByClassName($className, $abort=true)
- {
- if (!class_exists($className)) {
- if ($abort) {
-
- throw new Exception('CiviRule event class "' . $className . '" does not exist');
- }
- return false;
- }
-
- $object = new $className();
- if (!$object instanceof CRM_Civirules_Event) {
- if ($abort) {
- throw new Exception('CiviRule event class "' . $className . '" is not a subclass of CRM_Civirules_Event');
- }
- return false;
- }
- return $object;
- }
-
- public static function getEventObjectByEventId($event_id, $abort=true) {
- $sql = "SELECT e.*
- FROM `civirule_event` e
- WHERE e.`is_active` = 1 AND e.id = %1";
-
- $params[1] = array($event_id, 'Integer');
- $dao = CRM_Core_DAO::executeQuery($sql, $params);
- if ($dao->fetch()) {
- if (!empty($dao->object_name) && !empty($dao->op) && empty($dao->cron)) {
- return self::getPostEventObjectByClassName($dao->class_name, $abort);
- } elseif (!empty($dao->class_name)) {
- return self::getEventObjectByClassName($dao->class_name, $abort);
- }
- }
-
- if ($abort) {
- throw new Exception('Could not find event with ID: '.$event_id);
- }
- }
-
- /*
- * Function to check if an event exists with class_name or object_name/op
- *
- * @param array $params
- * @return bool
- * @access public
- * @static
- */
- public static function eventExists($params) {
- if (isset($params['class_name']) && !empty($params['class_name'])) {
- $checkParams['class_name'] = $params['class_name'];
- } else {
- if (isset($params['object_name']) && isset($params['op']) && !empty($params['object_name']) && !empty($params['op'])) {
- $checkParams['object_name'] = $params['object_name'];
- $checkParams['op'] = $params['op'];
- }
- }
- if (!empty($checkParams)) {
- $foundEvents = self::getValues($checkParams);
- if (!empty($foundEvents)) {
- return TRUE;
- }
- }
- return FALSE;
- }
-}
\ No newline at end of file
diff --git a/CRM/Civirules/BAO/Rule.php b/CRM/Civirules/BAO/Rule.php
index 8b93661e85bbf6c93b74ba2c55441f34602830ca..4adeb6a275e4e6a6a4af0a7e08cd0b9683de00c7 100755
--- a/CRM/Civirules/BAO/Rule.php
+++ b/CRM/Civirules/BAO/Rule.php
@@ -157,59 +157,59 @@ class CRM_Civirules_BAO_Rule extends CRM_Civirules_DAO_Rule {
}
/**
- * Returns an array with rules which should be triggered imeditaly
+ * Returns an array with rules which should be triggered immediately
*
- * @param $objectName ObjectName in the Post hook
- * @param $op op in the Post hook
+ * @param string $objectName ObjectName in the Post hook
+ * @param string $op op in the Post hook
* @return array
*/
public static function findRulesByObjectNameAndOp($objectName, $op)
{
- $events = array();
- $sql = "SELECT r.id AS rule_id, e.id AS event_id, e.class_name, r.event_params
+ $triggers = array();
+ $sql = "SELECT r.id AS rule_id, t.id AS trigger_id, t.class_name, r.trigger_params
FROM `civirule_rule` r
- INNER JOIN `civirule_event` e ON r.event_id = e.id AND e.is_active = 1
- WHERE r.`is_active` = 1 AND e.cron = 0 AND e.object_name = %1 AND e.op = %2";
+ INNER JOIN `civirule_trigger` t ON r.trigger_id = t.id AND t.is_active = 1
+ WHERE r.`is_active` = 1 AND t.cron = 0 AND t.object_name = %1 AND t.op = %2";
$params[1] = array($objectName, 'String');
$params[2] = array($op, 'String');
$dao = CRM_Core_DAO::executeQuery($sql, $params);
while ($dao->fetch()) {
- $eventObject = CRM_Civirules_BAO_Event::getPostEventObjectByClassName($dao->class_name, false);
- if ($eventObject !== false) {
- $eventObject->setEventId($dao->event_id);
- $eventObject->setRuleId($dao->rule_id);
- $eventObject->setEventParams($dao->event_params);
- $events[] = $eventObject;
+ $triggerObject = CRM_Civirules_BAO_Trigger::getPostTriggerObjectByClassName($dao->class_name, false);
+ if ($triggerObject !== false) {
+ $triggerObject->setTriggerId($dao->trigger_id);
+ $triggerObject->setRuleId($dao->rule_id);
+ $triggerObject->setTriggerParams($dao->trigger_params);
+ $triggers[] = $triggerObject;
}
}
- return $events;
+ return $triggers;
}
/**
- * Returns an array with cron events which should be triggered in the cron
+ * Returns an array with cron triggers which should be triggered in the cron
*
* @return array
*/
public static function findRulesForCron()
{
- $cronEvents = array();
- $sql = "SELECT r.id AS rule_id, e.id AS event_id, e.class_name, r.event_params
+ $cronTriggers = array();
+ $sql = "SELECT r.id AS rule_id, t.id AS trigger_id, t.class_name, r.trigger_params
FROM `civirule_rule` r
- INNER JOIN `civirule_event` e ON r.event_id = e.id AND e.is_active = 1
- WHERE r.`is_active` = 1 AND e.cron = 1";
+ INNER JOIN `civirule_trigger` t ON r.trigger_id = t.id AND t.is_active = 1
+ WHERE r.`is_active` = 1 AND t.cron = 1";
$dao = CRM_Core_DAO::executeQuery($sql);
while ($dao->fetch()) {
- $cronEventObject = CRM_Civirules_BAO_Event::getEventObjectByClassName($dao->class_name, false);
- if ($cronEventObject !== false) {
- $cronEventObject->setEventId($dao->event_id);
- $cronEventObject->setRuleId($dao->rule_id);
- $cronEventObject->setEventParams($dao->event_params);
- $cronEvents[] = $cronEventObject;
+ $cronTriggerObject = CRM_Civirules_BAO_Trigger::getTriggerObjectByClassName($dao->class_name, false);
+ if ($cronTriggerObject !== false) {
+ $cronTriggerObject->setTriggerId($dao->trigger_id);
+ $cronTriggerObject->setRuleId($dao->rule_id);
+ $cronTriggerObject->setTriggerParams($dao->trigger_params);
+ $cronTriggers[] = $cronTriggerObject;
}
}
- return $cronEvents;
+ return $cronTriggers;
}
/*
diff --git a/CRM/Civirules/BAO/Trigger.php b/CRM/Civirules/BAO/Trigger.php
new file mode 100755
index 0000000000000000000000000000000000000000..f2d6ef30409e98a591bc1282e56abff3c4f3239e
--- /dev/null
+++ b/CRM/Civirules/BAO/Trigger.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * BAO Trigger for CiviRule Trigger
+ *
+ * @author Erik Hommel (CiviCooP) <erik.hommel@civicoop.org>
+ * @license http://www.gnu.org/licenses/agpl-3.0.html
+ */
+class CRM_Civirules_BAO_Trigger extends CRM_Civirules_DAO_Trigger {
+
+ /**
+ * Function to get values
+ *
+ * @return array $result found rows with data
+ * @access public
+ * @static
+ */
+ public static function getValues($params) {
+ $result = array();
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ if (!empty($params)) {
+ $fields = self::fields();
+ foreach ($params as $key => $value) {
+ if (isset($fields[$key])) {
+ $trigger->$key = $value;
+ }
+ }
+ }
+ $trigger->find();
+ while ($trigger->fetch()) {
+ $row = array();
+ self::storeValues($trigger, $row);
+ $result[$row['id']] = $row;
+ }
+ return $result;
+ }
+
+ /**
+ * Function to add or update trigger
+ *
+ * @param array $params
+ * @return array $result
+ * @access public
+ * @throws Exception when params is empty
+ * @static
+ */
+ public static function add($params) {
+ $result = array();
+ if (empty($params)) {
+ throw new Exception('Params can not be empty when adding or updating a civirule trigger');
+ }
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ $fields = self::fields();
+ foreach ($params as $key => $value) {
+ if (isset($fields[$key])) {
+ $trigger->$key = $value;
+ }
+ }
+ if (!isset($trigger->name) || empty($trigger->name)) {
+ $trigger->name = CRM_Civirules_Utils::buildNameFromLabel($trigger->label);
+ }
+ $trigger->save();
+ self::storeValues($trigger, $result);
+ return $result;
+ }
+
+ /**
+ * Function to delete a trigger with id
+ *
+ * @param int $triggerId
+ * @throws Exception when triggerId is empty
+ * @access public
+ * @static
+ */
+ public static function deleteWithId($triggerId) {
+ if (empty($triggerId)) {
+ throw new Exception('trigger id can not be empty when attempting to delete a civirule trigger');
+ }
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ $trigger->id = $trigger;
+ $trigger->delete();
+ return;
+ }
+
+ /**
+ * Function to disable a trigger
+ *
+ * @param int $triggerId
+ * @throws Exception when triggerId is empty
+ * @access public
+ * @static
+ */
+ public static function disable($triggerId) {
+ if (empty($triggerId)) {
+ throw new Exception('trigger id can not be empty when attempting to disable a civirule trigger');
+ }
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ $trigger->id = $triggerId;
+ $trigger->find(true);
+ self::add(array('id' => $trigger->id, 'is_active' => 0));
+ }
+
+ /**
+ * Function to enable a trigger
+ *
+ * @param int $triggerId
+ * @throws Exception when triggerId is empty
+ * @access public
+ * @static
+ */
+ public static function enable($triggerId) {
+ if (empty($triggerId)) {
+ throw new Exception('trigger id can not be empty when attempting to enable a civirule trigger');
+ }
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ $trigger->id = $triggerId;
+ $trigger->find(true);
+ self::add(array('id' => $trigger->id, 'is_active' => 1));
+ }
+
+ /**
+ * Function to retrieve the label of an eva triggerent with triggerId
+ *
+ * @param int $triggerId
+ * @return string $trigger->label
+ * @access public
+ * @static
+ */
+ public static function getTriggerLabelWithId($triggerId) {
+ if (empty($triggerId)) {
+ return '';
+ }
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ $trigger->id = $triggerId;
+ $trigger->find(true);
+ return $trigger->label;
+ }
+
+ /**
+ * Get the trigger class based on class name or on objectName
+ *
+ * @param $className
+ * @param bool $abort
+ * @return CRM_Civirules_Trigger
+ * @throws Exception if abort is set to true and class does not exist or is not valid
+ */
+ public static function getPostTriggerObjectByClassName($className, $abort=true) {
+ if (empty($className)) {
+ $className = 'CRM_Civirules_Trigger_Post';
+ }
+ return self::getTriggerObjectByClassName($className, $abort);
+ }
+
+ /**
+ * Get the trigger class for this trigger
+ *
+ * @param $className
+ * @param bool $abort if true this function will throw an exception if class could not be instantiated
+ * @return CRM_Civirules_Trigger
+ * @throws Exception if abort is set to true and class does not exist or is not valid
+ */
+ public static function getTriggerObjectByClassName($className, $abort=true)
+ {
+ if (!class_exists($className)) {
+ if ($abort) {
+
+ throw new Exception('CiviRule trigger class "' . $className . '" does not exist');
+ }
+ return false;
+ }
+
+ $object = new $className();
+ if (!$object instanceof CRM_Civirules_Trigger) {
+ if ($abort) {
+ throw new Exception('CiviRule trigger class "' . $className . '" is not a subclass of CRM_Civirules_Trigger');
+ }
+ return false;
+ }
+ return $object;
+ }
+
+ public static function getTriggerObjectByTriggerId($triggerId, $abort=true) {
+ $sql = "SELECT t.*
+ FROM `civirule_trigger` t
+ WHERE t.`is_active` = 1 AND t.id = %1";
+
+ $params[1] = array($triggerId, 'Integer');
+ $dao = CRM_Core_DAO::executeQuery($sql, $params);
+ if ($dao->fetch()) {
+ if (!empty($dao->object_name) && !empty($dao->op) && empty($dao->cron)) {
+ return self::getPostTriggerObjectByClassName($dao->class_name, $abort);
+ } elseif (!empty($dao->class_name)) {
+ return self::getTriggerObjectByClassName($dao->class_name, $abort);
+ }
+ }
+
+ if ($abort) {
+ throw new Exception('Could not find trigger with ID: '.$triggerId);
+ }
+ }
+
+ /**
+ * Method to check if a trigger exists with class_name or object_name/op
+ *
+ * @param array $params
+ * @return bool
+ * @access public
+ * @static
+ */
+ public static function triggerExists($params) {
+ if (isset($params['class_name']) && !empty($params['class_name'])) {
+ $checkParams['class_name'] = $params['class_name'];
+ } else {
+ if (isset($params['object_name']) && isset($params['op']) && !empty($params['object_name']) && !empty($params['op'])) {
+ $checkParams['object_name'] = $params['object_name'];
+ $checkParams['op'] = $params['op'];
+ }
+ }
+ if (!empty($checkParams)) {
+ $foundTriggers = self::getValues($checkParams);
+ if (!empty($foundTriggers)) {
+ return TRUE;
+ }
+ }
+ return FALSE;
+ }
+}
\ No newline at end of file
diff --git a/CRM/Civirules/Condition.php b/CRM/Civirules/Condition.php
index 0ae377a1334e6f676f7288adabecbaed1e3faff2..6bb628d48d604ac61ba770ee47e967a916e3f179 100644
--- a/CRM/Civirules/Condition.php
+++ b/CRM/Civirules/Condition.php
@@ -26,12 +26,12 @@ abstract class CRM_Civirules_Condition {
/**
* This method returns true or false when an condition is valid or not
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
* @abstract
*/
- public abstract function isConditionValid(CRM_Civirules_EventData_EventData $eventData);
+ public abstract function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData);
/**
* Returns a redirect url to extra data input from the user after adding a condition
diff --git a/CRM/Civirules/Config.php b/CRM/Civirules/Config.php
index f894c138e95994e057230008bef11e7473cec6c3..0ebcc3f18c2630d38c7279662a9a50b1176bb17a 100644
--- a/CRM/Civirules/Config.php
+++ b/CRM/Civirules/Config.php
@@ -12,17 +12,17 @@ class CRM_Civirules_Config
*/
static private $_singleton = NULL;
/*
- * properties to hold the valid entities and actions for civirule event
+ * properties to hold the valid entities and actions for civirule trigger
*/
- protected $validEventObjectNames = NULL;
- protected $validEventOperations = NULL;
+ protected $validTriggerObjectNames = NULL;
+ protected $validTriggerOperations = NULL;
/**
* Constructor
*/
function __construct()
{
- $this->setEventProperties();
+ $this->setTriggerProperties();
}
/**
@@ -41,35 +41,35 @@ class CRM_Civirules_Config
}
/**
- * Function to get the valid event entities
+ * Function to get the valid trigger entities
*
* @return int
* @access public
*/
- public function getValidEventObjectNames()
+ public function getValidTriggerObjectNames()
{
- return $this->validEventObjectNames;
+ return $this->validTriggerObjectNames;
}
/**
- * Function to get the valid event actions
+ * Function to get the valid trigger actions
*
* @return int
* @access public
*/
- public function getValidEventOperations()
+ public function getValidTriggerOperations()
{
- return $this->validEventOperations;
+ return $this->validTriggerOperations;
}
- protected function setEventProperties() {
- $this->validEventOperations = array(
+ protected function setTriggerProperties() {
+ $this->validTriggerOperations = array(
'create',
'edit',
'delete',
'restore',
'trash');
- $this->validEventObjectNames = array(
+ $this->validTriggerObjectNames = array(
'Activity',
'Address',
'Case',
diff --git a/CRM/Civirules/DAO/Rule.php b/CRM/Civirules/DAO/Rule.php
index 19d30cb9b312b99da50e797dfe1c7e59d84e41df..077b36efaa47a1fcdd98abeca57aafa8623fba41 100755
--- a/CRM/Civirules/DAO/Rule.php
+++ b/CRM/Civirules/DAO/Rule.php
@@ -44,12 +44,12 @@ class CRM_Civirules_DAO_Rule extends CRM_Core_DAO {
'type' => CRM_Utils_Type::T_STRING,
'maxlength' => 128,
),
- 'event_id' => array(
- 'name' => 'event_id',
+ 'trigger_id' => array(
+ 'name' => 'trigger_id',
'type' => CRM_Utils_Type::T_INT,
),
- 'event_params' => array(
- 'name' => 'event_params',
+ 'trigger_params' => array(
+ 'name' => 'trigger_params',
'type' => CRM_Utils_Type::T_TEXT
),
'is_active' => array(
@@ -89,8 +89,8 @@ class CRM_Civirules_DAO_Rule extends CRM_Core_DAO {
'id' => 'id',
'name' => 'name',
'label' => 'label',
- 'event_id' => 'event_id',
- 'event_params' => 'event_params',
+ 'trigger_id' => 'trigger_id',
+ 'trigger_params' => 'trigger_params',
'is_active' => 'is_active',
'created_date' => 'created_date',
'created_user_id' => 'created_user_id',
diff --git a/CRM/Civirules/DAO/Event.php b/CRM/Civirules/DAO/Trigger.php
similarity index 96%
rename from CRM/Civirules/DAO/Event.php
rename to CRM/Civirules/DAO/Trigger.php
index 3ee796511305e126a78e6c1beb938b12b189ccda..b973e253f201fbb9aa78c9bc933614febdc9cfa4 100755
--- a/CRM/Civirules/DAO/Event.php
+++ b/CRM/Civirules/DAO/Trigger.php
@@ -1,11 +1,11 @@
<?php
/**
- * DAO Event for table civirule_event
+ * DAO Trigger for table civirule_trigger
*
* @author Erik Hommel (CiviCooP) <erik.hommel@civicoop.org>
* @license http://www.gnu.org/licenses/agpl-3.0.html
*/
-class CRM_Civirules_DAO_Event extends CRM_Core_DAO {
+class CRM_Civirules_DAO_Trigger extends CRM_Core_DAO {
/**
* static instance to hold the field values
*
@@ -18,7 +18,7 @@ class CRM_Civirules_DAO_Event extends CRM_Core_DAO {
* empty definition for virtual function
*/
static function getTableName() {
- return 'civirule_event';
+ return 'civirule_trigger';
}
/**
* returns all the column names of this table
diff --git a/CRM/Civirules/Engine.php b/CRM/Civirules/Engine.php
index cf539a5e4ac030b1b5165e2e0d7585508e523174..6f22b49e64fe612aad8b2c0afcc47817284da481 100644
--- a/CRM/Civirules/Engine.php
+++ b/CRM/Civirules/Engine.php
@@ -15,20 +15,20 @@ class CRM_Civirules_Engine {
*
* The trigger will check the conditions and if conditions are valid then the actions are executed
*
- * @param CRM_Civirules_Event $event
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_Trigger $trigger
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool true when conditions are valid; false when conditions are not valid
* @access public
* @static
*/
- public static function triggerRule(CRM_Civirules_Event $event, CRM_Civirules_EventData_EventData $eventData) {
+ public static function triggerRule(CRM_Civirules_Trigger $trigger, CRM_Civirules_TriggerData_TriggerData $triggerData) {
try {
- $eventData->setEvent($event);
- $isRuleValid = self::areConditionsValid($eventData);
+ $triggerData->setTrigger($trigger);
+ $isRuleValid = self::areConditionsValid($triggerData);
if ($isRuleValid) {
- self::logRule($eventData);
- self::executeActions($eventData);
+ self::logRule($triggerData);
+ self::executeActions($triggerData);
return true;
}
} catch (Exception $e) {
@@ -37,7 +37,7 @@ class CRM_Civirules_Engine {
$context['line'] = $e->getLine();
$context['file'] = $e->getFile();
$context['exception_message'] = $e->getMessage();
- CRM_Civirules_Utils_LoggerFactory::logError("Failed to execute rule", $message, $eventData, $context);
+ CRM_Civirules_Utils_LoggerFactory::logError("Failed to execute rule", $message, $triggerData, $context);
}
return false;
}
@@ -45,29 +45,29 @@ class CRM_Civirules_Engine {
/**
* Method to execute the actions
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @access protected
* @static
*/
- protected static function executeActions(CRM_Civirules_EventData_EventData $eventData) {
+ protected static function executeActions(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$actionParams = array(
- 'rule_id' => $eventData->getEvent()->getRuleId(),
+ 'rule_id' => $triggerData->getTrigger()->getRuleId(),
);
$ruleActions = CRM_Civirules_BAO_RuleAction::getValues($actionParams);
foreach ($ruleActions as $ruleAction) {
- self::executeAction($eventData, $ruleAction);
+ self::executeAction($triggerData, $ruleAction);
}
}
/**
* Method to execute a single action
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @param array $ruleAction
* @access protected
* @static
*/
- protected static function executeAction(CRM_Civirules_EventData_EventData $eventData, $ruleAction) {
+ protected static function executeAction(CRM_Civirules_TriggerData_TriggerData $triggerData, $ruleAction) {
$object = CRM_Civirules_BAO_Action::getActionObjectById($ruleAction['action_id'], true);
if (!$object) {
return;
@@ -78,10 +78,10 @@ class CRM_Civirules_Engine {
//determine if the action should be executed with a delay
$delay = self::getActionDelay($ruleAction, $object);
if ($delay instanceof DateTime) {
- self::delayAction($delay, $object, $eventData);
+ self::delayAction($delay, $object, $triggerData);
} else {
//there is no delay so process action immediatly
- $object->processAction($eventData);
+ $object->processAction($triggerData);
}
}
@@ -125,14 +125,14 @@ class CRM_Civirules_Engine {
*
* @param \CRM_Queue_TaskContext $ctx
* @param \CRM_Civirules_Action $action
- * @param \CRM_Civirules_EventData_EventData $eventData
+ * @param \CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
*/
- public static function executeDelayedAction(CRM_Queue_TaskContext $ctx, CRM_Civirules_Action $action, CRM_Civirules_EventData_EventData $eventData) {
+ public static function executeDelayedAction(CRM_Queue_TaskContext $ctx, CRM_Civirules_Action $action, CRM_Civirules_TriggerData_TriggerData $triggerData) {
try {
- $action->processAction($eventData);
+ $action->processAction($triggerData);
} catch (Exception $e) {
- CRM_Civirules_Utils_LoggerFactory::logError("Failed to execute delayed action", $e->getMessage(), $eventData);
+ CRM_Civirules_Utils_LoggerFactory::logError("Failed to execute delayed action", $e->getMessage(), $triggerData);
}
return true;
}
@@ -142,9 +142,9 @@ class CRM_Civirules_Engine {
*
* @param \DateTime $delayTo
* @param \CRM_Civirules_Action $action
- * @param \CRM_Civirules_EventData_EventData $eventData
+ * @param \CRM_Civirules_TriggerData_TriggerData $triggerData
*/
- protected static function delayAction(DateTime $delayTo, CRM_Civirules_Action $action, CRM_Civirules_EventData_EventData $eventData) {
+ protected static function delayAction(DateTime $delayTo, CRM_Civirules_Action $action, CRM_Civirules_TriggerData_TriggerData $triggerData) {
$queue = CRM_Queue_Service::singleton()->create(array(
'type' => 'Civirules',
'name' => self::QUEUE_NAME,
@@ -154,7 +154,7 @@ class CRM_Civirules_Engine {
//create a task with the action and eventData as parameters
$task = new CRM_Queue_Task(
array('CRM_Civirules_Engine', 'executeDelayedAction'), //call back method
- array($action, $eventData) //parameters
+ array($action, $triggerData) //parameters
);
//save the task with a delay
@@ -171,7 +171,7 @@ class CRM_Civirules_Engine {
* Returns false when action could not be delayed or return a DateTime
* This DateTime object holds the date and time till when the action should be delayed
*
- * The delay is calculated by a seperate delay class. See CRM_Civirules_DelayDelay
+ * The delay is calculated by a separate delay class. See CRM_Civirules_DelayDelay
*
* @param $ruleAction
* @param CRM_Civirules_Action $actionObject
@@ -202,21 +202,21 @@ class CRM_Civirules_Engine {
/**
* Method to check if all conditions are valid
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access protected
* @static
*/
- protected static function areConditionsValid(CRM_Civirules_EventData_EventData $eventData) {
+ protected static function areConditionsValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isValid = true;
$firstCondition = true;
$conditionParams = array(
- 'rule_id' => $eventData->getEvent()->getRuleId(),
+ 'rule_id' => $triggerData->getTrigger()->getRuleId(),
);
$ruleConditions = CRM_Civirules_BAO_RuleCondition::getValues($conditionParams);
foreach ($ruleConditions as $ruleConditionId => $ruleCondition) {
- $isConditionValid = self::checkCondition($ruleCondition, $eventData);
+ $isConditionValid = self::checkCondition($ruleCondition, $triggerData);
if ($firstCondition) {
$isValid = $isConditionValid ? true : false;
$firstCondition = false;
@@ -243,33 +243,37 @@ class CRM_Civirules_Engine {
* Method to check condition
*
* @param array $ruleCondition
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access protected
* @static
*/
- protected static function checkCondition($ruleCondition, CRM_Civirules_EventData_EventData $eventData) {
+ protected static function checkCondition($ruleCondition, CRM_Civirules_TriggerData_TriggerData $triggerData) {
$condition = CRM_Civirules_BAO_Condition::getConditionObjectById($ruleCondition['condition_id'], false);
if (!$condition) {
return false;
}
$condition->setRuleConditionData($ruleCondition);
- $isValid = $condition->isConditionValid($eventData);
+ $isValid = $condition->isConditionValid($triggerData);
return $isValid;
}
/**
- * This function writes a record to the log table to indicate that this rule for this event is triggered
+ * This function writes a record to the log table to indicate that this rule for this trigger is triggered
*
+<<<<<<< HEAD
* The data this function stores is required by the cron type events.
* @todo: think of a better handling for cron type events
*
* @param CRM_Civirules_EventData_EventData $eventData
+=======
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
+>>>>>>> origin/event_to_trigger
*/
- protected static function logRule(CRM_Civirules_EventData_EventData $eventData) {
+ protected static function logRule(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$sql = "INSERT INTO `civirule_rule_log` (`rule_id`, `contact_id`, `log_date`) VALUES (%1, %2, NOW())";
- $params[1] = array($eventData->getEvent()->getRuleId(), 'Integer');
- $params[2] = array($eventData->getContactId(), 'Integer');
+ $params[1] = array($triggerData->getTrigger()->getRuleId(), 'Integer');
+ $params[2] = array($triggerData->getContactId(), 'Integer');
CRM_Core_DAO::executeQuery($sql, $params);
}
diff --git a/CRM/Civirules/Event/Cron.php b/CRM/Civirules/Event/Cron.php
deleted file mode 100644
index c8dd2f905c77fa9150b47a13b701c99585e8ae43..0000000000000000000000000000000000000000
--- a/CRM/Civirules/Event/Cron.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-abstract class CRM_Civirules_Event_Cron extends CRM_Civirules_Event {
-
- /**
- * This function returns a CRM_Civirules_EventData_EventData this entity is used for triggering the rule
- *
- * Return false when no next entity is available
- *
- * @return CRM_Civirules_EventData_EventData|false
- */
- abstract protected function getNextEntityEventData();
-
- /**
- * @return int
- */
- public function process() {
- $count = 0;
- $isValidCount = 0;
- while($eventData = $this->getNextEntityEventData()) {
- $isValid = CRM_Civirules_Engine::triggerRule($this, $eventData);
- if ($isValid) {
- $isValidCount++;
- }
- $count ++;
- }
- return array(
- 'count' => $count,
- 'is_valid_count' => $isValidCount,
- );
- }
-
-
-}
\ No newline at end of file
diff --git a/CRM/Civirules/Form/Rule.php b/CRM/Civirules/Form/Rule.php
index af58b548b77706f0bb11e3d2a1f96abefd02dd11..665aafc1da6ebf4871b7aeacd544a986300ed335 100755
--- a/CRM/Civirules/Form/Rule.php
+++ b/CRM/Civirules/Form/Rule.php
@@ -15,14 +15,14 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
protected $rule;
- protected $event;
+ protected $trigger;
protected $postRuleBlock = '';
/**
- * @var CRM_Civirules_Event
+ * @var CRM_Civirules_Trigger
*/
- protected $eventClass;
+ protected $triggerClass;
/**
* Function to buildQuickForm (extends parent function)
@@ -66,29 +66,29 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
$this->ruleId = CRM_Utils_Request::retrieve('id', 'Integer');
$this->rule = new CRM_Civirules_BAO_Rule();
- $this->event = new CRM_Civirules_BAO_Event();
+ $this->trigger = new CRM_Civirules_BAO_Trigger();
- $this->assign('event_edit_params', false);
- $this->eventClass = false;
+ $this->assign('trigger_edit_params', false);
+ $this->triggerClass = false;
if (!empty($this->ruleId)) {
$this->rule->id = $this->ruleId;
if (!$this->rule->find(TRUE)) {
throw new Exception('Civirules could not find rule');
}
- $this->event->id = $this->rule->event_id;
- if (!$this->event->find(TRUE)) {
- throw new Exception('Civirules could not find event');
+ $this->trigger->id = $this->rule->trigger_id;
+ if (!$this->trigger->find(TRUE)) {
+ throw new Exception('Civirules could not find trigger');
}
- $this->eventClass = CRM_Civirules_BAO_Event::getEventObjectByEventId($this->event->id, TRUE);
- $this->eventClass->setEventId($this->event->id);
- $this->eventClass->setRuleId($this->rule->id);
- $this->eventClass->setEventParams($this->rule->event_params);
+ $this->triggerClass = CRM_Civirules_BAO_Trigger::getTriggerObjectByTriggerId($this->trigger->id, TRUE);
+ $this->triggerClass->setTriggerId($this->trigger->id);
+ $this->triggerClass->setRuleId($this->rule->id);
+ $this->triggerClass->setTriggerParams($this->rule->trigger_params);
- $this->assign('event_edit_params', $this->eventClass->getExtraDataInputUrl($this->ruleId));
+ $this->assign('trigger_edit_params', $this->triggerClass->getExtraDataInputUrl($this->ruleId));
}
- $this->assign('eventClass', $this->eventClass);
+ $this->assign('triggerClass', $this->triggerClass);
$ruleConditionAddUrl = CRM_Utils_System::url('civicrm/civirule/form/rule_condition', 'reset=1&action=add&rid='.$this->ruleId, TRUE);
$ruleActionAddUrl = CRM_Utils_System::url('civicrm/civirule/form/rule_action', 'reset=1&action=add&rid='.$this->ruleId, TRUE);
@@ -127,8 +127,8 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
}
$this->saveRule($this->_submitValues, $userId);
- $this->saveRuleEvent($this->_submitValues);
- $session->setStatus('Rule with linked Event saved succesfully', 'CiviRule saved', 'success');
+ $this->saveRuleTrigger($this->_submitValues);
+ $session->setStatus('Rule with linked Trigger saved succesfully', 'CiviRule saved', 'success');
/*
* if add mode, set user context to form in edit mode to add conditions and actions
*/
@@ -137,8 +137,8 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
$session->pushUserContext($editUrl);
}
- if (isset($this->_submitValues['rule_event_select'])) {
- $redirectUrl = $this->getEventRedirect($this->_submitValues['rule_event_select']);
+ if (isset($this->_submitValues['rule_trigger_select'])) {
+ $redirectUrl = $this->getTriggerRedirect($this->_submitValues['rule_trigger_select']);
if ($redirectUrl) {
CRM_Utils_System::redirect($redirectUrl);
}
@@ -180,20 +180,20 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
));
}
if ($this->_action == CRM_Core_Action::ADD) {
- $this->addFormRule(array('CRM_Civirules_Form_Rule', 'validateEventEmpty'));
+ $this->addFormRule(array('CRM_Civirules_Form_Rule', 'validateTriggerEmpty'));
}
}
/**
- * Function to validate that event is not empty in add mode
+ * Function to validate that trigger is not empty in add mode
*
* @param array $fields
* @return array|bool
* @access static
*/
- static function validateEventEmpty($fields) {
- if (empty($fields['rule_event_select'])) {
- $errors['rule_event_select'] = ts('You have to select an event for the rule');
+ static function validateTriggerEmpty($fields) {
+ if (empty($fields['rule_trigger_select'])) {
+ $errors['rule_trigger_select'] = ts('You have to select a trigger for the rule');
return $errors;
}
return TRUE;
@@ -242,9 +242,9 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
$this->add('checkbox', 'rule_is_active', ts('Enabled'));
$this->add('text', 'rule_created_date', ts('Created Date'));
$this->add('text', 'rule_created_contact', ts('Created By'));
- $eventList = array(' - select - ') + CRM_Civirules_Utils::buildEventList();
- asort($eventList);
- $this->add('select', 'rule_event_select', ts('Select Event'), $eventList);
+ $triggerList = array(' - select - ') + CRM_Civirules_Utils::buildTriggerList();
+ asort($triggerList);
+ $this->add('select', 'rule_trigger_select', ts('Select Trigger'), $triggerList);
if ($this->_action == CRM_Core_Action::UPDATE) {
$this->createUpdateFormElements();
}
@@ -268,7 +268,7 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
* Function to add the form elements specific for the update action
*/
protected function createUpdateFormElements() {
- $this->add('text', 'rule_event_label', '', array('size' => CRM_Utils_Type::HUGE));
+ $this->add('text', 'rule_trigger_label', '', array('size' => CRM_Utils_Type::HUGE));
$this->assign('ruleConditions', $this->getRuleConditions());
$this->assign('ruleActions', $this->getRuleActions());
}
@@ -311,8 +311,8 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
strtotime($ruleData[$this->ruleId]['created_date']));
$defaults['rule_created_contact'] = CRM_Civirules_Utils::
getContactName($ruleData[$this->ruleId]['created_user_id']);
- if (!empty($ruleData[$this->ruleId]['event_id'])) {
- $defaults['rule_event_label'] = CRM_Civirules_BAO_Event::getEventLabelWithId($ruleData[$this->ruleId]['event_id']);
+ if (!empty($ruleData[$this->ruleId]['trigger_id'])) {
+ $defaults['rule_trigger_label'] = CRM_Civirules_BAO_Trigger::getTriggerLabelWithId($ruleData[$this->ruleId]['trigger_id']);
}
}
}
@@ -440,15 +440,15 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
}
/**
- * Function to link an event to a rule
+ * Function to link a trigger to a rule
*
* @param array $formValues
*/
- protected function saveRuleEvent($formValues) {
- if (isset($formValues['rule_event_select'])) {
+ protected function saveRuleTrigger($formValues) {
+ if (isset($formValues['rule_trigger_select'])) {
$ruleParams = array(
'id' => $this->ruleId,
- 'event_id' => $formValues['rule_event_select']
+ 'trigger_id' => $formValues['rule_trigger_select']
);
CRM_Civirules_BAO_Rule::add($ruleParams);
}
@@ -457,12 +457,12 @@ class CRM_Civirules_Form_Rule extends CRM_Core_Form {
/**
* Returns the url for redirect
*
- * @param $event_id
+ * @param $triggerId
* @return bool|string url
*/
- protected function getEventRedirect($event_id) {
- $event = CRM_Civirules_BAO_Event::getEventObjectByEventId($event_id, true);
- $redirectUrl = $event->getExtraDataInputUrl($this->ruleId);
+ protected function getTriggerRedirect($triggerId) {
+ $trigger = CRM_Civirules_BAO_Trigger::getTriggerObjectByTriggerId($triggerId, true);
+ $redirectUrl = $trigger->getExtraDataInputUrl($this->ruleId);
if (!empty($redirectUrl)) {
return $redirectUrl;
}
diff --git a/CRM/Civirules/Form/RuleCondition.php b/CRM/Civirules/Form/RuleCondition.php
index 61b57efa306f841853d52b50e1761fed5b169f06..1c08964557003c6132e89685de843b65a9b629d1 100755
--- a/CRM/Civirules/Form/RuleCondition.php
+++ b/CRM/Civirules/Form/RuleCondition.php
@@ -135,20 +135,20 @@ class CRM_Civirules_Form_RuleCondition extends CRM_Core_Form {
$rule = new CRM_Civirules_BAO_Rule();
$rule->id = $fields['rule_id'];
$rule->find(true);
- $event = new CRM_Civirules_BAO_Event();
- $event->id = $rule->event_id;
- $event->find(true);
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ $trigger->id = $rule->trigger_id;
+ $trigger->find(true);
- $eventObject = CRM_Civirules_BAO_Event::getPostEventObjectByClassName($event->class_name, true);
- $eventObject->setEventId($event->id);
+ $triggerObject = CRM_Civirules_BAO_Trigger::getPostTriggerObjectByClassName($trigger->class_name, true);
+ $triggerObject->setTriggerId($trigger->id);
$availableEntities = array();
- foreach($eventObject->getProvidedEntities() as $entityDef) {
+ foreach($triggerObject->getProvidedEntities() as $entityDef) {
$availableEntities[] = strtolower($entityDef->entity);
}
foreach($requiredEntities as $entity) {
if (!in_array(strtolower($entity), $availableEntities)) {
- $errors['rule_condition_select'] = ts('This condition is not available with event %1', array(1 => $event->label));
+ $errors['rule_condition_select'] = ts('This condition is not available with trigger %1', array(1 => $trigger->label));
return $errors;
}
}
diff --git a/CRM/Civirules/Page/Rule.php b/CRM/Civirules/Page/Rule.php
index f0f0e205c94edf3a33a595861794ef297a35e1f5..446755a9d9420124dde20ee0b049d76263b26784 100755
--- a/CRM/Civirules/Page/Rule.php
+++ b/CRM/Civirules/Page/Rule.php
@@ -30,8 +30,8 @@ class CRM_Civirules_Page_Rule extends CRM_Core_Page {
$rules = CRM_Civirules_BAO_Rule::getValues(array());
foreach ($rules as $ruleId => $rule) {
$rules[$ruleId]['actions'] = $this->setRowActions($rule);
- if (isset($rule['event_id']) && !empty($rule['event_id'])) {
- $rules[$ruleId]['event_label'] = CRM_Civirules_BAO_Event::getEventLabelWithId($rule['event_id']);
+ if (isset($rule['trigger_id']) && !empty($rule['trigger_id'])) {
+ $rules[$ruleId]['trigger_label'] = CRM_Civirules_BAO_Trigger::getTriggerLabelWithId($rule['trigger_id']);
}
$rules[$ruleId]['created_contact_name'] = CRM_Civirules_Utils::getContactName($rule['created_user_id']);
$rules[$ruleId]['is_active'] = CRM_Civirules_Utils::formatIsActive($rule['is_active']);
diff --git a/CRM/Civirules/Event.php b/CRM/Civirules/Trigger.php
similarity index 66%
rename from CRM/Civirules/Event.php
rename to CRM/Civirules/Trigger.php
index b0ae6ba2ccff226fc3f2355bc5ddd852122c274b..2bc597d86a4fa1162fc410fc20818be2a60eb4b5 100644
--- a/CRM/Civirules/Event.php
+++ b/CRM/Civirules/Trigger.php
@@ -1,12 +1,12 @@
<?php
-abstract class CRM_Civirules_Event {
+abstract class CRM_Civirules_Trigger {
protected $ruleId;
- protected $eventId;
+ protected $triggerId;
- protected $eventParams;
+ protected $triggerParams;
/**
* @var string
@@ -17,20 +17,20 @@ abstract class CRM_Civirules_Event {
$this->ruleId = $ruleId;
}
- public function setEventParams($eventParams) {
- $this->eventParams = $eventParams;
+ public function setTriggerParams($triggerParams) {
+ $this->triggerParams = $triggerParams;
}
public function getRuleId() {
return $this->ruleId;
}
- public function setEventId($eventId) {
- $this->eventId = $eventId;
+ public function setTriggerId($triggerId) {
+ $this->triggerId = $triggerId;
}
- public function getEventId() {
- return $this->eventId;
+ public function getTriggerId() {
+ return $this->triggerId;
}
public function getRuleTitle() {
@@ -45,9 +45,9 @@ abstract class CRM_Civirules_Event {
}
/**
- * Returns an array of entities on which the event reacts
+ * Returns an array of entities on which the trigger reacts
*
- * @return CRM_Civirules_EventData_EntityDefinition
+ * @return CRM_Civirules_TriggerData_EntityDefinition
*/
abstract protected function reactOnEntity();
@@ -65,16 +65,16 @@ abstract class CRM_Civirules_Event {
}
/**
- * Returns an array of additional entities provided in this event
+ * Returns an array of additional entities provided in this trigger
*
- * @return array of CRM_Civirules_EventData_EntityDefinition
+ * @return array of CRM_Civirules_TriggerData_EntityDefinition
*/
protected function getAdditionalEntities() {
return array();
}
/**
- * Returns a redirect url to extra data input from the user after adding a condition
+ * Returns a redirect url to extra data input from the user after adding a trigger
*
* Return false if you do not need extra data input
*
@@ -88,13 +88,13 @@ abstract class CRM_Civirules_Event {
}
/**
- * Returns a description of this event
+ * Returns a description of this trigger
*
* @return string
* @access public
* @abstract
*/
- public function getEventDescription() {
+ public function getTriggerDescription() {
return '';
}
diff --git a/CRM/Civirules/Trigger/Cron.php b/CRM/Civirules/Trigger/Cron.php
new file mode 100644
index 0000000000000000000000000000000000000000..d9734ccc4cddc3eb1479c82f4e4c40720e074eb2
--- /dev/null
+++ b/CRM/Civirules/Trigger/Cron.php
@@ -0,0 +1,34 @@
+<?php
+
+abstract class CRM_Civirules_Trigger_Cron extends CRM_Civirules_Trigger {
+
+ /**
+ * This function returns a CRM_Civirules_TriggerData_TriggerData this entity is used for triggering the rule
+ *
+ * Return false when no next entity is available
+ *
+ * @return CRM_Civirules_TriggerData_TriggerData|false
+ */
+ abstract protected function getNextEntityTriggerData();
+
+ /**
+ * @return int
+ */
+ public function process() {
+ $count = 0;
+ $isValidCount = 0;
+ while($triggerData = $this->getNextEntityTriggerData()) {
+ $isValid = CRM_Civirules_Engine::triggerRule($this, $triggerData);
+ if ($isValid) {
+ $isValidCount++;
+ }
+ $count ++;
+ }
+ return array(
+ 'count' => $count,
+ 'is_valid_count' => $isValidCount,
+ );
+ }
+
+
+}
\ No newline at end of file
diff --git a/CRM/Civirules/Event/Post.php b/CRM/Civirules/Trigger/Post.php
similarity index 50%
rename from CRM/Civirules/Event/Post.php
rename to CRM/Civirules/Trigger/Post.php
index 321a9c93a97c754bb2226ca22b330ee06b01aa84..30b56b7bf7cbac4803343be32b2d0b748974cd34 100644
--- a/CRM/Civirules/Event/Post.php
+++ b/CRM/Civirules/Trigger/Post.php
@@ -1,37 +1,37 @@
<?php
/**
- * Class for CiviRules post event handling
+ * Class for CiviRules post trigger handling
*
* @author Jaap Jansma (CiviCooP) <jaap.jansma@civicoop.org>
* @license AGPL-3.0
*/
-class CRM_Civirules_Event_Post extends CRM_Civirules_Event {
+class CRM_Civirules_Trigger_Post extends CRM_Civirules_Trigger {
protected $objectName;
protected $op;
- public function setEventId($eventId) {
- parent::setEventId($eventId);
+ public function setTriggerId($triggerId) {
+ parent::setTriggerId($triggerId);
- $event = new CRM_Civirules_BAO_Event();
- $event->id = $this->eventId;
- if (!$event->find(true)) {
- throw new Exception('Civirules: could not find event with ID: '.$this->eventId);
+ $trigger = new CRM_Civirules_BAO_Trigger();
+ $trigger->id = $this->triggerId;
+ if (!$trigger->find(true)) {
+ throw new Exception('Civirules: could not find trigger with ID: '.$this->triggerId);
}
- $this->objectName = $event->object_name;
- $this->op = $event->op;
+ $this->objectName = $trigger->object_name;
+ $this->op = $trigger->op;
}
/**
- * Returns an array of entities on which the event reacts
+ * Returns an array of entities on which the trigger reacts
*
- * @return CRM_Civirules_EventData_EntityDefinition
+ * @return CRM_Civirules_TriggerData_EntityDefinition
*/
protected function reactOnEntity() {
$entity = CRM_Civirules_Utils_ObjectName::convertToEntity($this->objectName);
- return new CRM_Civirules_EventData_EntityDefinition($this->objectName, $entity, $this->getDaoClassName(), $entity);
+ return new CRM_Civirules_TriggerData_EntityDefinition($this->objectName, $entity, $this->getDaoClassName(), $entity);
}
/**
@@ -56,34 +56,34 @@ class CRM_Civirules_Event_Post extends CRM_Civirules_Event {
*/
public static function post( $op, $objectName, $objectId, &$objectRef ) {
$extensionConfig = CRM_Civirules_Config::singleton();
- if (!in_array($op,$extensionConfig->getValidEventOperations())) {
+ if (!in_array($op,$extensionConfig->getValidTriggerOperations())) {
return;
}
//find matching rules for this objectName and op
- $events = CRM_Civirules_BAO_Rule::findRulesByObjectNameAndOp($objectName, $op);
- foreach($events as $event) {
- if ($event instanceof CRM_Civirules_Event_Post) {
- $event->triggerEvent($op, $objectName, $objectId, $objectRef);
+ $triggers = CRM_Civirules_BAO_Rule::findRulesByObjectNameAndOp($objectName, $op);
+ foreach($triggers as $trigger) {
+ if ($trigger instanceof CRM_Civirules_Trigger_Post) {
+ $trigger->triggerTrigger($op, $objectName, $objectId, $objectRef);
}
}
}
/**
- * Trigger a rule for this event
+ * Trigger a rule for this trigger
*
* @param $op
* @param $objectName
* @param $objectId
* @param $objectRef
*/
- public function triggerEvent($op, $objectName, $objectId, $objectRef) {
- $eventData = $this->getEventDataFromPost($op, $objectName, $objectId, $objectRef);
- CRM_Civirules_Engine::triggerRule($this, clone $eventData);
+ public function triggerTrigger($op, $objectName, $objectId, $objectRef) {
+ $triggerData = $this->getTriggerDataFromPost($op, $objectName, $objectId, $objectRef);
+ CRM_Civirules_Engine::triggerRule($this, clone $triggerData);
}
/**
- * Get event data belonging to this specific post event
+ * Get trigger data belonging to this specific post event
*
* Sub classes could override this method. E.g. a post on GroupContact doesn't give on object of GroupContact
* it rather gives an array with contact Id's
@@ -92,9 +92,9 @@ class CRM_Civirules_Event_Post extends CRM_Civirules_Event {
* @param $objectName
* @param $objectId
* @param $objectRef
- * @return CRM_Civirules_EventData_Edit|CRM_Civirules_EventData_Post
+ * @return CRM_Civirules_TriggerData_Edit|CRM_Civirules_TriggerData_Post
*/
- protected function getEventDataFromPost($op, $objectName, $objectId, $objectRef) {
+ protected function getTriggerDataFromPost($op, $objectName, $objectId, $objectRef) {
$entity = CRM_Civirules_Utils_ObjectName::convertToEntity($objectName);
//set data
@@ -108,11 +108,11 @@ class CRM_Civirules_Event_Post extends CRM_Civirules_Event {
if ($op == 'edit') {
//set also original data with an edit event
$oldData = CRM_Civirules_Utils_PreData::getPreData($entity, $objectId);
- $eventData = new CRM_Civirules_EventData_Edit($entity, $objectId, $data, $oldData);
+ $triggerData = new CRM_Civirules_TriggerData_Edit($entity, $objectId, $data, $oldData);
} else {
- $eventData = new CRM_Civirules_EventData_Post($entity, $objectId, $data);
+ $triggerData = new CRM_Civirules_TriggerData_Post($entity, $objectId, $data);
}
- return $eventData;
+ return $triggerData;
}
diff --git a/CRM/Civirules/EventData/Cron.php b/CRM/Civirules/TriggerData/Cron.php
similarity index 77%
rename from CRM/Civirules/EventData/Cron.php
rename to CRM/Civirules/TriggerData/Cron.php
index 37e04f5e49be9fe9aed1692bcc93791c7fc54f64..79675fd3bace1eb08bf7d19808258bc86e4fe1aa 100644
--- a/CRM/Civirules/EventData/Cron.php
+++ b/CRM/Civirules/TriggerData/Cron.php
@@ -1,6 +1,6 @@
<?php
-class CRM_Civirules_EventData_Cron extends CRM_Civirules_EventData_EventData {
+class CRM_Civirules_TriggerData_Cron extends CRM_Civirules_TriggerData_TriggerData {
protected $entity;
diff --git a/CRM/Civirules/EventData/Edit.php b/CRM/Civirules/TriggerData/Edit.php
similarity index 72%
rename from CRM/Civirules/EventData/Edit.php
rename to CRM/Civirules/TriggerData/Edit.php
index db658a001c914c08baf0d3c9e7b333eabe65e980..175a3e109f0885d800d88116134af7d63fccd690 100644
--- a/CRM/Civirules/EventData/Edit.php
+++ b/CRM/Civirules/TriggerData/Edit.php
@@ -1,6 +1,6 @@
<?php
-class CRM_Civirules_EventData_Edit extends CRM_Civirules_EventData_Post implements CRM_Civirules_EventData_Interface_OriginalData {
+class CRM_Civirules_TriggerData_Edit extends CRM_Civirules_TriggerData_Post implements CRM_Civirules_TriggerData_Interface_OriginalData {
protected $originalData = array();
@@ -8,7 +8,7 @@ class CRM_Civirules_EventData_Edit extends CRM_Civirules_EventData_Post implemen
parent::__construct($entity, $objectId, $data);
if (!is_array($originalData)) {
- throw new Exception('Original data is not set or is not an array in EditEventData for CiviRules');
+ throw new Exception('Original data is not set or is not an array in EditTriggerData for CiviRules');
}
$this->originalData = $originalData;
}
diff --git a/CRM/Civirules/EventData/EntityDefinition.php b/CRM/Civirules/TriggerData/EntityDefinition.php
similarity index 82%
rename from CRM/Civirules/EventData/EntityDefinition.php
rename to CRM/Civirules/TriggerData/EntityDefinition.php
index c4c90a91b968ff64c94544084f42bf3d75e382e9..80c315da4530122c541ce0d130d1bd36c6e70dd1 100644
--- a/CRM/Civirules/EventData/EntityDefinition.php
+++ b/CRM/Civirules/TriggerData/EntityDefinition.php
@@ -1,6 +1,6 @@
<?php
-class CRM_Civirules_EventData_EntityDefinition {
+class CRM_Civirules_TriggerData_EntityDefinition {
/**
* Label of the entity might be shown to the user
@@ -24,7 +24,7 @@ class CRM_Civirules_EventData_EntityDefinition {
public $daoClass;
/**
- * Key of this entity in the event e.g. contact, individual, first_contribution etc...,
+ * Key of this entity in the trigger e.g. contact, individual, first_contribution etc...,
*
* @var string
*/
diff --git a/CRM/Civirules/EventData/Interface/OriginalData.php b/CRM/Civirules/TriggerData/Interface/OriginalData.php
similarity index 79%
rename from CRM/Civirules/EventData/Interface/OriginalData.php
rename to CRM/Civirules/TriggerData/Interface/OriginalData.php
index 3cd3972937d874b074254adca0d4d48367697806..a645919b6ba10eaa983a1cdd621e19a211ceff26 100644
--- a/CRM/Civirules/EventData/Interface/OriginalData.php
+++ b/CRM/Civirules/TriggerData/Interface/OriginalData.php
@@ -1,6 +1,6 @@
<?php
-interface CRM_Civirules_EventData_Interface_OriginalData {
+interface CRM_Civirules_TriggerData_Interface_OriginalData {
/**
* Returns an array with the original data
diff --git a/CRM/Civirules/EventData/Post.php b/CRM/Civirules/TriggerData/Post.php
similarity index 83%
rename from CRM/Civirules/EventData/Post.php
rename to CRM/Civirules/TriggerData/Post.php
index f5af6c5b3959cc6ee4783468be87db8cf001ff7c..07b5882ac49313248ba74c5d7d14d358250d32c6 100644
--- a/CRM/Civirules/EventData/Post.php
+++ b/CRM/Civirules/TriggerData/Post.php
@@ -1,6 +1,6 @@
<?php
-class CRM_Civirules_EventData_Post extends CRM_Civirules_EventData_EventData {
+class CRM_Civirules_TriggerData_Post extends CRM_Civirules_TriggerData_TriggerData {
protected $entity;
diff --git a/CRM/Civirules/EventData/EventData.php b/CRM/Civirules/TriggerData/TriggerData.php
similarity index 65%
rename from CRM/Civirules/EventData/EventData.php
rename to CRM/Civirules/TriggerData/TriggerData.php
index 563f32cdd6a146323acd8028b8707f0146831394..74be8a88fa7383e2189fe4e97d68022d3d42b1c4 100644
--- a/CRM/Civirules/EventData/EventData.php
+++ b/CRM/Civirules/TriggerData/TriggerData.php
@@ -1,15 +1,15 @@
<?php
/**
- * Event data
- * If you have custom events you can create a subclass of this class
+ * Trigger data
+ * If you have custom triggers you can create a subclass of this class
* and change where needed
*
*/
-abstract class CRM_Civirules_EventData_EventData {
+abstract class CRM_Civirules_TriggerData_TriggerData {
/**
- * Contains data for entities available in the event
+ * Contains data for entities available in the trigger
*
* @var array
*/
@@ -18,32 +18,32 @@ abstract class CRM_Civirules_EventData_EventData {
protected $contact_id = 0;
/**
- * @var CRM_Civirules_Event
+ * @var CRM_Civirules_Trigger
*/
- protected $event;
+ protected $trigger;
public function __construct() {
}
/**
- * Set the event
+ * Set the trigger
*
- * @param CRM_Civirules_Event $event
+ * @param CRM_Civirules_Trigger $trigger
*/
- public function setEvent(CRM_Civirules_Event $event) {
- $this->event = $event;
+ public function setTrigger(CRM_Civirules_Trigger $trigger) {
+ $this->trigger = $trigger;
}
/**
- * @return CRM_Civirules_Event
+ * @return CRM_Civirules_Trigger
*/
- public function getEvent() {
- return $this->event;
+ public function getTrigger() {
+ return $this->trigger;
}
/**
- * Returns the ID of the contact used in the event
+ * Returns the ID of the contact used in the trigger
*
* @return int
*/
@@ -78,7 +78,7 @@ abstract class CRM_Civirules_EventData_EventData {
*
* @param string $entity
* @param array $data
- * @return CRM_CiviRules_Engine_EventData
+ * @return CRM_CiviRules_Engine_TriggerData
*/
public function setEntityData($entity, $data) {
if (is_array($data)) {
diff --git a/CRM/Civirules/Upgrader.php b/CRM/Civirules/Upgrader.php
index 1e1a62db119af13af241c419b401653ea565e549..67725534860ee42e1e31ffeff9b6fe88bb9988b7 100755
--- a/CRM/Civirules/Upgrader.php
+++ b/CRM/Civirules/Upgrader.php
@@ -13,8 +13,8 @@ class CRM_Civirules_Upgrader extends CRM_Civirules_Upgrader_Base {
public function install() {
$this->executeSqlFile('sql/createCiviruleAction.sql');
$this->executeSqlFile('sql/createCiviruleCondition.sql');
- $this->executeSqlFile('sql/createCiviruleEvent.sql');
- $this->executeSqlFile('sql/insertCiviruleEvent.sql');
+ $this->executeSqlFile('sql/createCiviruleTrigger.sql');
+ $this->executeSqlFile('sql/insertCiviruleTrigger.sql');
$this->executeSqlFile('sql/createCiviruleRule.sql');
$this->executeSqlFile('sql/createCiviruleRuleAction.sql');
$this->executeSqlFile('sql/createCiviruleRuleCondition.sql');
@@ -27,12 +27,38 @@ class CRM_Civirules_Upgrader extends CRM_Civirules_Upgrader_Base {
public function upgrade_1001() {
CRM_Core_DAO::executeQuery("ALTER TABLE `civirule_rule` ADD event_params TEXT NULL AFTER event_id");
-
- CRM_Core_DAO::executeQuery("
- INSERT INTO civirule_event (name, label, object_name, op, cron, class_name, created_date, created_user_id)
- VALUES
- ('groupmembership', 'Daily trigger for group members', null, null, 1, 'CRM_CivirulesCronEvent_GroupMembership', CURDATE(), 1);
- ");
+ if (CRM_Core_DAO::checkTableExists("civicrm_event")) {
+ CRM_Core_DAO::executeQuery("
+ INSERT INTO civirule_event (name, label, object_name, op, cron, class_name, created_date, created_user_id)
+ VALUES
+ ('groupmembership', 'Daily trigger for group members', NULL, NULL, 1, 'CRM_CivirulesCronEvent_GroupMembership', CURDATE(), 1);
+ ");
+ }
return true;
}
+ /**
+ * Method for upgrade 1002
+ * (rename events to trigger, check https://github.com/CiviCooP/org.civicoop.civirules/issues/42)
+ * - rename table civirule_event to civirule_trigger
+ * - rename columns event_id, event_params in table civirule_rule to trigger_id, trigger_params
+ * - remove index on event_id
+ * - add index on trigger_id
+ */
+ public function upgrade_1002() {
+ // rename table civirule_event to civirule_trigger
+ if (CRM_Core_DAO::checkTableExists("civirule_event")) {
+ CRM_Core_DAO::executeQuery("RENAME TABLE civirule_event TO civirule_trigger");
+ } else {
+ $this->executeSqlFile('sql/createCiviruleTrigger.sql');
+ $this->executeSqlFile('sql/insertCiviruleTrigger.sql');
+ }
+ // rename columns event_id and event_params in civirule_rule
+ if (CRM_Core_DAO::checkTableExists("civirule_rule")) {
+ CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule CHANGE event_id trigger_id INT");
+ CRM_Core_DAO::executeQuery("ALTER TABLE civirule_rule CHANGE event_params trigger_params TEXT");
+ }
+ // remove index on event_id and add one on trigger_id
+ CRM_Core_DAO("ALTER TABLE civirule_rule ADD INDEX fk_rule_trigger_idx (trigger_id),
+ DROP INDEX fk_rule_event_idx");
+ }
}
\ No newline at end of file
diff --git a/CRM/Civirules/Utils.php b/CRM/Civirules/Utils.php
index 9b3bd113ff7036a0363b7b7baa927cf862a4783f..39ffe891512da000ef6d560038d2765260586e3c 100755
--- a/CRM/Civirules/Utils.php
+++ b/CRM/Civirules/Utils.php
@@ -61,19 +61,19 @@ class CRM_Civirules_Utils {
}
/**
- * Function to build the event list
+ * Function to build the trigger list
*
- * @return array $eventList
+ * @return array $triggerList
* @access public
* @static
*/
- public static function buildEventList() {
- $eventList = array();
- $events = CRM_Civirules_BAO_Event::getValues(array());
- foreach ($events as $eventId => $event) {
- $eventList[$eventId] = $event['label'];
+ public static function buildTriggerList() {
+ $triggerList = array();
+ $triggers = CRM_Civirules_BAO_Trigger::getValues(array());
+ foreach ($triggers as $triggerId => $trigger) {
+ $triggerList[$triggerId] = $trigger['label'];
}
- return $eventList;
+ return $triggerList;
}
/**
diff --git a/CRM/Civirules/Utils/LoggerFactory.php b/CRM/Civirules/Utils/LoggerFactory.php
index 9dfc0a3a9bee88716a98d8444d1fc976fef3cd60..110ffb4d5a85988f1394e9a90f634a9c1d47037a 100644
--- a/CRM/Civirules/Utils/LoggerFactory.php
+++ b/CRM/Civirules/Utils/LoggerFactory.php
@@ -26,16 +26,16 @@ class CRM_Civirules_Utils_LoggerFactory {
$logger->log($level, $message, $context);
}
- public static function logError($reason, $original_error, CRM_Civirules_EventData_EventData $eventData, $context=array()) {
+ public static function logError($reason, $original_error, CRM_Civirules_TriggerData_TriggerData $triggerData, $context=array()) {
$logger = CRM_Civirules_Utils_LoggerFactory::getLogger();
if (empty($logger)) {
return;
}
$error = "Rule: '{rule_title}' with id {rule_id} failed for contact {contact_id} because of {reason}";
- $context['rule_id'] = $eventData->getEvent()->getRuleId();
- $context['rule_title'] = $eventData->getEvent()->getRuleTitle();
+ $context['rule_id'] = $triggerData->getTrigger()->getRuleId();
+ $context['rule_title'] = $triggerData->getTrigger()->getRuleTitle();
$context['original_error'] = $original_error;
- $context['contact_id'] = $eventData->getContactId();
+ $context['contact_id'] = $triggerData->getContactId();
$context['reason'] = $reason;
$logger->error($error, $context);
}
diff --git a/CRM/CivirulesActions/Activity/Add.php b/CRM/CivirulesActions/Activity/Add.php
index 05f0eb75ad885f5019805e7977ff2614712a49db..914c78fe5e9b542303c2c5df664893f31a57a70c 100644
--- a/CRM/CivirulesActions/Activity/Add.php
+++ b/CRM/CivirulesActions/Activity/Add.php
@@ -12,14 +12,14 @@ class CRM_CivirulesActions_Activity_Add extends CRM_CivirulesActions_Generic_Api
* Returns an array with parameters used for processing an action
*
* @param array $params
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return array $params
* @access protected
*/
- protected function alterApiParameters($params, CRM_Civirules_EventData_EventData $eventData) {
+ protected function alterApiParameters($params, CRM_Civirules_TriggerData_TriggerData $triggerData) {
$action_params = $this->getActionParameters();
//this function could be overridden in subclasses to alter parameters to meet certain criteraia
- $params['target_contact_id'] = $eventData->getContactId();
+ $params['target_contact_id'] = $triggerData->getContactId();
$params['activity_type_id'] = $action_params['activity_type_id'];
$params['status_id'] = $action_params['status_id'];
$params['subject'] = $action_params['subject'];
diff --git a/CRM/CivirulesActions/Contact/SoftDelete.php b/CRM/CivirulesActions/Contact/SoftDelete.php
index 6b5f19b037dc9b49d8711e75f9dd6c689078a27e..be5e0fcd5b4a84303723c2befc59704aa2642421 100644
--- a/CRM/CivirulesActions/Contact/SoftDelete.php
+++ b/CRM/CivirulesActions/Contact/SoftDelete.php
@@ -10,12 +10,12 @@ class CRM_CivirulesActions_Contact_SoftDelete extends CRM_Civirules_Action {
/**
* Method processAction to execute the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
- $contactId = $eventData->getContactId();
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $contactId = $triggerData->getContactId();
//we cannot delete domain contacts
if (CRM_Contact_BAO_Contact::checkDomainContact($contactId)) {
diff --git a/CRM/CivirulesActions/Contact/Subtype.php b/CRM/CivirulesActions/Contact/Subtype.php
index 6aa2c3ccdfab72bca1c7f4f55cb61c5a63846975..02dea415caa4f9c39370b06b530a9db2f0fb26cf 100644
--- a/CRM/CivirulesActions/Contact/Subtype.php
+++ b/CRM/CivirulesActions/Contact/Subtype.php
@@ -5,12 +5,12 @@ class CRM_CivirulesActions_Contact_Subtype extends CRM_Civirules_Action {
/**
* Method processAction to execute the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
- $contactId = $eventData->getContactId();
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $contactId = $triggerData->getContactId();
$subTypes = CRM_Contact_BAO_Contact::getContactSubType($contactId);
$contactType = CRM_Contact_BAO_Contact::getContactType($contactId);
diff --git a/CRM/CivirulesActions/Contribution/ThankYouDate.php b/CRM/CivirulesActions/Contribution/ThankYouDate.php
index 516cb3ebd7f8520a43baff9b6a6dd382d6875d8c..b4a8076fee701a66a3f37119ed76275e5b799786 100644
--- a/CRM/CivirulesActions/Contribution/ThankYouDate.php
+++ b/CRM/CivirulesActions/Contribution/ThankYouDate.php
@@ -9,12 +9,12 @@ class CRM_CivirulesActions_Contribution_ThankYouDate extends CRM_Civirules_Actio
/**
* Method processAction to execute the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
- $contribution = $eventData->getEntityData('Contribution');
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $contribution = $triggerData->getEntityData('Contribution');
$actionParams = $this->getActionParameters();
switch ($actionParams['thank_you_radio']) {
case 1:
diff --git a/CRM/CivirulesActions/CreateDonor.php b/CRM/CivirulesActions/CreateDonor.php
index 938e1b36ee4aba292bf86590c66e2b98a7aeb1a9..fac488cd108992a82c56705d407777fc5eb1f77c 100644
--- a/CRM/CivirulesActions/CreateDonor.php
+++ b/CRM/CivirulesActions/CreateDonor.php
@@ -9,12 +9,12 @@ class CRM_CivirulesActions_CreateDonor extends CRM_Civirules_Action {
/**
* Method processAction to execute the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
- $contactId = $eventData->getContactId();
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $contactId = $triggerData->getContactId();
$processContact = false;
// retrieve contact type of contact
diff --git a/CRM/CivirulesActions/Form/Form.php b/CRM/CivirulesActions/Form/Form.php
index c6f4ef65891ba46f24327b01cc73b2f2ca57eef0..8b6198c5d702b6dc68d2af966d0f717881c59071 100644
--- a/CRM/CivirulesActions/Form/Form.php
+++ b/CRM/CivirulesActions/Form/Form.php
@@ -11,12 +11,12 @@ class CRM_CivirulesActions_Form_Form extends CRM_Core_Form
protected $rule;
- protected $event;
+ protected $trigger;
/**
- * @var CRM_Civirules_Event
+ * @var CRM_Civirules_Trigger
*/
- protected $eventClass;
+ protected $triggerClass;
/**
* Overridden parent method to perform processing before form is build
@@ -32,7 +32,7 @@ class CRM_CivirulesActions_Form_Form extends CRM_Core_Form
$this->action = new CRM_Civirules_BAO_Action();
$this->rule = new CRM_Civirules_BAO_Rule();
- $this->event = new CRM_Civirules_BAO_Event();
+ $this->trigger = new CRM_Civirules_BAO_Trigger();
if (!$this->ruleAction->find(true)) {
throw new Exception('Civirules could not find ruleAction');
@@ -48,13 +48,13 @@ class CRM_CivirulesActions_Form_Form extends CRM_Core_Form
throw new Exception('Civirules could not find rule');
}
- $this->event->id = $this->rule->event_id;
- if (!$this->event->find(true)) {
- throw new Exception('Civirules could not find event');
+ $this->trigger->id = $this->rule->trigger_id;
+ if (!$this->trigger->find(true)) {
+ throw new Exception('Civirules could not find trigger');
}
- $this->eventClass = CRM_Civirules_BAO_Event::getPostEventObjectByClassName($this->event->class_name, true);
- $this->eventClass->setEventId($this->event->id);
+ $this->triggerClass = CRM_Civirules_BAO_Trigger::getPostTriggerObjectByClassName($this->trigger->class_name, true);
+ $this->triggerClass->setTriggerId($this->trigger->id);
//set user context
$session = CRM_Core_Session::singleton();
diff --git a/CRM/CivirulesActions/Generic/Api.php b/CRM/CivirulesActions/Generic/Api.php
index afad0e345b4c2f44909baa79015707d250fe02f3..d2b9faf2ee675b0a4b90a811f2a51260667b335b 100644
--- a/CRM/CivirulesActions/Generic/Api.php
+++ b/CRM/CivirulesActions/Generic/Api.php
@@ -22,11 +22,11 @@ abstract class CRM_CivirulesActions_Generic_Api extends CRM_Civirules_Action {
* Returns an array with parameters used for processing an action
*
* @param array $parameters
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return array
* @access protected
*/
- protected function alterApiParameters($parameters, CRM_Civirules_EventData_EventData $eventData) {
+ protected function alterApiParameters($parameters, CRM_Civirules_TriggerData_TriggerData $triggerData) {
//this method could be overridden in subclasses to alter parameters to meet certain criteria
return $parameters;
}
@@ -34,17 +34,17 @@ abstract class CRM_CivirulesActions_Generic_Api extends CRM_Civirules_Action {
/**
* Process the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$entity = $this->getApiEntity();
$action = $this->getApiAction();
$params = $this->getActionParameters();
//alter parameters by subclass
- $params = $this->alterApiParameters($params, $eventData);
+ $params = $this->alterApiParameters($params, $triggerData);
//execute the action
$this->executeApiAction($entity, $action, $params);
diff --git a/CRM/CivirulesActions/GroupContact/GroupContact.php b/CRM/CivirulesActions/GroupContact/GroupContact.php
index edc10b19977ceb6d484f1340fa40be9c0a3cc752..675d86f1847e61019f6213e3757a98c479c82a49 100644
--- a/CRM/CivirulesActions/GroupContact/GroupContact.php
+++ b/CRM/CivirulesActions/GroupContact/GroupContact.php
@@ -12,39 +12,39 @@ abstract class CRM_CivirulesActions_GroupContact_GroupContact extends CRM_Civiru
* Returns an array with parameters used for processing an action
*
* @param array $params
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return array $params
* @access protected
*/
- protected function alterApiParameters($params, CRM_Civirules_EventData_EventData $eventData) {
- //this function could be overridden in subclasses to alter parameters to meet certain criteraia
- $params['contact_id'] = $eventData->getContactId();
+ protected function alterApiParameters($params, CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ //this function could be overridden in subclasses to alter parameters to meet certain criteria
+ $params['contact_id'] = $triggerData->getContactId();
return $params;
}
/**
* Process the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$entity = $this->getApiEntity();
$action = $this->getApiAction();
- $action_params = $this->getActionParameters();
- $group_ids = array();
- if (!empty($action_params['group_id'])) {
- $group_ids = array($action_params['group_id']);
- } elseif (!empty($action_params['group_ids']) && is_array($action_params['group_ids'])) {
- $group_ids = $action_params['group_ids'];
+ $actionParams = $this->getActionParameters();
+ $groupIds = array();
+ if (!empty($actionParams['group_id'])) {
+ $groupIds = array($actionParams['group_id']);
+ } elseif (!empty($actionParams['group_ids']) && is_array($actionParams['group_ids'])) {
+ $groupIds = $actionParams['group_ids'];
}
- foreach($group_ids as $group_id) {
+ foreach($groupIds as $groupId) {
$params = array();
- $params['group_id'] = $group_id;
+ $params['group_id'] = $groupId;
//alter parameters by subclass
- $params = $this->alterApiParameters($params, $eventData);
+ $params = $this->alterApiParameters($params, $triggerData);
//execute the action
$this->executeApiAction($entity, $action, $params);
diff --git a/CRM/CivirulesActions/GroupContact/Remove.php b/CRM/CivirulesActions/GroupContact/Remove.php
index e6a303db7d5e33c177ec8344ed9e62e3ee427030..38537ee7d3edd523aeceaf93fe353fc30e0ea87f 100644
--- a/CRM/CivirulesActions/GroupContact/Remove.php
+++ b/CRM/CivirulesActions/GroupContact/Remove.php
@@ -24,13 +24,13 @@ class CRM_CivirulesActions_GroupContact_Remove extends CRM_CivirulesActions_Grou
/**
* Process the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$entity = $this->getApiEntity();
$action = $this->getApiAction();
- $contactId = $eventData->getContactId();
+ $contactId = $triggerData->getContactId();
$action_params = $this->getActionParameters();
$group_ids = array();
@@ -45,7 +45,7 @@ class CRM_CivirulesActions_GroupContact_Remove extends CRM_CivirulesActions_Grou
$params['group_id'] = $group_id;
//alter parameters by subclass
- $params = $this->alterApiParameters($params, $eventData);
+ $params = $this->alterApiParameters($params, $triggerData);
//execute the action
$this->executeApiAction($entity, $action, $params);
diff --git a/CRM/CivirulesActions/Tag/Tag.php b/CRM/CivirulesActions/Tag/Tag.php
index bbc0dc1ba94c2145f39dee3f4d4f9dccb15c3de2..c1452629d620713d1cc9015846e02d5b6b38b265 100644
--- a/CRM/CivirulesActions/Tag/Tag.php
+++ b/CRM/CivirulesActions/Tag/Tag.php
@@ -12,13 +12,13 @@ abstract class CRM_CivirulesActions_Tag_Tag extends CRM_CivirulesActions_Generic
* Returns an array with parameters used for processing an action
*
* @param array $params
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return array $params
* @access protected
*/
- protected function alterApiParameters($params, CRM_Civirules_EventData_EventData $eventData) {
+ protected function alterApiParameters($params, CRM_Civirules_TriggerData_TriggerData $triggerData) {
//this function could be overridden in subclasses to alter parameters to meet certain criteraia
- $params['entity_id'] = $eventData->getContactId();
+ $params['entity_id'] = $triggerData->getContactId();
$params['entity_table'] = 'civicrm_contact';
return $params;
}
@@ -26,10 +26,10 @@ abstract class CRM_CivirulesActions_Tag_Tag extends CRM_CivirulesActions_Generic
/**
* Process the action
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @access public
*/
- public function processAction(CRM_Civirules_EventData_EventData $eventData) {
+ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$entity = $this->getApiEntity();
$action = $this->getApiAction();
@@ -45,7 +45,7 @@ abstract class CRM_CivirulesActions_Tag_Tag extends CRM_CivirulesActions_Generic
$params['tag_id'] = $tag_id;
//alter parameters by subclass
- $params = $this->alterApiParameters($params, $eventData);
+ $params = $this->alterApiParameters($params, $triggerData);
//execute the action
$this->executeApiAction($entity, $action, $params);
diff --git a/CRM/CivirulesConditions/Activity/RecordType.php b/CRM/CivirulesConditions/Activity/RecordType.php
index 503aff503078309e384e2095900fe0cc0b05653c..c8f196ddf2a6da451c7bc80b2c37b0158eb087a6 100644
--- a/CRM/CivirulesConditions/Activity/RecordType.php
+++ b/CRM/CivirulesConditions/Activity/RecordType.php
@@ -33,12 +33,12 @@ class CRM_CivirulesConditions_Activity_RecordType extends CRM_Civirules_Conditio
* Method to check if the condition is valid, will check if the contact
* has an activity of the selected type
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- $ActivityContact = $eventData->getEntityData('ActivityContact');
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $ActivityContact = $triggerData->getEntityData('ActivityContact');
if ($ActivityContact['record_type_id'] == $this->conditionParams['record_type_id']) {
return true;
}
diff --git a/CRM/CivirulesConditions/Activity/Type.php b/CRM/CivirulesConditions/Activity/Type.php
index 5d66c8392f0fc854b5a935e11edd6226ca8bc543..a0fdb26c575b2dae408010104fbc0d9c72618128 100644
--- a/CRM/CivirulesConditions/Activity/Type.php
+++ b/CRM/CivirulesConditions/Activity/Type.php
@@ -33,12 +33,12 @@ class CRM_CivirulesConditions_Activity_Type extends CRM_Civirules_Condition {
* Method to check if the condition is valid, will check if the contact
* has an activity of the selected type
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- $activity = $eventData->getEntityData('Activity');
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $activity = $triggerData->getEntityData('Activity');
if ($activity['activity_type_id'] == $this->conditionParams['activity_type_id']) {
return true;
}
diff --git a/CRM/CivirulesConditions/Contact/AgeComparison.php b/CRM/CivirulesConditions/Contact/AgeComparison.php
index 28d5497185fce9513691aa782e074ad87a6769b3..3a41d4fc630241fc8eb71a87542e305628079758 100644
--- a/CRM/CivirulesConditions/Contact/AgeComparison.php
+++ b/CRM/CivirulesConditions/Contact/AgeComparison.php
@@ -11,12 +11,12 @@ class CRM_CivirulesConditions_Contact_AgeComparison extends CRM_CivirulesConditi
/**
* Returns value of the field
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return mixed
* @access protected
*/
- protected function getFieldValue(CRM_Civirules_EventData_EventData $eventData) {
- $sourceBirthDate = civicrm_api3('Contact', 'getvalue', array('id' => $eventData->getContactId(), 'return' => 'birth_date'));
+ protected function getFieldValue(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $sourceBirthDate = civicrm_api3('Contact', 'getvalue', array('id' => $triggerData->getContactId(), 'return' => 'birth_date'));
if ($sourceBirthDate) {
$birthDate = new DateTime($sourceBirthDate);
return $birthDate->diff(new DateTime('now'))->y;
diff --git a/CRM/CivirulesConditions/Contact/HasTag.php b/CRM/CivirulesConditions/Contact/HasTag.php
index b06fb07a09755a2a4cddf2ab699f78f8fd866077..4c0d25f4bef9de96b2a5f10e46ff444fc8cdd5fe 100644
--- a/CRM/CivirulesConditions/Contact/HasTag.php
+++ b/CRM/CivirulesConditions/Contact/HasTag.php
@@ -27,14 +27,14 @@ class CRM_CivirulesConditions_Contact_HasTag extends CRM_Civirules_Condition {
/**
* This method returns true or false when an condition is valid or not
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
* @abstract
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isConditionValid = false;
- $contact_id = $eventData->getContactId();
+ $contact_id = $triggerData->getContactId();
switch($this->conditionParams['operator']) {
case 'in one of':
$isConditionValid = $this->contactHasOneOfTags($contact_id, $this->conditionParams['tag_ids']);
diff --git a/CRM/CivirulesConditions/Contact/InGroup.php b/CRM/CivirulesConditions/Contact/InGroup.php
index abd71b38ae21112dea216c5dd75f763456361225..2c481bd64bdb9d4a5ab5758ac04b94590f24f748 100644
--- a/CRM/CivirulesConditions/Contact/InGroup.php
+++ b/CRM/CivirulesConditions/Contact/InGroup.php
@@ -27,14 +27,14 @@ class CRM_CivirulesConditions_Contact_InGroup extends CRM_Civirules_Condition {
/**
* This method returns true or false when an condition is valid or not
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
* @abstract
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isConditionValid = false;
- $contact_id = $eventData->getContactId();
+ $contact_id = $triggerData->getContactId();
switch($this->conditionParams['operator']) {
case 'in one of':
$isConditionValid = $this->contactIsMemberOfOneGroup($contact_id, $this->conditionParams['group_ids']);
diff --git a/CRM/CivirulesConditions/Contribution/Amount.php b/CRM/CivirulesConditions/Contribution/Amount.php
index 6230d7a6f292768c420cbe1ca23f01224842d859..b7383597d6d1401753d444cbde89b0cd5e18b89c 100644
--- a/CRM/CivirulesConditions/Contribution/Amount.php
+++ b/CRM/CivirulesConditions/Contribution/Amount.php
@@ -11,12 +11,12 @@ class CRM_CivirulesConditions_Contribution_Amount extends CRM_CivirulesCondition
/**
* Returns value of the field
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return mixed
* @access protected
*/
- protected function getFieldValue(CRM_Civirules_EventData_EventData $eventData) {
- $contribution = $eventData->getEntityData('Contribution');
+ protected function getFieldValue(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $contribution = $triggerData->getEntityData('Contribution');
if (isset($contribution['total_amount'])) {
return (float) $contribution['total_amount'];
}
diff --git a/CRM/CivirulesConditions/Contribution/CountRecurring.php b/CRM/CivirulesConditions/Contribution/CountRecurring.php
index 064551908f16cee0d19816b87ea6c731fb601641..014ea2a0e9ffb92a25ca35c241ada96ac2c8134b 100644
--- a/CRM/CivirulesConditions/Contribution/CountRecurring.php
+++ b/CRM/CivirulesConditions/Contribution/CountRecurring.php
@@ -30,13 +30,13 @@ class CRM_CivirulesConditions_Contribution_CountRecurring extends CRM_Civirules_
/**
* Method to determine if the condition is valid
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isConditionValid = FALSE;
- $contribution = $eventData->getEntityData('Contribution');
+ $contribution = $triggerData->getEntityData('Contribution');
/*
* retrieve count of completed contributions for donor where recurring_contribution_id is not empty
*/
diff --git a/CRM/CivirulesConditions/Contribution/DistinctContributingDay.php b/CRM/CivirulesConditions/Contribution/DistinctContributingDay.php
index f09b899eb3fe2581527847b99865463f5a8ff581..1bb2d45d028a05bfc34622a22c8906ab3f940c58 100644
--- a/CRM/CivirulesConditions/Contribution/DistinctContributingDay.php
+++ b/CRM/CivirulesConditions/Contribution/DistinctContributingDay.php
@@ -31,14 +31,14 @@ class CRM_CivirulesConditions_Contribution_DistinctContributingDay extends CRM_C
/**
* Method to determine if the condition is valid
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData)
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData)
{
$isConditionValid = FALSE;
- $contact_id = $eventData->getContactId();
+ $contact_id = $triggerData->getContactId();
/*
* retrieve count of contributions for donor grouped by extracted YMD from receive_date
*/
diff --git a/CRM/CivirulesConditions/Contribution/DonorIsRecurring.php b/CRM/CivirulesConditions/Contribution/DonorIsRecurring.php
index 4c167b312cb1bf879c530001766ac23644f3b25e..16021397ea2bcae5aff6fda576e9ebfe1bca77f3 100644
--- a/CRM/CivirulesConditions/Contribution/DonorIsRecurring.php
+++ b/CRM/CivirulesConditions/Contribution/DonorIsRecurring.php
@@ -29,12 +29,12 @@ class CRM_CivirulesConditions_Contribution_DonorIsRecurring extends CRM_Civirule
/**
* Method is mandatory and checks if the condition is met
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- $contactId = $eventData->getContactId();
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $contactId = $triggerData->getContactId();
$donorHasAny = FALSE;
$recurringParams = array(
'contact_id' => $contactId,
diff --git a/CRM/CivirulesConditions/Contribution/FinancialType.php b/CRM/CivirulesConditions/Contribution/FinancialType.php
index f016cef6a6bb2bd7529596d319f657599cff310d..cdcccbac043e928cf0ff36e448d2a6fae969b01c 100644
--- a/CRM/CivirulesConditions/Contribution/FinancialType.php
+++ b/CRM/CivirulesConditions/Contribution/FinancialType.php
@@ -21,13 +21,13 @@ class CRM_CivirulesConditions_Contribution_FinancialType extends CRM_Civirules_C
/**
* Method to determine if the condition is valid
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isConditionValid = FALSE;
- $contribution = $eventData->getEntityData('Contribution');
+ $contribution = $triggerData->getEntityData('Contribution');
switch ($this->conditionParams['operator']) {
case 0:
if ($contribution['financial_type_id'] == $this->conditionParams['financial_type_id']) {
diff --git a/CRM/CivirulesConditions/Contribution/FirstContribution.php b/CRM/CivirulesConditions/Contribution/FirstContribution.php
index abc39b9b3df86d60379f90b660563e7bede09f05..9a4f41ec85ba2155700c47ca5db2e093325432c4 100644
--- a/CRM/CivirulesConditions/Contribution/FirstContribution.php
+++ b/CRM/CivirulesConditions/Contribution/FirstContribution.php
@@ -11,13 +11,13 @@ class CRM_CivirulesConditions_Contribution_FirstContribution extends CRM_Civirul
/**
* Method is mandatory and checks if the condition is met
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData)
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData)
{
- $contactId = $eventData->getContactId();
+ $contactId = $triggerData->getContactId();
$contributionParams = array('contact_id' => $contactId);
$countContributions = civicrm_api3('Contribution', 'getcount', $contributionParams);
switch ($countContributions) {
@@ -26,8 +26,8 @@ class CRM_CivirulesConditions_Contribution_FirstContribution extends CRM_Civirul
break;
case 1:
$existingContribution = civicrm_api3('Contribution', 'Getsingle', array('contact_id' => $contactId));
- $eventContribution = $eventData->getEntityData('Contribution');
- if ($eventContribution['contribution_id'] == $existingContribution['contribution_id']) {
+ $triggerContribution = $triggerData->getEntityData('Contribution');
+ if ($triggerContribution['contribution_id'] == $existingContribution['contribution_id']) {
return TRUE;
}
break;
diff --git a/CRM/CivirulesConditions/Contribution/LastContribution.php b/CRM/CivirulesConditions/Contribution/LastContribution.php
index 65920d49b5e22332bdad4086e6e3ce83f017d4d1..27c1213276e7a779ce89f95040888086cfac4c42 100644
--- a/CRM/CivirulesConditions/Contribution/LastContribution.php
+++ b/CRM/CivirulesConditions/Contribution/LastContribution.php
@@ -11,13 +11,13 @@ class CRM_CivirulesConditions_Contribution_LastContribution extends CRM_Civirule
/**
* Returns value of the field
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return mixed
* @access protected
*/
- protected function getFieldValue(CRM_Civirules_EventData_EventData $eventData) {
+ protected function getFieldValue(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$completed_status_id = CRM_Core_OptionGroup::getValue('contribution_status', 'completed', 'name');
- $contact_id = $eventData->getContactId();
+ $contact_id = $triggerData->getContactId();
$params[1] = array($completed_status_id, 'Integer');
$params[2] = array($contact_id, 'Integer');
diff --git a/CRM/CivirulesConditions/Contribution/PaidBy.php b/CRM/CivirulesConditions/Contribution/PaidBy.php
index cf461ce4106f451156604e71799907179c92f462..0e5aad9963ce0753839a5968288842d0fed6adf4 100644
--- a/CRM/CivirulesConditions/Contribution/PaidBy.php
+++ b/CRM/CivirulesConditions/Contribution/PaidBy.php
@@ -21,13 +21,13 @@ class CRM_CivirulesConditions_Contribution_PaidBy extends CRM_Civirules_Conditio
/**
* Method to determine if the condition is valid
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isConditionValid = FALSE;
- $contribution = $eventData->getEntityData('Contribution');
+ $contribution = $triggerData->getEntityData('Contribution');
switch ($this->conditionParams['operator']) {
case 0:
if ($contribution['payment_instrument_id'] == $this->conditionParams['payment_instrument_id']) {
diff --git a/CRM/CivirulesConditions/Contribution/RecurringEndDate.php b/CRM/CivirulesConditions/Contribution/RecurringEndDate.php
index 2c8346c8141c5bfd3a66ad9d853e1732fac6b858..71866990a03b4e03789169dc544839c63f6e8c04 100644
--- a/CRM/CivirulesConditions/Contribution/RecurringEndDate.php
+++ b/CRM/CivirulesConditions/Contribution/RecurringEndDate.php
@@ -30,13 +30,13 @@ class CRM_CivirulesConditions_Contribution_RecurringEndDate extends CRM_Civirule
/**
* Method to determine if the condition is valid
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isConditionValid = FALSE;
- $recurring = $eventData->getEntityData('ContributionRecur');
+ $recurring = $triggerData->getEntityData('ContributionRecur');
if ($this->conditionParams['end_date'] == 0 && empty($recurring['end_date'])) {
$isConditionValid = TRUE;
}
diff --git a/CRM/CivirulesConditions/Contribution/SpecificAmount.php b/CRM/CivirulesConditions/Contribution/SpecificAmount.php
index e7e51455e9d02d6f10a0f57abec2acd4640857f8..b3f569b1de68fec08bb3fb3456e9d2b930bdc095 100644
--- a/CRM/CivirulesConditions/Contribution/SpecificAmount.php
+++ b/CRM/CivirulesConditions/Contribution/SpecificAmount.php
@@ -32,14 +32,14 @@ class CRM_CivirulesConditions_Contribution_SpecificAmount extends CRM_Civirules_
/**
* Method to determine if the condition is valid
*
- * @param CRM_Civirules_EventData_EventData $eventData
+ * @param CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$isConditionValid = FALSE;
- $this->buildWhereClauses($eventData->getEntityData('Contribution'));
+ $this->buildWhereClauses($triggerData->getEntityData('Contribution'));
if (!empty($this->whereClauses)) {
$query = 'SELECT COUNT(*) as countContributions FROM civicrm_contribution WHERE '.implode(' AND ', $this->whereClauses);
$dao = CRM_Core_DAO::executeQuery($query, $this->whereParams);
diff --git a/CRM/CivirulesConditions/Contribution/Status.php b/CRM/CivirulesConditions/Contribution/Status.php
index 5f2b03db64ff5a6c0ef2dbce55235117edcdcdc2..08e06468e6cada4d35288379161b753cbc1a4cb6 100644
--- a/CRM/CivirulesConditions/Contribution/Status.php
+++ b/CRM/CivirulesConditions/Contribution/Status.php
@@ -18,8 +18,8 @@ class CRM_CivirulesConditions_Contribution_Status extends CRM_Civirules_Conditio
}
}
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- $contribution = $eventData->getEntityData('Contribution');
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $contribution = $triggerData->getEntityData('Contribution');
if ($contribution['contribution_status_id'] == $this->conditionParams['contribution_status_id']) {
return true;
}
diff --git a/CRM/CivirulesConditions/Contribution/TotalContributedAmount.php b/CRM/CivirulesConditions/Contribution/TotalContributedAmount.php
index 9432c91716c1b0b86abb393070b85b9c4586d815..b09aa7d39498d9200bfae0a896d13d5622426d84 100644
--- a/CRM/CivirulesConditions/Contribution/TotalContributedAmount.php
+++ b/CRM/CivirulesConditions/Contribution/TotalContributedAmount.php
@@ -5,13 +5,13 @@ class CRM_CivirulesConditions_Contribution_TotalContributedAmount extends CRM_Ci
/**
* Returns value of the field
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return mixed
* @access protected
*/
- protected function getFieldValue(CRM_Civirules_EventData_EventData $eventData) {
+ protected function getFieldValue(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$completed_status_id = CRM_Core_OptionGroup::getValue('contribution_status', 'completed', 'name');
- $contact_id = $eventData->getContactId();
+ $contact_id = $triggerData->getContactId();
$sql = "SELECT SUM(`total_amount`)
FROM `civicrm_contribution`
diff --git a/CRM/CivirulesConditions/Email/PrimaryEmailChanged.php b/CRM/CivirulesConditions/Email/PrimaryEmailChanged.php
index 42a60eda952bdfa18a5fd17bb36c555ce445204b..20385c8ea99a91c3d75996c11cbf59bc625d0949 100644
--- a/CRM/CivirulesConditions/Email/PrimaryEmailChanged.php
+++ b/CRM/CivirulesConditions/Email/PrimaryEmailChanged.php
@@ -31,14 +31,14 @@ class CRM_CivirulesConditions_Email_PrimaryEmailChanged extends CRM_CivirulesCon
/**
* Method to check if the condition is valid
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- $isValid = parent::isConditionValid($eventData);
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $isValid = parent::isConditionValid($triggerData);
if ($isValid) {
- $data = $eventData->getEntityData($this->getEntity());
+ $data = $triggerData->getEntityData($this->getEntity());
if (!empty($data['is_primary'])) {
$isValid = true;
} else {
diff --git a/CRM/CivirulesConditions/FieldValueComparison.php b/CRM/CivirulesConditions/FieldValueComparison.php
index ad9bb6c8c6ebed6c4940d11c3670c0014a72f10e..4ad60005dd7bb63ac590e63899a09bea80eafa14 100644
--- a/CRM/CivirulesConditions/FieldValueComparison.php
+++ b/CRM/CivirulesConditions/FieldValueComparison.php
@@ -6,16 +6,16 @@ class CRM_CivirulesConditions_FieldValueComparison extends CRM_CivirulesConditio
* Returns the value of the field for the condition
* For example: I want to check if age > 50, this function would return the 50
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return
* @access protected
* @abstract
*/
- protected function getFieldValue(CRM_Civirules_EventData_EventData $eventData) {
+ protected function getFieldValue(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$entity = $this->conditionParams['entity'];
$field = $this->conditionParams['field'];
- $data = $eventData->getEntityData($entity);
+ $data = $triggerData->getEntityData($entity);
if (isset($data[$field])) {
return $this->normalizeValue($data[$field]);
}
diff --git a/CRM/CivirulesConditions/Form/FieldValueComparison.php b/CRM/CivirulesConditions/Form/FieldValueComparison.php
index 3bfdd9c1dce4706b3578f227a24d40a02ed21943..37ec95fafa110d469cc0bfff5f1a1dc891bf3c63 100644
--- a/CRM/CivirulesConditions/Form/FieldValueComparison.php
+++ b/CRM/CivirulesConditions/Form/FieldValueComparison.php
@@ -10,7 +10,7 @@ class CRM_CivirulesConditions_Form_FieldValueComparison extends CRM_CivirulesCon
protected function getEntityOptions() {
$return = array();
- foreach($this->eventClass->getProvidedEntities() as $entityDef) {
+ foreach($this->triggerClass->getProvidedEntities() as $entityDef) {
if (!empty($entityDef->daoClass) && class_exists($entityDef->daoClass)) {
$return[$entityDef->entity] = $entityDef->label;
}
@@ -20,7 +20,7 @@ class CRM_CivirulesConditions_Form_FieldValueComparison extends CRM_CivirulesCon
protected function getEntities() {
$return = array();
- foreach($this->eventClass->getProvidedEntities() as $entityDef) {
+ foreach($this->triggerClass->getProvidedEntities() as $entityDef) {
if (!empty($entityDef->daoClass) && class_exists($entityDef->daoClass)) {
$return[$entityDef->entity] = $entityDef->entity;
}
@@ -30,7 +30,7 @@ class CRM_CivirulesConditions_Form_FieldValueComparison extends CRM_CivirulesCon
protected function getFields() {
$return = array();
- foreach($this->eventClass->getProvidedEntities() as $entityDef) {
+ foreach($this->triggerClass->getProvidedEntities() as $entityDef) {
if (!empty($entityDef->daoClass) && class_exists($entityDef->daoClass)) {
$key = $entityDef->entity . '_';
$className = $entityDef->daoClass;
diff --git a/CRM/CivirulesConditions/Form/Form.php b/CRM/CivirulesConditions/Form/Form.php
index 81c659b3a2c07f268797fb0605678bd5231cb74d..bb24acfb691fdbf04875abb1dcf997cba7ca7895 100644
--- a/CRM/CivirulesConditions/Form/Form.php
+++ b/CRM/CivirulesConditions/Form/Form.php
@@ -11,12 +11,12 @@ class CRM_CivirulesConditions_Form_Form extends CRM_Core_Form
protected $rule;
- protected $event;
+ protected $trigger;
/**
- * @var CRM_Civirules_Event
+ * @var CRM_Civirules_Trigger
*/
- protected $eventClass;
+ protected $triggerClass;
/**
* @var CRM_Civirules_Condition
@@ -39,7 +39,7 @@ class CRM_CivirulesConditions_Form_Form extends CRM_Core_Form
$this->condition = new CRM_Civirules_BAO_Condition();
$this->rule = new CRM_Civirules_BAO_Rule();
- $this->event = new CRM_Civirules_BAO_Event();
+ $this->trigger = new CRM_Civirules_BAO_Trigger();
if (!$this->ruleCondition->find(true)) {
throw new Exception('Civirules could not find ruleCondition');
@@ -55,9 +55,9 @@ class CRM_CivirulesConditions_Form_Form extends CRM_Core_Form
throw new Exception('Civirules could not find rule');
}
- $this->event->id = $this->rule->event_id;
- if (!$this->event->find(true)) {
- throw new Exception('Civirules could not find event');
+ $this->trigger->id = $this->rule->trigger_id;
+ if (!$this->trigger->find(true)) {
+ throw new Exception('Civirules could not find trigger');
}
$this->conditionClass = CRM_Civirules_BAO_Condition::getConditionObjectById($this->condition->id, false);
@@ -65,9 +65,9 @@ class CRM_CivirulesConditions_Form_Form extends CRM_Core_Form
$this->conditionClass->setRuleConditionData($ruleConditionData);
}
- $this->eventClass = CRM_Civirules_BAO_Event::getEventObjectByEventId($this->event->id, true);
- $this->eventClass->setEventId($this->event->id);
- $this->eventClass->setEventParams($this->rule->event_params);
+ $this->triggerClass = CRM_Civirules_BAO_Trigger::getTriggerObjectByTriggerId($this->trigger->id, true);
+ $this->triggerClass->setTriggerId($this->trigger->id);
+ $this->triggerClass->setTriggerParams($this->rule->trigger_params);
parent::preProcess();
diff --git a/CRM/CivirulesConditions/Generic/FieldChanged.php b/CRM/CivirulesConditions/Generic/FieldChanged.php
index b2aa1beb726d785b66df0e746426a5268d0f40e3..f383fcc2a6c0fb5542741a28a51250b3dca02381 100644
--- a/CRM/CivirulesConditions/Generic/FieldChanged.php
+++ b/CRM/CivirulesConditions/Generic/FieldChanged.php
@@ -29,23 +29,23 @@ abstract class CRM_CivirulesConditions_Generic_FieldChanged extends CRM_Civirule
/**
* Method to check if the condition is valid
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- //not the right event. The event data should contain also
- if (!$eventData instanceof CRM_Civirules_EventData_Interface_OriginalData) {
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ //not the right trigger. The trigger data should contain also
+ if (!$triggerData instanceof CRM_Civirules_TriggerData_Interface_OriginalData) {
return false;
}
$entity = $this->getEntity();
- if ($entity != $eventData->getOriginalEntity()) {
+ if ($entity != $triggerData->getOriginalEntity()) {
return false;
}
- $fieldData = $this->getFieldData($eventData);
- $originalData = $this->getOriginalFieldData($eventData);
+ $fieldData = $this->getFieldData($triggerData);
+ $originalData = $this->getOriginalFieldData($triggerData);
if (empty($fieldData) && empty($originalData)) {
return false; //both original and new data are null so assume not changed
@@ -87,13 +87,13 @@ abstract class CRM_CivirulesConditions_Generic_FieldChanged extends CRM_Civirule
/**
* Method to get the field data
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return mixed|null
* @access protected
*/
- protected function getFieldData(CRM_Civirules_EventData_EventData $eventData) {
+ protected function getFieldData(CRM_Civirules_TriggerData_TriggerData $triggerData) {
$entity = $this->getEntity();
- $data = $eventData->getEntityData($entity);
+ $data = $triggerData->getEntityData($entity);
$field = $this->getField();
if (isset($data[$field])) {
return $this->transformFieldData($data[$field]);
@@ -104,17 +104,17 @@ abstract class CRM_CivirulesConditions_Generic_FieldChanged extends CRM_Civirule
/**
* Method to get the original field data
*
- * @param object CRM_Civirules_EventData_Interface_OriginalData $eventData
+ * @param object CRM_Civirules_TriggerData_Interface_OriginalData $triggerData
* @return mixed|null
* @access protected
*/
- protected function getOriginalFieldData(CRM_Civirules_EventData_Interface_OriginalData $eventData) {
+ protected function getOriginalFieldData(CRM_Civirules_TriggerData_Interface_OriginalData $triggerData) {
$entity = $this->getEntity();
- if ($eventData->getOriginalEntity() != $entity) {
+ if ($triggerData->getOriginalEntity() != $entity) {
return null;
}
- $data = $eventData->getOriginalData();
+ $data = $triggerData->getOriginalData();
$field = $this->getField();
if (isset($data[$field])) {
return $this->transformFieldData($data[$field]);
diff --git a/CRM/CivirulesConditions/Generic/ValueComparison.php b/CRM/CivirulesConditions/Generic/ValueComparison.php
index 8affe2314b30871df8f2576eb47245038d353d17..105b17dcf326e7fb494c7d19c1dde812438ecd56 100644
--- a/CRM/CivirulesConditions/Generic/ValueComparison.php
+++ b/CRM/CivirulesConditions/Generic/ValueComparison.php
@@ -53,12 +53,12 @@ abstract class CRM_CivirulesConditions_Generic_ValueComparison extends CRM_Civir
* Returns the value of the field for the condition
* For example: I want to check if age > 50, this function would return the 50
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return
* @access protected
* @abstract
*/
- abstract protected function getFieldValue(CRM_Civirules_EventData_EventData $eventData);
+ abstract protected function getFieldValue(CRM_Civirules_TriggerData_TriggerData $triggerData);
/**
* Returns the value for the data comparison
@@ -118,13 +118,13 @@ abstract class CRM_CivirulesConditions_Generic_ValueComparison extends CRM_Civir
/**
* Mandatory method to return if the condition is valid
*
- * @param object CRM_Civirules_EventData_EventData $eventData
+ * @param object CRM_Civirules_TriggerData_TriggerData $triggerData
* @return bool
* @access public
*/
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- $value = $this->getFieldValue($eventData);
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $value = $this->getFieldValue($triggerData);
$compareValue = $this->getComparisonValue();
return $this->compare($value, $compareValue, $this->getOperator());
}
diff --git a/CRM/CivirulesConditions/GroupContact/GroupId.php b/CRM/CivirulesConditions/GroupContact/GroupId.php
index 256cbca6f1802b04bea7d2c4ad7d37aaa7aa8519..e8132391b6dab7f95ad42faa62545bc3b157bf00 100644
--- a/CRM/CivirulesConditions/GroupContact/GroupId.php
+++ b/CRM/CivirulesConditions/GroupContact/GroupId.php
@@ -18,8 +18,8 @@ class CRM_CivirulesConditions_GroupContact_GroupId extends CRM_Civirules_Conditi
}
}
- public function isConditionValid(CRM_Civirules_EventData_EventData $eventData) {
- $groupContact = $eventData->getEntityData('GroupContact');
+ public function isConditionValid(CRM_Civirules_TriggerData_TriggerData $triggerData) {
+ $groupContact = $triggerData->getEntityData('GroupContact');
if ($groupContact['group_id'] == $this->conditionParams['group_id']) {
return true;
}
diff --git a/CRM/CivirulesCronEvent/Birthday.php b/CRM/CivirulesCronTrigger/Birthday.php
similarity index 57%
rename from CRM/CivirulesCronEvent/Birthday.php
rename to CRM/CivirulesCronTrigger/Birthday.php
index bf4fd1c39abf0e007bc748e0ddc9401f7c2e39a1..32205d26577be6ca95865039b4db589c65888b8a 100644
--- a/CRM/CivirulesCronEvent/Birthday.php
+++ b/CRM/CivirulesCronTrigger/Birthday.php
@@ -1,51 +1,51 @@
<?php
/**
- * Class for CiviRules CronEvent Birthday
+ * Class for CiviRules CronTrigger Birthday
*
* @author Jaap Jansma (CiviCooP) <jaap.jansma@civicoop.org>
* @license AGPL-3.0
*/
-class CRM_CivirulesCronEvent_Birthday extends CRM_Civirules_Event_Cron {
+class CRM_CivirulesCronTrigger_Birthday extends CRM_Civirules_Trigger_Cron {
private $dao = false;
/**
- * Returns an array of entities on which the event reacts
+ * Returns an array of entities on which the t riggerreacts
*
- * @return CRM_Civirules_EventData_EntityDefinition
+ * @return CRM_Civirules_TriggerData_EntityDefinition
*/
protected function reactOnEntity() {
- return new CRM_Civirules_EventData_EntityDefinition(ts('Person'), 'contact', 'CRM_Contact_DAO_Contact', 'contact');
+ return new CRM_Civirules_TriggerData_EntityDefinition(ts('Person'), 'contact', 'CRM_Contact_DAO_Contact', 'contact');
}
/**
- * This method returns a CRM_Civirules_EventData_EventData this entity is used for triggering the rule
+ * This method returns a CRM_Civirules_TriggerData_TriggerData this entity is used for triggering the rule
*
* Return false when no next entity is available
*
- * @return object|bool CRM_Civirules_EventData_EventData|false
+ * @return object|bool CRM_Civirules_TriggerData_TriggerData|false
* @access protected
*/
- protected function getNextEntityEventData() {
+ protected function getNextEntityTriggerData() {
if (!$this->dao) {
- $this->queryForEventEntities();
+ $this->queryForTriggerEntities();
}
if ($this->dao->fetch()) {
$data = array();
CRM_Core_DAO::storeValues($this->dao, $data);
- $eventData = new CRM_Civirules_EventData_Cron($this->dao->id, 'contact', $data);
- return $eventData;
+ $triggerData = new CRM_Civirules_TriggerData_Cron($this->dao->id, 'contact', $data);
+ return $triggerData;
}
return false;
}
/**
- * Method to query event entities
+ * Method to query trigger entities
*
* @access private
*/
- private function queryForEventEntities() {
+ private function queryForTriggerEntities() {
$sql = "SELECT c.*
FROM `civicrm_contact` `c`
WHERE `c`.`birth_date` IS NOT NULL
@@ -60,5 +60,4 @@ class CRM_CivirulesCronEvent_Birthday extends CRM_Civirules_Event_Cron {
$params[1] = array($this->ruleId, 'Integer');
$this->dao = CRM_Core_DAO::executeQuery($sql, $params, true, 'CRM_Contact_BAO_Contact');
}
-
}
\ No newline at end of file
diff --git a/CRM/CivirulesCronEvent/Form/GroupMembership.php b/CRM/CivirulesCronTrigger/Form/GroupMembership.php
similarity index 87%
rename from CRM/CivirulesCronEvent/Form/GroupMembership.php
rename to CRM/CivirulesCronTrigger/Form/GroupMembership.php
index c05661736ec13e4b6bd74378cee7a723604cc914..86bc85f57f66879e9ad6d4048addfdcbf81f06d3 100644
--- a/CRM/CivirulesCronEvent/Form/GroupMembership.php
+++ b/CRM/CivirulesCronTrigger/Form/GroupMembership.php
@@ -6,7 +6,7 @@
* @license AGPL-3.0
*/
-class CRM_CivirulesCronEvent_Form_GroupMembership extends CRM_CivirulesEvent_Form_Form {
+class CRM_CivirulesCronTrigger_Form_GroupMembership extends CRM_CivirulesTrigger_Form_Form {
/**
* Method to get groups
@@ -41,7 +41,7 @@ class CRM_CivirulesCronEvent_Form_GroupMembership extends CRM_CivirulesEvent_For
*/
public function setDefaultValues() {
$defaultValues = parent::setDefaultValues();
- $data = unserialize($this->rule->event_params);
+ $data = unserialize($this->rule->trigger_params);
if (!empty($data['group_id'])) {
$defaultValues['group_id'] = $data['group_id'];
}
@@ -56,7 +56,7 @@ class CRM_CivirulesCronEvent_Form_GroupMembership extends CRM_CivirulesEvent_For
*/
public function postProcess() {
$data['group_id'] = $this->_submitValues['group_id'];
- $this->rule->event_params = serialize($data);
+ $this->rule->trigger_params = serialize($data);
$this->rule->save();
parent::postProcess();
diff --git a/CRM/CivirulesCronEvent/GroupMembership.php b/CRM/CivirulesCronTrigger/GroupMembership.php
similarity index 57%
rename from CRM/CivirulesCronEvent/GroupMembership.php
rename to CRM/CivirulesCronTrigger/GroupMembership.php
index 14399c3dbe5d0845a260efcb988e1dbdc553fa73..63ecd13effc0e9cfcaacf112e56d009fbf4bc078 100644
--- a/CRM/CivirulesCronEvent/GroupMembership.php
+++ b/CRM/CivirulesCronTrigger/GroupMembership.php
@@ -6,49 +6,49 @@
* Time: 10:26 AM
*/
-class CRM_CivirulesCronEvent_GroupMembership extends CRM_Civirules_Event_Cron {
+class CRM_CivirulesCronTrigger_GroupMembership extends CRM_Civirules_Trigger_Cron {
private $dao = false;
/**
- * This function returns a CRM_Civirules_EventData_EventData this entity is used for triggering the rule
+ * This function returns a CRM_Civirules_TriggerData_TriggerData this entity is used for triggering the rule
*
* Return false when no next entity is available
*
- * @return CRM_Civirules_EventData_EventData|false
+ * @return CRM_Civirules_TriggerData_TriggerData|false
*/
- protected function getNextEntityEventData() {
+ protected function getNextEntityTriggerData() {
if (!$this->dao) {
- if (!$this->queryForEventEntities()) {
+ if (!$this->queryForTriggerEntities()) {
return false;
}
}
if ($this->dao->fetch()) {
$data = array();
CRM_Core_DAO::storeValues($this->dao, $data);
- $eventData = new CRM_Civirules_EventData_Cron($this->dao->contact_id, 'GroupContact', $data);
- return $eventData;
+ $triggerData = new CRM_Civirules_TriggerData_Cron($this->dao->contact_id, 'GroupContact', $data);
+ return $triggerData;
}
return false;
}
/**
- * Returns an array of entities on which the event reacts
+ * Returns an array of entities on which the trigger reacts
*
- * @return CRM_Civirules_EventData_EntityDefinition
+ * @return CRM_Civirules_TriggerData_EntityDefinition
*/
protected function reactOnEntity() {
- return new CRM_Civirules_EventData_EntityDefinition('GroupContact', 'GroupContact', 'CRM_Contact_DAO_GroupContact', 'GroupContact');
+ return new CRM_Civirules_TriggerData_EntityDefinition('GroupContact', 'GroupContact', 'CRM_Contact_DAO_GroupContact', 'GroupContact');
}
/**
- * Method to query event entities
+ * Method to query trigger entities
*
* @access private
*/
- private function queryForEventEntities() {
+ private function queryForTriggerEntities() {
- if (empty($this->eventParams['group_id'])) {
+ if (empty($this->triggerParams['group_id'])) {
return false;
}
@@ -60,7 +60,7 @@ class CRM_CivirulesCronEvent_GroupMembership extends CRM_Civirules_Event_Cron {
FROM `civirule_rule_log` `rule_log`
WHERE `rule_log`.`rule_id` = %2 AND DATE(`rule_log`.`log_date`) = DATE(NOW())
)";
- $params[1] = array($this->eventParams['group_id'], 'Integer');
+ $params[1] = array($this->triggerParams['group_id'], 'Integer');
$params[2] = array($this->ruleId, 'Integer');
$this->dao = CRM_Core_DAO::executeQuery($sql, $params, true, 'CRM_Contact_DAO_GroupContact');
@@ -78,26 +78,26 @@ class CRM_CivirulesCronEvent_GroupMembership extends CRM_Civirules_Event_Cron {
* @abstract
*/
public function getExtraDataInputUrl($ruleId) {
- return CRM_Utils_System::url('civicrm/civirule/form/event/groupmembership/', 'rule_id='.$ruleId);
+ return CRM_Utils_System::url('civicrm/civirule/form/trigger/groupmembership/', 'rule_id='.$ruleId);
}
- public function setEventParams($eventParams) {
- $this->eventParams = unserialize($eventParams);
+ public function setTriggerParams($triggerParams) {
+ $this->triggerParams = unserialize($triggerParams);
}
/**
- * Returns a description of this event
+ * Returns a description of this trigger
*
* @return string
* @access public
* @abstract
*/
- public function getEventDescription() {
+ public function getTriggerDescription() {
$groupName = ts('Unknown');
try {
$groupName = civicrm_api3('Group', 'getvalue', array(
'return' => 'title',
- 'id' => $this->eventParams['group_id']
+ 'id' => $this->triggerParams['group_id']
));
} catch (Exception $e) {
//do nothing
@@ -106,5 +106,4 @@ class CRM_CivirulesCronEvent_GroupMembership extends CRM_Civirules_Event_Cron {
1 => $groupName
));
}
-
}
\ No newline at end of file
diff --git a/CRM/CivirulesPostEvent/Activity.php b/CRM/CivirulesPostEvent/Activity.php
deleted file mode 100644
index d091322e4bd964ef9b5010ffaa0beb137d7a521e..0000000000000000000000000000000000000000
--- a/CRM/CivirulesPostEvent/Activity.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-class CRM_CivirulesPostEvent_Activity extends CRM_Civirules_Event_Post {
-
- /**
- * Returns an array of entities on which the event reacts
- *
- * @return CRM_Civirules_EventData_EntityDefinition
- */
- protected function reactOnEntity() {
- return new CRM_Civirules_EventData_EntityDefinition($this->objectName, $this->objectName, $this->getDaoClassName(), 'Activity');
- }
-
- /**
- * Return the name of the DAO Class. If a dao class does not exist return an empty value
- *
- * @return string
- */
- protected function getDaoClassName() {
- return 'CRM_Activity_DAO_Activity';
- }
-
- /**
- * Trigger a rule for this event
- *
- * @param $op
- * @param $objectName
- * @param $objectId
- * @param $objectRef
- */
- public function triggerEvent($op, $objectName, $objectId, $objectRef) {
- $eventData = $this->getEventDataFromPost($op, $objectName, $objectId, $objectRef);
-
- //trigger for activity event for every source_contact_id, target_contact_id and assignee_contact_id
- $activityContact = new CRM_Activity_BAO_ActivityContact();
- $activityContact->activity_id = $objectId;
- $activityContact->find();
- while($activityContact->fetch()) {
- $data = array();
- CRM_Core_DAO::storeValues($activityContact, $data);
- $eventData->setEntityData('ActivityContact', $data);
- $contactObject = new CRM_Contact_BAO_Contact();
- $contactObject->id = $data['contact_id'];
- $contactObject->find(true);
- $contactData = array();
- CRM_Core_DAO::storeValues($contactObject, $contactData);
- $eventData->setEntityData('Contact', $contactData);
-
- CRM_Civirules_Engine::triggerRule($this, clone $eventData);
- }
- }
-
- /**
- * Returns an array of additional entities provided in this event
- *
- * @return array of CRM_Civirules_EventData_EntityDefinition
- */
- protected function getAdditionalEntities() {
- return array(
- new CRM_Civirules_EventData_EntityDefinition('ActivityContact', 'ActivityContact', 'CRM_Activity_DAO_ActivityContact' , 'ActivityContact'),
- new CRM_Civirules_EventData_EntityDefinition('Contact', 'Contact', 'CRM_Contact_DAO_Contact' , 'Contact'),
- );
- }
-
-}
\ No newline at end of file
diff --git a/CRM/CivirulesPostEvent/Contact.php b/CRM/CivirulesPostEvent/Contact.php
deleted file mode 100644
index 34d3849e63f846f5372471c77e9b421a26e9482a..0000000000000000000000000000000000000000
--- a/CRM/CivirulesPostEvent/Contact.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class CRM_CivirulesPostEvent_Contact extends CRM_Civirules_Event_Post {
-
- /**
- * Returns an array of entities on which the event reacts
- *
- * @return CRM_Civirules_EventData_EntityDefinition
- */
- protected function reactOnEntity() {
- return new CRM_Civirules_EventData_EntityDefinition($this->objectName, $this->objectName, $this->getDaoClassName(), 'contact');
- }
-
- /**
- * Return the name of the DAO Class. If a dao class does not exist return an empty value
- *
- * @return string
- */
- protected function getDaoClassName() {
- return 'CRM_Contact_DAO_Contact';
- }
-
-}
\ No newline at end of file
diff --git a/CRM/CivirulesPostTrigger/Activity.php b/CRM/CivirulesPostTrigger/Activity.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d07b14dbf26c6beee407fafd881f74440dbc4d2
--- /dev/null
+++ b/CRM/CivirulesPostTrigger/Activity.php
@@ -0,0 +1,65 @@
+<?php
+
+class CRM_CivirulesPostTrigger_Activity extends CRM_Civirules_Trigger_Post {
+
+ /**
+ * Returns an array of entities on which the trigger reacts
+ *
+ * @return CRM_Civirules_TriggerData_EntityDefinition
+ */
+ protected function reactOnEntity() {
+ return new CRM_Civirules_TriggerData_EntityDefinition($this->objectName, $this->objectName, $this->getDaoClassName(), 'Activity');
+ }
+
+ /**
+ * Return the name of the DAO Class. If a dao class does not exist return an empty value
+ *
+ * @return string
+ */
+ protected function getDaoClassName() {
+ return 'CRM_Activity_DAO_Activity';
+ }
+
+ /**
+ * Trigger a rule for this trigger
+ *
+ * @param $op
+ * @param $objectName
+ * @param $objectId
+ * @param $objectRef
+ */
+ public function triggerTrigger($op, $objectName, $objectId, $objectRef) {
+ $triggerData = $this->getTriggerDataFromPost($op, $objectName, $objectId, $objectRef);
+
+ //trigger for activity trigger for every source_contact_id, target_contact_id and assignee_contact_id
+ $activityContact = new CRM_Activity_BAO_ActivityContact();
+ $activityContact->activity_id = $objectId;
+ $activityContact->find();
+ while($activityContact->fetch()) {
+ $data = array();
+ CRM_Core_DAO::storeValues($activityContact, $data);
+ $triggerData->setEntityData('ActivityContact', $data);
+ $contactObject = new CRM_Contact_BAO_Contact();
+ $contactObject->id = $data['contact_id'];
+ $contactObject->find(true);
+ $contactData = array();
+ CRM_Core_DAO::storeValues($contactObject, $contactData);
+ $triggerData->setEntityData('Contact', $contactData);
+
+ CRM_Civirules_Engine::triggerRule($this, clone $triggerData);
+ }
+ }
+
+ /**
+ * Returns an array of additional entities provided in this trigger
+ *
+ * @return array of CRM_Civirules_TriggerData_EntityDefinition
+ */
+ protected function getAdditionalEntities() {
+ return array(
+ new CRM_Civirules_TriggerData_EntityDefinition('ActivityContact', 'ActivityContact', 'CRM_Activity_DAO_ActivityContact' , 'ActivityContact'),
+ new CRM_Civirules_TriggerData_EntityDefinition('Contact', 'Contact', 'CRM_Contact_DAO_Contact' , 'Contact'),
+ );
+ }
+
+}
\ No newline at end of file
diff --git a/CRM/CivirulesPostTrigger/Contact.php b/CRM/CivirulesPostTrigger/Contact.php
new file mode 100644
index 0000000000000000000000000000000000000000..412a509502dc41016d49fee0c7aabaa3724ed695
--- /dev/null
+++ b/CRM/CivirulesPostTrigger/Contact.php
@@ -0,0 +1,23 @@
+<?php
+
+class CRM_CivirulesPostTrigger_Contact extends CRM_Civirules_Trigger_Post {
+
+ /**
+ * Returns an array of entities on which the trigger reacts
+ *
+ * @return CRM_Civirules_TriggerData_EntityDefinition
+ */
+ protected function reactOnEntity() {
+ return new CRM_Civirules_TriggerData_EntityDefinition($this->objectName, $this->objectName, $this->getDaoClassName(), 'contact');
+ }
+
+ /**
+ * Return the name of the DAO Class. If a dao class does not exist return an empty value
+ *
+ * @return string
+ */
+ protected function getDaoClassName() {
+ return 'CRM_Contact_DAO_Contact';
+ }
+
+}
\ No newline at end of file
diff --git a/CRM/CivirulesPostEvent/GroupContact.php b/CRM/CivirulesPostTrigger/GroupContact.php
similarity index 65%
rename from CRM/CivirulesPostEvent/GroupContact.php
rename to CRM/CivirulesPostTrigger/GroupContact.php
index 3b57dceb4169d66cf48b2f466921c8502995184a..f229b573203dc28dfc77cd7d7055768b86424ca8 100644
--- a/CRM/CivirulesPostEvent/GroupContact.php
+++ b/CRM/CivirulesPostTrigger/GroupContact.php
@@ -1,14 +1,14 @@
<?php
-class CRM_CivirulesPostEvent_GroupContact extends CRM_Civirules_Event_Post {
+class CRM_CivirulesPostTrigger_GroupContact extends CRM_Civirules_Trigger_Post {
/**
- * Returns an array of entities on which the event reacts
+ * Returns an array of entities on which the trigger reacts
*
- * @return CRM_Civirules_EventData_EntityDefinition
+ * @return CRM_Civirules_TriggerData_EntityDefinition
*/
protected function reactOnEntity() {
- return new CRM_Civirules_EventData_EntityDefinition($this->objectName, $this->objectName, $this->getDaoClassName(), 'GroupContact');
+ return new CRM_Civirules_TriggerData_EntityDefinition($this->objectName, $this->objectName, $this->getDaoClassName(), 'GroupContact');
}
/**
@@ -21,14 +21,14 @@ class CRM_CivirulesPostEvent_GroupContact extends CRM_Civirules_Event_Post {
}
/**
- * Trigger a rule for this event
+ * Trigger a rule for this trigger
*
* @param $op
* @param $objectName
* @param $objectId
* @param $objectRef
*/
- public function triggerEvent($op, $objectName, $objectId, $objectRef) {
+ public function triggerTrigger($op, $objectName, $objectId, $objectRef) {
//in case of GroupContact $objectRef consist of an array of contactIds
//so convert this array to group contact objects
//we do this by a query on the group_contact table to retrieve the latest records for this group and contact
@@ -41,9 +41,8 @@ class CRM_CivirulesPostEvent_GroupContact extends CRM_Civirules_Event_Post {
while ($dao->fetch()) {
$data = array();
CRM_Core_DAO::storeValues($dao, $data);
- $eventData = $this->getEventDataFromPost($op, $objectName, $objectId, $data);
- CRM_Civirules_Engine::triggerRule($this, clone $eventData);
+ $triggerData = $this->getTriggerDataFromPost($op, $objectName, $objectId, $data);
+ CRM_Civirules_Engine::triggerRule($this, clone $triggerData);
}
}
-
}
\ No newline at end of file
diff --git a/CRM/CivirulesEvent/Form/Form.php b/CRM/CivirulesTrigger/Form/Form.php
similarity index 67%
rename from CRM/CivirulesEvent/Form/Form.php
rename to CRM/CivirulesTrigger/Form/Form.php
index e26a1efa18a9a939d04c22333e10f40f1ee326d7..f84c90216d00447d2161418132367c44fdcb55e4 100644
--- a/CRM/CivirulesEvent/Form/Form.php
+++ b/CRM/CivirulesTrigger/Form/Form.php
@@ -1,18 +1,18 @@
<?php
-class CRM_CivirulesEvent_Form_Form extends CRM_Core_Form
+class CRM_CivirulesTrigger_Form_Form extends CRM_Core_Form
{
protected $ruleId = false;
protected $rule;
- protected $event;
+ protected $trigger;
/**
- * @var CRM_Civirules_Event
+ * @var CRM_Civirules_Trigger
*/
- protected $eventClass;
+ protected $triggerClass;
/**
* Overridden parent method to perform processing before form is build
@@ -24,22 +24,22 @@ class CRM_CivirulesEvent_Form_Form extends CRM_Core_Form
$this->ruleId = CRM_Utils_Request::retrieve('rule_id', 'Integer');
$this->rule = new CRM_Civirules_BAO_Rule();
- $this->event = new CRM_Civirules_BAO_Event();
+ $this->trigger = new CRM_Civirules_BAO_Trigger();
$this->rule->id = $this->ruleId;
if (!$this->rule->find(true)) {
throw new Exception('Civirules could not find rule');
}
- $this->event->id = $this->rule->event_id;
- if (!$this->event->find(true)) {
- throw new Exception('Civirules could not find event');
+ $this->trigger->id = $this->rule->trigger_id;
+ if (!$this->trigger->find(true)) {
+ throw new Exception('Civirules could not find trigger');
}
- $this->eventClass = CRM_Civirules_BAO_Event::getEventObjectByEventId($this->event->id, true);
- $this->eventClass->setEventId($this->event->id);
- $this->eventClass->setRuleId($this->rule->id);
- $this->eventClass->setEventParams($this->rule->event_params);
+ $this->triggerClass = CRM_Civirules_BAO_Trigger::getTriggerObjectByTriggerId($this->trigger->id, true);
+ $this->triggerClass->setTriggerId($this->trigger->id);
+ $this->triggerClass->setRuleId($this->rule->id);
+ $this->triggerClass->setTriggerParams($this->rule->trigger_params);
parent::preProcess();
@@ -77,8 +77,8 @@ class CRM_CivirulesEvent_Form_Form extends CRM_Core_Form
* @access protected
*/
protected function setFormTitle() {
- $title = 'CiviRules Edit event parameters';
- $this->assign('ruleEventHeader', 'Edit rule '.$this->rule->label);
+ $title = 'CiviRules Edit trigger parameters';
+ $this->assign('ruleTriggerHeader', 'Edit rule '.$this->rule->label);
CRM_Utils_System::setTitle($title);
}
diff --git a/civirules.php b/civirules.php
index b7f3919998cc931a99d95356401af1f955a8d02f..8d879a3f562e2ae954bad5822b2f55dbcc933a8a 100755
--- a/civirules.php
+++ b/civirules.php
@@ -133,5 +133,5 @@ function civirules_civicrm_pre($op, $objectName, $objectId, &$params) {
}
function civirules_civicrm_post( $op, $objectName, $objectId, &$objectRef ) {
- CRM_Civirules_Event_Post::post($op, $objectName, $objectId, $objectRef);
+ CRM_Civirules_Trigger_Post::post($op, $objectName, $objectId, $objectRef);
}
diff --git a/info.xml b/info.xml
index 3424fff9fd954c5bd29690073f7c5cf6dc8caed2..79763571d1906310def1524d9ea337dad8f68b98 100755
--- a/info.xml
+++ b/info.xml
@@ -15,7 +15,7 @@
<email>helpdesk@civicoop.org</email>
</maintainer>
<releaseDate>2015-01-13</releaseDate>
- <version>1.0</version>
+ <version>1.1</version>
<develStage>stable</develStage>
<compatibility>
<ver>4.4</ver>
diff --git a/sql/createCiviruleRule.sql b/sql/createCiviruleRule.sql
index 266af8e3563606f76e15d23a34c5d1f4f6c98749..9f84630f06356331cbaf965cbeeeee609a98c313 100755
--- a/sql/createCiviruleRule.sql
+++ b/sql/createCiviruleRule.sql
@@ -2,8 +2,8 @@ CREATE TABLE IF NOT EXISTS civirule_rule (
id INT UNSIGNED NOT NULL AUTO_INCREMENT,
name VARCHAR(80) NULL,
label VARCHAR(128) NULL,
- event_id INT UNSIGNED NULL,
- event_params TEXT NULL,
+ trigger_id INT UNSIGNED NULL,
+ trigger_params TEXT NULL,
is_active TINYINT NULL DEFAULT 1,
created_date DATE NULL,
created_user_id INT NULL,
@@ -11,10 +11,10 @@ CREATE TABLE IF NOT EXISTS civirule_rule (
modified_user_id INT NULL,
PRIMARY KEY (id),
UNIQUE INDEX id_UNIQUE (id ASC),
- INDEX fk_rule_event_idx (event_id ASC),
- CONSTRAINT fk_rule_event
- FOREIGN KEY (event_id)
- REFERENCES civirule_event (id)
+ INDEX fk_rule_trigger_idx (trigger_id ASC),
+ CONSTRAINT fk_rule_trigger
+ FOREIGN KEY (trigger_id)
+ REFERENCES civirule_trigger (id)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB
diff --git a/sql/createCiviruleEvent.sql b/sql/createCiviruleTrigger.sql
similarity index 91%
rename from sql/createCiviruleEvent.sql
rename to sql/createCiviruleTrigger.sql
index 5616a4a0e98c0098b8ffed4bb3e1bb0336bef0dc..718d33547f89cdad5a67b6e2da2724e105e68562 100755
--- a/sql/createCiviruleEvent.sql
+++ b/sql/createCiviruleTrigger.sql
@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS civirule_event (
+CREATE TABLE IF NOT EXISTS civirule_trigger (
id INT UNSIGNED NOT NULL AUTO_INCREMENT,
name VARCHAR(80) NULL,
label VARCHAR(128) NULL,
diff --git a/sql/insertCiviruleEvent.sql b/sql/insertCiviruleTrigger.sql
similarity index 95%
rename from sql/insertCiviruleEvent.sql
rename to sql/insertCiviruleTrigger.sql
index 36cfb608f1d557ccfe372575226be4cfaa5c00f4..51441a525954b5a818527f40b78acea703a70f39 100644
--- a/sql/insertCiviruleEvent.sql
+++ b/sql/insertCiviruleTrigger.sql
@@ -1,4 +1,4 @@
-INSERT INTO civirule_event (name, label, object_name, op, class_name, created_date, created_user_id)
+INSERT INTO civirule_trigger (name, label, object_name, op, class_name, created_date, created_user_id)
VALUES
('new_activity', 'Activity is added', 'Activity', 'create', 'CRM_CivirulesPostEvent_Activity', CURDATE(), 1),
('changed_activity', 'Activity is changed', 'Activity', 'edit', 'CRM_CivirulesPostEvent_Activity', CURDATE(), 1),
@@ -30,7 +30,7 @@ VALUES
('trashed_organization', 'Organization is trashed', 'Organization', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1),
('restored_organization', 'Organization is restored', 'Organization', 'delete', 'CRM_CivirulesPostEvent_Contact', CURDATE(), 1);
-INSERT INTO civirule_event (name, label, object_name, op, class_name, created_date, created_user_id)
+INSERT INTO civirule_trigger (name, label, object_name, op, class_name, created_date, created_user_id)
VALUES
('new_contribution', 'Contribution is added', 'Contribution', 'create', null, CURDATE(), 1),
('changed_contribution', 'Contribution is changed', 'Contribution', 'edit', null, CURDATE(), 1),
@@ -61,7 +61,7 @@ VALUES
('changed_membership_payment', 'Membership Payment is changed', 'MembershipPayment', 'edit', null, CURDATE(), 1),
('deleted_membership_payment', 'Membership Payment is deleted', 'MembershipPayment', 'delete', null, CURDATE(), 1);
-INSERT INTO civirule_event (name, label, object_name, op, class_name, created_date, created_user_id)
+INSERT INTO civirule_trigger (name, label, object_name, op, class_name, created_date, created_user_id)
VALUES
('new_participant', 'Event Participant is added', 'Participant', 'create', null, CURDATE(), 1),
('changed_participant', 'Event Participant is changed', 'Participant', 'edit', null, CURDATE(), 1),
@@ -85,7 +85,7 @@ VALUES
('changed_tag', 'Tag is changed', 'Tag', 'edit', null, CURDATE(), 1),
('deleted_tag', 'Tag is deleted', 'Tag', 'delete', null, CURDATE(), 1);
-INSERT INTO civirule_event (name, label, object_name, op, cron, class_name, created_date, created_user_id)
+INSERT INTO civirule_trigger (name, label, object_name, op, cron, class_name, created_date, created_user_id)
VALUES
('birthday', 'Individual has birthday', null, null, 1, 'CRM_CivirulesCronEvent_Birthday', CURDATE(), 1),
('groupmembership', 'Daily trigger for group members', null, null, 1, 'CRM_CivirulesCronEvent_GroupMembership', CURDATE(), 1);
diff --git a/sql/uninstall.sql b/sql/uninstall.sql
index 17d12e4600fca4e51836f90bc161d93773aada67..fb797e8b35b088d06c40c1e8c0bfccd3c444adb7 100644
--- a/sql/uninstall.sql
+++ b/sql/uninstall.sql
@@ -4,4 +4,4 @@ DROP TABLE IF EXISTS `civirule_rule_log`;
DROP TABLE IF EXISTS `civirule_rule`;
DROP TABLE IF EXISTS `civirule_action`;
DROP TABLE IF EXISTS `civirule_condition`;
-DROP TABLE IF EXISTS `civirule_event`;
\ No newline at end of file
+DROP TABLE IF EXISTS `civirule_trigger`;
\ No newline at end of file
diff --git a/templates/CRM/Civirules/Form/Rule.tpl b/templates/CRM/Civirules/Form/Rule.tpl
index ba47951e15dbe350f70e7995a8f10e84f410320a..f7ccec7de5d0145d321218df5d7c03622888111d 100755
--- a/templates/CRM/Civirules/Form/Rule.tpl
+++ b/templates/CRM/Civirules/Form/Rule.tpl
@@ -10,7 +10,7 @@
</div>
{else}
{include file="CRM/Civirules/Form/RuleBlocks/RuleBlock.tpl"}
- {include file="CRM/Civirules/Form/RuleBlocks/EventBlock.tpl"}
+ {include file="CRM/Civirules/Form/RuleBlocks/TriggerBlock.tpl"}
{if $action ne 1}
{include file="CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl"}
{include file="CRM/Civirules/Form/RuleBlocks/ActionBlock.tpl"}
diff --git a/templates/CRM/Civirules/Form/RuleBlocks/EventBlock.tpl b/templates/CRM/Civirules/Form/RuleBlocks/EventBlock.tpl
deleted file mode 100755
index 03e4b2540dcb68151b4c65bb67cc856219cc2acf..0000000000000000000000000000000000000000
--- a/templates/CRM/Civirules/Form/RuleBlocks/EventBlock.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{* block for linked event *}
-<h3>Linked Event</h3>
-<div class="crm-block crm-form-block crm-civirule-event-block">
- {if empty($form.rule_event_label.value)}
- <div class="crm-section">
- <div class="label">{$form.rule_event_select.label}</div>
- <div class="content">{$form.rule_event_select.html}</div>
- <div class="clear"></div>
- </div>
- {else}
- <div class="crm-section">
- <div id="civirule_eventBlock-wrapper" class="dataTables_wrapper">
- <table id="civirule-eventBlock-table" class="display">
- <tbody>
- <tr class="odd-row">
- <td>
- {$form.rule_event_label.value}
- {if $eventClass && $eventClass->getEventDescription()}
- <br><span class="description">
- {$eventClass->getEventDescription()}
- </span>
- {/if}
- {if $event_edit_params}
- <br><a href="{$event_edit_params}">{ts}Edit event parameters{/ts}</a>
- {/if}
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- {/if}
-</div>
-
diff --git a/templates/CRM/Civirules/Form/RuleBlocks/TriggerBlock.tpl b/templates/CRM/Civirules/Form/RuleBlocks/TriggerBlock.tpl
new file mode 100755
index 0000000000000000000000000000000000000000..a27ef3c2e72f796d4f43eff93c639e14504ca4f1
--- /dev/null
+++ b/templates/CRM/Civirules/Form/RuleBlocks/TriggerBlock.tpl
@@ -0,0 +1,34 @@
+{* block for linked trigger *}
+<h3>Linked Trigger</h3>
+<div class="crm-block crm-form-block crm-civirule-trigger-block">
+ {if empty($form.rule_trigger_label.value)}
+ <div class="crm-section">
+ <div class="label">{$form.rule_trigger_select.label}</div>
+ <div class="content">{$form.rule_trigger_select.html}</div>
+ <div class="clear"></div>
+ </div>
+ {else}
+ <div class="crm-section">
+ <div id="civirule_triggerBlock-wrapper" class="dataTables_wrapper">
+ <table id="civirule-triggerBlock-table" class="display">
+ <tbody>
+ <tr class="odd-row">
+ <td>
+ {$form.rule_trigger_label.value}
+ {if $triggerClass && $triggerClass->getTriggerDescription()}
+ <br><span class="description">
+ {$triggerClass->getTriggerDescription()}
+ </span>
+ {/if}
+ {if $trigger_edit_params}
+ <br><a href="{$trigger_edit_params}">{ts}Edit trigger parameters{/ts}</a>
+ {/if}
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ {/if}
+</div>
+
diff --git a/templates/CRM/Civirules/Page/Rule.tpl b/templates/CRM/Civirules/Page/Rule.tpl
index d4655f8a15d9a61efc691e3a6bd51ed0c44f2e85..21a0e90c5eda5ce71910500d76b089ba84219e01 100755
--- a/templates/CRM/Civirules/Page/Rule.tpl
+++ b/templates/CRM/Civirules/Page/Rule.tpl
@@ -12,7 +12,7 @@
<thead>
<tr>
<th class="sorting-disabled" rowspan="1" colspan="1">{ts}Name{/ts}</th>
- <th class="sorting-disabled" rowspan="1" colspan="1">{ts}Event{/ts}</th>
+ <th class="sorting-disabled" rowspan="1" colspan="1">{ts}Trigger{/ts}</th>
<th class="sorting-disabled" rowspan="1" colspan="1">{ts}Active{/ts}</th>
<th class="sorting-disabled" rowspan="1" colspan="1">{ts}Date Created{/ts}</th>
<th class="sorting-disabled" rowspan="1" colspan="1">{ts}Created By{/ts}</th>
@@ -24,7 +24,7 @@
{foreach from=$rules key=rule_id item=rule}
<tr id="row1" class={$row_class}>
<td>{$rule.label}</td>
- <td>{$rule.event_label}</td>
+ <td>{$rule.trigger_label}</td>
<td>{$rule.is_active}</td>
<td>{$rule.created_date|crmDate}</td>
<td>{$rule.created_contact_name}</td>
diff --git a/templates/CRM/CivirulesCronEvent/Form/GroupMembership.tpl b/templates/CRM/CivirulesCronTrigger/Form/GroupMembership.tpl
similarity index 71%
rename from templates/CRM/CivirulesCronEvent/Form/GroupMembership.tpl
rename to templates/CRM/CivirulesCronTrigger/Form/GroupMembership.tpl
index cced0a4a65206d44fc1041bd8c4fd1ec31b5bf27..817e52872300baad52fd431d20f7d36f915de885 100644
--- a/templates/CRM/CivirulesCronEvent/Form/GroupMembership.tpl
+++ b/templates/CRM/CivirulesCronTrigger/Form/GroupMembership.tpl
@@ -1,5 +1,5 @@
-<h3>{$ruleEventHeader}</h3>
-<div class="crm-block crm-form-block crm-civirule-cron_event-block-group_membership">
+<h3>{$ruleTriggerHeader}</h3>
+<div class="crm-block crm-form-block crm-civirule-cron_trigger-block-group_membership">
<div class="crm-section">
<div class="label">{$form.group_id.label}</div>
<div class="content">{$form.group_id.html}</div>
diff --git a/xml/Menu/civirules.xml b/xml/Menu/civirules.xml
index 0dd0bd1bc7d9ca4ef047c1696f0bd03f7fbbb50e..4be88e7548617d4e79fd57b4d3e70a8b011c7d08 100755
--- a/xml/Menu/civirules.xml
+++ b/xml/Menu/civirules.xml
@@ -141,8 +141,8 @@
<access_arguments>administer CiviCRM</access_arguments>
</item>
<item>
- <path>civicrm/civirule/form/event/groupmembership</path>
- <page_callback>CRM_CivirulesCronEvent_Form_GroupMembership</page_callback>
+ <path>civicrm/civirule/form/trigger/groupmembership</path>
+ <page_callback>CRM_CivirulesCronTrigger_Form_GroupMembership</page_callback>
<title>Group membership</title>
<access_arguments>access CiviCRM</access_arguments>
<access_arguments>administer CiviCRM</access_arguments>