X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Lock.php;h=b0e7ea9a2c05f14b13dd6e4ca26feb2eb1ed77be;hp=8d6cc90e21923747751e6465f78d78a646b61f3b;hb=8cd2a9237c684aa16bc21e3ac6d3793c49c65400;hpb=32cd64c970bc3f4a29a8508754f966553e20ad01

diff --git a/Lock.php b/Lock.php
index 8d6cc90e..b0e7ea9a 100644
--- a/Lock.php
+++ b/Lock.php
@@ -48,7 +48,16 @@ class Pman_Core_Lock extends Pman
         return true; 
     }
     
-    function get($action)
+    function get($action, $opts=array())
+    {
+        // 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..
@@ -63,12 +72,13 @@ class Pman_Core_Lock extends Pman
         if (empty($_REQUEST['id'])) {
             $this->jerr("No lock id");
         }
-        $curlock = DB_DataObject::factory('Core_locking');
+        $curlock = DB_DataObject::factory('core_locking');
         if (!$curlock->get($_REQUEST['id'])) {
-            $this->jerr("No lock exists");
+            $this->jok("No lock exists"); // been deleted before.. probably ok..
         }
         
         if ($curlock->person_id != $this->authUser->id) {
+            // this is an error conditon..
             $this->jerr("Lock id is invalid");
         }
         
@@ -83,56 +93,97 @@ class Pman_Core_Lock extends Pman
             $this->jerr("Missing table or id");
         }
        
-        $tab = str_replace('/', '',$_REQUEST['on_table']); // basic protection??
+        $tab = str_replace('/', '', strtolower($_REQUEST['on_table'])); // basic protection??
         $x = DB_DataObject::factory($tab);
         if (!$x->get($_REQUEST['on_id'])) {
             $this->jerr("Item does not exist");
         }
         // is there a current lock on the item..
         
-        $curlock = DB_DataObject::factory('Core_locking');
+        $curlock = DB_DataObject::factory('core_locking');
         $curlock->setFrom(array(
             'on_id' => $_REQUEST['on_id'],
-            'on_table' => $_REQUEST['on_table']
+            'on_table' => strtolower($_REQUEST['on_table'])
         ));
         
+        // remove old locks..
+        $llc = clone($curlock);
+        $exp = date('Y-m-d', strtotime('NOW - 1 WEEK'));
+        $llc->whereAdd("created < '$exp'");
+        if ($llc->count()) {
+            $llc->find();
+            while($llc->fetch()) {
+                $llcd = clone($llc);
+                $llcd->delete();
+           
+            }
+        }
+        
+        
+        $curlock_ex = clone($curlock);
+        $curlock->person_id = $this->authUser->id;
+        
+        
+        $curlock_ex->whereAdd('person_id != '. $this->authUser->id);
+        $nlocks = $curlock_ex->count() ;
+        
+        $ret = false;
         
-        $nlocks = $curlock->count() ;
         if ($nlocks && empty($_REQUEST['force'])) {
+           // DB_DataObjecT::debugLevel(1);
+            $ar = $curlock_ex->fetchAll('person_id', 'created');
+            $p = DB_DataObject::factory('core_person');
+            $p->selectAdd();
+            $p->selectAdd('id,name,email');
             
-            $curlock->selectAdd();
-            $ar = $curlock->fetchAll('person_id', 'created');
-            $p = DB_DataObject::factory('Person');
-            $p->whereAddIn('id', $ar, 'int');
+            $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));
+             $this->jok(array_values($ret));
             
         }
-        if ($nlocks) {
+        // trash the lock if it belongs to current user..
+        $ulocks = $curlock->count();
+        if ($ulocks) {
             // trash all the locks..
+            $curlock = DB_DataObject::factory('core_locking');
+            $curlock->setFrom(array(
+                'on_id' => $_REQUEST['on_id'],
+                'on_table' => strtolower($_REQUEST['on_table']),
+                'person_id' => $this->authUser->id
+            ));
+            
             $curlock->find();
             while($curlock->fetch()) {
                 $cc =clone($curlock);
                 $cc->delete();
             }
         }
+        if ($nlocks && !empty($_REQUEST['force'])) {
+            // user has decied to delete eveyone elses locks..
+            $curlock_ex->find();
+            while($curlock_ex->fetch()) {
+                $cc =clone($curlock_ex);
+                $cc->delete();
+            }
+        }
+        
         
         // make a lock..
         
-        $curlock = DB_DataObject::factory('Core_locking');
+        $curlock = DB_DataObject::factory('core_locking');
         $curlock->setFrom(array(
             'on_id' => $_REQUEST['on_id'],
-            'on_table' => $_REQUEST['on_table'],
+            'on_table' => strtolower($_REQUEST['on_table']),
             'created' => date('Y-m-d H:i:s'),
             'person_id' => $this->authUser->id,
         ));
         $id = $curlock->insert();
-        $this->jok($id);
+        $this->jok( $id);
         
     }