X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Lock.php;h=b0e7ea9a2c05f14b13dd6e4ca26feb2eb1ed77be;hp=fa29ec0700d5265bf171af03675814a2d3064bd4;hb=HEAD;hpb=c7811520f1e368d00fb86448b437817e6e2bc325 diff --git a/Lock.php b/Lock.php index fa29ec07..661381fa 100644 --- a/Lock.php +++ b/Lock.php @@ -1,6 +1,36 @@ 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!!!! @@ -18,30 +48,37 @@ 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.. - $action = empty($action) ? 'lock' : 'unlock'; - $this->$action($curlock); - - - + $action = empty($action) || $action == 'lock' ? 'lock' : 'unlock'; + $this->$action(); } - function unlock($curlock) + function unlock() { 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) { + if ($curlock->person_id != $this->authUser->id && empty($_REQUEST['force'])) { + // this is an error conditon.. $this->jerr("Lock id is invalid"); } @@ -56,52 +93,100 @@ 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']) )); - if ($curlock->count()) { - $err = $this->canUnlock(); - if ($err !== true) { - $this->jerr($err); + + // 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(); + } } - // make a lock.. - $curlock = DB_DataObject::factory('Core_locking'); - $curlock->setFrom(array( - 'on_id' => $_REQUEST['on_id'], - 'on_table' => $_REQUEST['on_table'], - 'created' => date('Y-m-d H:i:s'), - 'person_id' => $this->authUser->id, - )); - $id = $curlock->insert(); - $this->jok($id); - } - - function canUnlock() - { - // the only scenario where we can automatically unlock is::: + $curlock_ex = clone($curlock); + $curlock->person_id = $this->authUser->id; - // this user owns the lock. - // the user who owns the lock is not logged in.. + $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_ex->fetchAll('person_id', 'created'); + $p = DB_DataObject::factory('core_person'); + $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->toArray(); + $ret[$p->id]['lock_created'] = $ar[$p->id]; + } + $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->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->setFrom(array( + 'on_id' => $_REQUEST['on_id'], + '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); } +