From 15c949b3e55d425db65fee1377df5bf220cb640d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 05 Jun 2012 05:24:33 -0400
Subject: [PATCH] Fixed: FS#2239 - Ubuntu 12.04 - Apache errors - vlogger keeps failing
---
interface/lib/app.inc.php | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 32b5918..a228ba0 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -28,12 +28,20 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+//* 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 & ~E_DEPRECATED);
+}
+
/*
Application Class
*/
-
-ob_start('ob_gzhandler');
-
class app {
private $_language_inc = 0;
@@ -74,6 +82,11 @@
}
$this->uses('auth,plugin,functions');
+ }
+
+ public function __destruct() {
+ session_write_close();
+ if(isset($this->db)) $this->db->closeConn();
}
public function uses($classes) {
@@ -157,6 +170,7 @@
/** Translates strings in current language */
public function lng($text) {
+ global $conf;
if($this->_language_inc != 1) {
$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
//* loading global Wordbook
@@ -203,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', ' ');
}
+ */
+ $this->tpl->setVar('app_logo', $this->_conf['logo']);
$this->tpl->setVar('phpsessid', session_id());
@@ -228,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