Bugfix Parse Error in includes/classes/usu.php

zencartpro · Apr 13, 2020 · 2b45165 · 2b45165
1 parent e906e45
commit 2b45165
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/NEUE DATEIEN/includes/classes/usu.php b/NEUE DATEIEN/includes/classes/usu.php
@@ -3,9 +3,9 @@
  * Part of Ultimate URLs for Zen Cart. Originally derived from Ultimate SEO URLs
  * v2.1 for osCommerce by Chemo.
  *
- * @copyright Copyright 2019        Cindy Merkin (vinosdefrutastropicales.com)
+ * @copyright Copyright 2019-2020 Cindy Merkin (vinosdefrutastropicales.com)
  * @copyright Copyright 2012 - 2015 Andrew Ballanger
- * @copyright Portions Copyright 2003 - 2019 Zen Cart Development Team
+ * @copyright Portions Copyright 2003 - 2020 Zen Cart Development Team
  * @copyright Portions Copyright 2005 Joshua Dechant
  * @copyright Portions Copyright 2005 Bobby Easland
  * @license http://www.gnu.org/licenses/gpl.txt GNU GPL V3.0
@@ -250,13 +250,16 @@ protected function add_sid($link, $add_session_id, $connection, $separator)
     {
         global $request_type, $http_domain, $https_domain, $session_started;
 
-        $_sid = null;
+        $_sid = '';
         if ($add_session_id == true && $session_started && SESSION_FORCE_COOKIE_USE == 'False') {
-            if (defined('SID') && zen_not_null(constant('SID'))) {
+            if (defined('SID') && !empty(constant('SID'))) {
                 $_sid = constant('SID');
-            } elseif(($request_type == 'NONSSL' && $connection == 'SSL' && ENABLE_SSL == 'true') || ($request_type == 'SSL' && $connection == 'NONSSL')) {
-                if ($http_domain != $https_domain) {
-                    $_sid = zen_session_name() . '=' . zen_session_id();
+            } else {
+                $ssl_enabled = (IS_ADMIN_FLAG === true) ? ENABLE_SSL_CATALOG : ENABLE_SSL;
+                if (($request_type == 'NONSSL' && $connection == 'SSL' && $ssl_enabled == 'true') || ($request_type == 'SSL' && $connection == 'NONSSL')) {
+                    if ($http_domain != $https_domain) {
+                        $_sid = zen_session_name() . '=' . zen_session_id();
+                    }
                 }
             }
         }
@@ -265,7 +268,7 @@ protected function add_sid($link, $add_session_id, $connection, $separator)
             case (!isset($_SESSION['customer_id']) && defined('ENABLE_PAGE_CACHE') && ENABLE_PAGE_CACHE == 'true' && class_exists('page_cache')):
                 $return = $link . $separator . '<zensid>';
                 break;
-            case (zen_not_null($_sid)):
+            case (!empty($_sid)):
                 $return = $link . $separator . $_sid;
                 break;
             default: