Merge branch 'master' of ssh://kyberia.cz/srv/git/kyberia-bloodline
authorDaniel Hromada <hromi@Aphrodité.(none)>
Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)
committerDaniel Hromada <hromi@Aphrodité.(none)>
Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)
1  2 
wwwroot/backend/mysql/backend.inc
wwwroot/inc/eventz/verify.inc
wwwroot/nodes.php

index ccefe80a029b567cd936aa2f49efc065292f11c1,55e633ffbc2fe4ac3f27a320c969b4197f578139..a3ee375bd645043ceb6950fa60464bbbc13935a1
@@@ -49,7 -49,7 +49,7 @@@ function putNode($what,$where,$checkper
        $nodeshell_vector = $nodeshell['node_vector'];
        
        if ($checkpermissions) {
 -              $nodeshell_permissions = permissions::checkPermissions($nodeshell);
 +              $nodeshell_permissions = permissions::checkPerms($nodeshell);
                if (!$nodeshell_permissions['w']) {
                        $error = $error_messages['WRITE_PERMISSION_ERROR'];
                        return false;
@@@ -72,7 -72,7 +72,7 @@@ function addNode($params) 
                  $parent_id=$node['node_id'];
          }
  
 -        $parent_permissions=permissions::checkPermissions($parent_id);
 +        $parent_permissions=permissions::checkPerms($parent_id);
          if (!$parent_permissions['w']) {
                  $error=$error_messages['WRITE_PERMISSION_ERROR'];
                  logger::log('add','error','WRITE_PERMISSION_ERROR');
@@@ -165,34 -165,34 +165,34 @@@ node_vector='".$params['node_vector']."
  }
  
  
        function getUserByLogin($login) {
-                 global $error, $error_messages;
-                 $q2="select user_id from users where login='".$login."'";
-                 $userset=$db->query($q2);
-                 $userset->next();
-                 $id=$userset->getString('user_id');
-                 if (is_numeric($id)) return $id;
-                 else {
-                         $error = $error_messages['USER_NOT_FOUND'];
-                         return false;
-                 }
        }
+ function getUserByLogin($login) {
+       global $error, $error_messages;
+       $q2="select user_id from users where login='".$login."'";
+       $userset=$db->query($q2);
+       $userset->next();
+       $id=$userset->getString('user_id');
+       if (is_numeric($id)) return $id;
+       else {
+               $error = $error_messages['USER_NOT_FOUND'];
+               return false;
+       }
+ }
  
      function getNodeIdByName($name, $external_link=false) {
-           global $db;
static function getNodeIdByName($name, $external_link=false) {
+       global $db;
  
-           $qh = sprintf('select node_id from nodes where node_name = "%s"', mysql_real_escape_string($name));
-               if ($external_link)
-                               $qh .= sprintf(' and external_link="%s"', mysql_real_escape_string($external_link));
+       $qh = sprintf('select node_id from nodes where node_name = "%s"', mysql_real_escape_string($name));
+       if ($external_link)
+               $qh .= sprintf(' and external_link="%s"', mysql_real_escape_string($external_link));
  
-           $set = $db->query($qh);
-           $set->next();
-           return $set->getString('node_id');
      }
+       $set = $db->query($qh);
+       $set->next();
+       return $set->getString('node_id');
+ }
  
        function getNodeById($node_handle,$user_id, $table_name="nodes") {
-                 global $db, $error;
-                 $q="select length(concat($table_name.node_vector)) as
+ function getNodeById($node_handle,$user_id, $table_name="nodes") {
+       global $db, $error;
+       $q="select length(concat($table_name.node_vector)) as
  vector_depth,$table_name.*,$table_name.node_creator as
  node_owner_id,creator.node_name as owner,node_access.*,$table_name.node_id as
  node_id,node_parent.node_name as node_parent_name
@@@ -201,128 -201,144 +201,144 @@@ left join $table_name as node_parent o
  left join node_access on (node_access.node_id='$node_handle' and node_access.user_id='$user_id')
  where $table_name.node_id='$node_handle'";
  
-                 $result=$db->query($q);
-                 if (!$result->next()) {
-                         return false;
-                 }
-                 else {
-                         $node=addBase36id($result->getRecord());
-                         $node['node_vector']=trim($node['node_vector'],"z");
-                         $ancestors=str_split($node['node_vector'],VECTOR_CHARS);
-                         foreach ($ancestors as $ancestor) {
-                           $node['ancestors'][]=array("name"=>"","link"=>ltrim($ancestor,"0"));
-                         }
-                 }
-               transport_process_node($node);
-                 return $node;
+       $result=$db->query($q);
+       if (!$result->next()) {
+               return false;
+       }
+       else {
+               $node=addBase36id($result->getRecord());
+               $node['node_vector']=trim($node['node_vector'],"z");
+               $ancestors=str_split($node['node_vector'],VECTOR_CHARS);
+               foreach ($ancestors as $ancestor) {
+                       $node['ancestors'][]=array("name"=>"","link"=>ltrim($ancestor,"0"));
+               }
+       }
+       transport_process_node($node);
+       return $node;
  
        }
+ }
  
  
        function redirByName($node_handle) {
-                 global $db, $error;
-                 $user_id=$_SESSION['user_id'];
-                 $set=$db->query("select node_id from nodes where node_name='$node_handle' and node_creator='$user_id'");
-                 if ($set->next()) {
-                         $node_id=$set->getString('node_id');
-                         if (!empty($node_id)) {
-                                 return nodes::getNodeById($node_id,$_SESSION['user_id']);
-                         }
+ function redirByName($node_handle) {
+       global $db, $error;
+       $user_id=$_SESSION['user_id'];
+       $set=$db->query("select node_id from nodes where node_name='$node_handle' and node_creator='$user_id'");
+       if ($set->next()) {
+               $node_id=$set->getString('node_id');
+               if (!empty($node_id)) {
+                       return nodes::getNodeById($node_id,$_SESSION['user_id']);
+               }
  
-                 }
-                 $set=$db->query("select node_id from nodes where node_name='$node_handle' ");
-                 $set->next();
-                 $node_id=$set->getString('node_id');
-                 if (!empty($node_id)) {
-                         return nodes::getNodeById($node_id,$_SESSION['user_id']);
-                 }
+       }
+       $set=$db->query("select node_id from nodes where node_name='$node_handle' ");
+       $set->next();
+       $node_id=$set->getString('node_id');
+       if (!empty($node_id)) {
+               return nodes::getNodeById($node_id,$_SESSION['user_id']);
+       }
  
        }
+ }
  
        function getNodesByName($node_handle) {
-                 global $db, $error;
-                 $q="select nodes.* from nodes where node_name='$node_handle%'";
+ function getNodesByName($node_handle) {
+       global $db, $error;
+       $q="select nodes.* from nodes where node_name='$node_handle%'";
  
-                 $result=$db->query($q);
+       $result=$db->query($q);
  
-                 while ($result->next()){
-                         $record[]=addBase36id($result->getRecord());
-                 }
-                 return $record;
+       while ($result->next()){
+               $record[]=addBase36id($result->getRecord());
+       }
+       return $record;
  
        }
+ }
  
  
  
        function getChildrenNodes($orderby="desc",$offset=0,$limit=DEFAULT_LISTING_AMOUNT) {
-                 global $db, $error, $node;
-                 $node_handle=$node['node_id'];
+ function getChildrenNodes($orderby="desc",$offset=0,$limit=DEFAULT_LISTING_AMOUNT) {
+       global $db, $error, $node;
+       $node_handle=$node['node_id'];
  
-                 $q="select users.*,nodes.* from nodes
+       $q="select users.*,nodes.* from nodes
  left join users on users.user_id=nodes.node_creator where
  node_parent='$node_handle' order by node_created $orderby LIMIT $offset,$limit";
-                 echo $q;
-                 $result=$db->query($q);
+       echo $q;
+       $result=$db->query($q);
  
-                 while ($result->next()) {
-                         $array[]=addBase36id($result->getRecord());
-                 }
+       while ($result->next()) {
+               $array[]=addBase36id($result->getRecord());
+       }
  
-                 return $array;
+       return $array;
  
        }
+ }
  
  
        function getThreadedChildrenNodes($orderby="desc",$offset=0,$limit=DEFAULT_LISTING_AMOUNT) {
-                 global $db, $error, $node;
-                 $node_handle=$node['node_id'];
+ function getThreadedChildrenNodes($orderby="desc",$offset=0,$limit=DEFAULT_LISTING_AMOUNT) {
+       global $db, $error, $node;
+       $node_handle=$node['node_id'];
  
-                 $q="select length(node_vector) as depth,users.login,nodes.* from nodes left join users on users.user_id=nodes.node_creator where  node_vector like '".$node['node_vector'].";".$node['node_id']."%' and node_type=3 order by concat(node_vector,';',nodes.node_id,';z') desc,depth LIMIT $offset,$limit";
+       $q="select length(node_vector) as depth,users.login,nodes.* from nodes left join users on users.user_id=nodes.node_creator where  node_vector like '".$node['node_vector'].";".$node['node_id']."%' and node_type=3 order by concat(node_vector,';',nodes.node_id,';z') desc,depth LIMIT $offset,$limit";
  
-                 $result=$db->query($q);
+       $result=$db->query($q);
  
-                 while ($result->next()) {
-                         $children_array[]=addBase36id($result->getRecord());
-                 }
+       while ($result->next()) {
+               $children_array[]=addBase36id($result->getRecord());
+       }
  
-                 return $children_array;
+       return $children_array;
  
        }
+ }
  
  
  
        function getNodeAccessData() {
-                 global $node,$db;
-                 $q="select users.login,node_access.* from node_access left join users on users.user_id=node_access.user_id where node_id='".$node['node_id']."' and node_permission!=''";
-                 $result=$db->query($q);
+ function getNodeAccessData() {
+       global $node,$db;
+       $q="select users.login,node_access.* from node_access left join users on users.user_id=node_access.user_id where node_id='".$node['node_id']."' and node_permission!=''";
+       $result=$db->query($q);
  
-                 while ($result->next()) {
-                         $access_data[]=$result->getRecord();
-                 }
+       while ($result->next()) {
+               $access_data[]=$result->getRecord();
+       }
  
-                 return $access_data;
+       return $access_data;
  
        }
+ }
  
  
  // Simple internal function to set node parrent
  
- function setParent($params) {
-         global $db,$node,$error,$error_messages;
-         $parent_id=$params['node_parent'];
-         $node_id=$params['node_id'];
+ function setParent($node_id,$parent_id) {
+       global $db,$node,$error,$error_messages;
+       if (!is_numeric($parent_id)) {
+               return false;
+       }
  
-         if (!is_numeric($parent_id)) {
-                 return false;
-         }
        $q="select node_vector from nodes where node_id='$parent_id'";
-       $parent_vector=$db->query($q);
+       $set=$db->query($q);
+       $set->next();
+       $parent_vector=$set->getString('node_vector');
+       $new_vector=$parent_vector.str_pad($node_id,VECTOR_CHARS,"0",STR_PAD_LEFT);
  
-       $new_vector=$parent_vector.str_pad($node_id,VECTOR_CHARS,"0",STR_PAD_LEFT);     
-       $q="update nodes set node_parent='$parent_id',node_vector='".$new_vector."
-               ' where node_id='$node_id'";
+       $q="update nodes set node_parent='$parent_id',node_vector='$new_vector' where node_id='$node_id'";
        $db->query($q);
+       return 0;
  }
  
+ // Get nodes sorted by weight_k specific to user
+ function getKNeurons($user_id,$interval) {
+       global $db,$node,$error,$error_messages;
+       $q="call k_neurons('$user_id','$interval')";
+       $set=$db->query($q);
+       while ($set->next()) {
+               $k_array[]=$set->getRecord();
+       }
+       return $k_array;
  }
  
+ }
index 62495b9599d39215538bd3644fda91ed4f572bc0,7593708735aaba14dc9ec502e78b6aee1d30b95b..2ee01875fdec6d38b252fa19bda3245193172464
@@@ -30,13 -30,10 +30,10 @@@ if($uvercode!=$vercode) 
  //  ouch!! this is gonna be dirty!!!!! will be revised later:-)
  // XXX hardcoded, rewrite
  
- $q="update nodes set node_parent=".REGISTRATION_REQUEST_NODE.", node_vector='000001010473807402091448$userid' where node_id='$userid'";
- $db->update($q);
+ //$q="update nodes set node_parent=".REGISTRATION_REQUEST_NODE.", node_vector='000001010473807402091448$userid' where node_id='$userid'";
+ //$db->update($q);
  
- //    $params['node_parent']=REGISTRATION_REQUEST_NODE;
- //    $params['node_id']=$userid;
- //    nodes::setParent($params);
+ nodes::setParent($userid,REGISTRATION_REQUEST_NODE);
  
  
  $q="update nodes set node_children_count=node_children_count+1 where node_id=".REGISTRATION_REQUEST_NODE;
@@@ -47,6 -44,7 +44,6 @@@ $q="update nodes set node_system_access
  $db->update($q);
  $q="update node_access set node_user_subchild_count=node_user_subchild_count+1 where node_id=".REGISTRATION_REQUEST_NODE;
  $db->update($q);
 -
  nodes::putNode($userid,$guild_id,false);
  
  // and now the happy news:-))
diff --combined wwwroot/nodes.php
index 29b6478b5c04359149d70c7c5b7824607914d5a5,bd4500eeaba4d9f58ab09a8dd9afad0970743199..490ee443eb077842539ecac9c9e31e7f826a36ce
@@@ -39,26 -39,36 +39,36 @@@ require_once(INCLUDE_DIR.'transports.in
  
  $db = new CLASS_DATABASE();
  
- if (preg_match('/id\/([0-9]+)(?:\/([0-9]+)\/?)?/',$_SERVER['PATH_INFO'],$match)) {
- //    print_r($match);
-       $_GET['node_id']=$match[1];
-       if (!empty($match[2])) {
-               $_GET['template_id']=$match[2];
-       }
-       //Base36 fascism redirect
-       if(!count($_POST) && !(isset($_GET['template_id']) && $_GET['template_id'] == 'download')) { //Fix ugly download hack...
-               header('Location: /k/'.base_convert($_GET['node_id'], 10, 36).
-                       (isset($_GET['template_id'])?'/'.base_convert($_GET['template_id'], 10, 36):'')
-               );
-               die("Die!!! All Fascists Are Bastards...\n");
-       }
- } elseif (preg_match('/k\/([a-z0-9]{1,7})(?:\/([a-z0-9]{1,7}))?/',$_SERVER['PATH_INFO'],$match)) {
-       $_GET['node_id']=base_convert($match[1], 36, 10);
-       if (!empty($match[2])) {
-               $_GET['template_id']=base_convert($match[2],36,10);     
-       }
- } elseif (preg_match('/name\/(.*?)\/?$/',$_SERVER['PATH_INFO'],$match)) {
-       $_GET['node_id']  = nodes::getNodeIdByName($match[1]);
+ switch(true) {
+       case preg_match('/id\/([0-9]+)(?:\/([0-9]+)\/?)?/',$_SERVER['PATH_INFO'],$match):
+               //      print_r($match);
+               $_GET['node_id']=$match[1];
+               if (!empty($match[2])) {
+                       $_GET['template_id']=$match[2];
+               }
+               //Base36 fascism redirect
+               if(!count($_POST) && !(isset($_GET['template_id']) && $_GET['template_id'] == 'download')) { //Fix ugly download hack...
+                       header('Location: /k/'.base_convert($_GET['node_id'], 10, 36).
+                               (isset($_GET['template_id'])?'/'.base_convert($_GET['template_id'], 10, 36):'')
+                       );
+                       die("Die!!! All Fascists Are Bastards...\n");
+               }
+               break;
+       case preg_match('/k\/([a-z0-9]{1,7})(?:\/([a-z0-9]{1,7}))?/',$_SERVER['PATH_INFO'],$match):
+               $_GET['node_id']=base_convert($match[1], 36, 10);
+               if (!empty($match[2])) {
+                       $_GET['template_id']=base_convert($match[2],36,10);
+               }
+               break;
+       case preg_match('/name\/(.*?)\/?$/',$_SERVER['PATH_INFO'],$match):
+               $_GET['node_id']  = nodes::getNodeIdByName($match[1]);
+               break;
+       case preg_match('/\/(.+)\/?$/',$_SERVER['PATH_INFO'],$match):
+               $_GET['node_id']  = nodes::getNodeIdByName($match[1]);
+               break;
+       default:
+               $_GET['node_id']=1;
+               break;
  }
  
  if (!empty($_GET['template_id'])) {
@@@ -137,12 -147,14 +147,12 @@@ if (isset($_SESSION['cube_vector']) && 
  @include_once(INCLUDE_DIR.'mail_rss.inc'); //haluz...
  
  //checking permissions
 -function _checkPermissions()
 -{
 -      global $permissions, $node;
 -      require(INCLUDE_DIR.'permissions.inc');
 -      $permissions=permissions::checkPermissions($node);
 -      $permissions['h']=permissions::isHierarch($node);
 +include_once(BACKEND_DIR.'/'.DB_TYPE.'/permissions.inc');
 +$permissions=permissions::checkPerms($node);
 +if ($_SESSION['debugging']) {
 +      print_r($permissions);
  }
 -_checkPermissions();
 +
  
  
  // DO NOT MESS WITH THIS !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
This page took 0.277682 seconds and 4 git commands to generate.