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

diff --git a/Lock.php b/Lock.php
index 71ac45a7..b0e7ea9a 100644
--- a/Lock.php
+++ b/Lock.php
@@ -48,7 +48,7 @@ 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??
@@ -72,7 +72,7 @@ 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->jok("No lock exists"); // been deleted before.. probably ok..
         }
@@ -100,13 +100,30 @@ class Pman_Core_Lock extends Pman
         }
         // 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' => strtolower($_REQUEST['on_table'])
         ));
-        $curlock->person_id = $this->authUser->id;
+        
+        // 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() ;
         
@@ -114,8 +131,8 @@ class Pman_Core_Lock extends Pman
         
         if ($nlocks && empty($_REQUEST['force'])) {
            // DB_DataObjecT::debugLevel(1);
-            $ar = $curlock->fetchAll('person_id', 'created');
-            $p = DB_DataObject::factory('Person');
+            $ar = $curlock_ex->fetchAll('person_id', 'created');
+            $p = DB_DataObject::factory('core_person');
             $p->selectAdd();
             $p->selectAdd('id,name,email');
             
@@ -126,20 +143,20 @@ class Pman_Core_Lock extends Pman
                 $ret[$p->id] = $p->toArray();
                 $ret[$p->id]['lock_created'] = $ar[$p->id];
             }
-            $ret = array_values($ret);
-            //$this->jok(array_values($ret));
+             $this->jok(array_values($ret));
             
         }
         // 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 = DB_DataObject::factory('core_locking');
             $curlock->setFrom(array(
                 'on_id' => $_REQUEST['on_id'],
-                'on_table' => strtolower($_REQUEST['on_table'])
+                'on_table' => strtolower($_REQUEST['on_table']),
+                'person_id' => $this->authUser->id
             ));
-            $curlock->person_id = $this->authUser->id;
+            
             $curlock->find();
             while($curlock->fetch()) {
                 $cc =clone($curlock);
@@ -153,15 +170,12 @@ class Pman_Core_Lock extends Pman
                 $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' => strtolower($_REQUEST['on_table']),
@@ -169,7 +183,7 @@ class Pman_Core_Lock extends Pman
             'person_id' => $this->authUser->id,
         ));
         $id = $curlock->insert();
-        $this->jok($ret ? $ret : $id);
+        $this->jok( $id);
         
     }