1.0.4 - $_SERVER['REQUEST_SCHEME'] not available for Apache 2.2 or LiteSpeed #1

Author: bitboxfw

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.4 - 2019-06-13
+### Fixed
+- Define REQUEST_SCHEME not by $_SERVER to support Apache 2.2, LightSpeed and IIS
+
 ## 1.0.3 - 2019-01-16
 ### Fixed
 - Fixed Undefined index Exception

composer.json

@@ -2,7 +2,7 @@
     "name": "bitboxde/error-notifier",
     "description": "Sending an email if an error occurred.",
     "type": "craft-plugin",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "keywords": [
         "craft",
         "cms",

src/services/HandleException.php

@@ -28,7 +28,7 @@ public function handleException($exception)
     {
         $recievers = $this->getRecievers();
 
-        if($recievers !== false && $this->pluginSettings->enabled && $this->checkEnvironment() && $this->checkNotFound($exception)) {
+        if ($recievers !== false && $this->pluginSettings->enabled && $this->checkEnvironment() && $this->checkNotFound($exception)) {
             $view = Craft::$app->getView();
             $oldTemplatesPath = $view->getTemplatesPath();
             $view->setTemplatesPath(ErrorNotifier::getInstance()->getBasePath());
@@ -45,11 +45,11 @@ public function handleException($exception)
             );
             $view->setTemplatesPath($oldTemplatesPath);
 
-            if(array_key_exists('fromName', $this->settings)) {
+            if (array_key_exists('fromName', $this->settings)) {
                 $message = new Message();
                 $message->setFrom([$this->pluginSettings->sender => $this->settings['fromName']]);
                 $message->setTo($recievers);
-                $message->setSubject($this->pluginSettings->emailPrefix .' - ' . $this->settings['fromName'] . ' - ' . $this->getExceptionName($exception));
+                $message->setSubject($this->pluginSettings->emailPrefix . ' - ' . $this->settings['fromName'] . ' - ' . $this->getExceptionName($exception));
                 $message->setHtmlBody($body);
 
                 Craft::$app->mailer->send($message);
@@ -59,7 +59,7 @@ public function handleException($exception)
 
     protected function getRecievers()
     {
-        if($this->pluginSettings->recievers !== '') {
+        if ($this->pluginSettings->recievers !== '') {
             return array_map('trim', explode(',', $this->pluginSettings->recievers));
         }
 
@@ -68,7 +68,7 @@ protected function getRecievers()
 
     protected function checkEnvironment()
     {
-        if(in_array($this->environment, $this->pluginEnvironments, true)) {
+        if (in_array($this->environment, $this->pluginEnvironments, true)) {
             return true;
         }
 
@@ -77,7 +77,7 @@ protected function checkEnvironment()
 
     protected function checkNotFound($exception)
     {
-        if($this->pluginSettings->notFound !== '1' && $this->getExceptionName($exception) === 'Not Found') {
+        if ($this->pluginSettings->notFound !== '1' && $this->getExceptionName($exception) === 'Not Found') {
             return false;
         }
 
@@ -95,12 +95,27 @@ protected function getServerVars()
     {
         $serverVars = $_SERVER;
 
+        $serverVars['REQUEST_SCHEME'] = $this->getRequestScheme();
+
         // clean some fields
         unset($serverVars['DB_PASSWORD'], $serverVars['HTTP_COOKIE']);
 
         return $serverVars;
     }
 
+    protected function getRequestScheme()
+    {
+        if (isset($_SERVER['HTTPS']) && ('on' === strtolower($_SERVER['HTTPS']) || '1' == $_SERVER['HTTPS'])) {
+            return 'https';
+        }
+
+        if (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
+            return 'https';
+        }
+
+        return 'http';
+    }
+
     protected function getUserVars()
     {
         return print_r(Craft::$app->getUser(), true);
@@ -119,4 +134,4 @@ protected function getCookieVars()
     {
         return print_r($_COOKIE, true);
     }
-}
+}