From 33bbcc014bafa2065a2309bbb5bf7c9c879dda12 Mon Sep 17 00:00:00 2001 From: Josh Sherman Date: Sat, 8 Dec 2012 15:38:05 -0500 Subject: [PATCH 1/2] Updated to allow for both object variables and explicit module returns to be merged into $__module --- classes/Controller.php | 4 ++++ jar.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/classes/Controller.php b/classes/Controller.php index 8d3eaaa..dce6f3e 100644 --- a/classes/Controller.php +++ b/classes/Controller.php @@ -389,6 +389,10 @@ class Controller extends Object { $module_return = $module->return; } + else + { + $module_return = array_merge($module_return, $module->return); + } } $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message)); diff --git a/jar.php b/jar.php index 5b24eee..76003a6 100755 --- a/jar.php +++ b/jar.php @@ -1417,6 +1417,10 @@ class Controller extends Object { $module_return = $module->return; } + else + { + $module_return = array_merge($module_return, $module->return); + } } $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message)); From 0c2aaafefc0a62ac70db04336e8e66e696aeecb4 Mon Sep 17 00:00:00 2001 From: Josh Sherman Date: Thu, 13 Dec 2012 16:05:34 -0500 Subject: [PATCH 2/2] Fixed issue with nginx HTTPS global Variable was set to an empty string and being evaluated as true. --- classes/Browser.php | 2 +- jar.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Browser.php b/classes/Browser.php index ac25498..17fb69f 100644 --- a/classes/Browser.php +++ b/classes/Browser.php @@ -53,7 +53,7 @@ class Browser { if (strpos($destination, '://') === false) { - $destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination; + $destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' || $_SERVER['HTTPS'] == '') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination; } header('Location: ' . $destination); diff --git a/jar.php b/jar.php index 76003a6..0950cee 100755 --- a/jar.php +++ b/jar.php @@ -358,7 +358,7 @@ class Browser { if (strpos($destination, '://') === false) { - $destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination; + $destination = 'http' . ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' || $_SERVER['HTTPS'] == '') ? '' : 's') . '://' . $_SERVER['HTTP_HOST'] . $destination; } header('Location: ' . $destination);