Changeset 22 for trunk/services/lock.php

Timestamp:

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

Author:

scdev

Message:

More bugs and shifting things about.

File:

• trunk/services/lock.php (modified) (2 diffs)

trunk/services/lock.php

@@ -11 +11 @@
 App::sslOn();
 
-if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
+if (getFormData('boomerang', false)) {
     // We remember which page we came from so we can go back there.
     $boom_url = strpos(getFormData('boomerang'), '/') !== false ? getFormData('boomerang') : $_SERVER['HTTP_REFERER'];
     App::setBoomerangURL($boom_url, 'lock');
+    App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'cancel-lock');
 }
 
-$lock =& RecordLock::getInstance($GLOBALS['auth']);
+if (!isset($lock) || !is_a($lock, 'RecordLock')) {
+    $lock =& RecordLock::getInstance($auth);
+}
 $lock->select(getFormData('lock_id'));
 
@@ -31 +34 @@
     App::dieBoomerangURL('lock');
 } else if (getFormData('cancel', false)) {
-    App::dieBoomerangURL('lock');
+    // Since the boomerang URL will go back to the locked record, and the record was not unlocked, we must delete the boomerang URL otherwise we'll come back here.
+    App::deleteBoomerangURL('lock');
+    App::dieBoomerangURL('cancel-lock');
 }