fixed vector in registrations

[mirrors/Kyberia-bloodline.git] / wwwroot / inc / nodes.inc

diff --git a/wwwroot/inc/nodes.inc b/wwwroot/inc/nodes.inc
index 47bba1bfa0765f8f033407542e639f8778eef314..008a527a0be424320be4325cb2d390d9d452dedb 100644 (file)
--- a/wwwroot/inc/nodes.inc
+++ b/wwwroot/inc/nodes.inc
@@ -13,9 +13,9 @@
      }
    }
 
-class nodes {
-
+require_once(INCLUDE_DIR.'base36.inc');
 
+class nodes {
 
 function addNode($params) {
         global $db,$node,$error,$error_messages;
@@ -61,10 +61,13 @@ function addNode($params) {
         $template_id=$params['template_id'];
         if (!is_numeric($template_id)) $template_id=DEFAULT_TEMPLATE_ID;
 
+        if(!isset($params['node_system_access'])) $params['node_system_access'] = $node['node_system_access'];
+        if(!isset($params['node_external_access'])) $params['node_external_access'] = $node['node_external_access'];
+
         $q="insert into nodes set
 node_name='".$params['node_name']."',
-node_external_access='".$node['node_external_access']."',
-node_system_access='".$node['node_system_access']."',
+node_external_access='".$params['node_external_access']."',
+node_system_access='".$params['node_system_access']."',
 node_creator='".$params['node_creator']."',
 template_id='".$template_id."',
 external_link='".$external_link."',
@@ -148,7 +151,7 @@ function processContent($node_content) {
                 }
 
                 $node_content = eregi_Replace("((( )|(\n)|(^))+)(http://|ftp://|https://)([[:alnum:]][^,[:space:]]*)","\\2<a target='_blank' href=\"\\6\\7\">\\6\\7</a>",$node_content);
-               $node_content = mysql_real_escape_string($node_content);
+               //$node_content = mysql_real_escape_string($node_content); once is enough
         }
 
         return $node_content;
@@ -194,8 +197,7 @@ where $table_name.node_id='$node_handle'";
                         return false;
                 }
                 else {
-                        $node=$result->getRecord();
-                        $node['node_kid']=base_convert($node['node_id'],10,36);
+                        $node=addBase36id($result->getRecord());
                         $node['node_vector']=trim($node['node_vector'],"z");
                         $ancestors=str_split($node['node_vector'],VECTOR_CHARS);
                         foreach ($ancestors as $ancestor) {
@@ -234,7 +236,7 @@ where $table_name.node_id='$node_handle'";
                 $result=$db->query($q);
 
                 while ($result->next()){
-                        $record[]=$result->getRecord();
+                        $record[]=addBase36id($result->getRecord());
                 }
                 return $record;
 
@@ -253,7 +255,7 @@ node_parent='$node_handle' order by node_created $orderby LIMIT $offset,$limit";
                 $result=$db->query($q);
 
                 while ($result->next()) {
-                        $array[]=$result->getRecord();
+                        $array[]=addBase36id($result->getRecord());
                 }
 
                 return $array;
@@ -270,7 +272,7 @@ node_parent='$node_handle' order by node_created $orderby LIMIT $offset,$limit";
                 $result=$db->query($q);
 
                 while ($result->next()) {
-                        $children_array[]=$result->getRecord();
+                        $children_array[]=addBase36id($result->getRecord());
                 }
 
                 return $children_array;