X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Lock.php;h=b0e7ea9a2c05f14b13dd6e4ca26feb2eb1ed77be;hp=747678bde454a5595976c23cd6e5c26e231f4e19;hb=HEAD;hpb=bd4bc54727f4e7f2a9280f88bfb03c311e2696a8

diff --git a/Lock.php b/Lock.php
index 747678bd..661381fa 100644
--- a/Lock.php
+++ b/Lock.php
@@ -40,7 +40,7 @@ class Pman_Core_Lock extends Pman
     {
          $au = $this->getAuthUser();
         if (!$au) {
-             $this->jerr("Not authenticated", array('authFailure' => true));
+             $this->jerror("LOGIN-NOAUTH", "Not authenticated", array('authFailure' => true));
         }
         $this->authUser = $au;
         // check that it's a supplier!!!! 
@@ -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,12 +72,12 @@ 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..
         }
         
-        if ($curlock->person_id != $this->authUser->id) {
+        if ($curlock->person_id != $this->authUser->id && empty($_REQUEST['force'])) {
             // this is an error conditon..
             $this->jerr("Lock id is invalid");
         }
@@ -100,21 +100,39 @@ 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'])
         ));
         
+        // 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_ex->whereAdd('person_id != '. $this->authUser->id);
+        $curlock->person_id = $this->authUser->id;
         
         
+        $curlock_ex->whereAdd('person_id != '. $this->authUser->id);
         $nlocks = $curlock_ex->count() ;
+        
+        $ret = false;
+        
         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');
             
@@ -125,28 +143,39 @@ class Pman_Core_Lock extends Pman
                 $ret[$p->id] = $p->toArray();
                 $ret[$p->id]['lock_created'] = $ar[$p->id];
             }
-            $this->jok(array_values($ret));
+             $this->jok(array_values($ret));
             
         }
         // trash the lock if it belongs to current user..
-        $nlocks = $curlock->count();
-        if ($nlocks) {
+        $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->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' => strtolower($_REQUEST['on_table']),
@@ -154,7 +183,7 @@ class Pman_Core_Lock extends Pman
             'person_id' => $this->authUser->id,
         ));
         $id = $curlock->insert();
-        $this->jok($id);
+        $this->jok( $id);
         
     }