From f53d3cdbfdb180865062eebf96340b3598083eae Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 Jul 2008 07:18:37 -0400
Subject: [PATCH] Fixed missing Delete confirmation text when a dns a record is deleted.
---
interface/lib/app.inc.php | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 7c63a56..dff1bd7 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -55,7 +55,7 @@
}
//* Start the session
- if($conf["start_session"] == true) {
+ if($this->_conf['start_session'] == true) {
session_start();
//* Initialize session variables
@@ -63,16 +63,19 @@
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)
{
- $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 +89,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 +147,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;
}
@@ -174,6 +178,9 @@
if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {
$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
--
Gitblit v1.9.1