Changeset 129

Timestamp:

May 26, 2006 9:40:35 PM (18 years ago)

Author:

scdev

Message:

finished updating to 2.0singleton

Location:

branches/2.0singleton

Files:

• services/admins.php (modified) (17 diffs)
• services/lock.php (modified) (3 diffs)
• services/login.php (modified) (2 diffs)
• services/logout.php (modified) (1 diff)
• services/logs.php (modified) (11 diffs)
• services/password.php (modified) (2 diffs)
• services/versions.php (modified) (7 diffs)
• tests/AppTest.php (modified) (6 diffs)

branches/2.0singleton/services/admins.php

@@ -8 +8 @@
 
 $auth->requireLogin();
-App::sslOn();
+$app->sslOn();
 
 require_once 'codebase/lib/PageNumbers.inc.php';
@@ -54 +54 @@
 
 // Search limiters retain their values between page requests.
-App::carryQuery('search_query');
+$app->carryQuery('search_query');
 
 
@@ -64 +64 @@
 // allows us to remember which page we came from so we can go back there.
 if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
-    App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'admins');
+    $app->setBoomerangURL($_SERVER['HTTP_REFERER'], 'admins');
 }
 
@@ -91 +91 @@
 case 'del' :
     deleteRecord(getFormData('admin_id'));
-    if (App::validBoomerangURL('admins')) {
+    if ($app->validBoomerangURL('admins')) {
         // Display boomerang page.
-        App::dieBoomerangURL('admins');
+        $app->dieBoomerangURL('admins');
     }
     // Display default page.
-    App::dieURL($_SERVER['PHP_SELF']);
+    $app->dieURL($_SERVER['PHP_SELF']);
     break;
 
 case 'insert' :
     if (getFormdata('cancel', false)) {
-        if (App::validBoomerangURL('admins')) {
+        if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            App::dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins');
         }
         // Display default page.
-        App::dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF']);
     }
     validateInput();
@@ -118 +118 @@
         if (getFormdata('repeat', false)) {
             // Display function again.
-            App::dieURL($_SERVER['PHP_SELF'] . '?op=add');
-        } else if (App::validBoomerangURL('admins')) {
+            $app->dieURL($_SERVER['PHP_SELF'] . '?op=add');
+        } else if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            App::dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins');
         }
         // Display default page.
-        App::dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF']);
     }
     break;
@@ -130 +130 @@
 case 'update' :
     if (getFormdata('reset', false)) {
-        App::raiseMsg(_("Saved values have been reloaded."), MSG_NOTICE, __FILE__, __LINE__);
-        App::dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . getFormData('admin_id'));
+        $app->raiseMsg(_("Saved values have been reloaded."), MSG_NOTICE, __FILE__, __LINE__);
+        $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . getFormData('admin_id'));
     }
     if (getFormdata('cancel', false)) {
@@ -137 +137 @@
         $lock->select('admin_tbl', 'admin_id', getFormData('admin_id'));
         $lock->remove();
-        if (App::validBoomerangURL('admins')) {
+        if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            App::dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins');
         }
         // Display default page.
-        App::dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF']);
     }
     validateInput();
@@ -156 +156 @@
             $qid = DB::query("SELECT admin_id FROM admin_tbl WHERE admin_id > '" . DB::escapeString(getFormData('admin_id')) . "' ORDER BY admin_id ASC LIMIT 1");
             if (list($next_id) = mysql_fetch_row($qid)) {
-                App::dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id);
+                $app->dieURL($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $next_id);
             } else {
-                App::raiseMsg(_("Cannot edit next, the end of the list was reached"), MSG_NOTICE, __FILE__, __LINE__);
+                $app->raiseMsg(_("Cannot edit next, the end of the list was reached"), MSG_NOTICE, __FILE__, __LINE__);
             }
-        } else if (App::validBoomerangURL('admins')) {
+        } else if ($app->validBoomerangURL('admins')) {
             // Display boomerang page.
-            App::dieBoomerangURL('admins');
+            $app->dieBoomerangURL('admins');
         }
         // Display default page.
-        App::dieURL($_SERVER['PHP_SELF']);
+        $app->dieURL($_SERVER['PHP_SELF']);
     }
     break;
