From 02bf997271f4d09e91c8fcb9cecd08f06f2400c4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Apr 2012 12:04:52 -0400
Subject: [PATCH] Merged revisions 3028-3045 from stable branch.
---
server/lib/app.inc.php | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
old mode 100644
new mode 100755
index fc2397c..87f964dc
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -28,36 +28,29 @@
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;
if($conf['start_db'] == true) {
$this->load('db_'.$conf['db_type']);
$this->db = new db;
- if($this->db->linkId) $this->db->closeConn();
- $this->db->dbHost = $conf['db_host'];
- $this->db->dbName = $conf['db_database'];
- $this->db->dbUser = $conf['db_user'];
- $this->db->dbPass = $conf['db_password'];
/*
Initialize the connection to the master DB,
if we are in a multiserver setup
*/
- if($conf['dbmaster_host'] != '' && $conf['dbmaster_host'] != $conf['db_host']) {
- $this->dbmaster = new db;
- if($this->dbmaster->linkId) $this->dbmaster->closeConn();
- $this->dbmaster->dbHost = $conf['dbmaster_host'];
- $this->dbmaster->dbName = $conf['dbmaster_database'];
- $this->dbmaster->dbUser = $conf['dbmaster_user'];
- $this->dbmaster->dbPass = $conf['dbmaster_password'];
+ 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;
}
@@ -75,7 +68,7 @@
if(is_array($cl)) {
foreach($cl as $classname) {
if(!@is_object($this->$classname)) {
- if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
+ if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && (DEVSYSTEM || !is_link($conf['classpath'].'/'.$classname.'.inc.php'))) {
include_once($conf['classpath'].'/'.$classname.'.inc.php');
$this->$classname = new $classname;
}
@@ -91,7 +84,7 @@
$cl = explode(',',$classes);
if(is_array($cl)) {
foreach($cl as $classname) {
- if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
+ if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && (DEVSYSTEM || !is_link($conf['classpath'].'/'.$classname.'.inc.php'))) {
include_once($conf['classpath'].'/'.$classname.'.inc.php');
} else {
die('Unable to load: '.$conf['classpath'].'/'.$classname.'.inc.php');
--
Gitblit v1.9.1