Merge pull request #4887 from pratikshad/broken-webtest

[civicrm-core.git] / CRM / Core / BAO / Email.php

diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php
index 99015fb0ff34fdf580d4e31b57a0c449fd8891a6..7b459fbfe57745a141d6cbf92b7afe0b3706adbb 100644 (file)
--- a/CRM/Core/BAO/Email.php
+++ b/CRM/Core/BAO/Email.php
@@ -64,7 +64,8 @@ class CRM_Core_BAO_Email extends CRM_Core_DAO_Email {
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
    *
-   * @return object       CRM_Core_BAO_Email object on success, null otherwise
+   * @return object
+   *   CRM_Core_BAO_Email object on success, null otherwise
    * @static
    */
   public static function add(&$params) {
@@ -90,9 +91,9 @@ UPDATE civicrm_email
 SET    is_bulkmail = 0
 WHERE  contact_id = {$params['contact_id']}
 ";
-    if($hook == 'edit'){
-      $sql .= " AND id <> {$params['id']}";
-    }
+      if ($hook == 'edit') {
+        $sql .= " AND id <> {$params['id']}";
+      }
       CRM_Core_DAO::executeQuery($sql);
     }
 
@@ -132,7 +133,8 @@ WHERE  contact_id = {$params['contact_id']}
    *
    * @param bool $updateBlankLocInfo
    *
-   * @return array  the array of email id's
+   * @return array
+   *   the array of email id's
    * @static
    */
   public static function allEmails($id, $updateBlankLocInfo = FALSE) {
@@ -160,8 +162,8 @@ ORDER BY  civicrm_email.is_primary DESC, email_id ASC ";
     );
 
     $emails = $values = array();
-    $dao    = CRM_Core_DAO::executeQuery($query, $params);
-    $count  = 1;
+    $dao = CRM_Core_DAO::executeQuery($query, $params);
+    $count = 1;
     while ($dao->fetch()) {
       $values = array(
         'locationType' => $dao->locationType,
@@ -187,9 +189,10 @@ ORDER BY  civicrm_email.is_primary DESC, email_id ASC ";
    *
    * @param array $entityElements
    *   The array containing entity_id and.
-   * entity_table name
+   *   entity_table name
    *
-   * @return array  the array of email id's
+   * @return array
+   *   the array of email id's
    * @static
    */
   public static function allEntityEmails(&$entityElements) {
@@ -200,7 +203,6 @@ ORDER BY  civicrm_email.is_primary DESC, email_id ASC ";
     $entityId = $entityElements['entity_id'];
     $entityTable = $entityElements['entity_table'];
 
-
     $sql = " SELECT email, ltype.name as locationType, e.is_primary as is_primary, e.on_hold as on_hold,e.id as email_id, e.location_type_id as locationTypeId
 FROM civicrm_loc_block loc, civicrm_email e, civicrm_location_type ltype, {$entityTable} ev
 WHERE ev.id = %1
@@ -267,8 +269,8 @@ AND    reset_date IS NULL
 ";
         if (CRM_Core_DAO::singleValueQuery($sql, $params)) {
           //set reset date only if it is not set and if hold date is set
-          $email->on_hold    = FALSE;
-          $email->hold_date  = 'null';
+          $email->on_hold = FALSE;
+          $email->hold_date = 'null';
           $email->reset_date = date('YmdHis');
         }
       }
@@ -284,12 +286,13 @@ AND    reset_date IS NULL
    * Build From Email as the combination of all the email ids of the logged in user and
    * the domain email id
    *
-   * @return array         an array of email ids
+   * @return array
+   *   an array of email ids
    * @static
    */
   public static function getFromEmail() {
-    $session         = CRM_Core_Session::singleton();
-    $contactID       = $session->get('userID');
+    $session = CRM_Core_Session::singleton();
+    $contactID = $session->get('userID');
     $fromEmailValues = array();
 
     // add all configured FROM email addresses