Changeset 22 for trunk/lib/RecordLock.inc.php

Timestamp:

Nov 23, 2005 9:29:33 PM (19 years ago)

Author:

scdev

Message:

More bugs and shifting things about.

File:

• trunk/lib/RecordLock.inc.php (modified) (4 diffs)

trunk/lib/RecordLock.inc.php

@@ -33 +33 @@
     {
         static $instances = array();
-
-        if (!is_a($auth_object, 'Auth_SQL')) {
-            trigger_error('Constructor not provided a valid Auth_SQL object.', E_USER_ERROR);
-        }
                 
         if (!isset($instances[$auth_object->getVal('auth_name')])) {
@@ -52 +48 @@
     function RecordLock($auth_object)
     {
+        if (!is_a($auth_object, 'Auth_SQL')) {
+            trigger_error('Constructor not provided a valid Auth_SQL object.', E_USER_ERROR);
+        }
+
         $this->_auth = $auth_object;
         
@@ -168 +168 @@
         }
         if ($this->data = mysql_fetch_assoc($qid)) {
-            App::logMsg(sprintf('Found locked record: %s %s %s', $record_table_or_lock_id, $record_key, $record_val), LOG_DEBUG, __FILE__, __LINE__);
+            App::logMsg(sprintf('Selecting %slocked record: %s %s %s', ($this->data['set_by_admin_id'] == $this->_auth->getVal('user_id') ? 'self-' : ''), $record_table_or_lock_id, $record_key, $record_val), LOG_DEBUG, __FILE__, __LINE__);
+            /// FIX ME: What if admin set lock, but public user is current lock user?
             $this->data['editor'] = $this->_auth->getUsername($this->data['set_by_admin_id']);
             return true;
@@ -275 +276 @@
             WHERE lock_id = '" . addslashes($this->data['lock_id']) . "'
         ");
+        
+        App::logMsg(sprintf('Removing lock: %s', $this->data['lock_id']), LOG_DEBUG, __FILE__, __LINE__);
     }