Changeset 128

Timestamp:

May 26, 2006 9:29:19 PM (18 years ago)

Author:

scdev

Message:

finished /lib folder

Location:

branches/2.0singleton/lib

Files:

• ImageThumb.inc.php (modified) (39 diffs)
• MCVE.inc.php (modified) (12 diffs)
• Nav.inc.php (modified) (3 diffs)
• PEdit.inc.php (modified) (29 diffs)
• PageNumbers.inc.php (modified) (6 diffs)
• PageSequence.inc.php (modified) (4 diffs)
• PayPal.inc.php (modified) (10 diffs)
• Prefs.inc.php (modified) (2 diffs)
• RecordLock.inc.php (modified) (14 diffs)
• RecordVersion.inc.php (modified) (10 diffs)
• SessionCache.inc.php (modified) (8 diffs)
• SortOrder.inc.php (modified) (3 diffs)
• SpellCheck.inc.php (modified) (6 diffs)
• TemplateGlue.inc.php (modified) (2 diffs)
• Upload.inc.php (modified) (28 diffs)

branches/2.0singleton/lib/ImageThumb.inc.php

@@ -95 +95 @@
     function setParam($params)
     {
+        $app =& App::getInstance();
+
         if (isset($params) && is_array($params)) {
 
@@ -102 +104 @@
                 // Must be directory.
                 if (!is_dir($params['source_dir'])) {
-                    App::logMsg(sprintf('Source directory invalid: %s', $params['source_dir']), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Source directory invalid: %s', $params['source_dir']), LOG_ERR, __FILE__, __LINE__);
                     trigger_error(sprintf('Source directory invalid: %s', $params['source_dir']), E_USER_ERROR);
                 }
                 // Must be readable.
                 if (!is_readable($params['source_dir'])) {
-                    App::logMsg(sprintf('Source directory not readable: %s', $params['source_dir']), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Source directory not readable: %s', $params['source_dir']), LOG_ERR, __FILE__, __LINE__);
                     trigger_error(sprintf('Source directory not readable: %s', $params['source_dir']), E_USER_ERROR);
                 }
@@ -115 +117 @@
             $this->_params = array_merge($this->_params, $params);
         } else {
-            App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
         }
     }
@@ -128 +130 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -144 +148 @@
     function setSpec($spec, $index=null)
     {
+        $app =& App::getInstance();
+
         // A little sanity checking.
         if (!isset($spec['dest_dir']) || '' == $spec['dest_dir']) {
-            App::logMsg('setSpec error: dest_dir not specified.', LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('setSpec error: dest_dir not specified.', LOG_ERR, __FILE__, __LINE__);
         }
         if (isset($spec['dest_file_type'])) {
@@ -152 +158 @@
             case IMG_JPG :
                 if (imagetypes() & IMG_JPG == 0) {
-                    App::logMsg(sprintf('IMG_JPG is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('IMG_JPG is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
                 }
                 $spec['dest_file_extention'] = 'jpg';
@@ -158 +164 @@
             case IMG_PNG :
                 if (imagetypes() & IMG_PNG == 0) {
-                    App::logMsg(sprintf('IMG_PNG is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('IMG_PNG is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
                 }
                 $spec['dest_file_extention'] = 'png';
@@ -164 +170 @@
             case IMG_GIF :
                 if (imagetypes() & IMG_GIF == 0) {
-                    App::logMsg(sprintf('IMG_GIF is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('IMG_GIF is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
                 }
                 $spec['dest_file_extention'] = 'gif';
@@ -170 +176 @@
             case IMG_WBMP :
                 if (imagetypes() & IMG_WBMP == 0) {
-                    App::logMsg(sprintf('IMG_WBMP is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('IMG_WBMP is not supported by this version of PHP GD.', null), LOG_ERR, __FILE__, __LINE__);
                 }
                 $spec['dest_file_extention'] = 'wbmp';
                 break;
             default :
-                App::logMsg(sprintf('Invalid dest_file_type: %s', $spec['dest_file_type']), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Invalid dest_file_type: %s', $spec['dest_file_type']), LOG_ERR, __FILE__, __LINE__);
                 break;
             }
         }
         if (!isset($spec['width']) || !is_int($spec['width'])) {
-            App::logMsg('setSpec error: width not specified.', LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('setSpec error: width not specified.', LOG_ERR, __FILE__, __LINE__);
         }
         if (!isset($spec['height']) || !is_int($spec['height'])) {
-            App::logMsg('setSpec error: height not specified.', LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('setSpec error: height not specified.', LOG_ERR, __FILE__, __LINE__);
         }
         if (isset($spec['quality']) && IMG_JPG != $spec['dest_file_type']) {
-            App::logMsg('The "quality" specification is not used unless IMG_JPG is the dest_file_type.', LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg('The "quality" specification is not used unless IMG_JPG is the dest_file_type.', LOG_INFO, __FILE__, __LINE__);
         }
         if (isset($spec['progressive']) && IMG_JPG != $spec['dest_file_type']) {
-            App::logMsg('The "progressive" specification is not used unless IMG_JPG is the dest_file_type.', LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg('The "progressive" specification is not used unless IMG_JPG is the dest_file_type.', LOG_INFO, __FILE__, __LINE__);
         }
         
@@ -213 +219 @@
     function processAll($runtime_specs=null)
     {
+        $app =& App::getInstance();
+
         // Ensure we have a source.
         if ('' == $this->getParam('source_dir')) {
-            App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -237 +245 @@
             return 0 === $return_val;
         } else {
-            App::logMsg(sprintf('No images found to thumbnail in directory %s.', $this->getParam('source_dir')), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('No images found to thumbnail in directory %s.', $this->getParam('source_dir')), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -252 +260 @@
     function processFile($file_name, $runtime_specs=null)
     {
+        $app =& App::getInstance();
+
         // Source file determinted by provided file_name.
         $source_file = realpath(sprintf('%s/%s', $this->getParam('source_dir'), $file_name));
@@ -260 +270 @@
                 $this->setSpec($runtime_specs, 0);
             } else {
-                App::logMsg(sprintf('Image specifications not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Image specifications not set before processing.'), LOG_ERR, __FILE__, __LINE__);
                 return false;                
             }
@@ -267 +277 @@
         // Ensure we have a source.
         if ('' == $this->getParam('source_dir')) {
-            App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -274 +284 @@
         if (!file_exists($source_file)) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s was not found."), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image not found: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source image not found: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }
@@ -281 +291 @@
         if (!is_readable($source_file)) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s is not readable."), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image not readable: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source image not readable: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }
@@ -288 +298 @@
         if (filesize($source_file) <= 0) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s is zero bytes."), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image is zero bytes: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source image is zero bytes: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }
@@ -295 +305 @@
         if (!$this->_validFileExtension($file_name)) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s not a valid type. It must have one of the following file name extensions: %s"), $file_name, join(', ', $this->getParam('valid_file_extensions'))), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -324 +334 @@
                 $file_size = filesize($dest_file);
                 if (false !== $file_size && $file_size < $spec['keep_filesize']) {
-                    App::logMsg(sprintf('Skipping thumbnail %s. File already exists and file size is less than %s bytes.', $spec['dest_dir'] . '/' . $file_name, $spec['keep_filesize']), LOG_DEBUG, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Skipping thumbnail %s. File already exists and file size is less than %s bytes.', $spec['dest_dir'] . '/' . $file_name, $spec['keep_filesize']), LOG_DEBUG, __FILE__, __LINE__);
                     continue;
                 }
@@ -333 +343 @@
             if ($image_size['0'] <= $spec['width'] && $image_size['1'] <= $spec['height'] && !$spec['allow_upscaling']) {
                 $spec['scaling_type'] = IMAGETHUMB_NO_SCALE;
-                App::logMsg(sprintf('Image %s smaller than specified %s thumbnail size. Keeping original size.', $file_name, $spec['dest_dir']), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Image %s smaller than specified %s thumbnail size. Keeping original size.', $file_name, $spec['dest_dir']), LOG_DEBUG, __FILE__, __LINE__);
             }
 
@@ -339 +349 @@
             if (IMAGETHUMB_METHOD_NETPBM === $this->getParam('resize_method') && file_exists($this->getParam('anytopnm_binary')) && file_exists($this->getParam('pnmscale_binary')) && file_exists($this->getParam('cjpeg_binary'))) {
                 // Resize using Netpbm binaries.
-                App::logMsg(sprintf('Resizing with Netpbm...', null), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Resizing with Netpbm...', null), LOG_DEBUG, __FILE__, __LINE__);
                 $return_val += $this->_resizeWithNetpbm($source_file, $dest_file, $spec);
             } else if (IMAGETHUMB_METHOD_GD === $this->getParam('resize_method') && extension_loaded('gd')) {
                 // Resize with GD.
-                App::logMsg(sprintf('Resizing with GD...', null), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Resizing with GD...', null), LOG_DEBUG, __FILE__, __LINE__);
                 $return_val += $this->_resizeWithGD($source_file, $dest_file, $spec);
             } else {
-                App::logMsg(sprintf('Image thumbnailing failed. Neither Netpbm or GD is available.', null), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Image thumbnailing failed. Neither Netpbm or GD is available.', null), LOG_DEBUG, __FILE__, __LINE__);
                 return false;
             }
@@ -370 +380 @@
     function _resizeWithNetpbm($source_file, $dest_file, $spec)
     {
+        $app =& App::getInstance();
+
         // Define pnmscale arguments.
         switch ($spec['scaling_type']) {
@@ -405 +417 @@
             escapeshellcmd($file_name)
         );
-        App::logMsg(sprintf('ImageThumb Netpbm command: %s', $command), LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg(sprintf('ImageThumb Netpbm command: %s', $command), LOG_DEBUG, __FILE__, __LINE__);
         
         // Execute!
@@ -414 +426 @@
             // Make the thumbnail writable so the user can delete it over ftp without being 'apache'.
             chmod($dest_file, $this->getParam('dest_file_perms'));
-            App::logMsg(sprintf('Successfully resized image %s', $spec['dest_dir'] . '/' . basename($dest_file), $return_val), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Successfully resized image %s', $spec['dest_dir'] . '/' . basename($dest_file), $return_val), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             // An error occurred.
-            App::logMsg(sprintf('Image %s failed resizing with return value: %s%s', $spec['dest_dir'] . '/' . basename($dest_file), $return_val, empty($output) ? '' : ' (' . getDump($output) . ')'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Image %s failed resizing with return value: %s%s', $spec['dest_dir'] . '/' . basename($dest_file), $return_val, empty($output) ? '' : ' (' . getDump($output) . ')'), LOG_ERR, __FILE__, __LINE__);
         }
 
@@ -438 +450 @@
     function _resizeWithGD($source_file, $dest_file, $spec)
     {
+        $app =& App::getInstance();
+
         // Get original file dimensions and type.
         list($source_image_width, $source_image_height, $source_image_type) = getimagesize($source_file);
@@ -487 +501 @@
             $source_image_resource = imagecreatefromwbmp($source_file);
         default :
-            App::logMsg(sprintf('Source image type %s not supported.', $source_image_type), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source image type %s not supported.', $source_image_type), LOG_WARNING, __FILE__, __LINE__);
             return 1;
             break;
         }
         if (!$source_image_resource) {
-            App::logMsg(sprintf('Error creating %s image in memory from %s', $source_image_type, $source_file), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Error creating %s image in memory from %s', $source_image_type, $source_file), LOG_WARNING, __FILE__, __LINE__);
             return 1;
         }
@@ -501 +515 @@
         // Resample!
         if (!imagecopyresampled($dest_image_resource, $source_image_resource, 0, 0, 0, 0, $dest_image_width, $dest_image_height, $source_image_width, $source_image_height)) {
-            App::logMsg(sprintf('Error resampling image %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Error resampling image %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             return 1;
         }
@@ -528 +542 @@
             break;
         default :
-            App::logMsg(sprintf('Destination image type %s not supported for image %s.', $spec['dest_file_type'], $dest_file), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Destination image type %s not supported for image %s.', $spec['dest_file_type'], $dest_file), LOG_WARNING, __FILE__, __LINE__);
             return 1;
             break;
@@ -537 +551 @@
             // Make the thumbnail writable so the user can delete it over ftp without being 'apache'.
             chmod($dest_file, $this->getParam('dest_file_perms'));
-            App::logMsg(sprintf('Successfully resized image %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Successfully resized image %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);
             return 0;
         } else {
             // An error occurred.
-            App::logMsg(sprintf('Image %s failed resizing.', $dest_file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Image %s failed resizing.', $dest_file), LOG_ERR, __FILE__, __LINE__);
             return 1;
         }
@@ -555 +569 @@
     function deleteThumbs($file_name)
     {
+        $app =& App::getInstance();
+
         // Ensure we have a source.
         if ('' == $this->getParam('source_dir')) {
-            App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -567 +583 @@
                 if (!unlink($dest_file)) {
                     $return_val++;
-                    App::logMsg(sprintf(_("Delete thumbs failed: %s"), $dest_file), LOG_WARNING, __FILE__, __LINE__);
+                    $app->logMsg(sprintf(_("Delete thumbs failed: %s"), $dest_file), LOG_WARNING, __FILE__, __LINE__);
                 }
             }
@@ -584 +600 @@
     function deleteOriginal($file_name)
     {
+        $app =& App::getInstance();
+
         // Ensure we have a source.
         if ('' == $this->getParam('source_dir')) {
-            App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -592 +610 @@
         $source_file = realpath(sprintf('%s/%s', $this->getParam('source_dir'), $file_name));
         if (!unlink($source_file)) {
-            App::logMsg(sprintf(_("Delete original failed: %s"), $source_file), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Delete original failed: %s"), $source_file), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -608 +626 @@
     function exists($file_name)
     {
+        $app =& App::getInstance();
+
         // Ensure we have a source.
         if ('' == $this->getParam('source_dir')) {
-            App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -639 +659 @@
     function _createDestDirs()
     {
+        $app =& App::getInstance();
+
         static $already_checked = false;
 
@@ -644 +666 @@
             // Ensure we have a source.
             if ('' == $this->getParam('source_dir')) {
-                App::logMsg(sprintf('Source directory not set before creating destination directories.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Source directory not set before creating destination directories.'), LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -654 +676 @@
                     if (!mkdir($this->getParam('source_dir') . '/' . $spec['dest_dir'], $this->getParam('dest_dir_perms'))) {
                         $return_val++;
-                        App::logMsg(sprintf('mkdir failure: %s', $this->getParam('source_dir') . '/' . $spec['dest_dir']), LOG_ERR, __FILE__, __LINE__);
+                        $app->logMsg(sprintf('mkdir failure: %s', $this->getParam('source_dir') . '/' . $spec['dest_dir']), LOG_ERR, __FILE__, __LINE__);
                     }
                 }
@@ -667 +689 @@
 
     /**
-     * An alias for App::raiseMsg that only sends messages configured by display_messages.
+     * An alias for $app->raiseMsg that only sends messages configured by display_messages.
      *
      * @access public
@@ -679 +701 @@
     function _raiseMsg($message, $type, $file, $line)
     {
+        $app =& App::getInstance();
+
         if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && $this->getParam('display_messages') & $type > 0)) {
-            App::raiseMsg($message, $type, $file, $line);
+            $app->raiseMsg($message, $type, $file, $line);
         }
     }

branches/2.0singleton/lib/MCVE.inc.php

@@ -22 +22 @@
     function MCVE($username, $password)
     {
+        $app =& App::getInstance();
+
         // Ensure PHP was compiled with the MCVE functions.
         if (!extension_loaded('mcve')) {
@@ -27 +29 @@
         }
         if ('' == $username || '' == $password) {
-            App::logMsg(sprintf('Empty username or password provided.', null), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Empty username or password provided.', null), LOG_ERR, __FILE__, __LINE__);
         }
         $this->username = $username;
@@ -35 +37 @@
     function _connect()
     {
+        $app =& App::getInstance();
+
         if ($this->connected) {
             return true;
@@ -49 +53 @@
         case 'ip' :
             if (!MCVE_SetIP($this->conn, $this->host, $this->ip_port)) {
-                App::logMsg('Could not set method to IP.', LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('Could not set method to IP.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -55 +59 @@
         case 'ssl' :
             if (!MCVE_SetSSL($this->conn, $this->host, $this->ssl_port)) {
-                App::logMsg('Could not set method to IP.', LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('Could not set method to IP.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -61 +65 @@
         case 'dropfile' :
             if (!MCVE_SetDropFile($this->conn, '/var/mcve/trans')) {
-                App::logMsg('Could not set method to IP.', LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('Could not set method to IP.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
             break;
         default :
-            App::logMsg('Connection method not defined.', LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('Connection method not defined.', LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -75 +79 @@
         // non-blocking, but future versions of php_mcve will default to blocking.
         if (!MCVE_SetBlocking($this->conn, $this->blocking)) {
-            App::logMsg('Could not set blocking mode.', LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('Could not set blocking mode.', LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -81 +85 @@
         // Maximum of 30s per transaction allowed. Timeout occurs on server-end, not client-end
         if (!MCVE_SetTimeout($this->conn, $this->timeout)) {
-            App::logMsg('Could not set timeout.', LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('Could not set timeout.', LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -88 +92 @@
         if (!MCVE_Connect($this->conn)) {
             $error = MCVE_ConnectionError($this->conn);
-            App::logMsg("Connection failed: $error. Are you sure the MCVE engine is running?", LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg("Connection failed: $error. Are you sure the MCVE engine is running?", LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -117 +121 @@
     function sendTrans($tid, $type='', $hide_msg=false)
     {
+        $app =& App::getInstance();
+
         // Finalize structuring of  to MCVE and ready it to be sent
         if (!MCVE_TransSend($this->conn, $tid)) {
-            App::logMsg('Transaction improperly structured, possibly not enough info.', LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('Transaction improperly structured, possibly not enough info.', LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -139 +145 @@
         // Check to see if transaction was successful or not using a strict success/fail function
         if ($ret_status == MCVE_FAIL) {
-            App::raiseMsg(sprintf('MCVE %s failure: %s %s', $type, $ret_text, ('' == $verbiage ? '' : '(' . trim($verbiage) . ')')), MSG_WARNING, __FILE__, __LINE__);
+            $app->raiseMsg(sprintf('MCVE %s failure: %s %s', $type, $ret_text, ('' == $verbiage ? '' : '(' . trim($verbiage) . ')')), MSG_WARNING, __FILE__, __LINE__);
             return false;
         } else if ($ret_status == MCVE_SUCCESS) {
             if (!$hide_msg) {
-                App::raiseMsg(sprintf(_("MCVE %s success: %s %s"), $type, $ret_text, ('' == $verbiage ? '' : '(' . trim($verbiage) . ')')), MSG_SUCCESS, __FILE__, __LINE__);
+                $app->raiseMsg(sprintf(_("MCVE %s success: %s %s"), $type, $ret_text, ('' == $verbiage ? '' : '(' . trim($verbiage) . ')')), MSG_SUCCESS, __FILE__, __LINE__);
             }
-            App::logMsg(sprintf(_("MCVE success details. Auth: %s; Batch: %s; Item: %s; TTID: %s; AVS: %s; CV: %s."),
+            $app->logMsg(sprintf(_("MCVE success details. Auth: %s; Batch: %s; Item: %s; TTID: %s; AVS: %s; CV: %s."),
                 MCVE_TransactionAuth($this->conn, $tid),
                 MCVE_TransactionBatch($this->conn, $tid),
@@ -155 +161 @@
             return true;
         } else {
-            App::logMsg(sprintf('Transaction failed. Unknown return code: %s', $ret_status), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Transaction failed. Unknown return code: %s', $ret_status), LOG_ERR, __FILE__, __LINE__);
             return false;
         }

branches/2.0singleton/lib/Nav.inc.php

@@ -201 +201 @@
     function getBreadcrumbs($page_id=null)
     {
+        $app =& App::getInstance();
+
         $page_id = $this->_calculatePageID($page_id);
 
@@ -219 +221 @@
                     } else if ($crumb_count > $this->getFeature('chop_breadcrumb_links')) {
                         // A normal linked crumb.
-                        $breadcrumbs .= oTxt($pathmark, true) . '<a href="' . App::oHREF($page['url']) . '">' . sprintf($this->last_crumb_format, oTxt($page['title'], true)) . '</a>';
+                        $breadcrumbs .= oTxt($pathmark, true) . '<a href="' . $app->oHREF($page['url']) . '">' . sprintf($this->last_crumb_format, oTxt($page['title'], true)) . '</a>';
                     }
                 } else {
@@ -227 +229 @@
                     } else {
                         // A normal linked crumb.
-                        $breadcrumbs .= oTxt($pathmark, true) . '<a href="' . App::oHREF($page['url']) . '">' . oTxt($page['title'], true) . '</a>';
+                        $breadcrumbs .= oTxt($pathmark, true) . '<a href="' . $app->oHREF($page['url']) . '">' . oTxt($page['title'], true) . '</a>';
                     }
                 }

branches/2.0singleton/lib/PEdit.inc.php

@@ -95 +95 @@
     function setParam($params)
     {
+        $app =& App::getInstance();
+
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
         } else {
-            App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_WARNING, __FILE__, __LINE__);
         }
     }
@@ -112 +114 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_NOTICE, __FILE__, __LINE__);
             return null;
         }
@@ -129 +133 @@
     function start($initialize_data_file=false)
     {
+        $app =& App::getInstance();
+
         if (!is_dir($this->getParam('data_dir'))) {
             trigger_error(sprintf('PEdit data directory not found: %s', $this->getParam('data_dir')), E_USER_WARNING);
@@ -143 +149 @@
         case 'Save' :
             if ($this->_writeData()) {
-                App::dieURL($_SERVER['PHP_SELF']);
+                $app->dieURL($_SERVER['PHP_SELF']);
             }
             break;
         case 'Restore' :
             if ($this->_restoreVersion(getFormData('version'))) {
-                App::dieURL($_SERVER['PHP_SELF']);
+                $app->dieURL($_SERVER['PHP_SELF']);
             }
             break;
         case 'View' :
             $this->_data_file = sprintf('%s%s__%s.xml', $this->getParam('data_dir'), $_SERVER['PHP_SELF'], getFormData('version'));
-            App::raiseMsg(sprintf(_("This is <em><strong>only a preview</strong></em> of version %s."), getFormData('version')), MSG_NOTICE, __FILE__, __LINE__);
+            $app->raiseMsg(sprintf(_("This is <em><strong>only a preview</strong></em> of version %s."), getFormData('version')), MSG_NOTICE, __FILE__, __LINE__);
             break;
         }
@@ -176 +182 @@
     function set($name, $options=array())
     {
+        $app =& App::getInstance();
+
         $name = preg_replace('/\s/', '_', $name);
         if (!isset($this->_data[$name])) {
             $this->_data[$name] = array_merge(array('content' => ''), $options);
         } else {
-            App::logMsg(sprintf('Duplicate set data: %s', $name), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Duplicate set data: %s', $name), LOG_NOTICE, __FILE__, __LINE__);
         }
     }
@@ -208 +216 @@
     function formBegin()
     {
+        $app =& App::getInstance();
+
         if (!$this->_authorized || empty($this->_data)) {
             return false;
@@ -216 +226 @@
         <input type="hidden" name="file_hash" value="<?php echo $this->_fileHash(); ?>" />
         <?php
-        App::printHiddenSession();
+        $app->printHiddenSession();
         switch ($this->op) {
         case 'Edit' :
@@ -345 +355 @@
     function printVersions()
     {
+        $app =& App::getInstance();
+
         if ($this->_authorized && $this->op == 'Versions') {
             // Print versions and commands to view/restore.
@@ -362 +374 @@
                     ?>
                     <tr>
-                        <td><?php echo date(App::getParam('date_format'), $v['unixtime']); ?></td>
-                        <td><?php echo date(App::getParam('time_format'), $v['unixtime']); ?></td>
+                        <td><?php echo date($app->getParam('date_format'), $v['unixtime']); ?></td>
+                        <td><?php echo date($app->getParam('time_format'), $v['unixtime']); ?></td>
                         <td><?php echo humanFileSize($v['filesize']); ?></td>
-                        <td class="sc-nowrap"><a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?op=View&version=' . $v['unixtime'] . '&file_hash=' . $this->_fileHash()); ?>"><?php echo _("View"); ?></a> <?php echo _("or"); ?> <a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?op=Restore&version=' . $v['unixtime'] . '&file_hash=' . $this->_fileHash()); ?>"><?php echo _("Restore"); ?></a></td>
+                        <td class="sc-nowrap"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=View&version=' . $v['unixtime'] . '&file_hash=' . $this->_fileHash()); ?>"><?php echo _("View"); ?></a> <?php echo _("or"); ?> <a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=Restore&version=' . $v['unixtime'] . '&file_hash=' . $this->_fileHash()); ?>"><?php echo _("Restore"); ?></a></td>
                     </tr>
                     <?php
@@ -386 +398 @@
     function _fileHash()
     {
-        return md5(App::getParam('signing_key') . $_SERVER['PHP_SELF']);
+        $app =& App::getInstance();
+
+        return md5($app->getParam('signing_key') . $_SERVER['PHP_SELF']);
     }
 
@@ -399 +413 @@
     function _loadDataFile()
     {
+        $app =& App::getInstance();
+
         if (!file_exists($this->_data_file)) {
             if (!$this->_initializeDataFile()) {
-                App::logMsg(sprintf('Initializing content file failed: %s', $this->_data_file), LOG_WARNING, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Initializing content file failed: %s', $this->_data_file), LOG_WARNING, __FILE__, __LINE__);
                 return false;
             }
@@ -408 +424 @@
         $status = $this->xml_unserializer->unserialize($xml_file_contents, false);    
         if (PEAR::isError($status)) {
-            App::logMsg(sprintf('XML_Unserialize error: %s', $status->getMessage()), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('XML_Unserialize error: %s', $status->getMessage()), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -436 +452 @@
     function _initializeDataFile()
     {
-        App::logMsg(sprintf('Initializing data file: %s', $this->_data_file), LOG_INFO, __FILE__, __LINE__);
+        $app =& App::getInstance();
+
+        $app->logMsg(sprintf('Initializing data file: %s', $this->_data_file), LOG_INFO, __FILE__, __LINE__);
         $xml_file_contents = $this->xml_serializer->serialize($this->_data);
         return $this->_filePutContents($this->_data_file, $xml_file_contents);
@@ -450 +468 @@
     function _writeData()
     {
+        $app =& App::getInstance();
+
         if (!$this->_authorized) {
             return false;
@@ -455 +475 @@
         if ($this->_fileHash() != getFormData('file_hash')) {
             // Posted data is NOT for this file!
-            App::logMsg(sprintf('File_hash does not match current file.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('File_hash does not match current file.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -466 +486 @@
             $this->_deleteOldVersions();
             if (!$this->_createVersion()) {
-                App::logMsg(sprintf('Failed creating new version of file.', null), LOG_NOTICE, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Failed creating new version of file.', null), LOG_NOTICE, __FILE__, __LINE__);
                 return false;
             }
@@ -496 +516 @@
     function _filePutContents($filename, $content)
     {
+        $app =& App::getInstance();
+
         // Ensure requested filename is within the pedit data dir.
         if (strpos($filename, $this->getParam('data_dir')) === false) {
-            App::logMsg(sprintf('Failed writing file outside pedit _data_dir: %s', $filename), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Failed writing file outside pedit _data_dir: %s', $filename), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -510 +532 @@
             if (!is_dir($curr_path)) {
                 if (!mkdir($curr_path)) {
-                    App::logMsg(sprintf('Failed mkdir: %s', $curr_path), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Failed mkdir: %s', $curr_path), LOG_ERR, __FILE__, __LINE__);
                     return false;
                 }
@@ -522 +544 @@
                 flock($fp, LOCK_UN);
             } else {
-                App::logMsg(sprintf('Could not lock file for writing: %s', $filename), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Could not lock file for writing: %s', $filename), LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
             fclose($fp);
             // Success!
-            App::logMsg(sprintf('Wrote to file: %s', $filename), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Wrote to file: %s', $filename), LOG_DEBUG, __FILE__, __LINE__);
             return true;
         } else {
-            App::logMsg(sprintf('Could not open file for writing: %s', $filename), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Could not open file for writing: %s', $filename), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -544 +566 @@
     function _createVersion()
     {
+        $app =& App::getInstance();
+
         if (!$this->_authorized) {
             return false;
@@ -549 +573 @@
         if ($this->_fileHash() != getFormData('file_hash')) {
             // Posted data is NOT for this file!
-            App::logMsg(sprintf('File_hash does not match current file.', null), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('File_hash does not match current file.', null), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -555 +579 @@
         // Ensure current data file exists.
         if (!file_exists($this->_data_file)) {
-            App::logMsg(sprintf('Data file does not yet exist: %s', $this->_data_file), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Data file does not yet exist: %s', $this->_data_file), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -563 +587 @@
         $version_file = sprintf('%s__%s.xml', preg_replace('/\.xml$/', '', $this->_data_file), time());
         if (!copy($this->_data_file, $version_file)) {
-            App::logMsg(sprintf('Failed copying new version: %s -> %s', $this->_data_file, $version_file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Failed copying new version: %s -> %s', $this->_data_file, $version_file), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -580 +604 @@
     function _deleteOldVersions()
     {
+        $app =& App::getInstance();
+
         $version_files = $this->_getVersions();
         if (is_array($version_files) && sizeof($version_files) > $this->getParam('versions_min_qty')) {
@@ -590 +616 @@
                 $del_file = dirname($this->_data_file) . '/' . $oldest['filename'];
                 if (!unlink($del_file)) {
-                    App::logMsg(sprintf('Failed deleting version: %s', $del_file), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Failed deleting version: %s', $del_file), LOG_ERR, __FILE__, __LINE__);
                 }
                 $oldest = array_pop($version_files);
@@ -637 +663 @@
     function _restoreVersion($version)
     {
+        $app =& App::getInstance();
+
         if (!$this->_authorized) {
             return false;
@@ -646 +674 @@
         // Ensure specified version exists.
         if (!file_exists($version_file)) {
-            App::logMsg(sprintf('Cannot restore non-existant file: %s', $version_file), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot restore non-existant file: %s', $version_file), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -652 +680 @@
         // Make certain a version is created.
         if (!$this->_createVersion()) {
-            App::logMsg(sprintf('Failed creating new version of file.', null), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Failed creating new version of file.', null), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -658 +686 @@
         // Do the actual copy.
         if (!copy($version_file, $this->_data_file)) {
-            App::logMsg(sprintf('Failed copying old version: %s -> %s', $version_file, $this->_data_file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Failed copying old version: %s -> %s', $version_file, $this->_data_file), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
 
         // Success!
-        App::raiseMsg(sprintf(_("Page has been restored to version %s."), $version), MSG_SUCCESS, __FILE__, __LINE__);
+        $app->raiseMsg(sprintf(_("Page has been restored to version %s."), $version), MSG_SUCCESS, __FILE__, __LINE__);
         return true;
     }

branches/2.0singleton/lib/PageNumbers.inc.php

@@ -137 +137 @@
     function calculate()
     {
+        $app =& App::getInstance();
+
         if (!$this->set_per_page_initialized) {
-            App::logMsg(sprintf('set_per_page not initialized'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('set_per_page not initialized'), LOG_ERR, __FILE__, __LINE__);
         }
         if (!$this->set_page_number_initialized) {
-            App::logMsg(sprintf('set_page_number not initialized'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('set_page_number not initialized'), LOG_ERR, __FILE__, __LINE__);
         }
         if (!$this->set_total_items_initialized) {
-            App::logMsg(sprintf('set_total_items not initialized'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('set_total_items not initialized'), LOG_ERR, __FILE__, __LINE__);
         }
 
@@ -189 +191 @@
     function getLimitSQL()
     {
+        $app =& App::getInstance();
+
         if (is_numeric($this->first_item) && is_numeric($this->_per_page)) {
             return ' LIMIT ' . DB::escapeString($this->first_item) . ', ' . DB::escapeString($this->_per_page) . ' ';
         } else {
-            App::logMsg(sprintf('Could not find SQL to LIMIT by %s %s.', $this->first_item, $this->_per_page), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Could not find SQL to LIMIT by %s %s.', $this->first_item, $this->_per_page), LOG_WARNING, __FILE__, __LINE__);
             return '';
         }
@@ -204 +208 @@
     function printPerPageLinks($query_key='per_page')
     {
+        $app =& App::getInstance();
+
         $sp = '';
         for ($i=0; $i<sizeof($this->per_page_options); $i++) {
@@ -209 +215 @@
                 printf('%s<a href="%s">%s</a>',
                     $sp,
-                    App::oHREF($_SERVER['PHP_SELF'] . '?' . $query_key . '=' . $this->per_page_options[$i]),
+                    $app->oHREF($_SERVER['PHP_SELF'] . '?' . $query_key . '=' . $this->per_page_options[$i]),
                     $this->per_page_options[$i]
                 );
@@ -220 +226 @@
 
     /**
-     * Outputs an App::oHREF compatible url that goes to the page $page_number.
+     * Outputs an $app->oHREF compatible url that goes to the page $page_number.
      * Depends on $this->base_url to build the url onto. This is used in the
      * page_number.ihtml template.
@@ -232 +238 @@
     function getPageNumURL($page_number, $carry_args=null)
     {
-        return App::oHREF($this->url_base . $page_number, $carry_args);
+        $app =& App::getInstance();
+
+        return $app->oHREF($this->url_base . $page_number, $carry_args);
     }
     function printPageNumURL($page_number, $carry_args=null)

branches/2.0singleton/lib/PageSequence.inc.php

@@ -133 +133 @@
     function setCurrent($step_id)
     {
+        $app =& App::getInstance();
+
         if (false !== ($pos = $this->getPosition($step_id))) {
             // Specified step exists (even if numeric).
@@ -138 +140 @@
         } else {
             // Step with specified key does not exist.
-            App::logMsg(sprintf(_("Step %s not defined in sequence %s"), $step_id, $this->sequence_title), LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Step %s not defined in sequence %s"), $step_id, $this->sequence_title), LOG_INFO, __FILE__, __LINE__);
             return false;
         }
@@ -257 +259 @@
     function printEditLink($step_id=null)
     {
+        $app =& App::getInstance();
+
         $pos = isset($step_id) ? $this->getPosition($step_id) : $this->getPosition();
         if ($_SESSION[$this->seq]['steps'][$pos]['editable']) {
-            printf('[<a href="%s">%s</a>]', App::oHREF($_SERVER['PHP_SELF'] . '?step=' . $pos . '&boomerang=confirmation'), _("edit"));
+            printf('[<a href="%s">%s</a>]', $app->oHREF($_SERVER['PHP_SELF'] . '?step=' . $pos . '&boomerang=confirmation'), _("edit"));
         }
     }
@@ -320 +324 @@
     function _auto_timeout()
     {
+        $app =& App::getInstance();
+
         if (isset($_SESSION[$this->seq]['last_access_time'])
         && $_SESSION[$this->seq]['last_access_time'] < time() - $this->idle_timeout) {
             // Session has expired, flush all vars to start over.
             $this->startOver();
-            App::dieURL($this->start_url);
+            $app->dieURL($this->start_url);
         } else {
             // Set timer.

branches/2.0singleton/lib/PayPal.inc.php

@@ -74 +74 @@
     function setButtonDefaults($type, $options)
     {
+        $app =& App::getInstance();
+
         if (!is_array($options) || empty($options)) {
-            App::logMsg(sprintf('Invalid options: %s', getDump($options)), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Invalid options: %s', getDump($options)), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -82 +84 @@
             $this->_default_button_options['_global'] = array_merge($this->_default_button_options['_global'], $options);
         } else if (!isset($this->_default_button_options[$type])) {
-            App::logMsg(sprintf('Invalid button type: %s', $type), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Invalid button type: %s', $type), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -104 +106 @@
     function newButton($type, $name, $options=null)
     {
+        $app =& App::getInstance();
+
         if (!isset($this->_default_button_options[$type])) {
-            App::logMsg(sprintf('Invalid button type: %s', $type), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Invalid button type: %s', $type), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
 
         if (!is_array($options) || empty($options)) {
-            App::logMsg(sprintf('Invalid options: %s', getDump($options)), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Invalid options: %s', getDump($options)), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
 
         if (isset($this->_buttons[$name])) {
-            App::logMsg(sprintf('Overwriting existing button name: %s', getDump($this->_buttons[$name])), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Overwriting existing button name: %s', getDump($this->_buttons[$name])), LOG_DEBUG, __FILE__, __LINE__);
         }
 
@@ -137 +141 @@
     function getLink($name)
     {
+        $app =& App::getInstance();
+
         if (!isset($this->_buttons[$name])) {
-            App::logMsg(sprintf('Button does not exist: %s', $name), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Button does not exist: %s', $name), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -207 +213 @@
     function setParam($params)
     {
+        $app =& App::getInstance();
+
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
         } else {
-            App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
         }
     }
@@ -224 +232 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -259 +269 @@
     function processIPN()
     {
+        $app =& App::getInstance();
+
         if (getPost('test_ipn') == '1' || $this->getParam('test_mode')) {
-            App::logMsg(sprintf('Processing PayPal IPN in test mode: %s', getDump(getFormData())), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Processing PayPal IPN in test mode: %s', getDump(getFormData())), LOG_DEBUG, __FILE__, __LINE__);
             $url = parse_url('https://www.sandbox.paypal.com/cgi-bin/webscr');
         } else {
-            App::logMsg(sprintf('Processing PayPal IPN: %s', getDump(getFormData())), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Processing PayPal IPN: %s', getDump(getFormData())), LOG_DEBUG, __FILE__, __LINE__);
             $url = parse_url($this->getParam('paypal_url'));
         }
@@ -287 +299 @@
 
         if (!$fp) {
-            App::logMsg(sprintf('Connection to PayPal URL %s failed with error: %s (%s)', $ssl . $url['host'], $errstr, $errnum), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Connection to PayPal URL %s failed with error: %s (%s)', $ssl . $url['host'], $errstr, $errnum), LOG_WARNING, __FILE__, __LINE__);
             return false;
         } else {
@@ -304 +316 @@
             fclose($fp);
 
-            App::logMsg(sprintf('IPN response received: %s', $this->_ipn_response), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('IPN response received: %s', $this->_ipn_response), LOG_NOTICE, __FILE__, __LINE__);
             return true;
         }
@@ -318 +330 @@
     function verifiedIPN()
     {
+        $app =& App::getInstance();
+
         if (!isset($this->_ipn_response)) {
-            App::logMsg(sprintf('Cannot verify IPN, response not received.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot verify IPN, response not received.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
 
         if (empty($this->_ipn_response)) {
-            App::logMsg(sprintf('Cannot verify IPN, response empty.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot verify IPN, response empty.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
 
         if (preg_match('/VERIFIED/', $this->_ipn_response)) {
-            App::logMsg(sprintf('IPN verified!', null), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('IPN verified!', null), LOG_DEBUG, __FILE__, __LINE__);
             return true;
         } else if (preg_match('/INVALID/', $this->_ipn_response)) {
-            App::logMsg(sprintf('IPN invalid.', null), LOG_DEBUG, __FILE__, __LINE__);
-            return false;
-        } else {
-            App::logMsg(sprintf('IPN unknown.', null), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('IPN invalid.', null), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        } else {
+            $app->logMsg(sprintf('IPN unknown.', null), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }

branches/2.0singleton/lib/Prefs.inc.php

@@ -207 +207 @@
     function store($prefs=array())
     {
+        $app =& App::getInstance();
+
         // If we are not storing prefs in perpetually.
         if (!$_perpetual) {
@@ -223 +225 @@
 
         if (!is_array($prefs) || empty($prefs)) {
-            App::raiseMsg(_("No preferences are available."), MSG_ERR, __FILE__, __LINE__);
-            App::dieBoomerangURL();
+            $app->raiseMsg(_("No preferences are available."), MSG_ERR, __FILE__, __LINE__);
+            $app->dieBoomerangURL();
         }
 

branches/2.0singleton/lib/RecordLock.inc.php

@@ -48 +48 @@
     function RecordLock($auth_object)
     {
+        $app =& App::getInstance();
+
         if (!is_a($auth_object, 'Auth_SQL')) {
             trigger_error('Constructor not provided a valid Auth_SQL object.', E_USER_ERROR);
@@ -55 +57 @@
 
         // Get create tables config from global context.
-        if (!is_null(App::getParam('db_create_tables'))) {
-            $this->setParam(array('create_table' => App::getParam('db_create_tables')));
+        if (!is_null($app->getParam('db_create_tables'))) {
+            $this->setParam(array('create_table' => $app->getParam('db_create_tables')));
         }
     }
@@ -69 +71 @@
     function initDB($recreate_db=false)
     {
+        $app =& App::getInstance();
+
         static $_db_tested = false;
 
@@ -74 +78 @@
             if ($recreate_db) {
                 DB::query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
-                App::logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_table')), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_table')), LOG_DEBUG, __FILE__, __LINE__);
             }
             DB::query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
@@ -99 +103 @@
                 'lock_datetime',
             ), false, false)) {
-                App::logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->getParam('db_table')), LOG_ALERT, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->getParam('db_table')), LOG_ALERT, __FILE__, __LINE__);
                 trigger_error(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->getParam('db_table')), E_USER_ERROR);
             }
@@ -128 +132 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -147 +153 @@
     function select($record_table_or_lock_id, $record_key=null, $record_val=null)
     {
+        $app =& App::getInstance();
+
         $this->initDB();
 
@@ -168 +176 @@
         }
         if ($this->data = mysql_fetch_assoc($qid)) {
-            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__);
+            $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;
         } else {
-            App::logMsg(sprintf('No locked record: %s %s %s', $record_table_or_lock_id, $record_key, $record_val), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('No locked record: %s %s %s', $record_table_or_lock_id, $record_key, $record_val), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -266 +274 @@
     function remove()
     {
+        $app =& App::getInstance();
+
         $this->initDB();
 
@@ -277 +287 @@
         ");
 
-        App::logMsg(sprintf('Removing lock: %s', $this->data['lock_id']), LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Removing lock: %s', $this->data['lock_id']), LOG_DEBUG, __FILE__, __LINE__);
     }
 
@@ -285 +295 @@
     function removeAll($user_id=null)
     {
+        $app =& App::getInstance();
+
         $this->initDB();
 
@@ -293 +305 @@
             // Delete specific user's locks.
             DB::query("DELETE FROM " . $this->getParam('db_table') . " WHERE set_by_admin_id = '" . DB::escapeString($user_id) . "'");
-            App::logMsg(sprintf('Record locks owned by %s %s have been deleted', $this->_auth->getVal('auth_name'), $this->_auth->getUsername($user_id)), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Record locks owned by %s %s have been deleted', $this->_auth->getVal('auth_name'), $this->_auth->getUsername($user_id)), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             // Delete ALL locks.
             DB::query("DELETE FROM " . $this->getParam('db_table') . "");
-            App::logMsg(sprintf('All record locks deleted by %s %s', $this->_auth->getVal('auth_name'), $this->_auth->getVal('username')), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('All record locks deleted by %s %s', $this->_auth->getVal('auth_name'), $this->_auth->getVal('username')), LOG_DEBUG, __FILE__, __LINE__);
         }
     }
@@ -325 +337 @@
     function dieErrorPage()
     {
-        App::dieURL(sprintf('%s?lock_id=%s&boomerang=%s', $this->getParam('error_url'), $this->data['lock_id'], urlencode(absoluteMe())));
+        $app =& App::getInstance();
+
+        $app->dieURL(sprintf('%s?lock_id=%s&boomerang=%s', $this->getParam('error_url'), $this->data['lock_id'], urlencode(absoluteMe())));
     }
 
@@ -333 +347 @@
     function printErrorHTML()
     {
+        $app =& App::getInstance();
+
         ?>
         <form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
-        <?php App::printHiddenSession() ?>
+        <?php $app->printHiddenSession() ?>
         <input type="hidden" name="lock_id" value="<?php echo $this->getID(); ?>" />
 

branches/2.0singleton/lib/RecordVersion.inc.php

@@ -55 +55 @@
     function RecordVersion($auth_object)
     {
+        $app =& App::getInstance();
+
         if (!is_a($auth_object, 'Auth_SQL')) {
             trigger_error('Constructor not provided a valid Auth_SQL object.', E_USER_ERROR);
@@ -62 +64 @@
 
         // Get create tables config from global context.
-        if (!is_null(App::getParam('db_create_tables'))) {
-            $this->setParam(array('create_table' => App::getParam('db_create_tables')));
+        if (!is_null($app->getParam('db_create_tables'))) {
+            $this->setParam(array('create_table' => $app->getParam('db_create_tables')));
         }
     }
@@ -76 +78 @@
     function initDB($recreate_db=false)
     {
+        $app =& App::getInstance();
+
         static $_db_tested = false;
 
@@ -81 +85 @@
             if ($recreate_db) {
                 DB::query("DROP TABLE IF EXISTS " . $this->getParam('db_table'));
-                App::logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_table')), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_table')), LOG_DEBUG, __FILE__, __LINE__);
             }
             DB::query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_table') . " (
@@ -110 +114 @@
                 'version_datetime',
             ), false, false)) {
-                App::logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->getParam('db_table')), LOG_ALERT, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->getParam('db_table')), LOG_ALERT, __FILE__, __LINE__);
                 trigger_error(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->getParam('db_table')), E_USER_ERROR);
             }
@@ -139 +143 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -159 +165 @@
     function create($record_table, $record_key, $record_val, $title='', $notes='')
     {
+        $app =& App::getInstance();
+
         $this->initDB();
 
         // Get current record.
         if (!$record = $this->getCurrent($record_table, $record_key, $record_val)) {
-            App::logMsg(sprintf('Could not create %s version, record not found: %s, %s, %s.', $title, $record_table, $record_key, $record_val), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Could not create %s version, record not found: %s, %s, %s.', $title, $record_table, $record_key, $record_val), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -205 +213 @@
     function restore($version_id)
     {
+        $app =& App::getInstance();
+
         $this->initDB();
 
@@ -213 +223 @@
         ");
         if (!$record = mysql_fetch_assoc($qid)) {
-            App::raiseMsg(sprintf(_("Version ID %s%s not found."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')')), MSG_WARNING, __FILE__, __LINE__);
-            App::logMsg(sprintf(_("Version ID %s%s not found."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')')), LOG_WARNING, __FILE__, __LINE__);
+            $app->raiseMsg(sprintf(_("Version ID %s%s not found."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')')), MSG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Version ID %s%s not found."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')')), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -221 +231 @@
         // Ensure saved db columns match current table schema.
         if (!DB::columnExists($record['record_table'], array_keys($data), $this->getParam('db_schema_strict'))) {
-            App::raiseMsg(sprintf(_("Version ID %s%s is not compatible with the current database table."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')')), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf(_("Version ID %s%s restoration failed, DB schema does not match for table %s."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')'), $record['record_table']), LOG_ALERT, __FILE__, __LINE__);
+            $app->raiseMsg(sprintf(_("Version ID %s%s is not compatible with the current database table."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')')), MSG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Version ID %s%s restoration failed, DB schema does not match for table %s."), $version_id, (empty($record['version_title']) ? '' : ' (' . $record['version_title'] . ')'), $record['record_table']), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }

branches/2.0singleton/lib/SessionCache.inc.php

@@ -44 +44 @@
     function setParam($params)
     {
+        $app =& App::getInstance();
+
         if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
             $_this =& SessionCache::getInstance();
@@ -52 +54 @@
             $_this->_params = array_merge($_this->_params, $params);
         } else {
-            App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
         }
     }
@@ -65 +67 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
             $_this =& SessionCache::getInstance();
@@ -72 +76 @@
             return $_this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -95 +99 @@
     function putCache($var, $var_id, $force_it_in=false)
     {
+        $app =& App::getInstance();
+
         if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
             $_this =& SessionCache::getInstance();
@@ -100 +106 @@
 
         if (!$_this->getParam('enabled')) {
-            App::logMsg(sprintf('SessionCache not enabled, not saving data.', null), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('SessionCache not enabled, not saving data.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -109 +115 @@
 
         if ($serialized_var_len >= $_this->getParam('soft_limit') && !$force_it_in) {
-            App::logMsg(sprintf('Serialized variable (%s bytes) more than soft_limit (%s bytes).', $serialized_var_len, $_this->getParam('soft_limit')), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Serialized variable (%s bytes) more than soft_limit (%s bytes).', $serialized_var_len, $_this->getParam('soft_limit')), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
 
         if ($serialized_var_len >= $_this->getParam('hard_limit')) {
-            App::logMsg(sprintf('Serialized variable (%s bytes) more than hard_limit (%s bytes).', $serialized_var_len, $_this->getParam('hard_limit')), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Serialized variable (%s bytes) more than hard_limit (%s bytes).', $serialized_var_len, $_this->getParam('hard_limit')), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -131 +137 @@
 
         if ($serialized_var_len >= 1024000) {
-            App::logMsg(sprintf('Successfully cached oversized variable (%s bytes).', $serialized_var_len), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Successfully cached oversized variable (%s bytes).', $serialized_var_len), LOG_DEBUG, __FILE__, __LINE__);
         }
 

branches/2.0singleton/lib/SortOrder.inc.php

@@ -128 +128 @@
     function getSortOrderSQL()
     {
+        $app =& App::getInstance();
+
         if (!isset($this->_columns[strtolower($this->sort_by)])) {
             $this->sort_by = $this->default_sort;
@@ -139 +141 @@
             return sprintf(' ORDER BY %s ', DB::escapeString($this->_columns[strtolower($this->sort_by)][strtolower($this->order)]));
         } else {
-            App::logMsg(sprintf('Could not find SQL to sort by %s %s.', $this->sort_by, $this->order), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Could not find SQL to sort by %s %s.', $this->sort_by, $this->order), LOG_WARNING, __FILE__, __LINE__);
             return '';
         }
@@ -155 +157 @@
     function printSortHeader($col, $col_name, $default_order='ASC')
     {
+        $app =& App::getInstance();
+
         if ($this->sort_by == $col) {
             if (strtolower($this->order) == 'desc') {
-                ?><a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=ASC'); ?>" title="<?php echo _("Change to ascending sort order"); ?>"><?php echo $this->desc_widget; ?></a><?php echo $col_name; ?><?php
+                ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=ASC'); ?>" title="<?php echo _("Change to ascending sort order"); ?>"><?php echo $this->desc_widget; ?></a><?php echo $col_name; ?><?php
             } else {
-                ?><a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=DESC'); ?>" title="<?php echo _("Change to descending sort order"); ?>"><?php echo $this->asc_widget; ?></a><?php echo $col_name; ?><?php
+                ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=DESC'); ?>" title="<?php echo _("Change to descending sort order"); ?>"><?php echo $this->asc_widget; ?></a><?php echo $col_name; ?><?php
             }
         } else {
-            ?><a href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=' . $default_order); ?>" title="<?php echo sprintf(_("Sort by %s"), $col_name); ?>"><?php echo $col_name; ?></a><?php
+            ?><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?sort=' . $col . '&order=' . $default_order); ?>" title="<?php echo sprintf(_("Sort by %s"), $col_name); ?>"><?php echo $col_name; ?></a><?php
         }
     }

branches/2.0singleton/lib/SpellCheck.inc.php

@@ -62 +62 @@
     function SpellCheck($params)
     {
+        $app =& App::getInstance();
+
         if (!is_array($params) || empty($params)) {
             trigger_error('SpellCheck parameters not set properly', E_USER_ERROR);
@@ -75 +77 @@
         if ('' != $this->getParam('personal_wordlist')) {
             if (!is_writable(dirname($this->getParam('personal_wordlist'))) || !is_writable($this->getParam('personal_wordlist'))) {
-                App::logMsg(sprintf('Personal wordlist file not writable: %s', $this->getParam('personal_wordlist')), LOG_WARNING, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Personal wordlist file not writable: %s', $this->getParam('personal_wordlist')), LOG_WARNING, __FILE__, __LINE__);
             } else {
                 pspell_config_personal($this->_pspell_cfg_handle, $this->getParam('personal_wordlist'));
                 $this->_use_personal_wordlist = true;
-                App::logMsg(sprintf('Using personal wordlist: %s', $this->getParam('personal_wordlist')), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Using personal wordlist: %s', $this->getParam('personal_wordlist')), LOG_DEBUG, __FILE__, __LINE__);
             }
         }
@@ -94 +96 @@
     function setParam($params)
     {
+        $app =& App::getInstance();
+
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
         } else {
-            App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
         }
     }
@@ -111 +115 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -184 +190 @@
     function add($word)
     {
+        $app =& App::getInstance();
+
         if ($this->_use_personal_wordlist) {
             if (pspell_add_to_personal($this->_pspell_handle, $word)) {
-                App::logMsg(sprintf('Added "%s" to personal wordlist: %s', $word, $this->getParam('personal_wordlist')), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Added "%s" to personal wordlist: %s', $word, $this->getParam('personal_wordlist')), LOG_DEBUG, __FILE__, __LINE__);
                 return true;
             } else {
-                App::logMsg(sprintf('Failed adding "%s" to personal wordlist: %s', $word, $this->getParam('personal_wordlist')), LOG_WARNING, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Failed adding "%s" to personal wordlist: %s', $word, $this->getParam('personal_wordlist')), LOG_WARNING, __FILE__, __LINE__);
                 return false;
             }
@@ -207 +215 @@
     function save()
     {
+        $app =& App::getInstance();
+
         if ($this->_use_personal_wordlist) {
             if (pspell_save_wordlist($this->_pspell_handle)) {
-                App::logMsg(sprintf('Saved personal wordlist: %s', $this->getParam('personal_wordlist')), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Saved personal wordlist: %s', $this->getParam('personal_wordlist')), LOG_DEBUG, __FILE__, __LINE__);
                 return true;
             } else {
-                App::logMsg(sprintf('Failed saving personal wordlist: %s', $this->getParam('personal_wordlist')), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Failed saving personal wordlist: %s', $this->getParam('personal_wordlist')), LOG_ERR, __FILE__, __LINE__);
                 return false;
             }

branches/2.0singleton/lib/TemplateGlue.inc.php

@@ -66 +66 @@
 function getSetEnumFieldValues($db_table, $db_col)
 {
+    $app =& App::getInstance();
+
     $qid = DB::query("SHOW COLUMNS FROM " . DB::escapeString($db_table) . " LIKE '" . DB::escapeString($db_col) . "'",false);
 
@@ -72 +74 @@
         return $enum[1];
     } else {
-        App::logMsg(sprintf('No set or enum fields found.', null), LOG_ERR, __FILE__, __LINE__);
+        $app->logMsg(sprintf('No set or enum fields found.', null), LOG_ERR, __FILE__, __LINE__);
         return false;
     }

branches/2.0singleton/lib/Upload.inc.php

@@ -56 +56 @@
     function setParam($params)
     {
+        $app =& App::getInstance();
+
         if (isset($params) && is_array($params)) {
 
@@ -63 +65 @@
                 // Must be directory.
                 if (!is_dir($params['upload_path'])) {
-                    App::logMsg(sprintf('Attempting to auto-create upload directory: %s', $params['upload_path']), LOG_NOTICE, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Attempting to auto-create upload directory: %s', $params['upload_path']), LOG_NOTICE, __FILE__, __LINE__);
                     mkdir($params['upload_path'], $this->getParam('dest_dir_perms'));
                     if (!is_dir($params['upload_path'])) {
-                        App::logMsg(sprintf('Upload directory invalid: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
+                        $app->logMsg(sprintf('Upload directory invalid: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
                         trigger_error(sprintf('Upload directory invalid: %s', $params['upload_path']), E_USER_ERROR);
                     }
@@ -72 +74 @@
                 // Must be writable.
                 if (!is_writable($params['upload_path'])) {
-                    App::logMsg(sprintf('Upload directory not writable: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Upload directory not writable: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
                     trigger_error(sprintf('Upload directory not writable: %s', $params['upload_path']), E_USER_ERROR);
                 }
@@ -80 +82 @@
             $this->_params = array_merge($this->_params, $params);
         } else {
-            App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
         }
     }
@@ -93 +95 @@
     function getParam($param)
     {
+        $app =& App::getInstance();
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
         } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -117 +121 @@
     function process($form_name, $custom_file_name=null)
     {
+        $app =& App::getInstance();
+
         // Ensure we have a upload directory.
         if (!$this->getParam('upload_path')) {
-            App::logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             $this->_raiseMsg(_("There was a problem with the file upload. Please try again later."), MSG_ERR, __FILE__, __LINE__);
             return false;
@@ -126 +132 @@
         // Ensure the file form element specified actually exists.
         if (!isset($_FILES[$form_name])) {
-            App::logMsg(sprintf(_("Form element %s does not exist."), $form_name), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Form element %s does not exist."), $form_name), LOG_ERR, __FILE__, __LINE__);
             $this->_raiseMsg(_("There was a problem with the file upload. Please try again later."), MSG_ERR, __FILE__, __LINE__);
             return false;
@@ -167 +173 @@
                     $file_name = $custom_file_name;
                     $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
-                    App::logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
                 } else {
                     // Invalid custom file name provided. Use uploaded file name.
                     $file_name = $files['name'][$i];
-                    App::logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
                 }
             } else {
@@ -179 +185 @@
                     $file_name = $custom_file_name[$i];
                     $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
-                    App::logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
                 } else {
                     // Invalid custom file name provided. Use uploaded file name.
                     $file_name = $files['name'][$i];
-                    App::logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                    $app->logMsg(sprintf('Using uploaded file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
                 }
             }
@@ -190 +196 @@
             if (UPLOAD_ERR_INI_SIZE === $files['error'][$i]) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: it exceeds the maximum allowed upload file size of %s."), $file_name, ini_get('upload_max_filesize')), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_INI_SIZE (currently %s)."), $files['error'][$i], $file_name, ini_get('upload_max_filesize')), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_INI_SIZE (currently %s)."), $files['error'][$i], $file_name, ini_get('upload_max_filesize')), LOG_ERR, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_INI_SIZE);
                 continue;
@@ -196 +202 @@
             if (UPLOAD_ERR_FORM_SIZE === $files['error'][$i]) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: it exceeds the maximum allowed upload file size of %s."), $file_name, $_POST['MAX_FILE_SIZE']), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_FORM_SIZE (currently %s)."), $files['error'][$i], $file_name, $_POST['MAX_FILE_SIZE']), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_FORM_SIZE (currently %s)."), $files['error'][$i], $file_name, $_POST['MAX_FILE_SIZE']), LOG_ERR, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_FORM_SIZE);
                 continue;
@@ -202 +208 @@
             if (UPLOAD_ERR_PARTIAL === $files['error'][$i]) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: it was only partially uploaded."), $file_name), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_PARTIAL."), $files['error'][$i], $file_name), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_PARTIAL."), $files['error'][$i], $file_name), LOG_ERR, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_PARTIAL);
                 continue;
@@ -208 +214 @@
             if (UPLOAD_ERR_NO_FILE === $files['error'][$i]) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: no file was uploaded."), $file_name), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_NO_FILE."), $files['error'][$i], $file_name), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_NO_FILE."), $files['error'][$i], $file_name), LOG_ERR, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_NO_FILE);
                 continue;
@@ -214 +220 @@
             if (UPLOAD_ERR_NO_TMP_DIR === $files['error'][$i]) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: temporary upload directory missing."), $file_name), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_NO_TMP_DIR."), $files['error'][$i], $file_name), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The file %s failed uploading with PHP error %s UPLOAD_ERR_NO_TMP_DIR."), $files['error'][$i], $file_name), LOG_ERR, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_NO_TMP_DIR);
                 continue;
@@ -222 +228 @@
             if (!is_uploaded_file($files['tmp_name'][$i])) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading."), $file_name), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The file %s failed is_uploaded_file."), $file_name), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The file %s failed is_uploaded_file."), $file_name), LOG_ERR, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_NOT_UPLOADED_FILE);
                 continue;
@@ -230 +236 @@
             if ($files['size'][$i] <= 0) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: it contains zero bytes."), $file_name), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The uploaded file %s contains zero bytes."), $file_name), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The uploaded file %s contains zero bytes."), $file_name), LOG_ERR, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_EMPTY_FILE);
                 continue;
@@ -238 +244 @@
             if (!in_array(strtolower($this->getFilenameExtension($file_name)), $this->getParam('valid_file_extensions'))) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: it is an unrecognized type. Files must have one of the following file name extensions: %s."), $file_name, join(', ', $this->getParam('valid_file_extensions'))), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The uploaded file %s has an unrecognized file name extension."), $file_name), LOG_WARNING, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The uploaded file %s has an unrecognized file name extension."), $file_name), LOG_WARNING, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_INVALID_EXTENSION);
                 continue;
@@ -246 +252 @@
             if (!$this->getParam('allow_overwriting') && $this->exists($file_name)) {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading: a file with that name already exists."), $file_name), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("The uploaded file %s doesn't have a unique filename."), $file_name), LOG_WARNING, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("The uploaded file %s doesn't have a unique filename."), $file_name), LOG_WARNING, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_NOT_UNIQUE);
                 continue;
@@ -269 +275 @@
             if (move_uploaded_file($files['tmp_name'][$i], $file_path_name)) {
                 chmod($file_path_name, $this->getParam('dest_file_perms'));
-                App::logMsg(sprintf('File uploaded: %s', $file_path_name), LOG_INFO, __FILE__, __LINE__);
+                $app->logMsg(sprintf('File uploaded: %s', $file_path_name), LOG_INFO, __FILE__, __LINE__);
                 $this->_raiseMsg(sprintf(_("The file %s uploaded successfully."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
                 if (!isset($custom_file_name) && $files['name'][$i] != $file_name) {
@@ -284 +290 @@
             } else {
                 $this->_raiseMsg(sprintf(_("The file %s failed uploading."), $file_name), MSG_ERR, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("Moving file failed: %s -> %s"), $files['tmp_name'][$i], $file_path_name), LOG_ALERT, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("Moving file failed: %s -> %s"), $files['tmp_name'][$i], $file_path_name), LOG_ALERT, __FILE__, __LINE__);
                 $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_MOVE_FAILED);
             }
@@ -290 +296 @@
             // Check file extension with browsers interpretation of file type.
             if (isset($this->mime_extension_map[$file_extension]) && $files['type'][$i] != $this->mime_extension_map[$file_extension]) {
-                App::logMsg(sprintf('File extension (%s) does not match mime type (%s).', $file_extension, $files['type'][$i]), LOG_NOTICE, __FILE__, __LINE__);
+                $app->logMsg(sprintf('File extension (%s) does not match mime type (%s).', $file_extension, $files['type'][$i]), LOG_NOTICE, __FILE__, __LINE__);
             }
         }
@@ -307 +313 @@
     function deleteFile($file_name)
     {
+        $app =& App::getInstance();
+
         // Ensure we have a upload directory.
         if (!$this->getParam('upload_path')) {
-            App::logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -316 +324 @@
 
         if (!is_file($file_path_name)) {
-            App::logMsg(sprintf(_("Error deleting nonexistent file: %s"), $file_path_name), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Error deleting nonexistent file: %s"), $file_path_name), LOG_ERR, __FILE__, __LINE__);
             return false;
         } else if (unlink($file_path_name)) {
-            App::logMsg(sprintf('Deleted file: %s', $file_path_name), LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Deleted file: %s', $file_path_name), LOG_INFO, __FILE__, __LINE__);
         } else {
             $this->_raiseMsg(sprintf(_("The file %s could not be deleted."), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf(_("Failed deleting file: %s"), $file_path_name), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Failed deleting file: %s"), $file_path_name), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -337 +345 @@
     function moveFile($old_name, $new_name)
     {
+        $app =& App::getInstance();
+
         // Ensure we have an upload directory.
         if (!$this->getParam('upload_path')) {
-            App::logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -348 +358 @@
             if (rename($old_file_path_name, $new_file_path_name)) {
                 $this->_raiseMsg(sprintf(_("The file %s has been renamed to %s."), basename($old_file_path_name), basename($new_file_path_name)), MSG_NOTICE, __FILE__, __LINE__);
-                App::logMsg(sprintf('File renamed from %s to %s', $old_file_path_name, $new_file_path_name), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('File renamed from %s to %s', $old_file_path_name, $new_file_path_name), LOG_DEBUG, __FILE__, __LINE__);
             } else {
                 $this->_raiseMsg(sprintf(_("Error renaming file to %s"), $new_file_path_name), MSG_WARNING, __FILE__, __LINE__);
-                App::logMsg(sprintf(_("Error renaming file to %s"), $new_file_path_name), LOG_WARNING, __FILE__, __LINE__);
+                $app->logMsg(sprintf(_("Error renaming file to %s"), $new_file_path_name), LOG_WARNING, __FILE__, __LINE__);
                 return false;
             }
         } else {
             $this->_raiseMsg(sprintf(_("Couldn't rename nonexistent file %s."), $old_name), MSG_WARNING, __FILE__, __LINE__);
-            App::logMsg(sprintf(_("Error renaming nonexistent file: %s"), $old_file_path_name), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf(_("Error renaming nonexistent file: %s"), $old_file_path_name), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -370 +380 @@
     function exists($file_name)
     {
+        $app =& App::getInstance();
+
         // Ensure we have a upload directory.
         if (!$this->getParam('upload_path')) {
-            App::logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Upload directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -453 +465 @@
 
     /**
-     * An alias for App::raiseMsg that only sends messages configured by display_messages.
+     * An alias for $app->raiseMsg that only sends messages configured by display_messages.
      *
      * @access public
@@ -465 +477 @@
     function _raiseMsg($message, $type, $file, $line)
     {
+        $app =& App::getInstance();
+
         if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && $this->getParam('display_messages') & $type > 0)) {
-            App::raiseMsg($message, $type, $file, $line);
+            $app->raiseMsg($message, $type, $file, $line);
         }
     }