From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
interface/lib/app.inc.php | 144 +++++++++++++++++++++++++----------------------
1 files changed, 77 insertions(+), 67 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index f10dfaf..dff1bd7 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -1,4 +1,13 @@
<?php
+/**
+ * Application Class
+ *
+ * @author Till Brehm
+ * @copyright 2005, Till Brehm, projektfarm Gmbh
+ * @version 0.1
+ * @package ISPConfig
+ */
+
/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
All rights reserved.
@@ -31,65 +40,66 @@
class app {
- private $_language_inc = 0;
+ private $_language_inc = 0;
private $_wb;
private $_loaded_classes = array();
+ private $_conf;
- public function __construct() {
+ public function __construct()
+ {
global $conf;
-
- if($conf['start_db'] == true) {
- $this->load('db_'.$conf['db_type']);
+ $this->_conf = $conf;
+ if($this->_conf['start_db'] == true) {
+ $this->load('db_'.$this->_conf['db_type']);
$this->db = new db;
}
-
- if($conf['start_session'] == true) {
- session_start();
- $_SESSION['s']['id'] = session_id();
- if(!isset($_SESSION['s']['theme']) || $_SESSION['s']['theme'] == ''){
- $_SESSION['s']['theme'] = $conf['theme'];
- }
- if($_SESSION['s']['language'] == '') $_SESSION['s']['language'] = $conf['language'];
+
+ //* Start the session
+ if($this->_conf['start_session'] == true) {
+ session_start();
+
+ //* 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'];
}
+
+ $this->uses('auth');
}
- public function uses($classes) {
- global $conf;
-
- $cl = explode(',',$classes);
+ public function uses($classes)
+ {
+ $cl = explode(',', $classes);
if(is_array($cl)) {
foreach($cl as $classname){
+ $classname = trim($classname);
+ //* Class is not loaded so load it
if(!array_key_exists($classname, $this->_loaded_classes)){
- include_once($conf['classpath'] . '/'.$classname.'.inc.php');
- $this->$classname = new $classname;
+ include_once(ISPC_CLASS_PATH."/$classname.inc.php");
+ $this->$classname = new $classname();
$this->_loaded_classes[$classname] = true;
}
}
}
}
- public function load($files) {
- global $conf;
-
- $fl = explode(',',$files);
+ public function load($files)
+ {
+ $fl = explode(',', $files);
if(is_array($fl)) {
- foreach($fl as $file) {
- include_once($conf['classpath'] . '/'.$file.'.inc.php');
+ foreach($fl as $file){
+ $file = trim($file);
+ include_once(ISPC_CLASS_PATH."/$file.inc.php");
}
}
}
- /*
- 0 = DEBUG
- 1 = WARNING
- 2 = ERROR
- */
- public function log($msg, $priority = 0) {
- global $conf;
-
- if($priority >= $conf['log_priority']) {
- if (is_writable($conf['log_file'])) {
- if (!$fp = fopen ($conf['log_file'], 'a')) {
+ /** Priority values are: 0 = DEBUG, 1 = WARNING, 2 = ERROR */
+ public function log($msg, $priority = 0)
+ {
+ if($priority >= $this->_conf['log_priority']) {
+ if (is_writable($this->_conf['log_file'])) {
+ if (!$fp = fopen ($this->_conf['log_file'], 'a')) {
$this->error('Logfile konnte nicht ge�ffnet werden.');
}
if (!fwrite($fp, date('d.m.Y-H:i').' - '. $msg."\r\n")) {
@@ -102,12 +112,9 @@
}
}
- /*
- 0 = DEBUG
- 1 = WARNING
- 2 = ERROR
- */
- public function error($msg, $next_link = '', $stop = true, $priority = 1) {
+ /** Priority values are: 0 = DEBUG, 1 = WARNING, 2 = ERROR */
+ public function error($msg, $next_link = '', $stop = true, $priority = 1)
+ {
//$this->uses("error");
//$this->error->message($msg, $priority);
if($stop == true){
@@ -122,7 +129,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<td class="error"><b>Error:</b><br>'.$msg;
- if($next_link != "") $msg .= '<a href="'.$next_link.'">Next</a><br>';
+ if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a><br>';
$msg .= '</td>
</tr>
</table>
@@ -135,48 +142,51 @@
}
}
- public function lng($text){
- global $conf;
-
+ /** Loads language */
+ public function lng($text)
+ {
if($this->_language_inc != 1) {
//* loading global and module Wordbook
- @include_once($conf['rootpath'].'/lib/lang/'.$_SESSION['s']['language'].'.lng');
- @include_once($conf['rootpath'].'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng');
+ // TODO: this need to be made clearer somehow - pedro
+ @include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
+ @include_once(ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng');
$this->_wb = $wb;
$this->_language_inc = 1;
- }
-
+ }
if(!empty($this->_wb[$text])) {
$text = $this->_wb[$text];
}
-
return $text;
}
- public function tpl_defaults() {
- global $conf;
-
- $this->tpl->setVar('theme',$_SESSION['s']['theme']);
- $this->tpl->setVar('phpsessid',session_id());
- $this->tpl->setVar('html_content_encoding',$conf['html_content_encoding']);
- if($conf['logo'] != '' && @is_file($conf['logo'])){
- $this->tpl->setVar('logo', '<img src="'.$conf['logo'].'" border="0" alt="">');
+ public function tpl_defaults()
+ {
+ $this->tpl->setVar('theme', $_SESSION['s']['theme']);
+ $this->tpl->setVar('phpsessid', session_id());
+ $this->tpl->setVar('html_content_encoding', $this->_conf['html_content_encoding']);
+ if($this->_conf['logo'] != '' && @is_file($this->_conf['logo'])){
+ $this->tpl->setVar('logo', '<img src="'.$this->_conf['logo'].'" border="0" alt="">');
} else {
$this->tpl->setVar('logo', ' ');
}
- $this->tpl->setVar('app_title',$conf["app_title"]);
- $this->tpl->setVar('delete_confirmation',$this->lng('delete_confirmation'));
- $this->tpl->setVar('app_module',$_SESSION['s']['module']['name']);
+ $this->tpl->setVar('app_title', $this->_conf['app_title']);
+ $this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
+ //print_r($_SESSION);
+ if(isset($_SESSION['s']['module']['name'])) {
+ $this->tpl->setVar('app_module', $_SESSION['s']['module']['name']);
+ }
if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {
- $this->tpl->setVar('is_admin',1);
+ $this->tpl->setVar('is_admin', 1);
+ }
+ if(isset($_SESSION['s']['user']) && $this->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $this->tpl->setVar('is_reseller', 1);
}
}
} // end class
-/*
- Initialize application (app) object
-*/
-$app = new app(); // new app($conf);
+//** Initialize application (app) object
+//* possible future = new app($conf);
+$app = new app();
?>
\ No newline at end of file
--
Gitblit v1.9.1