Merge branch 'master' of ssh://kyberia.cz/srv/git/kyberia-bloodline

diff --git a/wwwroot/backend/mysql/backend.inc b/wwwroot/backend/mysql/backend.inc
index 55e633ffbc2fe4ac3f27a320c969b4197f578139..a3ee375bd645043ceb6950fa60464bbbc13935a1 100644 (file)
--- a/wwwroot/backend/mysql/backend.inc
+++ b/wwwroot/backend/mysql/backend.inc
@@ -49,7 +49,7 @@ function putNode($what,$where,$checkpermissions=true) {
        $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 @@ 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');

diff --git a/wwwroot/inc/eventz/verify.inc b/wwwroot/inc/eventz/verify.inc
index 7593708735aaba14dc9ec502e78b6aee1d30b95b..2ee01875fdec6d38b252fa19bda3245193172464 100644 (file)
--- a/wwwroot/inc/eventz/verify.inc
+++ b/wwwroot/inc/eventz/verify.inc
@@ -44,7 +44,6 @@ $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=".REGISTRATION_REQUEST_NODE;
 $db->update($q);
-
 nodes::putNode($userid,$guild_id,false);
 
 // and now the happy news:-))

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index bd4500eeaba4d9f58ab09a8dd9afad0970743199..490ee443eb077842539ecac9c9e31e7f826a36ce 100644 (file)
--- a/wwwroot/nodes.php
+++ b/wwwroot/nodes.php
@@ -147,14 +147,12 @@ if (isset($_SESSION['cube_vector']) && ($_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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!