Merge pull request civicrm#6 from ginkgostreet/status-page-1

CRM-13823: set severities for existing status checks
MegaphoneJon · Apr 25, 2015 · ee5bcbc · ee5bcbc
2 parents 400c1ae + 0c180da
commit ee5bcbc
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/CRM/Utils/Check/Env.php b/CRM/Utils/Check/Env.php
@@ -66,7 +66,8 @@ public function checkMysqlTime() {
           2 => $sqlNow,
           3 => $phpNow,
         )),
-        ts('Environment Settings')
+        ts('Environment Settings'),
+        \Psr\Log\LogLevel::ERROR
       );
     }
 
@@ -85,7 +86,8 @@ public function checkDebug() {
         'checkDebug',
         ts('Warning: Debug is enabled in <a href="%1">system settings</a>. This should not be enabled on production servers.',
           array(1 => CRM_Utils_System::url('civicrm/admin/setting/debug', 'reset=1'))),
-        ts('Debug Mode')
+        ts('Debug Mode'),
+        \Psr\Log\LogLevel::WARNING
       );
     }
 
@@ -108,7 +110,8 @@ public function checkOutboundMail() {
         'checkOutboundMail',
         ts('Warning: Outbound email is disabled in <a href="%1">system settings</a>. Proper settings should be enabled on production servers.',
           array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1'))),
-        ts('Outbound Email Settings')
+        ts('Outbound Email Settings'),
+        \Psr\Log\LogLevel::WARNING
       );
     }
 

diff --git a/CRM/Utils/Check/Security.php b/CRM/Utils/Check/Security.php
@@ -111,7 +111,8 @@ public function checkLogFileIsNotAccessible() {
           $messages[] = new CRM_Utils_Check_Message(
             'checkLogFileIsNotAccessible',
             ts($msg, array(1 => $log_url, 2 => $docs_url)),
-            ts('Security Warning')
+            ts('Security Warning'),
+            \Psr\Log\LogLevel::CRITICAL
           );
         }
       }
@@ -158,7 +159,8 @@ public function checkUploadsAreNotAccessible() {
               2 => $privateDir,
               3 => $heuristicUrl,
             )),
-          ts('Security Warning')
+          ts('Security Warning'),
+          \Psr\Log\LogLevel::WARNING
         );
       }
     }
@@ -204,7 +206,8 @@ public function checkDirectoriesAreNotBrowseable() {
         $messages[] = new CRM_Utils_Check_Message(
           'checkDirectoriesAreNotBrowseable',
           ts($msg, array(1 => $publicDir, 2 => $publicDir, 3 => $docs_url)),
-          ts('Security Warning')
+          ts('Security Warning'),
+          \Psr\Log\LogLevel::ERROR
         );
       }
     }
@@ -226,16 +229,34 @@ public function checkFilesAreNotPresent() {
 
     $messages = array();
     $files = array(
-      "{$civicrm_root}/packages/dompdf/dompdf.php", // CRM-16005, upgraded from Civi <= 4.5.6
-      "{$civicrm_root}/packages/vendor/dompdf/dompdf/dompdf.php", // CRM-16005, Civi >= 4.5.7
-      "{$civicrm_root}/vendor/dompdf/dompdf/dompdf.php", // CRM-16005, Civi >= 4.6.0
+      array(
+        "{$civicrm_root}/packages/dompdf/dompdf.php", // CRM-16005, upgraded from Civi <= 4.5.6
+        \Psr\Log\LogLevel::CRITICAL,
+      ),
+      array(
+        "{$civicrm_root}/packages/vendor/dompdf/dompdf/dompdf.php", // CRM-16005, Civi >= 4.5.7
+        \Psr\Log\LogLevel::CRITICAL,
+      ),
+      array(
+        "{$civicrm_root}/vendor/dompdf/dompdf/dompdf.php", // CRM-16005, Civi >= 4.6.0
+        \Psr\Log\LogLevel::CRITICAL,
+      ),
+      array(
+        "{$civicrm_root}/packages/OpenFlashChart/php-ofc-library/ofc_upload_image.php", // CIVI-SA-2013-001
+        \Psr\Log\LogLevel::CRITICAL,
+      ),
+      array(
+        "{$civicrm_root}/packages/html2text/class.html2text.inc",
+        \Psr\Log\LogLevel::CRITICAL,
+      ),
     );
     foreach ($files as $file) {
-      if (file_exists($file)) {
+      if (file_exists($file[0])) {
         $messages[] = new CRM_Utils_Check_Message(
           'checkFilesAreNotPresent',
           ts('File \'%1\' presents a security risk and should be deleted.', array(1 => $file)),
-          ts('Security Warning')
+          ts('Security Warning'),
+          $file[1]
         );
       }
     }