bulk comment fixes

[civicrm-core.git] / CRM / Activity / BAO / ActivityTarget.php

diff --git a/CRM/Activity/BAO/ActivityTarget.php b/CRM/Activity/BAO/ActivityTarget.php
index 55367b2aaacc46824d71faad95d2be8211e3ba1d..76ae5c2f3910cae7b43dcc355f402fafed3fdf88 100644 (file)
--- a/CRM/Activity/BAO/ActivityTarget.php
+++ b/CRM/Activity/BAO/ActivityTarget.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -58,21 +58,24 @@ class CRM_Activity_BAO_ActivityTarget extends CRM_Activity_DAO_ActivityContact {
    */
   public static function create(&$params) {
     $target = new CRM_Activity_BAO_ActivityContact();
+    $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name');
+    $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
 
     $target->copyValues($params);
-    $target->record_type = 'Target';
+    $target->record_type_id = $targetID ;
     return $target->save();
   }
 
   /**
    * function to retrieve id of target contact by activity_id
    *
-   * @param int    $id  ID of the activity
+   * @param $activity_id
+   *
+   * @internal param int $id ID of the activity
    *
    * @return mixed
    *
    * @access public
-   *
    */
   static function retrieveTargetIdsByActivityId($activity_id) {
     $targetArray = array();
@@ -80,12 +83,15 @@ class CRM_Activity_BAO_ActivityTarget extends CRM_Activity_DAO_ActivityContact {
       return $targetArray;
     }
 
+    $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name');
+    $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
+
     $sql = "
 SELECT     contact_id
 FROM       civicrm_activity_contact
 INNER JOIN civicrm_contact ON contact_id = civicrm_contact.id
 WHERE      activity_id = %1
-AND        record_type = 'Target'
+AND        record_type_id = $targetID
 AND        civicrm_contact.is_deleted = 0
 ";
     $target = CRM_Core_DAO::executeQuery($sql, array(1 => array($activity_id, 'Integer')));
@@ -111,13 +117,15 @@ AND        civicrm_contact.is_deleted = 0
     if (empty($activityID)) {
       return $targetNames;
     }
+    $activityContacts = CRM_Core_OptionGroup::values('activity_contacts', FALSE, FALSE, FALSE, NULL, 'name');
+    $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
 
     $query = "
 SELECT     contact_a.id, contact_a.sort_name
 FROM       civicrm_contact contact_a
 INNER JOIN civicrm_activity_contact ON civicrm_activity_contact.contact_id = contact_a.id
 WHERE      civicrm_activity_contact.activity_id = %1
-AND        civicrm_activity_contact.record_type = 'Target'
+AND        civicrm_activity_contact.record_type_id = $targetID
 AND        contact_a.is_deleted = 0
 ";
     $queryParam = array(1 => array($activityID, 'Integer'));