- Added (clickable) placeholders to client messaging function. - Added chec...

ftimme

2012-05-30 2cb1563f63386b35a69e460051aa9b4a2851d104

 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;
               }