From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6

---
 interface/lib/app.inc.php |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 597be87..a228ba0 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -31,9 +31,12 @@
 //* Enable gzip compression for the interface
 ob_start('ob_gzhandler');
 
+//* Set timezone
+if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']);
+
 //* Set error reporting level when we are not on a developer system
 if(DEVSYSTEM == 0) {
-	@ini_set('error_reporting', E_ALL & ~E_NOTICE);
+	@ini_set('error_reporting', E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 }
 
 /*
@@ -214,11 +217,14 @@
 			$this->tpl->setVar('app_version', '');
 		}
 		$this->tpl->setVar('app_link', $this->_conf['app_link']);
+		/*
 		if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])) {
 			$this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');
 		} else {
 			$this->tpl->setVar('app_logo', '&nbsp;');
 		}
+		*/
+		$this->tpl->setVar('app_logo', $this->_conf['logo']);
 
 		$this->tpl->setVar('phpsessid', session_id());
 
@@ -239,6 +245,7 @@
 		/* Show username */
 		if(isset($_SESSION['s']['user'])) {
 			$this->tpl->setVar('cpuser', $_SESSION['s']['user']['username']);
+			$this->tpl->setVar('logout_txt', $this->lng('logout_txt'));
 		}
 	}
 

--
Gitblit v1.9.1