fixed bug in permissions (node was displayed even with external_access=no)

[mirrors/Kyberia-bloodline.git] / wwwroot / backend / mysql / permissions.inc

diff --git a/wwwroot/backend/mysql/permissions.inc b/wwwroot/backend/mysql/permissions.inc
index a66af2d1298633854c6cd2ea3a66d9948083b66a..6ef959610a41be99105e7433cf45730f8461abf2 100644 (file)
--- a/wwwroot/backend/mysql/permissions.inc
+++ b/wwwroot/backend/mysql/permissions.inc
@@ -16,14 +16,15 @@ public static function checkPerms($node) {
        elseif (is_numeric($node)) {
                $node_id=$node;
        }
+       
 
-       if (!$node_vector) {
+       if (empty($node_vector)) {
                $set=$db->query("select node_vector from  nodes where node_id='$node_id'");
                $set->next();
                $node_vector=$set->getString('node_vector');
        }
-
-    $user_id = $_SESSION['user_id'];
+       
+       $user_id=(empty($_SESSION['user_id'])) ? "" : $_SESSION['user_id'];
 
     $perms['r'] = 0;
     $perms['w'] = 0;
@@ -57,6 +58,20 @@ public static function checkPerms($node) {
             $perms['node_system_access']   = $qr_np->getString('node_system_access');
             $perms['node_external_access'] = $qr_np->getString('node_external_access');
 
+        // external access must go first
+            if ($user_id == "") {
+                if ($perms['node_system_access'] != 'private'
+                && $perms['node_external_access'] == 'yes') {
+                        $perms['r'] = 1;
+                        $perms['w'] = 0;
+                    break;
+                } else {
+                        $perms['r'] = 0;
+                        $perms['w'] = 0;
+                    break;
+                }
+            }
+
             // r/w prava podla system accessu
             if ($perms['node_system_access'] == 'public') {
                 $perms['r'] = 1;
@@ -78,14 +93,6 @@ public static function checkPerms($node) {
                 break;
             }
 
-            if ($perms['node_system_access'] != 'private'
-                && !$_SESSION['user_id']
-                && $perms['node_external_access'] == 'yes') {
-                    $perms['r'] = 1;
-                    $perms['w'] = 0;
-                    break;
-            }
-
         } // if ($perms['node_permission'] == '' && $perms['node_system_access'] == '')
         else {
             // ked som v public alebo moderated fore a dalsie nadradene su uz privatne