From d05f7b6cf2fb14e99c096c6e8227419d0ebb5e29 Mon Sep 17 00:00:00 2001 From: Bob Robison Date: Tue, 19 Mar 2024 13:56:56 -0500 Subject: [PATCH 1/2] Add additional method to check for mod_rewrite --- src/ChurchCRM/Service/AppIntegrityService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChurchCRM/Service/AppIntegrityService.php b/src/ChurchCRM/Service/AppIntegrityService.php index 7a4596939f..a45f8787dc 100644 --- a/src/ChurchCRM/Service/AppIntegrityService.php +++ b/src/ChurchCRM/Service/AppIntegrityService.php @@ -202,7 +202,7 @@ public static function hasModRewrite(): bool // This header comes from index.php (which is the target of .htaccess for invalid URLs) $check = false; - $logger = LoggerUtils::getAppLogger(); + $logger = LoggerUtils::getAppLogger('DEBUG'); if (isset($_SERVER['HTTP_MOD_REWRITE'])) { $logger->debug("Webserver configuration has set mod_rewrite variable: {$_SERVER['HTTP_MOD_REWRITE']}"); @@ -213,6 +213,12 @@ public static function hasModRewrite(): bool $check = in_array('mod_rewrite', apache_get_modules()); } $logger->debug("Apache mod_rewrite check status: $check"); + if (empty($check)) { + if (!empty(shell_exec('/usr/sbin/apachectl -M | grep rewrite'))) { + $logger->debug('Found rewrite module enabled using apachectl'); + $check = true; + } + } } else { $logger->debug('PHP is not running through Apache'); } From 8f4e023b1e500fdb0136ceac0da875e09ea8151c Mon Sep 17 00:00:00 2001 From: Bob Robison Date: Wed, 20 Mar 2024 13:57:52 -0500 Subject: [PATCH 2/2] Change log msgs to info level --- src/ChurchCRM/Service/AppIntegrityService.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ChurchCRM/Service/AppIntegrityService.php b/src/ChurchCRM/Service/AppIntegrityService.php index a45f8787dc..d5a4bd641a 100644 --- a/src/ChurchCRM/Service/AppIntegrityService.php +++ b/src/ChurchCRM/Service/AppIntegrityService.php @@ -202,20 +202,20 @@ public static function hasModRewrite(): bool // This header comes from index.php (which is the target of .htaccess for invalid URLs) $check = false; - $logger = LoggerUtils::getAppLogger('DEBUG'); + $logger = LoggerUtils::getAppLogger(); if (isset($_SERVER['HTTP_MOD_REWRITE'])) { - $logger->debug("Webserver configuration has set mod_rewrite variable: {$_SERVER['HTTP_MOD_REWRITE']}"); + $logger->info("Webserver configuration has set mod_rewrite variable: {$_SERVER['HTTP_MOD_REWRITE']}"); $check = strtolower($_SERVER['HTTP_MOD_REWRITE']) === 'on'; } elseif (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) { - $logger->debug('PHP is running through Apache; looking for mod_rewrite'); + $logger->info('PHP is running through Apache; looking for mod_rewrite'); if (function_exists('apache_get_modules')) { $check = in_array('mod_rewrite', apache_get_modules()); } - $logger->debug("Apache mod_rewrite check status: $check"); + $logger->info("Apache mod_rewrite check status: $check"); if (empty($check)) { if (!empty(shell_exec('/usr/sbin/apachectl -M | grep rewrite'))) { - $logger->debug('Found rewrite module enabled using apachectl'); + $logger->info('Found rewrite module enabled using apachectl'); $check = true; } }