From b09e7ce7e8b2642bb7dcb2ca0544317f0ea867ae Mon Sep 17 00:00:00 2001
From: unknown <priyanka.karan26@gmail.com>
Date: Mon, 13 Oct 2014 16:54:24 +0100
Subject: [PATCH] change used_for column value to civicrm_type (entity-table)

---
 CRM/Activity/Form/Activity.php        |  2 +-
 CRM/Core/Form/RecurringEntity.php     | 32 ++++++++++++---------------
 CRM/Event/Form/ManageEvent/Repeat.php |  2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 051761377f..4258f243cd 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -964,7 +964,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
           'isRecurringEntityRecord' => FALSE,
         )
       );
-      CRM_Core_Form_RecurringEntity::postProcess($params, 'activity', $linkedEntities);
+      CRM_Core_Form_RecurringEntity::postProcess($params, 'civicrm_activity', $linkedEntities);
     }
 
     return array('activity' => $activity);
diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php
index d62342a75a..a9a9a9f63f 100644
--- a/CRM/Core/Form/RecurringEntity.php
+++ b/CRM/Core/Form/RecurringEntity.php
@@ -67,12 +67,7 @@ class CRM_Core_Form_RecurringEntity {
   * Entity Table
   */
   public static $_entityTable;
-  
-  /**
-  * Entity Type
-  */
-  public static $_entityType;
-  
+    
   /**
    * Checks current entityID has parent
    */
@@ -81,27 +76,22 @@ class CRM_Core_Form_RecurringEntity {
   static function preProcess($entityTable) {
     self::$_entityId = (int) CRM_Utils_Request::retrieve('id', 'Positive');
     self::$_entityTable = $entityTable;
-    $entityType = array();
+    
     if (self::$_entityId && $entityTable) {
       $checkParentExistsForThisId = CRM_Core_BAO_RecurringEntity::getParentFor(self::$_entityId, $entityTable);    
-      $entityType = explode("_", $entityTable);
-      self::$_entityType = $entityType[1];
-      if (self::$_entityType) {
-        self::$_entityType = self::$_entityType;
-      }
       if ($checkParentExistsForThisId) {
         self::$_hasParent = TRUE;
         self::$_parentEntityId = $checkParentExistsForThisId;
-        self::$_scheduleReminderDetails = CRM_Core_BAO_RecurringEntity::getReminderDetailsByEntityId($checkParentExistsForThisId, self::$_entityType);
+        self::$_scheduleReminderDetails = CRM_Core_BAO_RecurringEntity::getReminderDetailsByEntityId($checkParentExistsForThisId, $entityTable);
       }
       else {
         self::$_parentEntityId = self::$_entityId;
-        self::$_scheduleReminderDetails = CRM_Core_BAO_RecurringEntity::getReminderDetailsByEntityId(self::$_entityId, self::$_entityType);
+        self::$_scheduleReminderDetails = CRM_Core_BAO_RecurringEntity::getReminderDetailsByEntityId(self::$_entityId, $entityTable);
       }
       self::$_scheduleReminderID = self::$_scheduleReminderDetails->id;
     }
-    if (self::$_entityType) {
-      CRM_Core_OptionValue::getValues(array('name' => self::$_entityType.'_repeat_exclude_dates_'.self::$_parentEntityId), $optionValue);
+    if ($entityTable) {
+      CRM_Core_OptionValue::getValues(array('name' => $entityTable.'_repeat_exclude_dates_'.self::$_parentEntityId), $optionValue);
       $excludeOptionValues = array();
       if (!empty($optionValue)) {
         foreach($optionValue as $key => $val) {
@@ -378,6 +368,12 @@ class CRM_Core_Form_RecurringEntity {
         }
       }
 
+      //Set type for API
+      $apiEntityType = array();
+      $apiEntityType = explode("_", $type);
+      if (!empty($apiEntityType[1])) {
+        $apiType = $apiEntityType[1];
+      }
       //Delete relations if any from recurring entity tables before inserting new relations for this entity id
       if ($params['entity_id']) {
         //If entity has any pre delete function, consider that first
@@ -394,7 +390,7 @@ class CRM_Core_Form_RecurringEntity {
             //Check if pre delete function has some ids to be deleted
             if (!empty(CRM_Core_BAO_RecurringEntity::$_entitiesToBeDeleted)) {
               foreach (CRM_Core_BAO_RecurringEntity::$_entitiesToBeDeleted as $value) {
-                $result = civicrm_api3(ucfirst(strtolower($type)), CRM_Core_BAO_RecurringEntity::$_recurringEntityHelper[$params['entity_table']]['delete_func'], array(
+                $result = civicrm_api3(ucfirst(strtolower($apiType)), CRM_Core_BAO_RecurringEntity::$_recurringEntityHelper[$params['entity_table']]['delete_func'], array(
                           'sequential' => 1,
                           'id' => $value,
                           ));
@@ -406,7 +402,7 @@ class CRM_Core_Form_RecurringEntity {
             else {
               $getRelatedEntities = CRM_Core_BAO_RecurringEntity::getEntitiesFor($params['entity_id'], $params['entity_table'], FALSE);
               foreach ($getRelatedEntities as $key => $value) {
-                $result = civicrm_api3(ucfirst(strtolower($type)), CRM_Core_BAO_RecurringEntity::$_recurringEntityHelper[$params['entity_table']]['delete_func'], array(
+                $result = civicrm_api3(ucfirst(strtolower($apiType)), CRM_Core_BAO_RecurringEntity::$_recurringEntityHelper[$params['entity_table']]['delete_func'], array(
                           'sequential' => 1,
                           'id' => $value['id'],
                           ));
diff --git a/CRM/Event/Form/ManageEvent/Repeat.php b/CRM/Event/Form/ManageEvent/Repeat.php
index 591f2b6d4f..e61bdfcfbc 100644
--- a/CRM/Event/Form/ManageEvent/Repeat.php
+++ b/CRM/Event/Form/ManageEvent/Repeat.php
@@ -150,7 +150,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
           'isRecurringEntityRecord' => TRUE,
         ),
       );
-      CRM_Core_Form_RecurringEntity::postProcess($params, 'event', $linkedEntities);
+      CRM_Core_Form_RecurringEntity::postProcess($params, 'civicrm_event', $linkedEntities);
       CRM_Utils_System::redirect(CRM_Utils_System::url($url, $urlParams));
     }
     else {
-- 
2.25.1