RooTrait.php

[Pman.Core] / RooTrait.php

diff --git a/RooTrait.php b/RooTrait.php
index 75402fb..f29ec12 100644 (file)
--- a/RooTrait.php
+++ b/RooTrait.php
@@ -68,15 +68,6 @@ trait Pman_Core_RooTrait {
         
     }
     
-    function checkDebugPost()
-    {
-        return (!empty($_GET['_post']) || !empty($_GET['_debug_post'])) && 
-                    $this->authUser && 
-                    method_exists($this->authUser,'groups') &&
-                    in_array('Administrators', $this->authUser->groups('name')); 
-        
-    }
-    
     function dataObject($tab)
     {
         if (is_array($this->validTables) &&  !in_array($tab, $this->validTables)) {
@@ -94,66 +85,6 @@ trait Pman_Core_RooTrait {
         return $x;
     }
     
-    function selectSingle($x, $id, $req=false)
-    {
-        $_columns = !empty($req['_columns']) ? explode(',', $req['_columns']) : false;
-
-        //var_dump(array(!is_array($id) , empty($id)));
-        if (!is_array($id) && empty($id)) {
-            
-            if (method_exists($x, 'toRooSingleArray')) {
-                $this->jok($x->toRooSingleArray($this->getAuthUser(), $req));
-            }
-            
-            if (method_exists($x, 'toRooArray')) {
-                $this->jok($x->toRooArray($req));
-            }
-            
-            $this->jok($x->toArray());
-        }
-       
-        
-        $this->loadMap($x, array(
-                    'columns' => $_columns,
-                     
-            ));
-        if ($req !== false) { 
-            $this->setFilters($x, $req);
-        }
-        
-        // DB_DataObject::DebugLevel(1);
-        if (is_array($id)) {
-            // lookup...
-            $x->setFrom($req['lookup'] );
-            $x->limit(1);
-            if (!$x->find(true)) {
-                if (!empty($id['_id'])) {
-                    // standardize this?
-                    $this->jok($x->toArray());
-                }
-                $this->jok(false);
-            }
-            
-        } else if (!$x->get($id)) {
-            $this->jerr("selectSingle: no such record ($id)");
-        }
-        
-        // ignore perms if comming from update/insert - as it's already done...
-        if ($req !== false && !$this->checkPerm($x,'S'))  {
-            $this->jerr("PERMISSION DENIED - si");
-        }
-        // different symantics on all these calls??
-        if (method_exists($x, 'toRooSingleArray')) {
-            $this->jok($x->toRooSingleArray($this->authUser, $req));
-        }
-        if (method_exists($x, 'toRooArray')) {
-            $this->jok($x->toRooArray($req));
-        }
-        
-        $this->jok($x->toArray());
-        
-        
-    }
     
     /*
      * From Pman.php
@@ -223,6 +154,18 @@ trait Pman_Core_RooTrait {
         
     }
     
+    function checkPerm($obj, $lvl, $req= null)
+    {
+        if (!method_exists($obj, 'checkPerm')) {
+            return true;
+        }
+        if ($obj->checkPerm($lvl, $this->getAuthUser(), $req))  {
+            return true;
+        }
+        
+        return false;
+    }
+    
     function getAuthUser()
     {
         die('Get auth user is not implement.');