@@ -258 +258 @@
 {
     global $lock;
+    $app =& App::getInstance();
 
     $lock->select('admin_tbl', 'admin_id', $id);
@@ -271 +272 @@
     ");
     if (!$frm = mysql_fetch_assoc($qid)) {
-        App::logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
-        App::raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
-        App::dieBoomerangURL();
+        $app->logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
+        $app->dieBoomerangURL();
     }
 
@@ -313 +314 @@
 {
     global $auth, $lock;
+    $app =& App::getInstance();
 
     $lock->select('admin_tbl', 'admin_id', $id);
@@ -328 +330 @@
     ");
     if (! list($name, $user_type) = mysql_fetch_row($qid)) {
-        App::logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
-        App::raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
-        App::dieBoomerangURL();
+        $app->logMsg('Could not find record with admin_id: ' . $id, LOG_WARNING, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
+        $app->dieBoomerangURL();
     }
 
@@ -338 +340 @@
     if ('root' == $user_type && 'root' != $auth->getVal('user_type')) {
         // Only root users can delete root users!
-        App::raiseMsg(_("You do not have clearance to delete a root administrator."), MSG_NOTICE, __FILE__, __LINE__);
+        $app->raiseMsg(_("You do not have clearance to delete a root administrator."), MSG_NOTICE, __FILE__, __LINE__);
     } else if ($num_admins <= 1) {
         // There must always be at least one admnistrator!
-        App::raiseMsg(_("You cannot delete the only administrator in the database. There must be at least one to log in and create other users."), MSG_NOTICE, __FILE__, __LINE__);
+        $app->raiseMsg(_("You cannot delete the only administrator in the database. There must be at least one to log in and create other users."), MSG_NOTICE, __FILE__, __LINE__);
     } else if ($auth->getVal('user_id') == $id) {
         // Do not delete yourself!
-        App::raiseMsg(_("You cannot delete yourself."), MSG_NOTICE, __FILE__, __LINE__);
+        $app->raiseMsg(_("You cannot delete yourself."), MSG_NOTICE, __FILE__, __LINE__);
     } else {
         // Delete the record.
         DB::query("DELETE FROM admin_tbl WHERE admin_id = '" . DB::escapeString($id) . "'");
-        App::raiseMsg(sprintf(_("The admin <strong>%s</strong> has been deleted."), $name), MSG_SUCCESS, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("The admin <strong>%s</strong> has been deleted."), $name), MSG_SUCCESS, __FILE__, __LINE__);
     }
 
@@ -358 +360 @@
 {
     global $auth;
+    $app =& App::getInstance();
 
     // Break the cache because we are changing the list data.
@@ -391 +394 @@
     $version->create('admin_tbl', 'admin_id', $last_insert_id, $frm['username']);
 
-    App::raiseMsg(sprintf(_("The Admin <strong>%s</strong> has been added."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
+    $app->raiseMsg(sprintf(_("The Admin <strong>%s</strong> has been added."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
 
     return $last_insert_id;
@@ -399 +402 @@
 {
     global $auth, $lock;
+    $app =& App::getInstance();
 
     $lock->select('admin_tbl', 'admin_id', $frm['admin_id']);
@@ -431 +435 @@
     $version->create('admin_tbl', 'admin_id', $frm['admin_id'], $frm['username']);
 
-    App::raiseMsg(sprintf(_("The Admin <strong>%s</strong> has been updated."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
+    $app->raiseMsg(sprintf(_("The Admin <strong>%s</strong> has been updated."), $frm['username']), MSG_SUCCESS, __FILE__, __LINE__);
 
     // Unlock record.

branches/2.0singleton/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');
 }
 

branches/2.0singleton/services/login.php

@@ -8 +8 @@
 // allows us to remember which page we came from so we can go back there.
 if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
-    App::setBoomerangURL($_SERVER['HTTP_REFERER'], 'login');
+    $app->setBoomerangURL($_SERVER['HTTP_REFERER'], 'login');
 }
-App::sslOn();
+$app->sslOn();
 
 $frm['username'] = getFormdata('username');
@@ -19 +19 @@
 
     if ($auth->login($frm['username'], $frm['password'])) {
-        App::raiseMsg(_("You are now logged in."), MSG_SUCCESS, __FILE__, __LINE__);
-        App::dieBoomerangURL('login');
-        App::logMsg(sprintf('%s %s successfully logged-in.', $auth->getVal('auth_name'), $frm['username']), LOG_INFO, __FILE__, __LINE__);
+        $app->raiseMsg(_("You are now logged in."), MSG_SUCCESS, __FILE__, __LINE__);
+        $app->dieBoomerangURL('login');
+        $app->logMsg(sprintf('%s %s successfully logged-in.', $auth->getVal('auth_name'), $frm['username']), LOG_INFO, __FILE__, __LINE__);
     } else {
-        App::raiseMsg(_("Login failed, please try again."), MSG_NOTICE, __FILE__, __LINE__);
-        App::logMsg(sprintf('%s %s failed login using (MD5ed) password: %s', ucfirst($auth->getVal('auth_name')), $frm['username'], md5($frm['password'])), LOG_NOTICE, __FILE__, __LINE__);
+        $app->raiseMsg(_("Login failed, please try again."), MSG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('%s %s failed login using (MD5ed) password: %s', ucfirst($auth->getVal('auth_name')), $frm['username'], md5($frm['password'])), LOG_NOTICE, __FILE__, __LINE__);
     }
 }

branches/2.0singleton/services/logout.php

@@ -15 +15 @@
 $auth->clearAuth();
 
-App::raiseMsg(sprintf(_("Your session has been logged-out."), null), MSG_SUCCESS, __FILE__, __LINE__);
-App::dieURL(App::getParam('redirect_home_url'));
+$app->raiseMsg(sprintf(_("Your session has been logged-out."), null), MSG_SUCCESS, __FILE__, __LINE__);
+$app->dieURL($app->getParam('redirect_home_url'));
 
 ?>

branches/2.0singleton/services/logs.php

@@ -9 +9 @@
 $auth->requireLogin();
 // $auth->requireAccessClearance(ZONE_ADMIN_APPLOG);
-App::sslOn();
+$app->sslOn();
 
 require_once 'codebase/lib/PageNumbers.inc.php';
@@ -39 +39 @@
 
 // Set the defaults and catch incoming settings.
-Prefs::setDefault('log_file', App::getParam('log_filename'), 'logs_module');
+Prefs::setDefault('log_file', $app->getParam('log_filename'), 'logs_module');
 Prefs::setValue('log_file', getFormData('log'), 'logs_module');
 
@@ -57 +57 @@
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     deleteLog(Prefs::getValue('log_file', 'logs_module'));
-    Prefs::setValue('log_file', App::getParam('log_filename'), 'logs_module');
-    if (App::validBoomerangURL('app_log')) {
+    Prefs::setValue('log_file', $app->getParam('log_filename'), 'logs_module');
+    if ($app->validBoomerangURL('app_log')) {
         // Display boomerang page.
-        App::dieBoomerangURL('app_log');
+        $app->dieBoomerangURL('app_log');
     }
     // Display default page.
-    App::dieURL($_SERVER['PHP_SELF']);
+    $app->dieURL($_SERVER['PHP_SELF']);
     break;
 
@@ -69 +69 @@
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
     clearLog(Prefs::getValue('log_file', 'logs_module'));
-    if (App::validBoomerangURL('app_log')) {
+    if ($app->validBoomerangURL('app_log')) {
         // Display boomerang page.
-        App::dieBoomerangURL('app_log');
+        $app->dieBoomerangURL('app_log');
     }
     // Display default page.
-    App::dieURL($_SERVER['PHP_SELF']);
+    $app->dieURL($_SERVER['PHP_SELF']);
     break;
 
@@ -81 +81 @@
     if (archiveLog(Prefs::getValue('log_file', 'logs_module'))) {
         // Now flush current log.
-        App::dieURL($_SERVER['PHP_SELF'] . '?op=clear');
-    }
-    if (App::validBoomerangURL('app_log')) {
+        $app->dieURL($_SERVER['PHP_SELF'] . '?op=clear');
+    }
+    if ($app->validBoomerangURL('app_log')) {
         // Display boomerang page.
-        App::dieBoomerangURL('app_log');
+        $app->dieBoomerangURL('app_log');
     }
     // Display default page.
-    App::dieURL($_SERVER['PHP_SELF']);
+    $app->dieURL($_SERVER['PHP_SELF']);
     break;
 
@@ -138 +138 @@
 function deleteLog($log_file)
 {
-    if (!file_exists(App::getParam('log_directory') . '/' . $log_file)) {
-        App::raiseMsg(sprintf(_("Log file %s does not exist."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
-        App::logMsg(sprintf('Cannot delete nonexistent log file %s', App::getParam('log_directory') . '/' . $log_file), LOG_INFO, __FILE__, __LINE__);
-        return false;
-    }
-
-    if (!is_writable(App::getParam('log_directory') . '/' . $log_file) && !is_writable(App::getParam('log_directory'))) {
-        App::raiseMsg(sprintf(_("Log file %s could not be deleted."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
-        App::logMsg(sprintf('Cannot delete log file %s, not writable.', App::getParam('log_directory') . '/' . $log_file), LOG_INFO, __FILE__, __LINE__);
-        return false;
-    }
-
-    if (unlink(App::getParam('log_directory') . '/' . $log_file)) {
-        App::raiseMsg(sprintf(_("Log file %s has been deleted."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
-        App::logMsg(sprintf('Log file %s has been deleted', $log_file), LOG_INFO, __FILE__, __LINE__);
+    $app =& App::getInstance();
+
+    if (!file_exists($app->getParam('log_directory') . '/' . $log_file)) {
+        $app->raiseMsg(sprintf(_("Log file %s does not exist."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Cannot delete nonexistent log file %s', $app->getParam('log_directory') . '/' . $log_file), LOG_INFO, __FILE__, __LINE__);
+        return false;
+    }
+
+    if (!is_writable($app->getParam('log_directory') . '/' . $log_file) && !is_writable($app->getParam('log_directory'))) {
+        $app->raiseMsg(sprintf(_("Log file %s could not be deleted."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Cannot delete log file %s, not writable.', $app->getParam('log_directory') . '/' . $log_file), LOG_INFO, __FILE__, __LINE__);
+        return false;
+    }
+
+    if (unlink($app->getParam('log_directory') . '/' . $log_file)) {
+        $app->raiseMsg(sprintf(_("Log file %s has been deleted."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Log file %s has been deleted', $log_file), LOG_INFO, __FILE__, __LINE__);
         return true;
     } else {
-        App::raiseMsg(sprintf(_("Log file %s could not be deleted."), $log_file), MSG_WARNING, __FILE__, __LINE__);
-        App::logMsg(sprintf('unlink failed on log file %s', App::getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("Log file %s could not be deleted."), $log_file), MSG_WARNING, __FILE__, __LINE__);
+        $app->logMsg(sprintf('unlink failed on log file %s', $app->getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
         return false;
     }
@@ -163 +165 @@
 function clearLog($log_file)
 {
-    if (!$fp = fopen(App::getParam('log_directory') . '/' . $log_file, 'r+')) {
-        App::raiseMsg(sprintf(_("Log file %s could not be opened."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
-        App::logMsg(sprintf('fopen failed on log file %s', App::getParam('log_directory') . '/' . $log_file), LOG_INFO, __FILE__, __LINE__);
+    $app =& App::getInstance();
+
+    if (!$fp = fopen($app->getParam('log_directory') . '/' . $log_file, 'r+')) {
+        $app->raiseMsg(sprintf(_("Log file %s could not be opened."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('fopen failed on log file %s', $app->getParam('log_directory') . '/' . $log_file), LOG_INFO, __FILE__, __LINE__);
         return false;
     }
@@ -174 +178 @@
     fclose($fp);
     if (!$ftruncate_return) {
-        App::raiseMsg(sprintf(_("Log file %s could not be cleared."), $log_file), MSG_WARNING, __FILE__, __LINE__);
-        App::logMsg(sprintf('ftruncate failed on log file %s', App::getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("Log file %s could not be cleared."), $log_file), MSG_WARNING, __FILE__, __LINE__);
+        $app->logMsg(sprintf('ftruncate failed on log file %s', $app->getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
         return false;
     } else {
-        App::raiseMsg(sprintf(_("Log file %s has been cleared."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
-        App::logMsg(sprintf('Log file %s has been cleared', $log_file), LOG_INFO, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("Log file %s has been cleared."), $log_file), MSG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Log file %s has been cleared', $log_file), LOG_INFO, __FILE__, __LINE__);
         return true;
     }
@@ -186 +190 @@
 function archiveLog($log_file)
 {
+    $app =& App::getInstance();
+
     $old_file_name = $log_file;
     $new_file_name = $log_file . '__' . date('Y-m-d');
-    If (!is_writable(App::getParam('log_directory') . '')) {
-        App::raiseMsg(sprintf('Cannot archive log, log directory not writable: %s', App::getParam('log_directory')), MSG_WARNING, __FILE__, __LINE__);
-        App::logMsg(sprintf('Cannot archive log, log directory not writable: %s', App::getParam('log_directory')), LOG_WARNING, __FILE__, __LINE__);
-        return false;
-    }
-    If (!copy(App::getParam('log_directory') . '/' . $old_file_name, App::getParam('log_directory') . '/' . $new_file_name)) {
-        App::raiseMsg(sprintf(_("Cannot archive log, copying old log file failed."), null), MSG_WARNING, __FILE__, __LINE__);
-        App::logMsg(sprintf('Cannot archive log, copying old log file failed.', null), LOG_WARNING, __FILE__, __LINE__);
-        return false;
-    }
-
-    App::raiseMsg(sprintf(_("Log file %s has been archived to %s."), $old_file_name, $new_file_name), MSG_NOTICE, __FILE__, __LINE__);
-    App::logMsg(sprintf('Log file %s has been archived to %s.', $old_file_name, $new_file_name), LOG_NOTICE, __FILE__, __LINE__);
+    If (!is_writable($app->getParam('log_directory') . '')) {
+        $app->raiseMsg(sprintf('Cannot archive log, log directory not writable: %s', $app->getParam('log_directory')), MSG_WARNING, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Cannot archive log, log directory not writable: %s', $app->getParam('log_directory')), LOG_WARNING, __FILE__, __LINE__);
+        return false;
+    }
+    If (!copy($app->getParam('log_directory') . '/' . $old_file_name, $app->getParam('log_directory') . '/' . $new_file_name)) {
+        $app->raiseMsg(sprintf(_("Cannot archive log, copying old log file failed."), null), MSG_WARNING, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Cannot archive log, copying old log file failed.', null), LOG_WARNING, __FILE__, __LINE__);
+        return false;
+    }
+
+    $app->raiseMsg(sprintf(_("Log file %s has been archived to %s."), $old_file_name, $new_file_name), MSG_NOTICE, __FILE__, __LINE__);
+    $app->logMsg(sprintf('Log file %s has been archived to %s.', $old_file_name, $new_file_name), LOG_NOTICE, __FILE__, __LINE__);
     return true;
 }
@@ -206 +212 @@
 function printLog($log_file)
 {
-    if (!is_file(App::getParam('log_directory') . '/' . $log_file)) {
-        App::raiseMsg(sprintf(_("Log file %s not found."), $log_file), MSG_WARNING, __FILE__, __LINE__);
-        App::logMsg(sprintf('Log file %s not found.', App::getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
-        return false;
-    }
-
-    readfile(App::getParam('log_directory') . '/' . $log_file);
+    $app =& App::getInstance();
+
+    if (!is_file($app->getParam('log_directory') . '/' . $log_file)) {
+        $app->raiseMsg(sprintf(_("Log file %s not found."), $log_file), MSG_WARNING, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Log file %s not found.', $app->getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
+        return false;
+    }
+
+    readfile($app->getParam('log_directory') . '/' . $log_file);
 }
 
 function &getLog($log_file, $search_query='')
 {
-    if (!is_file(App::getParam('log_directory') . '/' . $log_file)) {
-        App::raiseMsg(sprintf(_("Log file %s not found."), $log_file), MSG_WARNING, __FILE__, __LINE__);
-        App::logMsg(sprintf('Log file %s not found.', App::getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
-        return false;
-    }
-    $log = file(App::getParam('log_directory') . '/' . $log_file);
+    $app =& App::getInstance();
+
+    if (!is_file($app->getParam('log_directory') . '/' . $log_file)) {
+        $app->raiseMsg(sprintf(_("Log file %s not found."), $log_file), MSG_WARNING, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Log file %s not found.', $app->getParam('log_directory') . '/' . $log_file), LOG_WARNING, __FILE__, __LINE__);
+        return false;
+    }
+    $log = file($app->getParam('log_directory') . '/' . $log_file);
 
     if ('' != trim($search_query)) {
@@ -237 +247 @@
 {
     global $valid_file_extensions;
+    $app =& App::getInstance();
 
     // Get a list of all files in the log directory.
-    $dir_handle = opendir(App::getParam('log_directory'));
+    $dir_handle = opendir($app->getParam('log_directory'));
     $list = array();
     while ($dir_handle && ($file = readdir($dir_handle)) !== false) {
-        if (!preg_match('/^\./', $file) && is_file(App::getParam('log_directory') . '/' . $file) && in_array(strtolower(Upload::getFilenameExtension($file)), $valid_file_extensions)) {
+        if (!preg_match('/^\./', $file) && is_file($app->getParam('log_directory') . '/' . $file) && in_array(strtolower(Upload::getFilenameExtension($file)), $valid_file_extensions)) {
             $list[] = array(
                 'filename' => $file,
-                'filesize' => filesize(App::getParam('log_directory') . '/' . $file),
-                'modified' => filemtime(App::getParam('log_directory') . '/' . $file),
+                'filesize' => filesize($app->getParam('log_directory') . '/' . $file),
+                'modified' => filemtime($app->getParam('log_directory') . '/' . $file),
             );
         }

branches/2.0singleton/services/password.php

@@ -27 +27 @@
 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'], 'admin_password');
+    $app->setBoomerangURL($_SERVER['HTTP_REFERER'], 'admin_password');
 }
-App::sslOn();
+$app->sslOn();
 
 switch (getFormData('op')) {
@@ -50 +50 @@
     if (!$fv->anyErrors() && false === $auth->authenticate($auth->getVal('username'), $frm['oldpassword'])) {
         $fv->addError('oldpassword', _("Your <strong>Old password</strong> failed authentication."));
-        App::logMsg(sprintf(_("Password change failed for %s, using (md5ed) password: %s"), $auth->getVal('username'), md5($frm['oldpassword'])), LOG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf(_("Password change failed for %s, using (md5ed) password: %s"), $auth->getVal('username'), md5($frm['oldpassword'])), LOG_NOTICE, __FILE__, __LINE__);
     }
 
     if (!$fv->anyErrors()) {
         $auth->setPassword(null, $frm['newpassword']);
-        App::logMsg(sprintf(_("Password change successful for %s"), $auth->getVal('username')), LOG_INFO, __FILE__, __LINE__);
-        App::raiseMsg(sprintf(_("Password change successful for %s"), $auth->getVal('username')), MSG_SUCCESS, __FILE__, __LINE__);
-        App::dieBoomerangURL('admin_password');
+        $app->logMsg(sprintf(_("Password change successful for %s"), $auth->getVal('username')), LOG_INFO, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("Password change successful for %s"), $auth->getVal('username')), MSG_SUCCESS, __FILE__, __LINE__);
+        $app->dieBoomerangURL('admin_password');
     }
     break;

branches/2.0singleton/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');
     }
 }

branches/2.0singleton/tests/AppTest.php

@@ -79 +79 @@
     {
         $expected = 'My message';
-        App::raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
+        $app->raiseMsg($expected, MSG_NOTICE, __FILE__, __LINE__);
         $msg = current($_SESSION[$this->App->app]['messages']);
         $this->assertEquals($expected, $msg['message']);
@@ -87 +87 @@
     {
         ob_start();
-        App::printraisedmessages();
+        $app->printraisedmessages();
         $result = ob_get_clean();
         $this->assertContains('My message', $result, 'Raised message not found in output.');
@@ -95 +95 @@
     {
         $file = $this->App->getParam('log_directory') . '/' . $this->App->getParam('log_filename');
-        App::logMsg('Test log message', LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg('Test log message', LOG_DEBUG, __FILE__, __LINE__);
         if ($result = file($file)) {
             $result = end($result);
@@ -107 +107 @@
     {
         $_GET['arg1'] = 'A';
-        $result = App::ohref('/some/url.php', array('arg1'), true);
+        $result = $app->ohref('/some/url.php', array('arg1'), true);
         $this->assertContains(session_name(), $result, 'SSID not found in URL.');
         $this->assertContains('arg1=A', $result, 'Argument not passed through.');
@@ -115 +115 @@
     {
         ob_start();
-        App::printhiddensession();
+        $app->printhiddensession();
         $result = ob_get_clean();
         $this->assertContains(session_name(), $result);
@@ -122 +122 @@
 //     function test_dieurl()
 //     {
-//         App::dieURL('/die/to/this/url.php');
+//         $app->dieURL('/die/to/this/url.php');
 //     }
 //