Changeset 136 for trunk/services/versions.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/versions.php (modified) (7 diffs)

trunk/services/versions.php

@@ -8 +8 @@
 
 $auth->requireLogin();
-App::sslOn();
+$app->sslOn();
 
 require_once 'codebase/lib/RecordVersion.inc.php';
@@ -20 +20 @@
 
 // Query arguments to retain their values between page requests.
-App::carryQuery('record_table');
-App::carryQuery('record_key');
-App::carryQuery('record_val');
-App::carryQuery('version_title');
+$app->carryQuery('record_table');
+$app->carryQuery('record_key');
+$app->carryQuery('record_val');
+$app->carryQuery('version_title');
 
 // Titles and navigation header.
@@ -39 +39 @@
 
 if ('' == $version_id && ('' == $record_table || '' == $record_key || '' == $record_val)) {
-    App::raiseMsg(_("Record not specified for versioning."), MSG_WARNING, __FILE__, __LINE__);
-    App::logMsg('Record not specified for versioning.', LOG_WARNING, __FILE__, __LINE__);
-    App::dieBoomerangURL();
+    $app->raiseMsg(_("Record not specified for versioning."), MSG_WARNING, __FILE__, __LINE__);
+    $app->logMsg('Record not specified for versioning.', LOG_WARNING, __FILE__, __LINE__);
+    $app->dieBoomerangURL();
 }
 
 if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
     // We remember which page we came from so we can go back there.
-    App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'versions');
+    $app->setBoomerangURL($_SERVER['HTTP_REFERER'], 'versions');
 }
 
@@ -53 +53 @@
 
 case _("Cancel") :
-    App::dieBoomerangURL('versions', false);
+    $app->dieBoomerangURL('versions', false);
     break;
 
@@ -68 +68 @@
     $current = $version->getCurrent($record_table, $record_key, $record_val);
     if (serialize($data) == serialize($current)) {
-        App::raiseMsg(sprintf(_("Version <strong>%s</strong> is identical to the current record"), $version_id), MSG_NOTICE, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("Version <strong>%s</strong> is identical to the current record"), $version_id), MSG_NOTICE, __FILE__, __LINE__);
     }
     $nav->addPage(sprintf(_("Difference between version %s (%s) and current record."), $version_id, $versionrecord['version_datetime']));
@@ -86 +86 @@
         // Create version of this restored record as the "current" version.
         $version->create($record_table, $record_key, $record_val, $v['version_title']);
-        App::raiseMsg(sprintf(_("The record <strong>%s</strong> has been replaced with <strong>%s</strong> version <strong>%s</strong> from <strong>%s</strong>."), getFormData('version_title'), $v['version_title'], $version_id, $v['version_datetime']), MSG_SUCCESS, __FILE__, __LINE__);
-        App::dieBoomerangURL('versions', array('break_list_cache'=>'true', false));
+        $app->raiseMsg(sprintf(_("The record <strong>%s</strong> has been replaced with <strong>%s</strong> version <strong>%s</strong> from <strong>%s</strong>."), getFormData('version_title'), $v['version_title'], $version_id, $v['version_datetime']), MSG_SUCCESS, __FILE__, __LINE__);
+        $app->dieBoomerangURL('versions', array('break_list_cache'=>'true', false));
     } else {
-        App::raiseMsg(_("Version restoration failed."), MSG_ERR, __FILE__, __LINE__);
-        App::dieURL($_SERVER['PHP_SELF']);
+        $app->raiseMsg(_("Version restoration failed."), MSG_ERR, __FILE__, __LINE__);
+        $app->dieURL($_SERVER['PHP_SELF']);
     }
     break;
@@ -101 +101 @@
         $main_template = 'versions_list.ihtml';
     } else {
-        App::raiseMsg(sprintf(_("No saved versions available for this record"), null), MSG_NOTICE, __FILE__, __LINE__);
-        App::dieBoomerangURL('versions');
+        $app->raiseMsg(sprintf(_("No saved versions available for this record"), null), MSG_NOTICE, __FILE__, __LINE__);
+        $app->dieBoomerangURL('versions');
     }
 }