DataObjects/Core_notify_recur.php

[Pman.Core] / DataObjects / Group_Rights.php

diff --git a/DataObjects/Group_Rights.php b/DataObjects/Group_Rights.php
index 0008dfa..c1748fc 100755 (executable)
--- a/DataObjects/Group_Rights.php
+++ b/DataObjects/Group_Rights.php
@@ -1,6 +1,17 @@
 <?php
 /**
  * Table Definition for Group_Rights
+ *
+ * // what they mean:
+        // A - add
+        // D - delete
+        // E - edit
+        // S - list
+        // P - print / export
+        // I - import
+        // M????
+ *
+ * 
  */
 require_once 'DB/DataObject.php';
 
@@ -13,7 +24,7 @@ class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
     public $__table = 'Group_Rights';                    // table name
     public $rightname;                       // string(64)  not_null
     public $group_id;                        // int(11)  not_null
-    public $AccessMask;                      // string(10)  not_null
+    public $accessmask;                      // string(10)  not_null
     public $id;                              // int(11)  not_null primary_key auto_increment
 
     
@@ -31,10 +42,10 @@ class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
         $ret = array();
         while($t->fetch()) {
             if (isset($ret[$t->rightname])) {
-                $ret[$t->rightname] = $this->mergeMask($ret[$t->rightname], $t->AccessMask);
+                $ret[$t->rightname] = $this->mergeMask($ret[$t->rightname], $t->accessmask);
                 continue;
             }
-            $ret[$t->rightname] = $t->AccessMask;
+            $ret[$t->rightname] = $t->accessmask;
         }
         // blank out rights that are disabled by the system..
         $defs = $this->defaultPermData();
@@ -164,16 +175,20 @@ class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
         $defs = $this->defaultPermData();
         switch($g->name) {
             case "Administrators";
-                $this->AccessMask = $this->mergeMask($this->AccessMask, $defs[$this->rightname][0]);
+                $this->accessmask = $this->mergeMask($this->accessmask, $defs[$this->rightname][0]);
                 break;
                 
             default:
-                //$this->AccessMask = $this->mergeMask($this->AccessMask, $defs[$this->rightname][1]);
+                //$this->accessmask = $this->mergeMask($this->accessmask, $defs[$this->rightname][1]);
                 break;
         
         }
         
     }
+    /**
+     * generates the default admin group.
+     * and returns it.
+     */
     function genDefault()
     {
         // need to create to special groups, admin & DEFAULT.
@@ -192,27 +207,27 @@ class Pman_Core_DataObjects_Group_Rights extends DB_DataObject
             $g->insert();
         }
         $this->applyDefs($g, 0);
-        
+        return $g;
         
     }
         
     function applyDefs($g, $usecol) {
         
         $defs = $this->defaultPermData();
-        echo '<PRE>';print_r($defs);
+        //echo '<PRE>';print_r($defs);
         //$usecol = 1;
         foreach($defs as $rightname => $defdata) {
             $gr = DB_DataObject::Factory('Group_Rights');
             $gr->rightname  = $rightname;
             $gr->group_id = $g->id;
             if (!$gr->find(true)) {
-                $gr->AccessMask = $defdata[$usecol];
+                $gr->accessmask = $defdata[$usecol];
                 $gr->insert();
                 continue;
             }
             $oldgr = clone($gr);
-            $gr->AccessMask = $gr->mergeMask($gr->AccessMask, $defdata[$usecol]);
-            if ($gr->AccessMask == $oldgr->AccessMask) {
+            $gr->accessmask = $gr->mergeMask($gr->accessmask, $defdata[$usecol]);
+            if ($gr->accessmask == $oldgr->accessmask) {
                 continue;
             }
             $gr->update($oldgr);