Changeset 136 for trunk/services/lock.php

Timestamp:

Jun 3, 2006 7:47:48 PM (18 years ago)

Author:

scdev

Message:

Q - Merged branches/2.0singleton into trunk. Completed updating classes to use singleton methods. Implemented tests. Fixed some bugs. Changed some interfaces.

File:

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

trunk/services/lock.php

@@ -9 +9 @@
 
 $auth->requireLogin();
-App::sslOn();
+$app->sslOn();
 
 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($boom_url, 'lock');
     if (isset($_SERVER['HTTP_REFERER'])) {
-        App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'cancel-lock');
+        $app->setBoomerangURL($_SERVER['HTTP_REFERER'], 'cancel-lock');
     }
 }
@@ -26 +26 @@
 
 if (!$lock->isLocked()) {
-    App::logMsg('Lock not found with lock_id: ' . getFormData('lock_id') . ', from referrer: ' . $_SERVER['HTTP_REFERER'], LOG_WARNING, __FILE__, __LINE__);
-    App::dieBoomerangURL('lock');
+    $app->logMsg('Lock not found with lock_id: ' . getFormData('lock_id') . ', from referrer: ' . $_SERVER['HTTP_REFERER'], LOG_WARNING, __FILE__, __LINE__);
+    $app->dieBoomerangURL('lock');
 }
 
@@ -33 +33 @@
 if (getFormData('unlock', false)) {
     $lock->remove();
-    App::raiseMsg(sprintf(_("The record <strong>%s</strong> has been unlocked, and can now be modified."), $lock->getTitle('title')), MSG_NOTICE, __FILE__, __LINE__);
-    App::dieBoomerangURL('lock');
+    $app->raiseMsg(sprintf(_("The record <strong>%s</strong> has been unlocked, and can now be modified."), $lock->getTitle('title')), MSG_NOTICE, __FILE__, __LINE__);
+    $app->dieBoomerangURL('lock');
 } else if (getFormData('cancel', false)) {
     // 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');
+    $app->deleteBoomerangURL('lock');
+    $app->dieBoomerangURL('cancel-lock');
 }