projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42fadf5
)
Lock.php
author
Alan Knowles
<alan@akbkhome.com>
Thu, 18 Nov 2010 08:20:46 +0000
(16:20 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Thu, 18 Nov 2010 08:20:46 +0000
(16:20 +0800)
Lock.php
patch
|
blob
|
history
diff --git
a/Lock.php
b/Lock.php
index
9d16bb2
..
d4b7240
100644
(file)
--- a/
Lock.php
+++ b/
Lock.php
@@
-31,12
+31,7
@@
class Pman_Core_Lock extends Pman
if (!$x->get($_REQUEST['on_id'])) {
$this->jerr("Item does not exist");
}
if (!$x->get($_REQUEST['on_id'])) {
$this->jerr("Item does not exist");
}
- $curlock = DB_DataObject::factory('Core_locking');
- $curlock->setFrom(array(
- 'on_id' => $_REQUEST['on_id'],
- 'on_table' => $_REQUEST['on_table'],
- //'person_id' => $this->authUser->id,
- ));
+
$locked = false;
if ($curlock->find(true)) {
$locked = true;
$locked = false;
if ($curlock->find(true)) {
$locked = true;
@@
-47,12
+42,24
@@
class Pman_Core_Lock extends Pman
function unlock($curlock)
{
function unlock($curlock)
{
- if (!$curlock->id) {
+
+ $curlock = DB_DataObject::factory('Core_locking');
+ $curlock->setFrom(array(
+ 'on_id' => $_REQUEST['on_id'],
+ 'on_table' => $_REQUEST['on_table'],
+ 'person_id' => $this->authUser->id,
+ ));
+
+
+ if (!$curlock->find()) {
$this->jok("No lock");
$this->jok("No lock");
+ }
+ while ($curlock->fetch()) {
+ $cc = clone($curlock);
+ $cc->delete();
}
}
- $curlock->delete();
- $this->jok('locked');
+ $this->jok('unlocked');
}
}