pedro_morgan
2007-08-19 7374887be781334d52b9ad5bf26c9035a971fe5a
* Idea of constants for digestion
* Small tweaks and a warning TODO

2 files modified
34 ■■■■ changed files
interface/lib/app.inc.php 4 ●●● patch | view | raw | blame | history
interface/lib/config.inc.php 30 ●●●●● patch | view | raw | blame | history
interface/lib/app.inc.php
@@ -124,7 +124,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>
@@ -165,6 +165,8 @@
        }
        $this->tpl->setVar('app_title', $this->_conf['app_title']);
        $this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
        //TODO: Silence this notice
        //print_r($_SESSION);
        $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);
interface/lib/config.inc.php
@@ -40,7 +40,9 @@
$conf['modules_available']     = 'admin,mail,sites,monitor,client,dns';
//** Future Code  - pedro - rfc
//********************************************************************************
//** Future Code idea  - pedro - rfc
//** >>>>
/*  Database connection
    The only time paramaters are needed is to connect, otherwise the variables
    are not required "around" the application. ie Connected and done.
@@ -82,8 +84,30 @@
    $conf['db_database']        = 'ispconfig3';
}
/*  Dynamic constants are another technique as well as key files as constants.
    The base root directory is the interface/ directory which is the top level for php
    From this eveything else is be defined underneath as constants
    The constants are directory paths with no trailing /
    This should do away with the $conf['rootpath'] etc
    The $conf['fs_div'] is unnecessary if only / is used, will work on windoze also
*/
//** The main ROOT is the parent directory to this file, ie interface
define('ISPC_ROOT', realpath('../'));
define('ISPC_CLASS_PATH', ISPC_ROOT.'/lib/classes');
define('ISPC_TEMP_PATH', ISPC_ROOT.'/temp');
define('ISPC_CACHE_PATH', ISPC_ROOT.'/cache');
//<< End pedro rfc block
//** Path Settings (Do not change!)
//** Database Settings
/* See above
$conf['db_type']            = 'mysql';
$conf['db_host']            = 'localhost';
$conf['db_user']            = 'root';
$conf['db_password']        = '';
$conf['db_database']        = 'ispconfig3';
*/
$conf['rootpath']            = substr(dirname(__FILE__),0,-4);
$conf['fs_div']                = '/'; // File system divider, \\ on windows and / on linux and unix
$conf['classpath']            = $conf['rootpath'].$conf['fs_div'].'lib'.$conf['fs_div'].'classes';
@@ -96,7 +120,7 @@
define('INCLUDE_ROOT', SERVER_ROOT.DIR_TRENNER.'lib');
define('CLASSES_ROOT', INCLUDE_ROOT.DIR_TRENNER.'classes');
/* pedro notes ? this stuff is REALLY not necessay */
/* pedro notes ? this stuff is REALLY not necessay, can leak everywhere */
define('DB_TYPE', $conf['db_type']);
define('DB_HOST', $conf['db_host']);
define('DB_DATABASE',$conf['db_database']);