From dcff5718f345f55f7ea81f18d1f086facde4eacf Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Mon, 20 Aug 2007 23:14:51 -0400
Subject: [PATCH] * Using new ISPC_*_PATH constants * Adding new data schema (to be moved shortly * no more $conf['classpath']
---
interface/lib/app.inc.php | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index a43759a..fc63f02 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -53,26 +53,28 @@
$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'];
}
}
public function uses($classes)
{
- $cl = explode(',',$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($this->_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;
}
}
@@ -81,10 +83,11 @@
public function load($files)
{
- $fl = explode(',',$files);
+ $fl = explode(',', $files);
if(is_array($fl)) {
- foreach($fl as $file) {
- include_once($this->_conf['classpath'] . '/'.$file.'.inc.php');
+ foreach($fl as $file){
+ $file = trim($file);
+ include_once(ISPC_CLASS_PATH."/$file.inc.php");
}
}
}
@@ -124,7 +127,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>
@@ -142,8 +145,9 @@
{
if($this->_language_inc != 1) {
//* loading global and module Wordbook
- @include_once($this->_conf['rootpath'].'/lib/lang/'.$_SESSION['s']['language'].'.lng');
- @include_once($this->_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;
}
@@ -165,7 +169,10 @@
}
$this->tpl->setVar('app_title', $this->_conf['app_title']);
$this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
- $this->tpl->setVar('app_module', $_SESSION['s']['module']['name']);
+ //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);
}
--
Gitblit v1.9.1