fix including constants

diff --git a/cron/register.php b/cron/register.php
index 588ffd6c060f07ead5a04157b4f489d4c42b21d7..50aa6e4b8c0e731486f69d3eb00c505c4b202c4b 100755 (executable)
--- 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 48bff0adccfca111202ad37e293b3e453b93bc4f..d00cba624b2f5014d2eb3696de1e44412de01cac 100644 (file)
--- 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 f494eade450c4eebbd36ec5136a8e6f3444afa49..2425b50a8d3983ff23f596956297a8dd395595d0 100644 (file)
--- 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']];