tbrehm
2012-08-17 b349c0bda24c5a0780f650f4e65ee9fce6a4df91
server/lib/app.inc.php
old mode 100644 new mode 100755
@@ -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');