Anihilating constans

diff --git a/cron/register.php b/cron/register.php
index 939c9ff55965573d5827af512541a2e6595035dc..588ffd6c060f07ead5a04157b4f489d4c42b21d7 100755 (executable)
--- a/cron/register.php
+++ b/cron/register.php
@@ -23,7 +23,6 @@ require(INCLUDE_DIR.'/senate.inc');
 
 //REGISTRATION_VOTES CONSTANT DEFINED IN INC/SENATE.INC
 define('REGISTER_TEXT','request for access');
-define('REGISTRATION_REQUEST_NODE',2091448);
 
 $_SESSION['user_id']=UBIK_ID;
 

diff --git a/wwwroot/inc/eventz/uprav_zaregistrovanych.inc b/wwwroot/inc/eventz/uprav_zaregistrovanych.inc
index fed3afaed25b808b050b399f9026a1fd3d321d31..f3217fae900056c23ec1c02fc28b8b30b6b208b8 100644 (file)
--- a/wwwroot/inc/eventz/uprav_zaregistrovanych.inc
+++ b/wwwroot/inc/eventz/uprav_zaregistrovanych.inc
@@ -5,8 +5,8 @@ global $db,$error;
 
 // XXX hardcoded, rewrite
 $q="select users.login as persona,users.email as email,k,node_id,node_creator,login from nodes
-left join users on nodes.node_creator=users.user_id where node_name!='request for access' and node_parent=2091448 and
-k>=3";
+left join users on nodes.node_creator=users.user_id where node_name!='request for access' and node_parent=".REGISTRATION_REQUEST_NODE." and
+k>=".REGISTRATION_VOTES;
 
 $set=$db->query($q);
 while ($set->next()) {

diff --git a/wwwroot/inc/eventz/verify.inc b/wwwroot/inc/eventz/verify.inc
index 1d80aceb49c9bd144243e15fabc48b11e0e64011..6b335ebb53928b3170bee023e68fff45175ce9e3 100644 (file)
--- a/wwwroot/inc/eventz/verify.inc
+++ b/wwwroot/inc/eventz/verify.inc
@@ -9,7 +9,7 @@ $kset=$db->query("select user_id from users where login='$login'");
 $kset->next();$userid=$kset->getString('user_id');
 
 // XXX HARD CODED
-$set=$db->query("select * from nodes where node_id='$userid' and node_parent=1836516");
+$set=$db->query("select * from nodes where node_id='$userid' and node_parent=".UNVERIFIED_REGISTRATIONS_NODE);
 if($set->getNumRows()!=1) {
          global $error;
          $error="User already verificated or invalid.";
@@ -27,15 +27,15 @@ if($uvercode!=$vercode) {
 } else {
 //  ouch!! this is gonna be dirty!!!!! will be revised later:-)
 // XXX hardcoded, rewrite
-$q="update nodes set node_parent=2091448, node_vector='0000010120914480$userid' where node_id='$userid'";
+$q="update nodes set node_parent=".REGISTRATION_REQUEST_NODE.", node_vector='0000010120914480$userid' where node_id='$userid'";
 $db->update($q);
-$q="update nodes set node_children_count=node_children_count+1 where node_id=2091448";
+$q="update nodes set node_children_count=node_children_count+1 where node_id=".REGISTRATION_REQUEST_NODE;
 $db->update($q);
 $q="update nodes set node_created=NOW() where node_id='$userid'";
 $db->update($q);
 $q="update nodes set node_system_access='public' where node_id='$userid'";
 $db->update($q);
-$q="update node_access set node_user_subchild_count=node_user_subchild_count+1 where node_id=2091448";
+$q="update node_access set node_user_subchild_count=node_user_subchild_count+1 where node_id=".REGISTRATION_REQUEST_NODE;
 $db->update($q);
 
 

diff --git a/wwwroot/inc/eventz/vycisti_registracky.inc b/wwwroot/inc/eventz/vycisti_registracky.inc
index 553a1a8d0bb649346df4b92c998dc613e3ca5433..8df8c0c6bcb9a20a9b5dd35f67237ed8095f3f11 100644 (file)
--- a/wwwroot/inc/eventz/vycisti_registracky.inc
+++ b/wwwroot/inc/eventz/vycisti_registracky.inc
@@ -3,7 +3,7 @@ function vycisti_registracky() {
 global $db,$error;
 
 $q="select users.login as persona,users.email as email,k,node_id,node_creator,login from nodes
-left join users on nodes.node_creator=users.user_id where node_name='request for access' and node_parent=2091448 and k<=4";
+left join users on nodes.node_creator=users.user_id where node_name='request for access' and node_parent=".REGISTRATION_REQUEST_NODE." and k<=".REGISTRATION_VOTES;
 
 $set=$db->query($q);
 while ($set->next()) {

diff --git a/wwwroot/inc/senate.inc b/wwwroot/inc/senate.inc
index 11820734592616e18203642ecc946e230c19df72..42638bdcfc016b601a92e8d0371985ed0ec462a6 100644 (file)
--- a/wwwroot/inc/senate.inc
+++ b/wwwroot/inc/senate.inc
@@ -47,16 +47,10 @@ define('UNVERIFIED_REGISTRATIONS_NODE',1836516);
 // unfriend.inc
 // $q = "update nodes set external_link='', node_parent=123456, node_vector='001234560$node_id' whe
 
-// uprav_zaregistrovanych.inc
-//  node_parent=2091448 and k>=3
-
 // verify.inc
-// node_parent=1836516")
-// $q="update nodes set node_parent=2091448, 
 // node_vector='0000010120914480$userid' where node_id='$user
 
 // vycisti_registracky.inc
-// node_parent=2091448 and k<=4
 // $q="delete from nodes where node_vector like '020914480$noda%'";
 
 // resource.kyberia.php

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index 3687d0803a8047ec799fabab7d6e602e7d63f518..f494eade450c4eebbd36ec5136a8e6f3444afa49 100644 (file)
--- a/wwwroot/nodes.php
+++ b/wwwroot/nodes.php
@@ -164,10 +164,11 @@ if (empty($node)) {
 }
 
 //modifying node glass pearl //XXX WTF
-if (is_array($children_types[$node['node_type']])) {
-       $smarty->assign('children_types',$children_types[$node['node_type']]);
-}
-$smarty->assign('types',$types);
+//if (is_array($children_types[$node['node_type']])) {
+//     $smarty->assign('children_types',$children_types[$node['node_type']]);
+//}
+
+smarty->assign('types',$types);
 
 
 //$node['node_type']=$types[$node['node_type']];