DataObjects/Core_event_audit.php

[Pman.Core] / DataObjects / Group_Rights.php

diff --git a/DataObjects/Group_Rights.php b/DataObjects/Group_Rights.php
index e7aeed7..30f2325 100755 (executable)
--- a/DataObjects/Group_Rights.php
+++ b/DataObjects/Group_Rights.php
@@ -120,6 +120,10 @@ class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
                 continue;
             }
             $ar = (array)json_decode(file_get_contents($fn));
+            if (empty($ar)) {
+                // since these are critical files.. die'ing with error is ok.
+                die("invalid json file: " . $fn);
+               }
            // echo '<PRE>';print_r($ar);
             foreach($ar as $k=> $perm) {
                 if ($k[0] == '/') {
@@ -164,7 +168,7 @@ class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
                 break;
                 
             default:
-                $this->AccessMask = $this->mergeMask($this->AccessMask, $defs[$this->rightname][1]);
+                //$this->AccessMask = $this->mergeMask($this->AccessMask, $defs[$this->rightname][1]);
                 break;
         
         }