X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Lock.php;h=b0e7ea9a2c05f14b13dd6e4ca26feb2eb1ed77be;hp=99c4161878985344ffde782ea07a06dff378c316;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hpb=98ec9a5089c737b4494654056312a9eecc1ab934 diff --git a/Lock.php b/Lock.php index 99c41618..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.. } @@ -132,7 +132,7 @@ class Pman_Core_Lock extends Pman if ($nlocks && empty($_REQUEST['force'])) { // DB_DataObjecT::debugLevel(1); $ar = $curlock_ex->fetchAll('person_id', 'created'); - $p = DB_DataObject::factory('Person'); + $p = DB_DataObject::factory('core_person'); $p->selectAdd(); $p->selectAdd('id,name,email'); @@ -175,7 +175,7 @@ class Pman_Core_Lock extends Pman // 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']),