From ac6dff25246b2c68c22823969a73fee431e204b6 Mon Sep 17 00:00:00 2001 From: niekt0 Date: Sun, 19 Dec 2010 20:47:48 +0100 Subject: [PATCH] fix including constants --- cron/register.php | 2 +- wwwroot/config/config_default.inc | 27 +++++++++------------------ wwwroot/nodes.php | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/cron/register.php b/cron/register.php index 588ffd6..50aa6e4 100755 --- a/cron/register.php +++ b/cron/register.php @@ -19,7 +19,7 @@ require(INCLUDE_DIR.'/database.inc'); require(INCLUDE_DIR.'/nodes.inc'); require(INCLUDE_DIR.'/permissions.inc'); require(INCLUDE_DIR.'/ubik.inc'); -require(INCLUDE_DIR.'/senate.inc'); +//require(INCLUDE_DIR.'/senate.inc'); //REGISTRATION_VOTES CONSTANT DEFINED IN INC/SENATE.INC define('REGISTER_TEXT','request for access'); diff --git a/wwwroot/config/config_default.inc b/wwwroot/config/config_default.inc index 48bff0a..d00cba6 100644 --- a/wwwroot/config/config_default.inc +++ b/wwwroot/config/config_default.inc @@ -8,8 +8,6 @@ define('DB_USER', 'kyberia'); define('DB_PASS', 'levenshtein'); define('DB_DATABASE', 'kyberia'); -date_default_timezone_set('Europe/Prague'); - define('SYSTEM_ROOT', '/srv/kyberia/'); define('SYSTEM_DATA', SYSTEM_ROOT . '/wwwroot/_data/'); define('SYSTEM_IMAGES', '/_images/'); @@ -17,13 +15,7 @@ define('CONFIG_DIR', SYSTEM_ROOT . 'config/'); define('AJAX_DIR', SYSTEM_ROOT . 'wwwroot/ajax/'); define('INCLUDE_DIR', SYSTEM_ROOT . 'wwwroot/inc/'); -/* -//Uncomment this to enable Basic HTTP Auth: -$realm = 'kyberia'; //This is used by browser to identify protected area and saving passwords (one_site+one_realm==one_user+one_password) -$users = array( //You can specify multiple users in this array - 'kyberia' => 'passw' -); -*/ +date_default_timezone_set( 'Europe/Prague'); define('SMARTY_DIR', SYSTEM_ROOT . 'wwwroot/smarty/libs/'); define('SMARTY_PLUGIN_DIR', SYSTEM_ROOT . 'wwwroot/inc/smarty/node_methodz/'); @@ -52,15 +44,14 @@ define('WARNING_ZONE', 1059888); define('MAX_CHILDREN', 42666); /* -define('SLAVE_HOST', '127.0.0.1'); -define('SLAVE_USER', 'kyberia'); -define('SLAVE_PASS', 'levenshtein'); -define('SLAVE_DATABASE', 'kyberia'); - -define('SLAVE2_HOST', '127.0.0.1'); -define('SLAVE2_USER', 'kyberia'); -define('SLAVE2_PASS', 'levenshtein'); -define('SLAVE2_DATABASE', 'kyberia'); +//Uncomment this to enable Basic HTTP Auth: +$realm = 'kyberia'; //This is used by browser to identify protected area and saving passwords (one_site+one_realm==one_user+one_password) +$users = array( //You can specify multiple users in this array + 'kyberia' => 'passw' +); */ + +// Kyberia senate specific settings (special node numbers, ... +require_once(INCLUDE_DIR.'senate.inc') ?> diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php index f494ead..2425b50 100644 --- a/wwwroot/nodes.php +++ b/wwwroot/nodes.php @@ -168,7 +168,7 @@ if (empty($node)) { // $smarty->assign('children_types',$children_types[$node['node_type']]); //} -smarty->assign('types',$types); +//smarty->assign('types',$types); //$node['node_type']=$types[$node['node_type']]; -- 2.30.2