From da5e7a023cec055984fbaab81609d2ddd4bccf13 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 19 Aug 2007 08:07:53 -0400
Subject: [PATCH] Fixed a problem in the session initialization

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

diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index bf5df99..353297a 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -53,15 +53,15 @@
 				$this->load('db_'.$this->_conf['db_type']);
 				$this->db = new db;
 		}
-		if($this->_conf['start_session'] == true) {
+		
+		//* Start the session
+		if($conf["start_session"] == true) {
 			session_start();
-            //* Initialise vars if session is not set
-            if( !isset($_SESSION['s']['id']) ){
-                $_SESSION['s'] = array( 'id' => session_id(), 
-                                        'theme' => $this->_conf['theme'], 
-                                        'language' => $this->_conf['language']
-                                        );
-            }
+			
+			//* Initialize session variables
+			if(!isset($_SESSION['s']['id']) ) $_SESSION["s"]['id'] = session_id();
+			if(empty($_SESSION["s"]["theme"])) $_SESSION["s"]['theme'] = $conf['theme'];
+			if(empty($_SESSION["s"]["language"])) $_SESSION["s"]['language'] = $conf['language'];
 		}
 	}
 

--
Gitblit v1.9.1