CRM-13331 re-apply email send once fix but in a way more true to origina...

CRM/Admin/Form/Preferences/Mailing.php

@@ -92,6 +92,13 @@ function preProcess() {
           'weight' => 7,
           'description' => NULL,
         ),
+        'disable_mandatory_tokens_check' =>
+        array(
+          'html_type' => 'checkbox',
+          'title' => ts('Disable check for mandatory tokens'),
+          'weight' => 9,
+          'description' => ts('Don\'t check for presence of mandatory tokens (domain address; unsubscribe/opt-out) before sending mailings. WARNING: Mandatory tokens are a safe-guard which facilitate compliance with the US CAN-SPAM Act. They should only be disabled if your organization adopts other mechanisms for compliance or if your organization is not subject to CAN-SPAM.'),
+        ),
       ),
     );
 

CRM/Contact/BAO/GroupContactCache.php

@@ -336,15 +336,21 @@ static function load(&$group, $fresh = FALSE) {
 
     $groupIDs = array($groupID);
     self::remove($groupIDs);
-
+    $tempTable = 'civicrm_temp_group_contact_cache' . rand(0,2000);
     foreach (array($sql, $sqlB) as $selectSql) {
       if (!$selectSql) {
         continue;
       }
-      $insertSql = "INSERT IGNORE INTO civicrm_group_contact_cache (group_id,contact_id) ($selectSql);";
+      $insertSql = "CREATE TEMPORARY TABLE $tempTable ($selectSql);";
       $processed = TRUE; // FIXME
       $result = CRM_Core_DAO::executeQuery($insertSql);
+      CRM_Core_DAO::executeQuery(
+        "INSERT IGNORE INTO civicrm_group_contact_cache (contact_id, group_id)
+        SELECT DISTINCT $idName , group_id FROM $tempTable
+      ");
+      CRM_Core_DAO::executeQuery(" DROP TABLE $tempTable");
     }
+
     self::updateCacheTime($groupIDs, $processed);
 
     if ($group->children) {

CRM/Contact/BAO/Query.php

@@ -353,7 +353,17 @@ class CRM_Contact_BAO_Query {
    * so we can skip the other
    */
   protected $_rangeCache = array();
+/**
+ * Set to true when $this->relationship is run to avoid adding twice
+ * @var Boolean
+ */
+  protected $_relationshipValuesAdded = FALSE;
 
+  /**
+   * Set to the name of the temp table if one has been created
+   * @var String
+   */
+  static $_relationshipTempTable = NULL;
   /**
    * class constructor which also does all the work
    *
@@ -1456,15 +1466,16 @@ function whereClauseSingle(&$values) {
         return;
 
       case 'relation_type_id':
-        $this->relationship($values);
-        return;
-
+      case 'relation_start_date_high':
+      case 'relation_start_date_low':
+      case 'relation_end_date_high':
+      case 'relation_end_date_low':
       case 'relation_target_name':
-        // since this case is handled with the above
-        return;
-
       case 'relation_status':
-        // since this case is handled with the above
+      case 'relation_date_low':
+      case 'relation_date_high':
+        $this->relationship($values);
+        $this->_relationshipValuesAdded = TRUE;
         return;
 
       case 'task_status_id':
@@ -1509,7 +1520,6 @@ function whereClause() {
     $this->includeContactIds();
     if (!empty($this->_params)) {
       $activity = FALSE;
-
       foreach (array_keys($this->_params) as $id) {
         if (!CRM_Utils_Array::value(0, $this->_params[$id])) {
           continue;
@@ -2260,8 +2270,15 @@ static function fromClause(&$tables, $inner = NULL, $right = NULL, $primaryLocat
 
         case 'civicrm_relationship':
           if (self::$_relType == 'reciprocal') {
-            $from .= " $side JOIN civicrm_relationship ON (civicrm_relationship.contact_id_b = contact_a.id OR civicrm_relationship.contact_id_a = contact_a.id)";
-            $from .= " $side JOIN civicrm_contact contact_b ON (civicrm_relationship.contact_id_a = contact_b.id OR civicrm_relationship.contact_id_b = contact_b.id)";
+            if(self::$_relationshipTempTable) {
+              // we have a temptable to join on
+              $tbl = self::$_relationshipTempTable;
+              $from .= " INNER JOIN {$tbl} civicrm_relationship ON civicrm_relationship.contact_id = contact_a.id";
+            }
+            else {
+              $from .= " $side JOIN civicrm_relationship ON (civicrm_relationship.contact_id_b = contact_a.id OR civicrm_relationship.contact_id_a = contact_a.id)";
+              $from .= " $side JOIN civicrm_contact contact_b ON (civicrm_relationship.contact_id_a = contact_b.id OR civicrm_relationship.contact_id_b = contact_b.id)";
+            }
           }
           elseif (self::$_relType == 'b') {
             $from .= " $side JOIN civicrm_relationship ON (civicrm_relationship.contact_id_b = contact_a.id )";
@@ -3435,7 +3452,9 @@ function task(&$values) {
    */
   function relationship(&$values) {
     list($name, $op, $value, $grouping, $wildcard) = $values;
-
+    if($this->_relationshipValuesAdded){
+       return;
+    }
     // also get values array for relation_target_name
     // for relatinship search we always do wildcard
     $targetName  = $this->getWhereValues('relation_target_name', $grouping);
@@ -3465,21 +3484,32 @@ function relationship(&$values) {
     $params = array('id' => $rel[0]);
     $rTypeValues = array();
     $rType = CRM_Contact_BAO_RelationshipType::retrieve($params, $rTypeValues);
-    if (!$rType) {
-      return;
-    }
 
     if ($rTypeValues['name_a_b'] == $rTypeValues['name_b_a']) {
+      // if we don't know which end of the relationship we are dealing with we'll create a temp table
+      //@todo unless we are dealing with a target group
       self::$_relType = 'reciprocal';
     }
-
-    if ($nameClause) {
-      $this->_where[$grouping][] = "( contact_b.sort_name $nameClause AND contact_b.id != contact_a.id )";
+    // if we are creating a temp table we build our own where for the relationship table
+    if(self::$_relType == 'reciprocal' && empty($targetGroup)) {
+      $where = array();
+      self::$_relationshipTempTable = $relationshipTempTable = 'civicrm_temp_rel' . rand(0,99999);
+      if($nameClause) {
+        $where[$grouping][] = " sort_name $nameClause ";
+      }
+    }
+    else {
+      $where = &$this->_where;
+      if ($nameClause) {
+        $where[$grouping][] = "( contact_b.sort_name $nameClause AND contact_b.id != contact_a.id )";
+      }
     }
 
+
     $relTypeInd          = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Individual');
     $relTypeOrg          = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Organization');
     $relTypeHou          = CRM_Contact_BAO_Relationship::getContactRelationshipType(NULL, 'null', NULL, 'Household');
+
     $allRelationshipType = array();
     $allRelationshipType = array_merge($relTypeInd, $relTypeOrg);
     $allRelationshipType = array_merge($allRelationshipType, $relTypeHou);
@@ -3488,7 +3518,6 @@ function relationship(&$values) {
       $this->_qill[$grouping][] = "$allRelationshipType[$value]  $name";
     }
 
-
     //check to see if the target contact is in specified group
     if ($targetGroup) {
       //add contacts from static groups
@@ -3521,27 +3550,80 @@ function relationship(&$values) {
     //check for active, inactive and all relation status
     $today = date('Ymd');
     if ($relStatus[2] == 0) {
-      $this->_where[$grouping][] = "(
+      $where[$grouping][] = "(
 civicrm_relationship.is_active = 1 AND
 ( civicrm_relationship.end_date IS NULL OR civicrm_relationship.end_date >= {$today} ) AND
 ( civicrm_relationship.start_date IS NULL OR civicrm_relationship.start_date <= {$today} )
 )";
-      $this->_qill[$grouping][] = ts('Relationship - Active');
+      $this->_qill[$grouping][] = ts('Relationship - Active and Current');
     }
     elseif ($relStatus[2] == 1) {
-      $this->_where[$grouping][] = "(
+      $where[$grouping][] = "(
 civicrm_relationship.is_active = 0 OR
 civicrm_relationship.end_date < {$today} OR
 civicrm_relationship.start_date > {$today}
 )";
-      $this->_qill[$grouping][] = ts('Relationship - Inactive');
+      $this->_qill[$grouping][] = ts('Relationship - Inactive or not Current');
     }
 
-    $this->_where[$grouping][] = 'civicrm_relationship.relationship_type_id = ' . $rel[0];
+    $this->addRelationshipDateClauses($grouping, $where);
+    if(!empty($rType) && isset($rType->id)){
+      $where[$grouping][] = 'civicrm_relationship.relationship_type_id = ' . $rType->id;
+    }
     $this->_tables['civicrm_relationship'] = $this->_whereTables['civicrm_relationship'] = 1;
     $this->_useDistinct = TRUE;
+    $this->_relationshipValuesAdded = TRUE;
+    // it could be a or b, using an OR creates an unindexed join - better to create a temp table &
+    // join on that,
+    // @todo creating a temp table could be expanded to group filter
+    // as even creating a temp table of all relationships is much much more efficient than
+    // an OR in the join
+    if($relationshipTempTable) {
+      $whereClause = ' WHERE ' . implode(' AND ', $where[$grouping]);
+      $sql = "
+        CREATE TEMPORARY TABLE {$relationshipTempTable}
+          (SELECT contact_id_b as contact_id, civicrm_relationship.id
+            FROM civicrm_relationship
+            INNER JOIN  civicrm_contact c ON civicrm_relationship.contact_id_a = c.id
+            $whereClause )
+          UNION
+            (SELECT contact_id_a as contact_id, civicrm_relationship.id
+            FROM civicrm_relationship
+            INNER JOIN civicrm_contact c ON civicrm_relationship.contact_id_b = c.id
+            $whereClause )
+      ";
+      CRM_Core_DAO::executeQuery($sql);
+    }
+
   }
+/**
+ * Add start & end date criteria in
+ * @param string $grouping
+ * @param array $where = array to add where clauses to, in case you are generating a temp table
+ * not the main query.
+ */
+  function addRelationshipDateClauses($grouping, &$where){
+    $dateValues = array();
+    $dateTypes = array(
+        'start_date',
+        'end_date',
+    );
 
+    foreach ($dateTypes as $dateField){
+      $dateValueLow = $this->getWhereValues('relation_'. $dateField .'_low', $grouping);
+      $dateValueHigh= $this->getWhereValues('relation_'. $dateField .'_high', $grouping);
+      if(!empty($dateValueLow)){
+        $date = date('Ymd', strtotime($dateValueLow[2]));
+        $where[$grouping][] = "civicrm_relationship.$dateField >= $date";
+        $this->_qill[$grouping][] = ($dateField == 'end_date' ? ts('Relationship Ended on or After') : ts('Relationship Recorded Start Date On or Before')) . " " . CRM_Utils_Date::customFormat($date);
+      }
+      if(!empty($dateValueHigh)){
+        $date = date('Ymd', strtotime($dateValueHigh[2]));
+        $where[$grouping][] = "civicrm_relationship.$dateField <= $date";
+        $this->_qill[$grouping][] = ( $dateField == 'end_date' ? ts('Relationship Ended on or Before') : ts('Relationship Recorded Start Date On or After')) . " " . CRM_Utils_Date::customFormat($date);
+      }
+    }
+  }
   /**
    * default set of return properties
    *
@@ -3733,7 +3815,7 @@ static function apiQuery($params = NULL,
    * @param boolean  $count    is this a count only query ?
    * @param boolean  $includeContactIds should we include contact ids?
    * @param boolean  $sortByChar if true returns the distinct array of first characters for search results
-   * @param boolean  $groupContacts if true, use a single mysql group_concat statement to get the contact ids
+   * @param boolean  $groupContacts if true, return only the contact ids
    * @param boolean  $returnQuery   should we return the query as a string
    * @param string   $additionalWhereClause if the caller wants to further restrict the search (used for components)
    * @param string   $additionalFromClause should be clause with proper joins, effective to reduce where clause load.

CRM/Contact/Form/Search/Criteria.php

@@ -239,7 +239,7 @@ static function location(&$form) {
     // Build location criteria based on _submitValues if
     // available; otherwise, use $form->_formValues.
     $formValues = $form->_submitValues;
-    
+
     if (empty($formValues) && !empty($form->_formValues)) {
       $formValues = $form->_formValues;
     }
@@ -436,6 +436,8 @@ function relationship(&$form) {
         array('id' => 'relation_target_group', 'multiple' => 'multiple', 'title' => ts('- select -'))
       );
     }
+    CRM_Core_Form_Date::buildDateRange($form, 'relation_start_date', 1, '_low', '_high', ts('From:'), FALSE, FALSE);
+    CRM_Core_Form_Date::buildDateRange($form, 'relation_end_date', 1, '_low', '_high', ts('From:'), FALSE, FALSE);
 
     // add all the custom  searchable fields
     $relationship = array('Relationship');

CRM/Contact/Form/Search/Custom/ActivitySearch.php

@@ -145,11 +145,11 @@ function templateFile() {
    * Construct the search query
    */
   function all($offset = 0, $rowcount = 0, $sort = NULL,
-    $includeContactIDs = FALSE, $onlyIDs = FALSE
+    $includeContactIDs = FALSE, $justIDs = FALSE
   ) {
 
     // SELECT clause must include contact_id as an alias for civicrm_contact.id
-    if ($onlyIDs) {
+    if ($justIDs) {
       $select = 'contact_a.id as contact_id';
     }
     else {
@@ -195,7 +195,7 @@ function all($offset = 0, $rowcount = 0, $sort = NULL,
     $sql = " SELECT $select FROM   $from $where ";
 
     //no need to add order when only contact Ids.
-    if (!$onlyIDs) {
+    if (!$justIDs) {
       // Define ORDER BY for query in $sort, with default value
       if (!empty($sort)) {
         if (is_string($sort)) {
@@ -226,19 +226,19 @@ function alterRow(&$row) {
   function from() {
     return "
         civicrm_contact contact_a
-            JOIN civicrm_activity activity 
+            JOIN civicrm_activity activity
                  ON contact_a.id = activity.source_contact_id
-            JOIN civicrm_option_value ov1 
+            JOIN civicrm_option_value ov1
                  ON activity.activity_type_id = ov1.value AND ov1.option_group_id = 2
-            JOIN civicrm_option_value ov2 
+            JOIN civicrm_option_value ov2
                  ON activity.status_id = ov2.value AND ov2.option_group_id = {$this->_groupId}
-            JOIN civicrm_contact contact_b 
+            JOIN civicrm_contact contact_b
                  ON activity.source_contact_id = contact_b.id
-            LEFT JOIN civicrm_case_activity cca 
+            LEFT JOIN civicrm_case_activity cca
                  ON activity.id = cca.activity_id
-            LEFT JOIN civicrm_activity_assignment assignment 
+            LEFT JOIN civicrm_activity_assignment assignment
                  ON activity.id = assignment.activity_id
-            LEFT JOIN civicrm_contact contact_c 
+            LEFT JOIN civicrm_contact contact_c
                  ON assignment.assignee_contact_id = contact_c.id ";
   }
 
@@ -254,8 +254,8 @@ function where($includeContactIDs = FALSE) {
     if (!empty($contactname)) {
       $dao         = new CRM_Core_DAO();
       $contactname = $dao->escape($contactname);
-      $clauses[]   = "(contact_a.sort_name LIKE '%{$contactname}%' OR 
-                           contact_b.sort_name LIKE '%{$contactname}%' OR 
+      $clauses[]   = "(contact_a.sort_name LIKE '%{$contactname}%' OR
+                           contact_b.sort_name LIKE '%{$contactname}%' OR
                            contact_c.display_name LIKE '%{$contactname}%')";
     }
 
@@ -316,9 +316,9 @@ function where($includeContactIDs = FALSE) {
     return implode(' AND ', $clauses);
   }
 
-  /* 
-     * Functions below generally don't need to be modified
-     */
+  /*
+   * Functions below generally don't need to be modified
+   */
   function count() {
     $sql = $this->all();