DataObjects/Core_notify.php

[Pman.Core] / Lock.php

diff --git a/Lock.php b/Lock.php
index 8d6cc90..a1b091f 100644 (file)
--- a/Lock.php
+++ b/Lock.php
@@ -49,6 +49,15 @@ class Pman_Core_Lock extends Pman
     }
     
     function get($action)
+    {
+        // should we allow url links to lock things???
+        // only for debugging??
+        $this->post($action);
+        // 
+        $this->jerr("invalid request");
+    }
+    
+    function post($action)
     {
         
         // default action is to attempt to lock..
@@ -99,16 +108,18 @@ class Pman_Core_Lock extends Pman
         
         $nlocks = $curlock->count() ;
         if ($nlocks && empty($_REQUEST['force'])) {
-            
-            $curlock->selectAdd();
+           // DB_DataObjecT::debugLevel(1);
             $ar = $curlock->fetchAll('person_id', 'created');
             $p = DB_DataObject::factory('Person');
-            $p->whereAddIn('id', $ar, 'int');
+            $p->selectAdd();
+            $p->selectAdd('id,name,email');
+            
+            $p->whereAddIn('id', array_keys($ar), 'int');
             $p->find();
             $ret = array();
             while ($p->fetch()) {
-                $ret[$p->id] = $p->toRooArray();
-                $ret[$p->id]->lock_created = $ar[$p->id];
+                $ret[$p->id] = $p->toArray();
+                $ret[$p->id]['lock_created'] = $ar[$p->id];
             }
             $this->jok(array_values($ret));