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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 7a382a4..fc63f02 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -59,20 +59,21 @@
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'];
+ 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)){
- require_once($this->_conf['classpath'] . '/'.$classname.'.inc.php');
+ include_once(ISPC_CLASS_PATH."/$classname.inc.php");
$this->$classname = new $classname();
$this->_loaded_classes[$classname] = true;
}
@@ -86,7 +87,7 @@
if(is_array($fl)) {
foreach($fl as $file){
$file = trim($file);
- include_once($this->_conf['classpath'] . '/'.$file.'.inc.php');
+ include_once(ISPC_CLASS_PATH."/$file.inc.php");
}
}
}
@@ -144,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;
}
--
Gitblit v1.9.1