From b349c0bda24c5a0780f650f4e65ee9fce6a4df91 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 17 Aug 2012 11:15:29 -0400
Subject: [PATCH] Removed debug code from remoting.inc.php
---
server/lib/app.inc.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 270ed4b..87f964dc 100755
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -28,12 +28,15 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+//* Set timezone
+if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']);
+
class app {
var $loaded_modules = array();
var $loaded_plugins = array();
- function app() {
+ function __construct() {
global $conf;
@@ -46,8 +49,8 @@
if we are in a multiserver setup
*/
- if($conf['dbmaster_host'] != '' && $conf['dbmaster_host'] != $conf['db_host']) {
- $this->dbmaster = new db;
+ if($conf['dbmaster_host'] != '' && ($conf['dbmaster_host'] != $conf['db_host'] || ($conf['dbmaster_host'] == $conf['db_host'] && $conf['dbmaster_database'] != $conf['db_database']))) {
+ $this->dbmaster = new db($conf['dbmaster_host'], $conf['dbmaster_user'], $conf['dbmaster_password'], $conf['dbmaster_database']);
} else {
$this->dbmaster = $this->db;
}
--
Gitblit v1.9.1