RooGetTrait.php

[Pman.Core] / RooGetTrait.php

diff --git a/RooGetTrait.php b/RooGetTrait.php
index f460616..2af4d95 100644 (file)
--- a/RooGetTrait.php
+++ b/RooGetTrait.php
@@ -131,19 +131,6 @@ trait Pman_Core_RooGetTrait {
        
         if (isset($_REQUEST['_delete'])) {
             $this->jerr("DELETE by GET has been removed - update the code to use POST");
-            /*
-            
-            $keys = $x->keys();
-            if (empty($keys) ) {
-                $this->jerr('no key');
-            }
-            
-            $this->key = $keys[0];
-            
-            
-            // do we really delete stuff!?!?!?
-            return $this->delete($x,$_REQUEST);
-            */
         } 
         
         
@@ -169,10 +156,10 @@ trait Pman_Core_RooGetTrait {
         
         // sets map and countWhat
         $this->loadMap($x, array(
-                    'columns' => $_columns,
-                    'distinct' => empty($_REQUEST['_distinct']) ? false:  $_REQUEST['_distinct'],
-                    'exclude' => empty($_REQUEST['_exclude_columns']) ? false:  explode(',', $_REQUEST['_exclude_columns'])
-            ));
+            'columns' => $_columns,
+            'distinct' => empty($_REQUEST['_distinct']) ? false:  $_REQUEST['_distinct'],
+            'exclude' => empty($_REQUEST['_exclude_columns']) ? false:  explode(',', $_REQUEST['_exclude_columns'])
+        ));
         
         
         $this->setFilters($x,$_REQUEST);
@@ -181,10 +168,6 @@ trait Pman_Core_RooGetTrait {
             $this->jerr("PERMISSION DENIED (g)");
         }
         
-         //print_r($x);
-        // build join if req.
-          //DB_DataObject::debugLevel(1);
-       //   var_dump($this->countWhat);
         $total = $x->count($this->countWhat);
         // sorting..
       //   
@@ -322,7 +305,6 @@ trait Pman_Core_RooGetTrait {
         
         $this->loadMap($x, array(
             'columns' => $_columns,
-
         ));
         
         if ($req !== false) { 
@@ -351,7 +333,7 @@ trait Pman_Core_RooGetTrait {
         }
         // different symantics on all these calls??
         if (method_exists($x, 'toRooSingleArray')) {
-            $this->jok($x->toRooSingleArray($this->authUser, $req));
+            $this->jok($x->toRooSingleArray($this->getAuthUser(), $req));
         }
         if (method_exists($x, 'toRooArray')) {
             $this->jok($x->toRooArray($req));
@@ -440,9 +422,7 @@ trait Pman_Core_RooGetTrait {
                 continue;
                 
             }
-            
-            
-            
+
             switch($key) {
                     
                 // Events and remarks -- fixme - move to events/remarsk...
@@ -482,29 +462,14 @@ trait Pman_Core_RooGetTrait {
             }
         }
         if (!empty($q_filtered)) {
-            //var_dump($q_filtered);
-            
-            
-            
             $x->setFrom($q_filtered);
         }
         
-        
-        
-       
-        // nice generic -- let's get rid of it.. where is it used!!!!
-        // used by: 
-        // Person / Group / Comapnies.... most of my queries noww...
         if (!empty($q['query']['name'])) {
-            
-            
             if (in_array( 'name',  array_keys($x->table()))) {
                 $x->whereAdd($x->tableName().".name LIKE '". $x->escape($q['query']['name']) . "%'");
             }
         }
         
-        // - projectdirectory staff list - persn queuy
-     
-        
     }
 }