From 9c9382e6949e1366c6adb502b7aacae2c11023f7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 08 Sep 2011 09:42:04 -0400
Subject: [PATCH] Fixed: FS#1709 - Wrong message "Your hard-disk space is going full" in the "Monitor -> Show Disk Usage"
---
interface/lib/classes/tpl_ini.inc.php | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/interface/lib/classes/tpl_ini.inc.php b/interface/lib/classes/tpl_ini.inc.php
index 8972114..8388148 100644
--- a/interface/lib/classes/tpl_ini.inc.php
+++ b/interface/lib/classes/tpl_ini.inc.php
@@ -1,4 +1,15 @@
<?php
+ /**
+ * vlibIni is a class used to store configuration parameters
+ * for the vLIB library.
+ *
+ * @since 21/07/2002
+ * @author Kelvin Jones <kelvin@kelvinjones.co.uk>
+ * @copyright 2002 Active Fish Group
+ * @package vLIB
+ * @access private
+ */
+
/* vim: set expandtab tabstop=4 shiftwidth=4: */
// +----------------------------------------------------------------------+
// | PHP version 4.0 |
@@ -30,28 +41,21 @@
if (!defined('vlibIniClassLoaded')) {
define('vlibIniClassLoaded', 1);
- /**
- * vlibIni is a class used to store configuration parameters
- * for the vLIB library.
- *
- * @since 21/07/2002
- * @author Kelvin Jones <kelvin@kelvinjones.co.uk>
- * @package vLIB
- * @access private
- */
- class vlibIni {
- /** config vars for vlibTemplate */
- function vlibTemplate () {
-
- global $conf;
-
- $tpl_dir = $conf["rootpath"]."/web/themes/".$_SESSION["s"]["theme"]."/templates";
-
+ class vlibIni{
+
+ /** Returns $array of config vars for vlibTemplate */
+ public static function vlibTemplate()
+ {
+
+ $tpl_dir = ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates';
+ $def_tpl_dir = ISPC_THEMES_PATH.'/default/templates';
return array(
- 'TEMPLATE_DIR' => $tpl_dir, // Default directory for your template files (full path)
+ 'INCLUDE_PATHS' => array($tpl_dir), // The path, searched BEVORE the template_dir is searched for the template-file
+
+ 'TEMPLATE_DIR' => $def_tpl_dir, // Default directory for your template files (full path)
// leave the '/' or '\' off the end of the directory.
'MAX_INCLUDES' => 10, // Drill depth for tmpl_include's
@@ -85,8 +89,8 @@
/* the following are only used by the vlibTemplateCache class. */
-
- 'CACHE_DIRECTORY' => $conf["template"]["cache_dir"],
+ // pedro notes:: triggers a notice as its not set - was $conf['template']['cache_dir'],
+ 'CACHE_DIRECTORY' => ISPC_CACHE_PATH,
// Directory where the cached filesystem
// will be set up (full path, and must be writable)
// '/' or '\' off the end of the directory.
@@ -101,16 +105,14 @@
- /** config vars for vlibDate */
- function vlibDate () {
-
- return array(
- 'DEFAULT_LANG' => 'de' // default language for the date displays
- );
-
- }// << end function vlibDate
+ /** Returns $array of config vars for vlibDate */
+ public function vlibDate()
+ {
+ return array( 'DEFAULT_LANG' => 'de' ); //* default language for the date displays
+ }
}// << end class vlibIni
-}
+
+} // << if Defined
?>
\ No newline at end of file
--
Gitblit v1.9.1