Merge pull request #15322 from alifrumin/removePrintIcon

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

diff --git a/CRM/Core/BAO/Domain.php b/CRM/Core/BAO/Domain.php
index fd2632785c01842e965d50242ab968fdc290ca0c..78460afdc42c7cdc0424538e16b5709d469b6090 100644 (file)
--- a/CRM/Core/BAO/Domain.php
+++ b/CRM/Core/BAO/Domain.php
@@ -38,11 +38,13 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
 
   /**
    * Cache for the current domain object.
+   * @var object
    */
-  static $_domain = NULL;
+  public static $_domain = NULL;
 
   /**
    * Cache for a domain's location array
+   * @var array
    */
   private $_location = NULL;
 
@@ -103,9 +105,9 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
   public function &getLocationValues() {
     if ($this->_location == NULL) {
       $domain = self::getDomain(NULL);
-      $params = array(
+      $params = [
         'contact_id' => $domain->contact_id,
-      );
+      ];
       $this->_location = CRM_Core_BAO_Location::getValues($params, TRUE);
 
       if (empty($this->_location)) {
@@ -125,10 +127,12 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
    *   domain
    */
   public static function edit(&$params, &$id) {
+    CRM_Utils_Hook::pre('edit', 'Domain', CRM_Utils_Array::value('id', $params), $params);
     $domain = new CRM_Core_DAO_Domain();
     $domain->id = $id;
     $domain->copyValues($params);
     $domain->save();
+    CRM_Utils_Hook::post('edit', 'Domain', $domain->id, $domain);
     return $domain;
   }
 
@@ -141,9 +145,12 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
    *   domain
    */
   public static function create($params) {
+    $hook = empty($params['id']) ? 'create' : 'edit';
+    CRM_Utils_Hook::pre($hook, 'Domain', CRM_Utils_Array::value('id', $params), $params);
     $domain = new CRM_Core_DAO_Domain();
     $domain->copyValues($params, TRUE);
     $domain->save();
+    CRM_Utils_Hook::post($hook, 'Domain', $domain->id, $domain);
     return $domain;
   }
 
@@ -164,7 +171,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
 
   /**
    * @param bool $skipFatal
-   *
+   * @param bool $returnString
    * @return array
    *   name & email for domain
    * @throws Exception
@@ -182,17 +189,17 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
         $fromName = CRM_Utils_Array::value(1, $fromArray);
         break;
       }
-      return array($fromName, $email);
+      return [$fromName, $email];
     }
 
     if ($skipFatal) {
-      return array(NULL, NULL);
+      return [NULL, NULL];
     }
 
     $url = CRM_Utils_System::url('civicrm/admin/options/from_email_address',
       'reset=1'
     );
-    $status = ts("There is no valid default from email address configured for the domain. You can configure here <a href='%1'>Configure From Email Address.</a>", array(1 => $url));
+    $status = ts("There is no valid default from email address configured for the domain. You can configure here <a href='%1'>Configure From Email Address.</a>", [1 => $url]);
 
     CRM_Core_Error::fatal($status);
   }
@@ -206,7 +213,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
     $groupID = self::getGroupId();
 
     if ($groupID) {
-      $contactIDs = array($contactID);
+      $contactIDs = [$contactID];
       CRM_Contact_BAO_GroupContact::addContactsToGroup($contactIDs, $groupID);
 
       return $groupID;
@@ -257,7 +264,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
    */
   public static function getChildGroupIds() {
     $domainGroupID = self::getGroupId();
-    $childGrps = array();
+    $childGrps = [];
 
     if ($domainGroupID) {
       $childGrps = CRM_Contact_BAO_GroupNesting::getChildGroupIds($domainGroupID);
@@ -273,7 +280,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
    */
   public static function getContactList() {
     $siteGroups = CRM_Core_BAO_Domain::getChildGroupIds();
-    $siteContacts = array();
+    $siteContacts = [];
 
     if (!empty($siteGroups)) {
       $query = "
@@ -296,18 +303,18 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
    * Try default from address then fall back to using logged in user details
    */
   public static function getDefaultReceiptFrom() {
-    $domain = civicrm_api3('domain', 'getsingle', array('id' => CRM_Core_Config::domainID()));
+    $domain = civicrm_api3('domain', 'getsingle', ['id' => CRM_Core_Config::domainID()]);
     if (!empty($domain['from_email'])) {
-      return array($domain['from_name'], $domain['from_email']);
+      return [$domain['from_name'], $domain['from_email']];
     }
     if (!empty($domain['domain_email'])) {
-      return array($domain['name'], $domain['domain_email']);
+      return [$domain['name'], $domain['domain_email']];
     }
     $userName = '';
     $userEmail = '';
 
     if (!Civi::settings()->get('allow_mail_from_logged_in_contact')) {
-      return array($userName, $userEmail);
+      return [$userName, $userEmail];
     }
 
     $userID = CRM_Core_Session::singleton()->getLoggedInContactID();
@@ -316,7 +323,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
     }
     // If still empty fall back to the logged in user details.
     // return empty values no matter what.
-    return array($userName, $userEmail);
+    return [$userName, $userEmail];
   }
 
   /**