diff --git a/app/Tygh/Bootstrap.php b/app/Tygh/Bootstrap.php
index 10cfa22..7d84c94 100644
--- a/app/Tygh/Bootstrap.php
+++ b/app/Tygh/Bootstrap.php
@@ -52,7 +52,7 @@ class Bootstrap
         ini_set('magic_quotes_sybase', 0);
         ini_set('pcre.backtrack_limit', '1000000'); // this value php versions < 5.3.7 10 times less, so set it as in newer versions.
         ini_set('arg_separator.output', '&');
-        ini_set('include_path', $dir_root . '/app/lib/pear/' . PATH_SEPARATOR . ini_get('include_path'));
+        ini_set('include_path', $dir_root . '/app/lib/pear/' . ini_get('include_path'));
 
         $session_id = session_id();
         if (empty($session_id)) {
@@ -65,27 +65,24 @@ class Bootstrap
     }
 
     /**
-     * Detects HTTPS mode.
-     *
-     * @param array $server $_SERVER superglobal array
-     *
-     * @return boolean Whether current request is SSL-secured.
+     * Detects HTTPS mode
+     * @param array $server SERVER superglobal array
      */
     public static function detectHTTPS($server)
     {
-        if (
-            (isset($server['HTTPS']) && (strcasecmp($server['HTTPS'], 'on') === 0 || $server['HTTPS'] == '1')) ||
-            (isset($server['HTTP_X_FORWARDED_SERVER']) && (strcasecmp($server['HTTP_X_FORWARDED_SERVER'], 'secure') === 0 || $server['HTTP_X_FORWARDED_SERVER'] == 'ssl')) ||
-            (isset($server['SCRIPT_URI']) && (strpos($server['SCRIPT_URI'], 'https') === 0)) ||
-            (isset($server['HTTP_HOST']) && (strpos($server['HTTP_HOST'], ':443') !== false)) ||
-            (isset($server['HTTP_X_FORWARDED_HTTPS']) && (strcasecmp($server['HTTP_X_FORWARDED_PROTO'], 'on') || $server['HTTP_X_FORWARDED_PROTO'] == '1')) ||
-            (isset($server['HTTP_X_FORWARDED_PROTO']) && $server['HTTP_X_FORWARDED_PROTO'] == 'https') ||
-            (isset($server['HTTP_X_HTTPS']) && (strcasecmp($server['HTTP_X_HTTPS'], 'on') === 0 || $server['HTTP_X_HTTPS'] == '1'))
-        ) {
-            return true;
-        }
-
-        return false;
+        if (isset($server['HTTPS']) && ($server['HTTPS'] == 'on' || $server['HTTPS'] == '1')) {
+            define('HTTPS', true);
+        } elseif (isset($server['HTTP_X_FORWARDED_SERVER']) && ($server['HTTP_X_FORWARDED_SERVER'] == 'secure' || $server['HTTP_X_FORWARDED_SERVER'] == 'ssl')) {
+            define('HTTPS', true);
+        } elseif (isset($server['SCRIPT_URI']) && (strpos($server['SCRIPT_URI'], 'https') === 0)) {
+            define('HTTPS', true);
+        } elseif (isset($server['HTTP_HOST']) && (strpos($server['HTTP_HOST'], ':443') !== false)) {
+            define('HTTPS', true);
+        } elseif (isset($server['HTTP_X_FORWARDED_PROTO']) && $server['HTTP_X_FORWARDED_PROTO'] == 'https') {
+            define('HTTPS', true);
+        } elseif (isset($server['HTTP_X_HTTPS']) && ($server['HTTP_X_HTTPS'] == 'on' || $server['HTTP_X_HTTPS'] == '1')) {
+            define('HTTPS', true);
+        }
     }
 
     /**
@@ -216,7 +213,7 @@ class Bootstrap
         $server = self::fixServerVars($server);
 
         self::disableZipCompression();
-        self::detectHTTPS($server) && define('HTTPS', true);
+        self::detectHTTPS($server);
         self::setConstants($server, $dir_root);
 
         list($get, $post, $server) = self::initConsoleMode($get, $post, $server, $dir_root);
@@ -445,4 +442,4 @@ class Bootstrap
     {
         return strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
     }
-}
\ No newline at end of file
+}