From 99bf8ffb9317827bc014fce2039ac15f52c72d17 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Mon, 20 Aug 2007 23:56:26 -0400
Subject: [PATCH] * Removing all references to $conf['rootpath'] and using contants * introduciton ISPC_WEB_PATH and ISPC_THEMES_PATH
---
interface/lib/config.inc.php | 20 ++--
interface/web/designer/module_list.php | 40 ++++-----
interface/lib/classes/tpl_ini.inc.php | 3
interface/web/admin/form/users.tform.php | 93 ++++++++++++-----------
interface/web/designer/form_list.php | 57 ++++++-------
interface/web/admin/lib/module.conf.php | 4
6 files changed, 106 insertions(+), 111 deletions(-)
diff --git a/interface/lib/classes/tpl_ini.inc.php b/interface/lib/classes/tpl_ini.inc.php
index a7bd06e..601c5c2 100644
--- a/interface/lib/classes/tpl_ini.inc.php
+++ b/interface/lib/classes/tpl_ini.inc.php
@@ -51,8 +51,7 @@
global $conf;
- $tpl_dir = $conf['rootpath'].'/web/themes/'.$_SESSION['s']['theme'].'/templates';
-
+ $tpl_dir = ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates';
return array(
'TEMPLATE_DIR' => $tpl_dir, // Default directory for your template files (full path)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index e5d155a..becba23 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -88,11 +88,14 @@
//** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
-define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../'));
-define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
-define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
-define('ISPC_TEMP_PATH', ISPC_ROOT_PATH.'/temp');
-define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
+define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../'));
+define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
+define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
+define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web');
+define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes');
+
+define('ISPC_TEMP_PATH', ISPC_ROOT_PATH.'/temp');
+define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
//** Database Settings
@@ -104,11 +107,10 @@
$conf['db_database'] = 'ispconfig3';
*/
-$conf['rootpath'] = substr(dirname(__FILE__),0,-4);
+//$conf['rootpath'] = substr(dirname(__FILE__),0,-4);
$conf['fs_div'] = '/'; // File system divider, \\ on windows and / on linux and unix
-$conf['temppath'] = $conf['rootpath'].$conf['fs_div'].'temp';
// predro notes: not sure this is the right thing ?
-$conf['cache_dir'] = $conf['rootpath'].$conf['fs_div'].'/cache';
+$conf['cache_dir'] = ISPC_ROOT_PATH.'/cache';
/* pedro notes ? this stuff is REALLY not necessay, can leak everywhere
@@ -122,7 +124,7 @@
//** External programs
//$conf["programs"]["convert"] = "/usr/bin/convert";
-$conf['programs']['wput'] = $conf['rootpath']."\\tools\\wput\\wput.exe";
+$conf['programs']['wput'] = ISPC_ROOT_PATH."\\tools\\wput\\wput.exe";
//** Themes
diff --git a/interface/web/admin/form/users.tform.php b/interface/web/admin/form/users.tform.php
index 7c7dea6..e756e47 100644
--- a/interface/web/admin/form/users.tform.php
+++ b/interface/web/admin/form/users.tform.php
@@ -16,7 +16,7 @@
may be used to endorse or promote products derived from this software without
specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
@@ -34,9 +34,9 @@
Tabellendefinition
Datentypen:
- - INTEGER (Wandelt Ausdr�cke in Int um)
+ - INTEGER (Wandelt Ausdr�cke in Int um)
- DOUBLE
- - CURRENCY (Formatiert Zahlen nach W�hrungsnotation)
+ - CURRENCY (Formatiert Zahlen nach W�hrungsnotation)
- VARCHAR (kein weiterer Format Check)
- TEXT (kein weiterer Format Check)
- DATE (Datumsformat, Timestamp Umwandlung)
@@ -55,77 +55,80 @@
- Wert oder Array
Hinweis:
- Das ID-Feld ist nicht bei den Table Values einzuf�gen.
+ Das ID-Feld ist nicht bei den Table Values einzuf�gen.
*/
-$form["title"] = "Users";
-$form["description"] = "Form to edit systemusers.";
-$form["name"] = "users";
-$form["action"] = "users_edit.php";
-$form["db_table"] = "sys_user";
-$form["db_table_idx"] = "userid";
-$form["tab_default"] = "users";
-$form["list_default"] = "users_list.php";
-$form["auth"] = 'yes';
+$form['title'] = 'Users';
+$form['description'] = 'Form to edit systemusers.';
+$form['name'] = 'users';
+$form['action'] = 'users_edit.php';
+$form['db_table'] = 'sys_user';
+$form['db_table_idx'] = 'userid';
+$form['tab_default'] = 'users';
+$form['list_default'] = 'users_list.php';
+$form['auth'] = 'yes';
-$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
+//* 0 = id of the user, > 0 id must match with id of current user
+$form['auth_preset']['userid'] = 0;
+//* 0 = default groupid of the user, > 0 id must match with groupid of current user
+$form['auth_preset']['groupid'] = 0;
-// lese Module aus
+//** Permissions are: r = read, i = insert, u = update, d = delete
+$form['auth_preset']['perm_user'] = 'riud';
+$form['auth_preset']['perm_group'] = 'riud'; //r = read, i = insert, u = update, d = delete
+$form['auth_preset']['perm_other'] = ''; //r = read, i = insert, u = update, d = delete
+
+//* Pick out modules
$modules_list = array();
-$handle = @opendir($conf["rootpath"]."/web");
+$handle = @opendir(ISPC_WEB_PATH);
while ($file = @readdir ($handle)) {
- if ($file != "." && $file != "..") {
- if(@is_dir($conf["rootpath"]."/web/".$file)) {
- if(is_file($conf["rootpath"]."/web/".$file."/lib/module.conf.php") and $file != 'login') {
+ if ($file != '.' && $file != '..') {
+ if(@is_dir(ISPC_WEB_PATH."/$file")) {
+ if(is_file(ISPC_WEB_PATH."/$file/lib/module.conf.php") and $file != 'login') {
$modules_list[$file] = $file;
}
}
}
}
-// lese Themes aus
+//* Load themes
$themes_list = array();
-$handle = @opendir($conf["rootpath"]."/web/themes");
+$handle = @opendir(ISPC_THEMES_PATH);
while ($file = @readdir ($handle)) {
- if (substr($file,0,1) != '.') {
- if(@is_dir($conf["rootpath"]."/web/themes/".$file)) {
+ if (substr($file, 0, 1) != '.') {
+ if(@is_dir(ISPC_THEMES_PATH."/$file")) {
$themes_list[$file] = $file;
}
}
}
-// lese verf�gbare Sprachen aus
+//* Languages
$language_list = array();
-$handle = @opendir($conf["rootpath"]."/lib/lang");
+$handle = @opendir(ISPC_ROOT_PATH.'/lib/lang');
while ($file = @readdir ($handle)) {
- if ($file != "." && $file != "..") {
- if(@is_file($conf["rootpath"]."/lib/lang/".$file) and substr($file,-4,4) == '.lng') {
- $tmp = substr($file,0,2);
+ if ($file != '.' && $file != '..') {
+ if(@is_file(ISPC_ROOT_PATH.'/lib/lang/'.$file) and substr($file,-4,4) == '.lng') {
+ $tmp = substr($file, 0, 2);
$language_list[$tmp] = $tmp;
}
}
}
-// lese verf�gbare Gruppen aus.
+//* Pick out groups
$groups_list = array();
-$tmp_records = $app->db->queryAllRecords("SELECT groupid, name FROM sys_group ORDER BY name");
+$tmp_records = $app->db->queryAllRecords('SELECT groupid, name FROM sys_group ORDER BY name');
if(is_array($tmp_records)) {
foreach($tmp_records as $tmp_rec) {
- $tmp_id = $tmp_rec["groupid"];
- $groups_list[$tmp_id] = $tmp_rec["name"];
+ $groups_list[$tmp_rec['groupid']] = $tmp_rec['name'];
}
}
-$form["tabs"]['users'] = array (
- 'title' => "Users",
+$form['tabs']['users'] = array (
+ 'title' => 'Users',
'width' => 80,
- 'template' => "templates/users_user_edit.htm",
+ 'template' => 'templates/users_user_edit.htm',
'fields' => array (
##################################
# Beginn Datenbankfelder
@@ -240,10 +243,10 @@
)
);
/*
-$form["tabs"]['address'] = array (
- 'title' => "Address",
+$form['tabs']['address'] = array (
+ 'title' => 'Address',
'width' => 80,
- 'template' => "templates/users_address_edit.htm",
+ 'template' => 'templates/users_address_edit.htm',
'fields' => array (
##################################
# Beginn Datenbankfelder
@@ -399,10 +402,10 @@
);
*/
-$form["tabs"]['groups'] = array (
- 'title' => "Groups",
+$form['tabs']['groups'] = array (
+ 'title' => 'Groups',
'width' => 80,
- 'template' => "templates/users_groups_edit.htm",
+ 'template' => 'templates/users_groups_edit.htm',
'fields' => array (
##################################
# Beginn Datenbankfelder
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index b00c86c..e958ff7 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -110,12 +110,12 @@
// Getting the admin options from other modules
-$modules = explode(',',$_SESSION['s']['user']['modules']);
+$modules = explode(',', $_SESSION['s']['user']['modules']);
if(is_array($modules)) {
foreach($modules as $mt) {
if(is_file($mt.'/lib/admin.conf.php')) {
$options = array();
- include_once($conf['rootpath'].'/web/'.$mt.'/lib/admin.conf.php');
+ include_once(ISPC_WEB_PATH."/$mt/lib/admin.conf.php");
if(is_array($options)) {
foreach($options as $opt) {
$module['nav'][] = $opt;
diff --git a/interface/web/designer/form_list.php b/interface/web/designer/form_list.php
index c220402..5103216 100644
--- a/interface/web/designer/form_list.php
+++ b/interface/web/designer/form_list.php
@@ -31,48 +31,45 @@
require_once('../../lib/app.inc.php');
// Checking permissions for the module
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
+if(!stristr($_SESSION['s']['user']['modules'],$_SESSION['s']['module']['name'])) {
+ header('Location: ../index.php');
exit;
}
$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl','templates/form_list.htm');
+$app->tpl->newTemplate('form.tpl.htm');
+$app->tpl->setInclude('content_tpl', 'templates/form_list.htm');
-function getinfo($file,$form_file,$bgcolor) {
- global $conf,$app;
+function getinfo($file, $form_file, $bgcolor) {
$module_name = $file;
- include($conf["rootpath"]."/web/".$file."/form/$form_file");
- return array( 'name' => $form["name"],
- 'title' => $form["title"],
- 'description' => $form["description"],
+ include(ISPC_WEB_PATH."/$file/form/$form_file");
+ return array( 'name' => $form['name'],
+ 'title' => $form['title'],
+ 'description' => $form['description'],
'module_name' => $module_name,
- 'bgcolor' => $bgcolor);
- //unset($form);
+ 'bgcolor' => $bgcolor
+ );
}
// lese Module aus
-$bgcolor = "#FFFFFF";
+$bgcolor = '#FFFFFF';
$modules_list = array();
-$handle = @opendir($conf["rootpath"]."/web");
+$handle = @opendir(ISPC_WEB_PATH);
while ($file = @readdir ($handle)) {
- if ($file != "." && $file != "..") {
- if(@is_dir($conf["rootpath"]."/web/".$file)) {
- if(is_file($conf["rootpath"]."/web/".$file."/lib/module.conf.php") and $file != 'login') {
-
- if(@is_dir($conf["rootpath"]."/web/".$file."/form")) {
- $handle2 = opendir($conf["rootpath"]."/web/".$file."/form");
+ if ($file != '.' && $file != '..') {
+ if(@is_dir(ISPC_WEB_PATH."/$file")) {
+ if(ISPC_WEB_PATH.'/'.$file.'/lib/module.conf.php') and $file != 'login') {
+ if(@is_dir(ISPC_WEB_PATH."/$file/form")) {
+ $handle2 = opendir(ISPC_WEB_PATH."/$file/form");
while ($form_file = @readdir ($handle2)) {
if (substr($form_file,0,1) != ".") {
- //echo $conf["rootpath"]."/web/".$file."/form/$form_file<br>";
- //include_once($conf["rootpath"]."/web/".$file."/form/$form_file");
+ //echo ISPC_ROOT_PATH."/web/".$file."/form/$form_file<br>";
+ //include_once(ISPC_ROOT_PATH."/web/".$file."/form/$form_file");
// Farbwechsel
- $bgcolor = ($bgcolor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
-
- $modules_list[] = getinfo($file,$form_file,$bgcolor);
-
+ $bgcolor = ($bgcolor == '#FFFFFF') ? '#EEEEEE' : '#FFFFFF';
+ $modules_list[] = getinfo($file, $form_file, $bgcolor);
+
}
}
}
@@ -81,17 +78,15 @@
}
}
+$app->tpl->setLoop('records', $modules_list);
-$app->tpl->setLoop('records',$modules_list);
-
-// loading language file
-$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_form_list.lng";
+//* load language file
+$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_form_list.lng';
include($lng_file);
$app->tpl->setVar($wb);
$app->tpl_defaults();
$app->tpl->pparse();
-
?>
\ No newline at end of file
diff --git a/interface/web/designer/module_list.php b/interface/web/designer/module_list.php
index 6449037..f18f9f7 100644
--- a/interface/web/designer/module_list.php
+++ b/interface/web/designer/module_list.php
@@ -30,49 +30,45 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-// Checking permissions for the module
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
+//* Check permissions for the module
+if(!stristr($_SESSION['s']['user']['modules'],$_SESSION['s']['module']['name'])) {
+ header('Location: ../index.php');
exit;
}
$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
+$app->tpl->newTemplate('form.tpl.htm');
$app->tpl->setInclude('content_tpl','templates/module_list.htm');
-// lese Module aus
-$bgcolor = "#FFFFFF";
+//* Pick out modules
+$bgcolor = '#FFFFFF';
$modules_list = array();
-$handle = @opendir($conf["rootpath"]."/web");
+$handle = @opendir(ISPC_WEB_PATH);
while ($file = @readdir ($handle)) {
- if ($file != "." && $file != "..") {
- if(@is_dir($conf["rootpath"]."/web/".$file)) {
- if(is_file($conf["rootpath"]."/web/".$file."/lib/module.conf.php") and $file != 'login') {
- include_once($conf["rootpath"]."/web/".$file."/lib/module.conf.php");
-
- // Farbwechsel
- $bgcolor = ($bgcolor == "#FFFFFF")?"#EEEEEE":"#FFFFFF";
-
- $modules_list[] = array( 'module' => $module["name"],
- 'title' => $module["title"],
- 'bgcolor' => $bgcolor);
+ if ($file != '.' && $file != '..') {
+ if(@is_dir(ISPC_WEB_PATH."/$file")) {
+ if(is_file(ISPC_WEB_PATH."/$file/lib/module.conf.php") and $file != 'login') {
+ include_once(ISPC_WEB_PATH."/$file/lib/module.conf.php");
+ $bgcolor = ($bgcolor == '#FFFFFF') ? '#EEEEEE' : '#FFFFFF';
+ $modules_list[] = array( 'module' => $module['name'],
+ 'title' => $module['title'],
+ 'bgcolor' => $bgcolor
+ );
}
}
}
}
-
-$app->tpl->setLoop('records',$modules_list);
+$app->tpl->setLoop('records', $modules_list);
// loading language file
-$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_module_list.lng";
+$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_module_list.lng';
include($lng_file);
$app->tpl->setVar($wb);
$app->tpl_defaults();
$app->tpl->pparse();
-
?>
\ No newline at end of file
--
Gitblit v1.9.1