phpcs fix

[civicrm-core.git] / CRM / Utils / Check.php

diff --git a/CRM/Utils/Check.php b/CRM/Utils/Check.php
index ba102ea82db611025fa33e7588cd5a0e953c3f6f..0332175d7c8f8201b13368999dae0e86c0c198be 100644 (file)
--- a/CRM/Utils/Check.php
+++ b/CRM/Utils/Check.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id: $
  *
  */
@@ -60,9 +60,14 @@ class CRM_Utils_Check {
   /**
    * Execute "checkAll".
    *
-   * @param array|NULL $messages list of CRM_Utils_Check_Message; or NULL if the default list should be fetched
+   * @param array|NULL $messages
+   *   List of CRM_Utils_Check_Message; or NULL if the default list should be fetched.
+   * @param array|string|callable $filter
+   *   Restrict messages using a callback filter.
+   *   By default, only show warnings and errors.
+   *   Set TRUE to show all messages.
    */
-  public function showPeriodicAlerts($messages = NULL) {
+  public function showPeriodicAlerts($messages = NULL, $filter = array(__CLASS__, 'isImportantAlert')) {
     if (CRM_Core_Permission::check('administer CiviCRM')
       && CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'securityAlert', NULL, TRUE)
     ) {
@@ -77,12 +82,29 @@ class CRM_Utils_Check {
           $messages = $this->checkAll();
         }
         foreach ($messages as $message) {
-          CRM_Core_Session::setStatus($message->getMessage(), $message->getTitle());
+          if ($filter === TRUE || call_user_func($filter, $message)) {
+            CRM_Core_Session::setStatus($message->getMessage(), $message->getTitle());
+          }
         }
       }
     }
   }
 
+  /**
+   * Determine if a message is important enough to harass the administrator about.
+   *
+   * @param CRM_Utils_Check_Message $message
+   * @return bool
+   */
+  protected static function isImportantAlert($message) {
+    return in_array($message->getLevel(), array(
+      \Psr\Log\LogLevel::WARNING,
+      \Psr\Log\LogLevel::ALERT,
+      \Psr\Log\LogLevel::CRITICAL,
+      \Psr\Log\LogLevel::EMERGENCY,
+    ));
+  }
+
   /**
    * Throw an exception if any of the checks fail.
    *
@@ -137,6 +159,9 @@ class CRM_Utils_Check {
     foreach ($checks as $check) {
       $messages = array_merge($messages, $check->checkAll());
     }
+
+    CRM_Utils_Hook::check($messages);
+
     return $messages;
   }