Changeset 119

Timestamp:

May 20, 2006 2:12:12 AM (18 years ago)

Author:

scdev

Message:

Q - making codebase 2 work with php5. Rewrote ImageThumb? class to work with GD

Location:

trunk

Files:

• bin/module_maker/module.cli.php (modified) (2 diffs)
• lib/App.inc.php (modified) (33 diffs)
• lib/Auth_SQL.inc.php (modified) (1 diff)
• lib/DB.inc.php (modified) (15 diffs)
• lib/Email.inc.php (modified) (1 diff)
• lib/FormValidator.inc.php (modified) (1 diff)
• lib/ImageThumb.inc.php (modified) (9 diffs)
• lib/SessionCache.inc.php (modified) (7 diffs)
• lib/SortOrder.inc.php (modified) (1 diff)
• lib/Upload.inc.php (modified) (15 diffs)
• services/templates/password.ihtml (modified) (1 diff)

trunk/bin/module_maker/module.cli.php

@@ -442 +442 @@
 
 if ('var' == $op) {
-    if (isset($replace[$_SERVER['argv'][5]])) {
+    if (isset($_SERVER['argv'][5]) && isset($replace[$_SERVER['argv'][5]])) {
         echo "\n\n" . $replace[$_SERVER['argv'][5]] . "\n\n";
-    } else if (isset($skel_files[$_SERVER['argv'][5]])) {
+    } else if (isset($_SERVER['argv'][5]) && isset($skel_files[$_SERVER['argv'][5]])) {
         echo "\n\n" . preg_replace($search, $replace, $skel_files[$_SERVER['argv'][5]]) . "\n\n";
     } else {
-        die(basename($_SERVER['argv'][0]) . " Error: variable " . $_SERVER['argv'][5] . " not defined. Please choose one of:\n" . join(', ', array_keys(array_merge($replace, $skel_files))) . "\n");
+        die(basename($_SERVER['argv'][0]) . " Error: variable " . (isset($_SERVER['argv'][5]) ? $_SERVER['argv'][5] : '') . " not defined. Please choose one of:\n" . join(', ', array_keys(array_merge($replace, $skel_files))) . "\n");
     }
     die;
@@ -549 +549 @@
     // Make user trash folder.
     if (!is_dir($user_trash_folder)) {
+        echo "Attempting to create user trash folder: $user_trash_folder/\n";
         mkdir($user_trash_folder);
-        chmod($user_trash_folder, 0777);
-        echo "Attempting to create user trash folder: $user_trash_folder/\n";
+        chmod($user_trash_folder, 0700);
     }
     if (!is_dir("$user_trash_folder/") || !is_writable("$user_trash_folder/")) {

trunk/lib/App.inc.php

@@ -16 +16 @@
 define('MSG_NOTICE', 4);
 define('MSG_SUCCESS', 8);
+define('MSG_ALL', MSG_SUCCESS | MSG_NOTICE | MSG_WARNING | MSG_ERROR);
 
 require_once dirname(__FILE__) . '/Utilities.inc.php';
@@ -163 +164 @@
     function setParam($param=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
         }
 
         if (isset($param) && is_array($param)) {
             // Merge new parameters with old overriding only those passed.
-            $this->_params = array_merge($this->_params, $param);
+            $_this->_params = array_merge($_this->_params, $param);
         }
     }
@@ -182 +183 @@
     function &getParam($param=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
         }
 
         if ($param === null) {
-            return $this->_params;
-        } else if (isset($this->_params[$param])) {
-            return $this->_params[$param];
+            return $_this->_params;
+        } else if (isset($_this->_params[$param])) {
+            return $_this->_params[$param];
         } else {
             trigger_error(sprintf('Parameter is not set: %s', $param), E_USER_NOTICE);
@@ -359 +360 @@
     function raiseMsg($message, $type=MSG_NOTICE, $file=null, $line=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
         }
 
         $message = trim($message);
 
-        if (!$this->running || '' == $message) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running or message is an empty string.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!$_this->running || '' == $message) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running or message is an empty string.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -372 +373 @@
         // Save message in session under unique key to avoid duplicate messages.
         $msg_id = md5($type . $message . $file . $line);
-        $_SESSION[$this->app]['messages'][$msg_id] = array(
+        $_SESSION[$_this->app]['messages'][$msg_id] = array(
             'type'    => $type,
             'message' => $message,
             'file'    => $file,
             'line'    => $line,
-            'count'   => (isset($_SESSION[$this->app]['messages'][$msg_id]['count']) ? (1 + $_SESSION[$this->app]['messages'][$msg_id]['count']) : 1)
+            'count'   => (isset($_SESSION[$_this->app]['messages'][$msg_id]['count']) ? (1 + $_SESSION[$_this->app]['messages'][$msg_id]['count']) : 1)
         );
 
         if (!in_array($type, array(MSG_NOTICE, MSG_SUCCESS, MSG_WARNING, MSG_ERR))) {
-            $this->logMsg(sprintf('Invalid MSG_* type: %s', $type), LOG_DEBUG, __FILE__, __LINE__);
+            $_this->logMsg(sprintf('Invalid MSG_* type: %s', $type), LOG_DEBUG, __FILE__, __LINE__);
         }
     }
@@ -395 +396 @@
     function getRaisedMessages()
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
         
         $output = array();
-        while (isset($_SESSION[$this->app]['messages']) && $message = array_shift($_SESSION[$this->app]['messages'])) {
+        while (isset($_SESSION[$_this->app]['messages']) && $message = array_shift($_SESSION[$_this->app]['messages'])) {
             $output[] = $message;
         }
@@ -420 +421 @@
     function clearRaisedMessages()
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
         
-        $_SESSION[$this->app]['messages'] = array();
+        $_SESSION[$_this->app]['messages'] = array();
     }
 
@@ -441 +442 @@
     function printRaisedMessages()
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
-            return false;
-        }
-
-        while (isset($_SESSION[$this->app]['messages']) && $message = array_shift($_SESSION[$this->app]['messages'])) {
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        }
+
+        while (isset($_SESSION[$_this->app]['messages']) && $message = array_shift($_SESSION[$_this->app]['messages'])) {
             ?><div class="sc-msg"><?php
-            if (error_reporting() > 0 && $this->getParam('display_errors')) {
+            if (error_reporting() > 0 && $_this->getParam('display_errors')) {
                 echo "\n<!-- [" . $message['file'] . ' : ' . $message['line'] . '] -->';
             }
@@ -500 +501 @@
         static $previous_events = array();
 
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
         }
 
         // If priority is not specified, assume the worst.
-        if (!$this->logPriorityToString($priority)) {
-            $this->logMsg(sprintf('Log priority %s not defined. (Message: %s)', $priority, $message), LOG_EMERG, $file, $line);
+        if (!$_this->logPriorityToString($priority)) {
+            $_this->logMsg(sprintf('Log priority %s not defined. (Message: %s)', $priority, $message), LOG_EMERG, $file, $line);
             $priority = LOG_EMERG;
         }
 
         // If log file is not specified, don't log to a file.
-        if (!$this->getParam('log_directory') || !$this->getParam('log_filename') || !is_dir($this->getParam('log_directory')) || !is_writable($this->getParam('log_directory'))) {
-            $this->setParam(array('log_file_priority' => false));
+        if (!$_this->getParam('log_directory') || !$_this->getParam('log_filename') || !is_dir($_this->getParam('log_directory')) || !is_writable($_this->getParam('log_directory'))) {
+            $_this->setParam(array('log_file_priority' => false));
             // We must use trigger_error to report this problem rather than calling App::logMsg, which might lead to an infinite loop.
-            trigger_error(sprintf('Codebase error: log directory (%s) not found or writable.', $this->getParam('log_directory')), E_USER_NOTICE);
+            trigger_error(sprintf('Codebase error: log directory (%s) not found or writable.', $_this->getParam('log_directory')), E_USER_NOTICE);
         }
 
@@ -530 +531 @@
             $previous_events[$msg_id]++;
             if ($previous_events[$msg_id] == 2) {
-                $this->logMsg(sprintf('%s (Event repeated %s or more times)', $message, $previous_events[$msg_id]), $priority, $file, $line);
+                $_this->logMsg(sprintf('%s (Event repeated %s or more times)', $message, $previous_events[$msg_id]), $priority, $file, $line);
             }
             return false;
@@ -542 +543 @@
             'remote ip' => getRemoteAddr(),
             'pid'       => (substr(PHP_OS, 0, 3) != 'WIN' ? posix_getpid() : ''),
-            'type'      => $this->logPriorityToString($priority),
+            'type'      => $_this->logPriorityToString($priority),
             'file:line' => "$file : $line",
             'url'       => (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''),
@@ -549 +550 @@
 
         // FILE ACTION
-        if ($this->getParam('log_file_priority') && $priority <= $this->getParam('log_file_priority')) {
+        if ($_this->getParam('log_file_priority') && $priority <= $_this->getParam('log_file_priority')) {
             $event_str = '[' . join('] [', $event) . ']';
-            error_log($event_str . "\n", 3, $this->getParam('log_directory') . '/' . $this->getParam('log_filename'));
+            error_log($event_str . "\n", 3, $_this->getParam('log_directory') . '/' . $_this->getParam('log_filename'));
         }
 
         // EMAIL ACTION
-        if ($this->getParam('log_email_priority') && $priority <= $this->getParam('log_email_priority')) {
+        if ($_this->getParam('log_email_priority') && $priority <= $_this->getParam('log_email_priority')) {
             $subject = sprintf('[%s %s] %s', getenv('HTTP_HOST'), $event['type'], $message);
             $email_msg = sprintf("A %s log event occured on %s\n\n", $event['type'], getenv('HTTP_HOST'));
@@ -562 +563 @@
                 $email_msg .= sprintf("%-11s%s\n", $k, $v);
             }
-            mail($this->getParam('log_to_email_address'), $subject, $email_msg, $headers, '-f codebase@strangecode.com');
+            mail($_this->getParam('log_to_email_address'), $subject, $email_msg, $headers, '-f codebase@strangecode.com');
         }
 
         // SMS ACTION
-        if ($this->getParam('log_sms_priority') && $priority <= $this->getParam('log_sms_priority')) {
+        if ($_this->getParam('log_sms_priority') && $priority <= $_this->getParam('log_sms_priority')) {
             $subject = sprintf('[%s %s]', getenv('HTTP_HOST'), $priority);
             $sms_msg = sprintf('%s [%s:%s]', $event['message'], basename($file), $line);
             $headers = "From: codebase@strangecode.com";
-            mail($this->getParam('log_to_sms_address'), $subject, $sms_msg, $headers, '-f codebase@strangecode.com');
+            mail($_this->getParam('log_to_sms_address'), $subject, $sms_msg, $headers, '-f codebase@strangecode.com');
         }
 
         // SCREEN ACTION
-        if ($this->getParam('log_screen_priority') && $priority <= $this->getParam('log_screen_priority')) {
+        if ($_this->getParam('log_screen_priority') && $priority <= $_this->getParam('log_screen_priority')) {
             echo "[{$event['date']}] [{$event['type']}] [{$event['file:line']}] [{$event['message']}]\n";
         }
@@ -619 +620 @@
     function carryQuery($query_key)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
         }
 
         // If not already set, and there is a non-empty value provided in the request...
-        if (!isset($this->_carry_queries[$query_key]) && getFormData($query_key, false)) {
+        if (!isset($_this->_carry_queries[$query_key]) && getFormData($query_key, false)) {
             // Copy the value of the specified query argument into the _carry_queries array.
-            $this->_carry_queries[$query_key] = getFormData($query_key);
+            $_this->_carry_queries[$query_key] = getFormData($query_key);
         }
     }
@@ -651 +652 @@
     function url($url, $carry_args=null, $always_include_sid=false)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -690 +691 @@
         if ($do_carry_queries) {
             // Join the global _carry_queries and local one_time_carry_queries.
-            $query_args = urlEncodeArray(array_merge($this->_carry_queries, $one_time_carry_queries));
+            $query_args = urlEncodeArray(array_merge($_this->_carry_queries, $one_time_carry_queries));
             foreach ($query_args as $key=>$val) {
                 // Check value is set and value does not already exist in the url.
@@ -714 +715 @@
                     (
                         !isset($_COOKIE[session_name()])
-                        || !$this->getParam('session_use_cookies')
+                        || !$_this->getParam('session_use_cookies')
                     )
-                    && $this->getParam('enable_session')
+                    && $_this->getParam('enable_session')
                     && isMyDomain($url)
                     &&
@@ -747 +748 @@
     function oHREF($url, $carry_args=null, $always_include_sid=false)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        $url = $this->url($url, $carry_args, $always_include_sid);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        $url = $_this->url($url, $carry_args, $always_include_sid);
 
         // Replace any & not followed by an html or unicode entity with it's &amp; equivalent.
@@ -771 +772 @@
     function printHiddenSession($carry_args=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -807 +808 @@
             // Join the global _carry_queries and local one_time_carry_queries.
             // urlencode is not used here, not for form data!
-            $query_args = array_merge($this->_carry_queries, $one_time_carry_queries);
+            $query_args = array_merge($_this->_carry_queries, $one_time_carry_queries);
             foreach ($query_args as $key=>$val) {
                 echo '<input type="hidden" name="' . $key . '" value="' . $val . '" />';
@@ -834 +835 @@
     function dieURL($url, $carry_args=null, $always_include_sid=false)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -845 +846 @@
         if ('' == $url) {
             // If URL is not specified, use the redirect_home_url.
-            $url = $this->getParam('redirect_home_url');
+            $url = $_this->getParam('redirect_home_url');
         }
 
@@ -855 +856 @@
         }
 
-        $url = $this->url($url, $carry_args, $always_include_sid);
+        $url = $_this->url($url, $carry_args, $always_include_sid);
 
         header(sprintf('Location: %s', $url));
-        $this->logMsg(sprintf('dieURL: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
+        $_this->logMsg(sprintf('dieURL: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
 
         // End this application.
         // Recommended, although I'm not sure it's necessary: http://cn2.php.net/session_write_close
-        $this->stop();
+        $_this->stop();
         die;
     }
@@ -883 +884 @@
     function dieBoomerangURL($id=null, $carry_args=null, $default_url=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
 
         // Get URL from stored boomerang. Allow non specific URL if ID not valid.
-        if ($this->validBoomerangURL($id, true)) {
-            if (isset($id) && isset($_SESSION[$this->app]['boomerang']['url'][$id])) {
-                $url = $_SESSION[$this->app]['boomerang']['url'][$id];
-                $this->logMsg(sprintf('dieBoomerangURL(%s) found: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+        if ($_this->validBoomerangURL($id, true)) {
+            if (isset($id) && isset($_SESSION[$_this->app]['boomerang']['url'][$id])) {
+                $url = $_SESSION[$_this->app]['boomerang']['url'][$id];
+                $_this->logMsg(sprintf('dieBoomerangURL(%s) found: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             } else {
-                $url = end($_SESSION[$this->app]['boomerang']['url']);
-                $this->logMsg(sprintf('dieBoomerangURL(%s) using: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+                $url = end($_SESSION[$_this->app]['boomerang']['url']);
+                $_this->logMsg(sprintf('dieBoomerangURL(%s) using: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             }
             // Delete stored boomerang.
-            $this->deleteBoomerangURL($id);
+            $_this->deleteBoomerangURL($id);
         } else if (isset($default_url)) {
             $url = $default_url;
@@ -908 +909 @@
             // Ensure that the redirecting page is not also the referrer.
             $url = getenv('HTTP_REFERER');
-            $this->logMsg(sprintf('dieBoomerangURL(%s) using referrer: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+            $_this->logMsg(sprintf('dieBoomerangURL(%s) using referrer: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             // If URL is not specified, use the redirect_home_url.
-            $url = $this->getParam('redirect_home_url');
-            $this->logMsg(sprintf('dieBoomerangURL(%s) not found, using redirect_home_url: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+            $url = $_this->getParam('redirect_home_url');
+            $_this->logMsg(sprintf('dieBoomerangURL(%s) not found, using redirect_home_url: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
         }
 
         // A redirection will never happen immediately twice.
         // Set the time so ensure this doesn't happen.
-        $_SESSION[$this->app]['boomerang']['time'] = time();
-        $this->dieURL($url, $carry_args);
+        $_SESSION[$_this->app]['boomerang']['time'] = time();
+        $_this->dieURL($url, $carry_args);
     }
 
@@ -930 +931 @@
     function setBoomerangURL($url=null, $id=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -945 +946 @@
             $url = preg_replace('/boomerang=[\w]+/', '', $url);
 
-            if (isset($_SESSION[$this->app]['boomerang']['url']) && is_array($_SESSION[$this->app]['boomerang']['url']) && !empty($_SESSION[$this->app]['boomerang']['url'])) {
+            if (isset($_SESSION[$_this->app]['boomerang']['url']) && is_array($_SESSION[$_this->app]['boomerang']['url']) && !empty($_SESSION[$_this->app]['boomerang']['url'])) {
                 // If the URL currently exists in the boomerang array, delete.
-                while ($existing_key = array_search($url, $_SESSION[$this->app]['boomerang']['url'])) {
-                    unset($_SESSION[$this->app]['boomerang']['url'][$existing_key]);
+                while ($existing_key = array_search($url, $_SESSION[$_this->app]['boomerang']['url'])) {
+                    unset($_SESSION[$_this->app]['boomerang']['url'][$existing_key]);
                 }
             }
 
             if (isset($id)) {
-                $_SESSION[$this->app]['boomerang']['url'][$id] = $url;
+                $_SESSION[$_this->app]['boomerang']['url'][$id] = $url;
             } else {
-                $_SESSION[$this->app]['boomerang']['url'][] = $url;
-            }
-            $this->logMsg(sprintf('setBoomerangURL(%s): %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+                $_SESSION[$_this->app]['boomerang']['url'][] = $url;
+            }
+            $_this->logMsg(sprintf('setBoomerangURL(%s): %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             return true;
         } else {
-            $this->logMsg(sprintf('setBoomerangURL(%s) is empty!', $id, $url), LOG_NOTICE, __FILE__, __LINE__);
+            $_this->logMsg(sprintf('setBoomerangURL(%s) is empty!', $id, $url), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -972 +973 @@
     function getBoomerangURL($id=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
 
         if (isset($id)) {
-            if (isset($_SESSION[$this->app]['boomerang']['url'][$id])) {
-                return $_SESSION[$this->app]['boomerang']['url'][$id];
+            if (isset($_SESSION[$_this->app]['boomerang']['url'][$id])) {
+                return $_SESSION[$_this->app]['boomerang']['url'][$id];
             } else {
                 return '';
             }
-        } else if (is_array($_SESSION[$this->app]['boomerang']['url'])) {
-            return end($_SESSION[$this->app]['boomerang']['url']);
+        } else if (is_array($_SESSION[$_this->app]['boomerang']['url'])) {
+            return end($_SESSION[$_this->app]['boomerang']['url']);
         } else {
             return false;
@@ -1001 +1002 @@
     function deleteBoomerangURL($id=null)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
-            return false;
-        }
-
-        $this->logMsg(sprintf('deleteBoomerangURL(%s): %s', $id, $this->getBoomerangURL($id)), LOG_DEBUG, __FILE__, __LINE__);
-
-        if (isset($id) && isset($_SESSION[$this->app]['boomerang']['url'][$id])) {
-            unset($_SESSION[$this->app]['boomerang']['url'][$id]);
-        } else if (is_array($_SESSION[$this->app]['boomerang']['url'])) {
-            array_pop($_SESSION[$this->app]['boomerang']['url']);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        }
+
+        $_this->logMsg(sprintf('deleteBoomerangURL(%s): %s', $id, $_this->getBoomerangURL($id)), LOG_DEBUG, __FILE__, __LINE__);
+
+        if (isset($id) && isset($_SESSION[$_this->app]['boomerang']['url'][$id])) {
+            unset($_SESSION[$_this->app]['boomerang']['url'][$id]);
+        } else if (is_array($_SESSION[$_this->app]['boomerang']['url'])) {
+            array_pop($_SESSION[$_this->app]['boomerang']['url']);
         }
     }
@@ -1027 +1028 @@
     function validBoomerangURL($id=null, $use_nonspecificboomerang=false)
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
-        }
-
-        if (!$this->running) {
-            $this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
-            return false;
-        }
-
-        if (!isset($_SESSION[$this->app]['boomerang']['url'])) {
-            $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set.', $id), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
+        }
+
+        if (!$_this->running) {
+            $_this->logMsg(sprintf('Canceled method call %s, application not running.', __FUNCTION__), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        }
+
+        if (!isset($_SESSION[$_this->app]['boomerang']['url'])) {
+            $_this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set.', $id), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -1044 +1045 @@
         // a boomerang redirection will always occur at least several seconds after the last boomerang redirect
         // or a boomerang being set.
-        $boomerang_time = isset($_SESSION[$this->app]['boomerang']['time']) ? $_SESSION[$this->app]['boomerang']['time'] : 0;
+        $boomerang_time = isset($_SESSION[$_this->app]['boomerang']['time']) ? $_SESSION[$_this->app]['boomerang']['time'] : 0;
 
         $url = '';
-        if (isset($id) && isset($_SESSION[$this->app]['boomerang']['url'][$id])) {
-            $url = $_SESSION[$this->app]['boomerang']['url'][$id];
+        if (isset($id) && isset($_SESSION[$_this->app]['boomerang']['url'][$id])) {
+            $url = $_SESSION[$_this->app]['boomerang']['url'][$id];
         } else if (!isset($id) || $use_nonspecificboomerang) {
             // Use non specific boomerang if available.
-            $url = end($_SESSION[$this->app]['boomerang']['url']);
-        }
-
-        $this->logMsg(sprintf('validBoomerangURL(%s) testing: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+            $url = end($_SESSION[$_this->app]['boomerang']['url']);
+        }
+
+        $_this->logMsg(sprintf('validBoomerangURL(%s) testing: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
 
         if ('' == $url) {
-            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, empty!', $id), LOG_DEBUG, __FILE__, __LINE__);
+            $_this->logMsg(sprintf('validBoomerangURL(%s) not valid, empty!', $id), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
         if ($url == absoluteMe()) {
             // The URL we are directing to is the current page.
-            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, same as absoluteMe: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+            $_this->logMsg(sprintf('validBoomerangURL(%s) not valid, same as absoluteMe: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
         if ($boomerang_time >= (time() - 2)) {
             // Last boomerang direction was more than 2 seconds ago.
-            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, boomerang_time too short: %s', $id, time() - $boomerang_time), LOG_DEBUG, __FILE__, __LINE__);
-            return false;
-        }
-
-        $this->logMsg(sprintf('validBoomerangURL(%s) is valid: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+            $_this->logMsg(sprintf('validBoomerangURL(%s) not valid, boomerang_time too short: %s', $id, time() - $boomerang_time), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        }
+
+        $_this->logMsg(sprintf('validBoomerangURL(%s) is valid: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
         return true;
     }
@@ -1081 +1082 @@
     function sslOn()
     {
-        if (!isset($this) || !is_a($this, 'App') && !is_subclass_of($this, 'App')) {
-            $this =& App::getInstance();
+        if (!isset($_this) || !is_a($_this, 'App') && !is_subclass_of($_this, 'App')) {
+            $_this =& App::getInstance();
         }
 
@@ -1092 +1093 @@
         }
 
-        if ('' == getenv('HTTPS') && $this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
-            $this->raiseMsg(sprintf(_("Secure SSL connection made to %s"), $this->getParam('ssl_domain')), MSG_NOTICE, __FILE__, __LINE__);
+        if ('' == getenv('HTTPS') && $_this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
+            $_this->raiseMsg(sprintf(_("Secure SSL connection made to %s"), $_this->getParam('ssl_domain')), MSG_NOTICE, __FILE__, __LINE__);
             // Always append session because some browsers do not send cookie when crossing to SSL URL.
-            $this->dieURL('https://' . $this->getParam('ssl_domain') . getenv('REQUEST_URI'), null, true);
+            $_this->dieURL('https://' . $_this->getParam('ssl_domain') . getenv('REQUEST_URI'), null, true);
         }
     }

trunk/lib/Auth_SQL.inc.php

@@ -720 +720 @@
             WHERE " . $this->_params['db_primary_key'] . " = '" . DB::escapeString($user_id) . "'
         ");
+        
+        if (mysql_affected_rows(DB::getDBH()) != 1) {
+            App::logMsg(sprintf('setPassword failed to update password for user %s', $user_id), LOG_NOTICE, __FILE__, __LINE__);
+        }
     }
 

trunk/lib/DB.inc.php

@@ -85 +85 @@
     function setParam($params)
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
         }
 
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
-            $this->_params = array_merge($this->_params, $params);
+            $_this->_params = array_merge($_this->_params, $params);
         } else {
             App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
@@ -108 +108 @@
     function getParam($param)
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-
-        if (isset($this->_params[$param])) {
-            return $this->_params[$param];
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+
+        if (isset($_this->_params[$param])) {
+            return $_this->_params[$param];
         } else {
             App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
@@ -129 +129 @@
     function connect()
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-
-        if (!$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass')) {
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+
+        if (!$_this->getParam('db_name') || !$_this->getParam('db_user') || !$_this->getParam('db_pass')) {
             App::logMsg('Database credentials missing.', LOG_EMERG, __FILE__, __LINE__);
             return false;
@@ -139 +139 @@
 
         // Connect to database. Always create a new link to the server.
-        if ($this->dbh = mysql_connect($this->getParam('db_server'), $this->getParam('db_user'), $this->getParam('db_pass'), true)) {
+        if ($_this->dbh = mysql_connect($_this->getParam('db_server'), $_this->getParam('db_user'), $_this->getParam('db_pass'), true)) {
             // Select database
-            mysql_select_db($this->getParam('db_name'), $this->dbh);
+            mysql_select_db($_this->getParam('db_name'), $_this->dbh);
         }
 
         // Test for connection errors.
-        if (!$this->dbh || mysql_error($this->dbh)) {
-            $mysql_error_msg = $this->dbh ? 'Codebase MySQL error: (' . mysql_errno($this->dbh) . ') ' . mysql_error($this->dbh) : 'Codebase MySQL error: Could not connect to server.';
+        if (!$_this->dbh || mysql_error($_this->dbh)) {
+            $mysql_error_msg = $_this->dbh ? 'Codebase MySQL error: (' . mysql_errno($_this->dbh) . ') ' . mysql_error($_this->dbh) : 'Codebase MySQL error: Could not connect to server.';
             App::logMsg($mysql_error_msg, LOG_EMERG, __FILE__, __LINE__);
 
             // Print helpful or pretty error?
-            if ($this->getParam('db_debug')) {
+            if ($_this->getParam('db_debug')) {
                 echo $mysql_error_msg . "\n";
             } else {
@@ -157 +157 @@
 
             // Die or continue without connection?
-            if ($this->getParam('db_die_on_failure')) {
+            if ($_this->getParam('db_die_on_failure')) {
                 echo "\n\n<!-- Script execution stopped out of embarrassment. -->";
                 die;
@@ -166 +166 @@
 
         // DB connection success!
-        $this->_connected = true;
+        $_this->_connected = true;
 
         // Tell MySQL what character set we're useing. Available only on MySQL verions > 4.01.01.
-        $this->query("/*!40101 SET NAMES '" . $this->mysql_character_sets[strtolower(App::getParam('character_set'))] . "' */");
+        $_this->query("/*!40101 SET NAMES '" . $_this->mysql_character_sets[strtolower(App::getParam('character_set'))] . "' */");
 
         return true;
@@ -183 +183 @@
     function close()
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-
-        if (!$this->_connected) {
-            return false;
-        }
-
-        mysql_close($this->dbh);
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+
+        if (!$_this->_connected) {
+            return false;
+        }
+
+        mysql_close($_this->dbh);
     }
 
@@ -204 +204 @@
     function getDBH()
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-
-        if (!$this->_connected) {
-            return false;
-        }
-
-        return $this->dbh;
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+
+        if (!$_this->_connected) {
+            return false;
+        }
+
+        return $_this->dbh;
     }
 
@@ -238 +238 @@
     function escapeString($string)
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-        return mysql_real_escape_string($string, $this->dbh);
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+        return mysql_real_escape_string($string, $_this->dbh);
     }
 
@@ -256 +256 @@
         static $_query_count = 0;
 
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-
-        if (!$this->_connected) {
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+
+        if (!$_this->_connected) {
            return false;
         }
@@ -266 +266 @@
         $_query_count++;
         $debugqry = preg_replace("/\n[\t ]+/", "\n", $query);
-        if ($this->getParam('db_always_debug') || $debug) {
+        if ($_this->getParam('db_always_debug') || $debug) {
             echo "<!-- ----------------- Query $_query_count ---------------------\n$debugqry\n-->\n";
         }
 
         // Execute!
-        $qid = mysql_query($query, $this->dbh);
+        $qid = mysql_query($query, $_this->dbh);
 
         // Error checking.
-        if (!$qid || mysql_error($this->dbh)) {
-            if ($this->getParam('db_debug')) {
-                echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
+        if (!$qid || mysql_error($_this->dbh)) {
+            if ($_this->getParam('db_debug')) {
+                echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($_this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
             } else {
                 echo _("This page is temporarily unavailable. It should be back up in a few minutes.");
             }
-            App::logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($this->dbh), mysql_error($this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
-            if ($this->getParam('db_die_on_failure')) {
+            App::logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($_this->dbh), mysql_error($_this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
+            if ($_this->getParam('db_die_on_failure')) {
                 echo "\n\n<!-- Script execution stopped out of embarrassment. -->";
                 die;
@@ -302 +302 @@
     function tableExists($table, $use_cached_results=true)
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-
-        if (!$this->_connected) {
-            return false;
-        }
-
-        if (!isset($this->existing_tables) || !$use_cached_results) {
-            $this->existing_tables = array();
-            $qid = $this->query("SHOW TABLES");
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+
+        if (!$_this->_connected) {
+            return false;
+        }
+
+        if (!isset($_this->existing_tables) || !$use_cached_results) {
+            $_this->existing_tables = array();
+            $qid = $_this->query("SHOW TABLES");
             while (list($row) = mysql_fetch_row($qid)) {
-                $this->existing_tables[] = $row;
-            }
-        }
-        if (in_array($table, $this->existing_tables)) {
+                $_this->existing_tables[] = $row;
+            }
+        }
+        if (in_array($table, $_this->existing_tables)) {
             return true;
         } else {
-            App::logMsg(sprintf('nonexistent DB table: %s.%s', $this->getParam('db_name'), $table), LOG_ALERT, __FILE__, __LINE__);
+            App::logMsg(sprintf('nonexistent DB table: %s.%s', $_this->getParam('db_name'), $table), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }
@@ -336 +336 @@
     function columnExists($table, $columns, $strict=true, $use_cached_results=true)
     {
-        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
-            $this =& DB::getInstance();
-        }
-
-        if (!$this->_connected) {
+        if (!isset($_this) || !is_a($_this, 'DB') && !is_subclass_of($_this, 'DB')) {
+            $_this =& DB::getInstance();
+        }
+
+        if (!$_this->_connected) {
             return false;
         }
 
         // Ensure the table exists.
-        if (!$this->tableExists($table, $use_cached_results)) {
+        if (!$_this->tableExists($table, $use_cached_results)) {
             return false;
         }
@@ -354 +354 @@
         }
 
-        if (!isset($this->table_columns[$table]) || !$use_cached_results) {
+        if (!isset($_this->table_columns[$table]) || !$use_cached_results) {
             // Populate and cache array of current columns for this table.
-            $this->table_columns[$table] = array();
-            $qid = $this->query("DESCRIBE $table");
+            $_this->table_columns[$table] = array();
+            $qid = $_this->query("DESCRIBE $table");
             while ($row = mysql_fetch_row($qid)) {
-                $this->table_columns[$table][] = $row[0];
+                $_this->table_columns[$table][] = $row[0];
             }
         }
@@ -366 +366 @@
             // Do an exact comparison of table schemas.
             sort($columns);
-            sort($this->table_columns[$table]);
-            return $this->table_columns[$table] == $columns;
+            sort($_this->table_columns[$table]);
+            return $_this->table_columns[$table] == $columns;
         } else {
             // Only check that the specified columns are available in the table.
-            $match_columns = array_intersect($this->table_columns[$table], $columns);
+            $match_columns = array_intersect($_this->table_columns[$table], $columns);
             sort($columns);
             sort($match_columns);

trunk/lib/Email.inc.php

@@ -281 +281 @@
         if (mail($final_to, $this->_params['subject'], $final_body, $final_headers, $envelope_sender_header)) {
             App::logMsg(sprintf('Email successfully sent to %s', $final_to), LOG_DEBUG, __FILE__, __LINE__);
-            return true
+            return true;
         } else {
             App::logMsg(sprintf('Email failure with parameters: %s, %s, %s, %s', $final_to, $this->_params['subject'], str_replace("\r\n", '\r\n', $final_headers), $envelope_sender_header), LOG_NOTICE, __FILE__, __LINE__);

trunk/lib/FormValidator.inc.php

@@ -417 +417 @@
 
         // Check domain exists: It's a domain if ip2long fails; Checkdnsrr ensures a MX record exists; Gethostbyname() ensures the domain exists.
-        if (ip2long($domain) == '-1' && function_exists('checkdnsrr') && !checkdnsrr($domain . '.', 'MX') && gethostbyname($domain) == $domain) {
+        // Compare ip2long twice for php4 backwards compat.
+        if ((ip2long($domain) == '-1' || ip2long($domain) === false) && function_exists('checkdnsrr') && !checkdnsrr($domain . '.', 'MX') && gethostbyname($domain) == $domain) {
             $this->addError($form_name, sprintf(_("<strong>%s</strong> is not a valid email domain name"), oTxt($domain)));
             App::logMsg(sprintf('The email address %s contains an invalid email domain name (%s).', getFormData($form_name), $domain), LOG_INFO, __FILE__, __LINE__);

trunk/lib/ImageThumb.inc.php

@@ -3 +3 @@
  * ImageThumb.inc.php
  * Code by Strangecode :: www.strangecode.com :: This document contains copyrighted information
- */
-
-/**
- * The ImageThumb class resizes images.
  *
  * @author   Quinn Comendant <quinn@strangecode.com>
- * @requires Netpbm binaries from http://sourceforge.net/projects/netpbm/
- * @version  1.1
+ * @requires Netpbm <http://sourceforge.net/projects/netpbm/> and libjpeg or GD.
+ * @version  2.0
  */
 
+// Image resize options.
 define('IMAGETHUMB_FIT_WIDTH', 1);
 define('IMAGETHUMB_FIT_HEIGHT', 2);
@@ -18 +15 @@
 define('IMAGETHUMB_STRETCH', 4);
 define('IMAGETHUMB_NO_SCALE', 5);
+define('IMAGETHUMB_METHOD_NETPBM', 6);
+define('IMAGETHUMB_METHOD_GD', 7);
 
 class ImageThumb {
-
-    // The location for images to create thumbnails from.
-    var $source_dir = null;
-
-    // Specifications for thumbnail images.
-    var $spec;
-
-    // Array of acceptable file extensions (lowercase).
-    var $valid_file_extensions = array('jpg', 'jpeg', 'gif', 'png');
-
-    // The uploaded files will be owned by user 'apache'. Set world-read/write
-    // if the website admin needs to read/delete these files. Must be at least 0400 with owner=apache.
-    var $dest_file_perms = 0644;
-
-    // Must be at least 0700 with owner=apache.
-    var $dest_dir_perms = 0777;
-
-    // Executable binary locations.
-    var $anytopnm_binary = '/usr/bin/anytopnm';
-    var $pnmscale_binary = '/usr/bin/pnmscale';
-    var $cjpeg_binary = '/usr/bin/cjpeg';
-    var $_valid_binaries = true;
-
-    // Display messages raised in this object?
-    var $display_messages = true;
-
-    /**
-     * Constructor.
-     *
-     * @access  public
-     */
-    function ImageThumb()
-    {
-        if (!file_exists($this->anytopnm_binary)) {
-            App::logMsg(sprintf('ImageThumb error: anytopnm binary %s not found.', $this->anytopnm_binary), LOG_ERR, __FILE__, __LINE__);
-            $this->_valid_binaries = false;
-        }
-        if (!file_exists($this->pnmscale_binary)) {
-            App::logMsg(sprintf('ImageThumb error: pnmscale binary %s not found.', $this->pnmscale_binary), LOG_ERR, __FILE__, __LINE__);
-            $this->_valid_binaries = false;
-        }
-        if (!file_exists($this->cjpeg_binary)) {
-            App::logMsg(sprintf('ImageThumb error: cjpeg binary %s not found.', $this->cjpeg_binary), LOG_ERR, __FILE__, __LINE__);
-            $this->_valid_binaries = false;
-        }
-    }
-
-    /**
-     * Set the directory of the source images.
-     *
-     * @access  public
-     * @param   string $source_dir The full directory path of the source images.
+    
+    // General object parameters.
+    var $_params = array(
+        // The location for images to create thumbnails from.
+        'source_dir' => null,
+
+        // Existing files will be overwritten when there is a name conflict?
+        'allow_overwriting' => false,
+
+        // The file permissions of the uploaded files. Remember, files will be owned by the web server user.
+        'dest_file_perms' => 0600,
+
+        // Permissions of autocreated directories. Must be at least 0700 with owner=apache.
+        'dest_dir_perms' => 0777,
+        
+        // Destination file types. (IMG_JPG, IMG_PNG, IMG_GIF, IMG_WBMP)
+        'dest_file_type' => IMG_JPG,
+
+        // Destination file types. ('jpg', 'png', 'gif', 'wbmp')
+        'dest_file_extention' => 'jpg',
+
+        // Require file to have one of the following file name extentions.
+        'valid_file_extensions' => array('jpg', 'jpeg', 'gif', 'png'),
+        
+        // Method to use for resizing. (IMAGETHUMB_METHOD_NETPBM or IMAGETHUMB_METHOD_GD)
+        'resize_method' => IMAGETHUMB_METHOD_NETPBM,
+
+        // Netpbm and libjpeg binary locations.
+        'anytopnm_binary' => '/usr/bin/anytopnm',
+        'pnmscale_binary' => '/usr/bin/pnmscale',
+        'cjpeg_binary' => '/usr/bin/cjpeg',
+
+        // Which messages do we pass to raiseMsg? Use one of the MSG_* constants or false to disable.
+        'display_messages' => MSG_ALL,
+    );
+    
+    // Default image size specs.
+    var $default_image_specs = array(
+        // The destination for an image thumbnail size. Path relative to source_dir (eg: ../thumbs).
+        'dest_dir' => null,
+        // Type of scaling to perform, and sizes used to calculate max dimentions.
+        'scaling_type' => IMAGETHUMB_FIT_LARGER,
+        'width' => null,
+        'height' => null,
+        // Percentage quality of image compression output 0-100.
+        'quality' => 65,
+        // Create progressive jpegs?
+        'progressive' => false,
+        // If source image is smaller than thumbnail, allow upscaling?
+        'allow_upscaling' => false,
+        // If thumb exists and filesize is smaller than this, do not overwrite the thumb.
+        'keep_filesize' => null,
+    );
+
+    // Final specifications for image sizes, set with setSpec().
+    var $image_specs = array();
+
+    /**
+     * Set (or overwrite existing) parameters by passing an array of new parameters.
+     *
+     * @access public
+     * @param  array    $params     Array of parameters (key => val pairs).
+     */
+    function setParam($params)
+    {
+        if (isset($params) && is_array($params)) {
+
+            // Enforce valid upload_path parameter.
+            if (isset($params['source_dir'])) {
+                $params['source_dir'] = realpath($params['source_dir']);
+                // Must be directory.
+                if (!is_dir($params['source_dir'])) {
+                    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__);
+                    trigger_error(sprintf('Source directory not readable: %s', $params['source_dir']), E_USER_ERROR);
+                }
+            }
+            
+            if (isset($params['dest_file_type'])) {
+                switch ($params['dest_file_type']) {
+                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__);
+                    }
+                    $params['dest_file_extention'] = 'jpg';
+                    break;
+                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__);
+                    }
+                    $params['dest_file_extention'] = 'png';
+                    break;
+                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__);
+                    }
+                    $params['dest_file_extention'] = 'gif';
+                    break;
+                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__);
+                    }
+                    $params['dest_file_extention'] = 'wbmp';
+                    break;
+                default :
+                    App::logMsg(sprintf('Invalid dest_file_type: %s', $params['dest_file_type']), LOG_ERR, __FILE__, __LINE__);
+                    break;
+                }
+            }
+
+            // 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__);
+        }
+    }
+
+    /**
+     * Return the value of a parameter, if it exists.
+     *
+     * @access public
+     * @param string $param        Which parameter to return.
+     * @return mixed               Configured parameter value.
+     */
+    function getParam($param)
+    {
+        if (isset($this->_params[$param])) {
+            return $this->_params[$param];
+        } else {
+            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            return null;
+        }
+    }
+
+    /**
+     * Set the specification of thumbnails.
+     *
+     * @access  public
+     * @param   array $spec The specifications for a size of output image.
+     */
+    function setSpec($spec)
+    {
+        // A little sanity checking.
+        if (!isset($spec['dest_dir']) || '' == $spec['dest_dir']) {
+            App::logMsg('setSpec error: dest_dir not specified.', LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+        if (!isset($spec['width']) || !is_int($spec['width'])) {
+            App::logMsg('setSpec error: width not specified.', LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+        if (!isset($spec['height']) || !is_int($spec['height'])) {
+            App::logMsg('setSpec error: height not specified.', LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+        if (isset($spec['quality']) && IMG_JPG != $this->getParam('dest_file_type')) {
+            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 != $this->getParam('dest_file_type')) {
+            App::logMsg('The "progressive" specification is not used unless IMG_JPG is the dest_file_type.', LOG_INFO, __FILE__, __LINE__);
+        }
+        // Merge defaults with provided.
+        $this->image_specs[] = array_merge($this->default_image_specs, $spec);
+    }
+
+    /**
+     * Process an entire directory of images.
+     *
+     * @access  public
      * @return  bool true on success, false on failure.
      */
-    function setSourceDirectory($source_dir)
-    {
-
-        // Set the source directory path, stripping any extra slashes if needed.
-        $this->source_dir = preg_replace('!/+$!', '', $source_dir);
-
-        if (!is_dir($this->source_dir)) {
-            App::logMsg(sprintf('ImageThumb error: source directory not found: %s', $this->source_dir), LOG_ERR, __FILE__, __LINE__);
-            return false;
-        }
-        if (!is_readable($this->source_dir)) {
-            App::logMsg(sprintf('ImageThumb error: source directory not readable: %s', $this->source_dir), LOG_ERR, __FILE__, __LINE__);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Set the specification of thumbnails.
-     *
-     * @access  public
-     * @param   array $spec The specifications for each size of output image.
-     * @return  bool true on success, false on failure.
-     */
-    function setSpec($spec = array())
-    {
-        $dest_dir        = preg_replace('!/+$!', '', $spec['dest_dir']);
-        $width           = $spec['width'];
-        $height          = $spec['height'];
-        $scaling_type    = $spec['scaling_type'];
-        $quality         = isset($spec['quality']) ? $spec['quality'] : 75;
-        $progressive     = isset($spec['progressive']) ? $spec['progressive'] : false;
-        $allow_upscaling = isset($spec['allow_upscaling']) ? $spec['allow_upscaling'] : false;
-        $keep_filesize   = isset($spec['keep_filesize']) ? $spec['keep_filesize'] : null;
-
-        // Define pnmscale arguments.
-        switch ($scaling_type) {
-        case IMAGETHUMB_FIT_WIDTH :
-            if (empty($width)) {
-                App::logMsg('ImageThumb error: width not specified for IMAGETHUMB_FIT_WIDTH.', LOG_ERR, __FILE__, __LINE__);
-                return false;
-            }
-            $pnmscale_args = sprintf(' -width %s ', escapeshellcmd($width));
-            break;
-        case IMAGETHUMB_FIT_HEIGHT :
-            if (empty($height)) {
-                App::logMsg('ImageThumb error: height not specified for IMAGETHUMB_FIT_HEIGHT.', LOG_ERR, __FILE__, __LINE__);
-                return false;
-            }
-            $pnmscale_args = sprintf(' -height %s ', escapeshellcmd($height));
-            break;
-        case IMAGETHUMB_FIT_LARGER :
-            if (empty($width) || empty($height)) {
-                App::logMsg('ImageThumb error: width or height not specified for IMAGETHUMB_FIT_LARGER.', LOG_ERR, __FILE__, __LINE__);
-                return false;
-            }
-            $pnmscale_args = sprintf(' -xysize %s %s ', escapeshellcmd($width), escapeshellcmd($height));
-            break;
-        case IMAGETHUMB_STRETCH :
-            if (empty($width) || empty($height)) {
-                App::logMsg('ImageThumb error: width or height not specified for IMAGETHUMB_STRETCH.', LOG_ERR, __FILE__, __LINE__);
-                return false;
-            }
-            $pnmscale_args = sprintf(' -width %s -height %s ', escapeshellcmd($width), escapeshellcmd($height));
-            break;
-        case IMAGETHUMB_NO_SCALE :
-        default :
-            $pnmscale_args = ' 1 ';
-            break;
-        }
-
-        // Define cjpeg arguments.
-        $cjpeg_args = sprintf(' -optimize -quality %s ', escapeshellcmd($quality));
-        $cjpeg_args .= (true === $progressive) ? ' -progressive ' : '';
-
-        $this->spec[] = array(
-            'dest_dir' => $dest_dir,
-            'width' => $width,
-            'height' => $height,
-            'scaling_type' => $scaling_type,
-            'quality' => $quality,
-            'progressive' => $progressive,
-            'pnmscale_args' => $pnmscale_args,
-            'cjpeg_args' => $cjpeg_args,
-            'allow_upscaling' => $allow_upscaling,
-            'keep_filesize' => $keep_filesize,
-        );
-    }
-
-    /**
-     * Make directory for each specified thumbnail size, if it doesn't exist.
-     *
-     * @access  public
-     * @return  bool true on success, false on failure.
-     */
-    function createDestDirs()
+    function processAll()
     {
         // Ensure we have a source.
-        if (!isset($this->source_dir)) {
-            App::logMsg(sprintf('Source directory not set before creating destination directories.'), LOG_ERR, __FILE__, __LINE__);
-            return false;
-        }
-        $return_val = 0;
-        foreach ($this->spec as $s) {
-            if (!is_dir($this->source_dir . '/' . $s['dest_dir'])) {
-                if (!mkdir($this->source_dir . '/' . $s['dest_dir'], $this->dest_dir_perms)) {
-                    $return_val += 1;
-                    App::logMsg(sprintf('mkdir failure: %s', $this->source_dir . '/' . $s['dest_dir']), LOG_ERR, __FILE__, __LINE__);
-                }
-            }
-        }
-
-        // If > 0, there was a problem creating dest dirs.
-        return (0 == $return_val);
+        if ('' == $this->getParam('source_dir')) {
+            App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+
+        // Get all files in source directory.
+        $dir_handle = opendir($this->getParam('source_dir'));
+        while ($dir_handle && ($file = readdir($dir_handle)) !== false) {
+            // If the file name does not start with a dot (. or .. or .htaccess).
+            if (!preg_match('/^\./', $file) && in_array(strtolower(substr($file, strrpos($file, '.') + 1)), $this->getParam('valid_file_extensions'))) {
+                $files[] = $file;
+            }
+        }
+
+        // Process each found file.
+        if (is_array($files) && !empty($files)) {
+            $return_val = 0;
+            foreach ($files as $file_name) {
+                $return_val += $this->processFile($file_name);
+            }
+            return 0 === $return_val;
+        } else {
+            App::logMsg(sprintf('No images found to thumbnail in directory %s.', $this->getParam('source_dir')), LOG_NOTICE, __FILE__, __LINE__);
+            return false;
+        }
     }
 
@@ -199 +233 @@
     function processFile($file_name)
     {
-        // Ensure we have valid binaries.
-        if (!$this->_valid_binaries) {
-            return false;
-        }
-
+        // Source file determinted by provided file_name.
+        $source_file = realpath(sprintf('%s/%s', $this->getParam('source_dir'), $file_name));
+        
         // Ensure we have a source.
-        if (!isset($this->source_dir)) {
+        if (sizeof($this->image_specs) < 1) {
+            App::logMsg(sprintf('Image specifications not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+
+        // Ensure we have a source.
+        if ('' == $this->getParam('source_dir')) {
             App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
 
+        // Confirm source image exists.
+        if (!file_exists($source_file)) {
+            $this->_raiseMsg(sprintf(_("Image resizing failed: source image not found: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Source image not found: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
+            return false;
+        }
+
+        // Confirm source image is readable.
+        if (!is_readable($source_file)) {
+            $this->_raiseMsg(sprintf(_("Image resizing failed: source image not readable: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Source image not readable: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
+            return false;
+        }
+
+        // Confirm source image contains data.
+        if (filesize($source_file) <= 0) {
+            $this->_raiseMsg(sprintf(_("Image resizing failed: source image corrupt: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Source image is zero bytes: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
+            return false;
+        }
+
+        // Confirm source image has a valid file extension.
+        if (!$this->_validFileExtension($file_name)) {
+            $this->_raiseMsg(sprintf(_("Image resizing failed: source image not of valid type: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $file_name), LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+
+        // Ensure destination directories are created. This will only be called once per page load.
+        $this->_createDestDirs();
+        
         // To keep this script running even if user tries to stop browser.
         ignore_user_abort(true);
@@ -216 +285 @@
         }
 
-        // Confirm source image exists.
-        if (!file_exists($this->source_dir . '/' . $file_name)) {
-            $this->raiseMsg(sprintf(_("Image resizing failed: source image not found: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image not found: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
-            return false;
-        }
-
-        // Confirm source image is readable.
-        if (!is_readable($this->source_dir . '/' . $file_name)) {
-            $this->raiseMsg(sprintf(_("Image resizing failed: source image not readable: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image not readable: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
-            return false;
-        }
-
-        // Confirm source image contains data.
-        if (filesize($this->source_dir . '/' . $file_name) < 1) {
-            $this->raiseMsg(sprintf(_("Image resizing failed: source image corrupt: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image is zero bytes: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
-            return false;
-        }
-
-        // Confirm source image has a valid file extension.
-        if (!$this->validFileExtension($file_name)) {
-            $this->raiseMsg(sprintf(_("Image resizing failed: source image not of valid type: <strong>%s</strong>"), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $file_name), LOG_ERR, __FILE__, __LINE__);
-            return false;
-        }
-
-        // Output file will be a jpg. Set file extension.
-        $file_name = substr($file_name, 0, strrpos($file_name, '.')) . '.jpg';
-
         // This remains zero until something goes wrong.
-        $final_return_val = 0;
-
-        foreach ($this->spec as $s) {
-
-            // Skip existing thumbnails with file size below $s['keep_filesize'].
-            if (file_exists(realpath($this->source_dir . '/' . $s['dest_dir'] . '/' . $file_name)) && isset($s['keep_filesize'])) {
-                $file_size = filesize(realpath($this->source_dir . '/' . $s['dest_dir'] . '/' . $file_name));
-                if ($file_size && $file_size < $s['keep_filesize']) {
-                    App::logMsg(sprintf('Skipping thumbnail %s. File already exists and file size is less than %s bytes.', $s['dest_dir'] . '/' . $file_name, $s['keep_filesize']), LOG_DEBUG, __FILE__, __LINE__);
+        $return_val = 0;
+
+        foreach ($this->image_specs as $spec) {
+            
+            // Destination filename uses the extention defined by dest_file_extention.
+            $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $this->getParam('dest_file_extention')));
+
+            // Skip existing thumbnails with file size below $spec['keep_filesize'].
+            if (isset($spec['keep_filesize']) && file_exists($dest_file)) {
+                $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__);
                     continue;
                 }
             }
 
-            // Determine if original file size is smaller than specified thumbnail size. Do not scale-up if allow_upscaling config is set to false.
-            $image_size = getimagesize(realpath($this->source_dir . '/' . $file_name));
-            if ($image_size['0'] <= $s['width'] && $image_size['1'] <= $s['height'] && !$s['allow_upscaling']) {
-                $pnmscale_args = ' 1 ';
-                App::logMsg(sprintf('Image %s smaller than specified %s thumbnail size. Keeping original size.', $file_name, $s['dest_dir']), LOG_DEBUG, __FILE__, __LINE__);
+            // Determine if original file size is smaller than specified thumbnail size. Do not scale-up if $spec['allow_upscaling'] config is set to false.
+            $image_size = getimagesize($source_file);
+            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__);
+            }
+
+            // DO IT! Based on available method.
+            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__);
+                $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__);
+                $return_val += $this->_resizeWithGD($source_file, $dest_file, $spec);
             } else {
-                $pnmscale_args = $s['pnmscale_args'];
-            }
-
-            // Execute the command that creates the thumbnail.
-            $command = sprintf('%s %s/%s | %s %s | %s %s > %s/%s',
-                escapeshellcmd($this->anytopnm_binary),
-                escapeshellcmd($this->source_dir),
-                escapeshellcmd($file_name),
-                escapeshellcmd($this->pnmscale_binary),
-                escapeshellcmd($pnmscale_args),
-                escapeshellcmd($this->cjpeg_binary),
-                escapeshellcmd($s['cjpeg_args']),
-                escapeshellcmd(realpath($this->source_dir . '/' . $s['dest_dir'])),
-                escapeshellcmd($file_name)
-            );
-            App::logMsg(sprintf('ImageThumb command: %s', $command), LOG_DEBUG, __FILE__, __LINE__);
-            exec($command, $output, $return_val);
-
-            if (0 == $return_val) {
-                // Make the thumbnail writable so the user can delete it over ftp without being 'apache'.
-                chmod(realpath($this->source_dir . '/' . $s['dest_dir'] . '/' . $file_name), $this->dest_file_perms);
-                App::logMsg(sprintf('Successfully resized image %s', $s['dest_dir'] . '/' . $file_name, $return_val), LOG_DEBUG, __FILE__, __LINE__);
+                App::logMsg(sprintf('Image thumbnailing failed. Neither Netpbm or GD is available.', null), LOG_DEBUG, __FILE__, __LINE__);
+                return false;
+            }
+        }
+
+        // If > 0, there was a problem thumb-nailing.
+        return 0 === $return_val;
+    }
+    
+    /*
+    * Use the Netpbm and libjpg cjpeg tools to generate a rescaled compressed image.
+    * This is the preferred method over GD which has (supposedly) less quality.
+    *
+    * @access   private
+    * @param    string  $source_file    Full path to source image file.
+    * @param    string  $dest_file      Full path to destination image file.
+    * @param    array   $spec           Array of image size specifications.
+    * @return   bool                    Success value.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    19 May 2006 13:55:46
+    */
+    function _resizeWithNetpbm($source_file, $dest_file, $spec)
+    {
+        // Define pnmscale arguments.
+        switch ($spec['scaling_type']) {
+        case IMAGETHUMB_FIT_WIDTH :
+            $pnmscale_args = sprintf(' -width %s ', escapeshellarg($spec['width']));
+            break;
+        case IMAGETHUMB_FIT_HEIGHT :
+            $pnmscale_args = sprintf(' -height %s ', escapeshellarg($spec['height']));
+            break;
+        case IMAGETHUMB_FIT_LARGER :
+            $pnmscale_args = sprintf(' -xysize %s %s ', escapeshellarg($spec['width']), escapeshellarg($spec['height']));
+            break;
+        case IMAGETHUMB_STRETCH :
+            $pnmscale_args = sprintf(' -width %s -height %s ', escapeshellarg($spec['width']), escapeshellarg($spec['height']));
+            break;
+        case IMAGETHUMB_NO_SCALE :
+        default :
+            $pnmscale_args = ' 1 ';
+            break;
+        }
+
+        // Define cjpeg arguments.
+        $cjpeg_args = sprintf(' -optimize -quality %s ', escapeshellarg($spec['quality']));
+        $cjpeg_args .= (true === $spec['progressive']) ? ' -progressive ' : '';
+
+        // Format the command that creates the thumbnail.
+        $command = sprintf('%s %s | %s %s | %s %s > %s/%s',
+            escapeshellcmd($this->getParam('anytopnm_binary')),
+            escapeshellcmd($source_file),
+            escapeshellcmd($this->getParam('pnmscale_binary')),
+            escapeshellcmd($pnmscale_args),
+            escapeshellcmd($this->getParam('cjpeg_binary')),
+            escapeshellcmd($cjpeg_args),
+            escapeshellcmd($dest_file),
+            escapeshellcmd($file_name)
+        );
+        App::logMsg(sprintf('ImageThumb Netpbm command: %s', $command), LOG_DEBUG, __FILE__, __LINE__);
+        
+        // Execute!
+        exec($command, $output, $return_val);
+
+        if (0 === $return_val) {
+            // Success!
+            // 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'] . '/' . $file_name, $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'] . '/' . $file_name, $return_val, empty($output) ? '' : ' (' . getDump($output) . ')'), LOG_ERR, __FILE__, __LINE__);
+        }
+
+        // Return from the command will be > 0 if there was an error.
+        return $return_val;
+    }
+
+    /*
+    * Use PHP's built-in GD tools to generate a rescaled compressed image.
+    *
+    * @access   private
+    * @param    string  $source_file    Full path to source image file.
+    * @param    string  $dest_file      Full path to destination image file.
+    * @param    array   $spec           Array of image size specifications.
+    * @return   bool                    Success value.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    19 May 2006 15:46:02
+    */
+    function _resizeWithGD($source_file, $dest_file, $spec)
+    {
+        // Get original file dimensions and type.
+        list($source_image_width, $source_image_height, $source_image_type) = getimagesize($source_file);
+
+        // Define destination image dimentions.
+        switch ($spec['scaling_type']) {
+        case IMAGETHUMB_FIT_WIDTH :
+            $dest_image_height = $source_image_height * ($spec['width'] / $source_image_width);
+            $dest_image_width = $spec['width'];
+            break;
+        case IMAGETHUMB_FIT_HEIGHT :
+            $dest_image_width = $source_image_width * ($spec['height'] / $source_image_height);
+            $dest_image_height = $spec['height'];
+            break;
+        case IMAGETHUMB_FIT_LARGER :
+            if ($source_image_width < $source_image_height) {
+               $dest_image_width = $source_image_width * ($spec['height'] / $source_image_height);
+               $dest_image_height = $source_image_height;
             } else {
-                App::logMsg(sprintf('Image %s failed resizing with return value: %s%s', $s['dest_dir'] . '/' . $file_name, $return_val, empty($output) ? '' : ' (' . getDump($output) . ')'), LOG_ERR, __FILE__, __LINE__);
-            }
-
-            // Return from the command will be > 0 if there was an error.
-            $final_return_val += $return_val;
-        }
-
-        // If > 0, there was a problem thumbnailing.
-        return (0 == $final_return_val);
-    }
-
-    /**
-     * Process an entire directory of images.
-     *
-     * @access  public
-     * @return  bool true on success, false on failure.
-     */
-    function processAll()
-    {
-        // Ensure we have a source.
-        if (!isset($this->source_dir)) {
-            App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
-            return false;
-        }
-
-        // Get all files in source directory.
-        $dir_handle = opendir($this->source_dir);
-        while ($dir_handle && ($file = readdir($dir_handle)) !== false) {
-            // If the file name does not start with a dot (. or .. or .htaccess).
-            if (!preg_match('/^\./', $file) && in_array(strtolower(substr($file, strrpos($file, '.') + 1)), $this->valid_file_extensions)) {
-                $files[] = $file;
-            }
-        }
-
-        // Process each found file.
-        if (is_array($files) && !empty($files)) {
-            foreach ($files as $file_name) {
-                $this->processFile($file_name);
-            }
-            return sizeof($files);
+               $dest_image_height = $source_image_height * ($spec['width'] / $source_image_width);
+               $dest_image_width = $source_image_width;
+            }
+            break;
+        case IMAGETHUMB_STRETCH :
+            $dest_image_width = $spec['width'];
+            $dest_image_height = $spec['height'];
+            break;
+        case IMAGETHUMB_NO_SCALE :
+        default :
+            $dest_image_width = $source_image_width;
+            $dest_image_height = $source_image_height;
+            break;
+        }
+        
+        echo '<li> sourceWidth: ' . $source_image_width;
+        echo '<li> sourceHeight: ' . $source_image_height;
+        echo '<li> Width: ' . $dest_image_width;
+        echo '<li> Height: ' . $dest_image_height;
+        die;///
+
+        // Create source image data in memory.
+        switch ($source_image_type) {
+        case IMAGETYPE_JPEG :
+            $source_image_data = imagecreatefromjpeg($source_file);
+            break;
+        case IMAGETYPE_PNG :
+            $source_image_data = imagecreatefrompng($source_file);
+            break;
+        case IMAGETYPE_GIF :
+            $source_image_data = imagecreatefromgif($source_file);
+            break;
+        case IMAGETYPE_WBMP :
+            $source_image_data = imagecreatefromwbmp($source_file);
+        default :
+            App::logMsg(sprintf('Source image type %s not supported.', $source_image_type), LOG_WARNING, __FILE__, __LINE__);
+            return false;
+            break;
+        }
+        if (!$source_image_data) {
+            App::logMsg(sprintf('Error creating %s image in memory from %s', $source_image_type, $source_file), LOG_WARNING, __FILE__, __LINE__);
+            return false;
+        }
+        
+        // Create destination image data in memory.
+        $dest_image_data = imagecreatetruecolor($dest_image_width, $dest_image_height);
+
+        // Resample!
+        if (!imagecopyresampled($dest_image_data, $source_image_data, 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__);
+            return false;
+        }
+
+        // Save image.
+        $return_val = true;
+        switch ($this->getParam('dest_file_type')) {
+        case IMG_JPG :
+            imageinterlace($dest_image_data, (true == $spec['progressive'] ? 1 : 0));
+            $return_val = imagejpeg($dest_image_data, $dest_file, $spec['quality']);
+            break;
+        case IMG_PNG :
+            $return_val = imagepng($dest_image_data, $dest_file);
+            break;
+        case IMG_GIF :
+            $return_val = imagegif($dest_image_data, $dest_file);
+            break;
+        case IMG_WBMP :
+            $return_val = imagewbmp($dest_image_data, $dest_file);
+            break;
+        default :
+            App::logMsg(sprintf('Destination image type %s not supported for image %s.', $this->getParam('dest_file_type'), $dest_file), LOG_WARNING, __FILE__, __LINE__);
+            return false;
+            break;
+        }
+
+        if ($return_val) {
+            // Success!
+            // Make the thumbnail writable so the user can delete it over ftp without being 'apache'.
+            chmod($source_file, $this->getParam('dest_file_perms'));
+            App::logMsg(sprintf('Successfully resized image %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);
+            return true;
         } else {
-            App::logMsg(sprintf('No images found to thumbnail in directory %s.', $this->source_dir), LOG_NOTICE, __FILE__, __LINE__);
-            return 0;
+            // An error occurred.
+            App::logMsg(sprintf('Image %s failed resizing.', $dest_file), LOG_ERR, __FILE__, __LINE__);
+            return false;
         }
     }
@@ -346 +527 @@
     {
         // Ensure we have a source.
-        if (!isset($this->source_dir)) {
+        if ('' == $this->getParam('source_dir')) {
             App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
 
-        $ret = 0;
-        foreach ($this->spec as $s) {
-            $file_path_name = realpath($this->source_dir . '/' . $s['dest_dir'] . '/' . $file_name);
-            if (file_exists($file_path_name)) {
-                if (!unlink($file_path_name)) {
-                    $ret++;
-                    App::logMsg(sprintf(_("Delete thumbs failed: %s"), $file_path_name), LOG_WARNING, __FILE__, __LINE__);
+        $return_val = 0;
+        foreach ($this->image_specs as $spec) {
+            $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $this->getParam('dest_file_extention')));
+            if (file_exists($dest_file)) {
+                if (!unlink($dest_file)) {
+                    $return_val++;
+                    App::logMsg(sprintf(_("Delete thumbs failed: %s"), $dest_file), LOG_WARNING, __FILE__, __LINE__);
                 }
             }
         }
-        $this->raiseMsg(sprintf(_("The thumbnails for file <strong>%s</strong> have been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
-        return (0 == $ret);
+        $this->_raiseMsg(sprintf(_("The thumbnails for file <strong>%s</strong> have been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
+        return 0 === $return_val;
     }
 
@@ -375 +556 @@
     {
         // Ensure we have a source.
-        if (!isset($this->source_dir)) {
+        if ('' == $this->getParam('source_dir')) {
             App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
 
-        $file_path_name = $this->source_dir . '/' . $file_name;
-        if (!unlink($file_path_name)) {
-            App::logMsg(sprintf(_("Delete original failed: %s"), $file_path_name), LOG_WARNING, __FILE__, __LINE__);
-            return false;
-        }
-        $this->raiseMsg(sprintf(_("The original file <strong>%s</strong> has been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
+        $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__);
+            return false;
+        }
+        $this->_raiseMsg(sprintf(_("The original file <strong>%s</strong> has been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
         return true;
     }
@@ -399 +580 @@
     {
         // Ensure we have a source.
-        if (!isset($this->source_dir)) {
+        if ('' == $this->getParam('source_dir')) {
             App::logMsg(sprintf('Source directory not set before processing.'), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
 
-        return file_exists($this->source_dir . '/' . $file_name);
+        $source_file = realpath(sprintf('%s/%s', $this->getParam('source_dir'), $file_name));
+        return file_exists($source_file);
     }
 
@@ -414 +596 @@
      * @return  bool    True on success, false on failure.
      */
-    function validFileExtension($file_name)
+    function _validFileExtension($file_name)
     {
         preg_match('/.*?\.(\w+)$/i', $file_name, $ext);
-        return in_array(strtolower($ext[1]), $this->valid_file_extensions);
-    }
-
-    /**
-     * An alias for App::raiseMsg that only sends messages if display_messages is true.
+        return in_array(strtolower($ext[1]), $this->getParam('valid_file_extensions'));
+    }
+
+    /**
+     * Make directory for each specified thumbnail size, if it doesn't exist.
+     *
+     * @access  public
+     * @return  bool true on success, false on failure.
+     */
+    function _createDestDirs()
+    {
+        static $already_checked = false;
+
+        if (!$already_checked) {
+            // 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__);
+                return false;
+            }
+        
+            // Loop through specs and ensure all dirs are created.
+            $return_val = 0;
+            foreach ($this->image_specs as $spec) {
+                if (!file_exists($this->getParam('source_dir') . '/' . $spec['dest_dir'])) {
+                    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__);
+                    }
+                }
+            }
+
+            // If > 0, there was a problem creating dest dirs.
+            return 0 === $return_val;
+        }
+
+        $already_checked = true;
+    }
+
+    /**
+     * An alias for App::raiseMsg that only sends messages configured by display_messages.
      *
      * @access public
@@ -431 +648 @@
      * @param string $line    __LINE__.
      */
-    function raiseMsg($message, $type, $file, $line)
-    {
-        if ($this->display_messages) {
+    function _raiseMsg($message, $type, $file, $line)
+    {
+        if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && $this->getParam('display_messages') & $type > 0)) {
             App::raiseMsg($message, $type, $file, $line);
         }

trunk/lib/SessionCache.inc.php

@@ -44 +44 @@
     function setParam($params)
     {
-        if (!isset($this) || !is_a($this, 'SessionCache') && !is_subclass_of($this, 'SessionCache')) {
-            $this =& SessionCache::getInstance();
+        if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
+            $_this =& SessionCache::getInstance();
         }
 
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
-            $this->_params = array_merge($this->_params, $params);
+            $_this->_params = array_merge($_this->_params, $params);
         } else {
             App::logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
@@ -65 +65 @@
     function getParam($param)
     {
-        if (!isset($this) || !is_a($this, 'SessionCache') && !is_subclass_of($this, 'SessionCache')) {
-            $this =& SessionCache::getInstance();
-        }
-
-        if (isset($this->_params[$param])) {
-            return $this->_params[$param];
+        if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
+            $_this =& SessionCache::getInstance();
+        }
+
+        if (isset($_this->_params[$param])) {
+            return $_this->_params[$param];
         } else {
             App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
@@ -95 +95 @@
     function putCache($var, $var_id, $force_it_in=false)
     {
-        if (!isset($this) || !is_a($this, 'SessionCache') && !is_subclass_of($this, 'SessionCache')) {
-            $this =& SessionCache::getInstance();
-        }
-
-        if (!$this->getParam('enabled')) {
+        if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
+            $_this =& SessionCache::getInstance();
+        }
+
+        if (!$_this->getParam('enabled')) {
             App::logMsg(sprintf('SessionCache not enabled, not saving data.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
@@ -108 +108 @@
         $serialized_var_len = strlen($serialized_var);
 
-        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__);
-            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__);
+        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__);
+            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__);
             return false;
         }
@@ -123 +123 @@
             unset($_SESSION['_session_cache'][$var_id]);
             // Continue to prune the cache if it's length is too long for the new variable to fit, but keep at least MIN_ITEMS at least.
-            while (strlen(serialize($_SESSION['_session_cache'])) + $serialized_var_len >= $this->getParam('soft_limit')
-            && sizeof($_SESSION['_session_cache']) >= $this->getParam('min_items')) {
+            while (strlen(serialize($_SESSION['_session_cache'])) + $serialized_var_len >= $_this->getParam('soft_limit')
+            && sizeof($_SESSION['_session_cache']) >= $_this->getParam('min_items')) {
                 array_shift($_SESSION['_session_cache']);
             }
@@ -149 +149 @@
     function getCache($var_id)
     {
-        if (!isset($this) || !is_a($this, 'SessionCache') && !is_subclass_of($this, 'SessionCache')) {
-            $this =& SessionCache::getInstance();
-        }
-
-        if (!$this->getParam('enabled')) {
+        if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
+            $_this =& SessionCache::getInstance();
+        }
+
+        if (!$_this->getParam('enabled')) {
             return false;
         }
@@ -179 +179 @@
     function isCached($var_id)
     {
-        if (!isset($this) || !is_a($this, 'SessionCache') && !is_subclass_of($this, 'SessionCache')) {
-            $this =& SessionCache::getInstance();
-        }
-
-        if (!$this->getParam('enabled')) {
+        if (!isset($_this) || !is_a($_this, 'SessionCache') && !is_subclass_of($_this, 'SessionCache')) {
+            $_this =& SessionCache::getInstance();
+        }
+
+        if (!$_this->getParam('enabled')) {
             return false;
         }

trunk/lib/SortOrder.inc.php

@@ -3 +3 @@
  * SortOrder.inc.php
  * Code by Strangecode :: www.strangecode.com :: This document contains copyrighted information
- */
-
-/**
+ *
  * SortOrder can determing how to sort results of a database query for display
  * on a listing. It can print column headers that will be links to
  * automatically change the sort and order.
  *
- * @requires    This class requires App.inc.php
- * @requires    This class requires Utilities.inc.php
  * @requires    This class requires Prefs.inc.php
  *
  * @author  Quinn Comendant <quinn@strangecode.com>
- * @version 1.6.1
+ * @version 1.6.2
  */
-require_once dirname(__FILE__) . '/App.inc.php';
-require_once dirname(__FILE__) . '/Utilities.inc.php';
 require_once dirname(__FILE__) . '/Prefs.inc.php';
 

trunk/lib/Upload.inc.php

@@ -8 +8 @@
  * @author  Quinn Comendant <quinn@strangecode.com>
  * @requires App.inc.php
- * @version 1.3
+ * @version 1.4
  */
 
-// Message Types.
-define('UPLOAD_MSG_ERR', MSG_ERR);
-define('UPLOAD_MSG_ERROR', MSG_ERROR);
-define('UPLOAD_MSG_WARNING', MSG_WARNING);
-define('UPLOAD_MSG_NOTICE', MSG_NOTICE);
-define('UPLOAD_MSG_SUCCESS', MSG_SUCCESS);
-define('UPLOAD_MSG_ALL', MSG_SUCCESS + MSG_NOTICE + MSG_WARNING + MSG_ERROR);
-
-require_once dirname(__FILE__) . '/App.inc.php';
+// Upload error types.
+define('UPLOAD_USER_ERR_EMPTY_FILE', 100);
+define('UPLOAD_USER_ERR_NOT_UPLOADED_FILE', 101);
+define('UPLOAD_USER_ERR_INVALID_EXTENSION', 102);
+define('UPLOAD_USER_ERR_NOT_UNIQUE', 103);
+define('UPLOAD_USER_ERR_MOVE_FAILED', 104);
 
 class Upload {
@@ -27 +24 @@
 
         // Which messages do we pass to raiseMsg?
-        'display_messages' => UPLOAD_MSG_ALL,
+        'display_messages' => MSG_ALL,
 
         // Existing files will be overwritten when there is a name conflict?
@@ -116 +113 @@
         if (!$this->getParam('upload_path')) {
             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__);
+            $this->_raiseMsg(_("There was a problem with the file upload. Please try again later."), MSG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -123 +120 @@
         if (!isset($_FILES[$form_name])) {
             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__);
+            $this->_raiseMsg(_("There was a problem with the file upload. Please try again later."), MSG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -162 +159 @@
                     // Valid custom file name.
                     $file_name = $custom_file_name;
-                    $this->raiseMsg(sprintf(_("The file <strong>%s</strong> has been renamed to <strong>%s</strong>."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                    $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> has been renamed to <strong>%s</strong>."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
                     App::logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
                 } else {
@@ -174 +171 @@
                     // Valid custom file name.
                     $file_name = $custom_file_name[$i];
-                    $this->raiseMsg(sprintf(_("The file <strong>%s</strong> has been renamed to <strong>%s</strong>."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                    $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> has been renamed to <strong>%s</strong>."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
                     App::logMsg(sprintf('Using custom file name: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
                 } else {
@@ -200 +197 @@
             if (UPLOAD_ERR_INI_SIZE === $files['error'][$i]) {
                 if ($this->getParam('display_messages')) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading: it exceeds the maximum allowed upload file size of %s."), $file_name, ini_get('upload_max_filesize')), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_INI_SIZE);
                 continue;
             }
             if (UPLOAD_ERR_FORM_SIZE === $files['error'][$i]) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading: it exceeds the maximum allowed upload file size of %s."), $file_name, $_POST['MAX_FILE_SIZE']), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_FORM_SIZE);
                 continue;
             }
             if (UPLOAD_ERR_PARTIAL === $files['error'][$i]) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading: it was only partially uploaded."), $file_name), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_PARTIAL);
                 continue;
             }
             if (UPLOAD_ERR_NO_FILE === $files['error'][$i]) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading: no file was uploaded."), $file_name), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_NO_FILE);
                 continue;
             }
             if (UPLOAD_ERR_NO_TMP_DIR === $files['error'][$i]) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading: temporary upload directory missing."), $file_name), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_ERR_NO_TMP_DIR);
                 continue;
             }
@@ -233 +230 @@
             // Check to be sure it's an uploaded file.
             if (!is_uploaded_file($files['tmp_name'][$i])) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading."), $file_name), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading."), $file_name), MSG_ERR, __FILE__, __LINE__);
                 App::logMsg(sprintf(_("The file %s failed is_uploaded_file."), $file_name), LOG_ERR, __FILE__, __LINE__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_NOT_UPLOADED_FILE);
                 continue;
             }
 
             // Check to be sure the file is not empty.
-            if ($files['size'][$i] < 1) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading: it contains zero bytes."), $file_name), MSG_ERR, __FILE__, __LINE__);
+            if ($files['size'][$i] <= 0) {
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_EMPTY_FILE);
                 continue;
             }
@@ -249 +246 @@
             // Check to be sure the file has a valid file name extension.
             if (!in_array(strtolower($this->getFilenameExtension($file_name)), $this->getParam('valid_file_extensions'))) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_INVALID_EXTENSION);
                 continue;
             }
@@ -257 +254 @@
             // Check to be sure the file has a unique file name.
             if (!$this->getParam('allow_overwriting') && $this->exists($file_name)) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading: a file with that name already exists."), $file_name), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_NOT_UNIQUE);
                 continue;
             }
@@ -267 +264 @@
                 chmod($file_path_name, $this->getParam('dest_file_perms'));
                 App::logMsg(sprintf('File uploaded: %s', $file_path_name), LOG_INFO, __FILE__, __LINE__);
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> uploaded successfully."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> uploaded successfully."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
                 if (!isset($custom_file_name) && $files['name'][$i] != $file_name) {
                     // Notify user if uploaded file name was modified (unless a custom file name will be used anyways).
-                    $this->raiseMsg(sprintf(_("The file <strong>%s</strong> was renamed to <strong>%s</strong>."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
+                    $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> was renamed to <strong>%s</strong>."), $files['name'][$i], $file_name), MSG_NOTICE, __FILE__, __LINE__);
                 }
                 $new_file_names[] = array(
@@ -279 +276 @@
                 continue;
             } else {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> failed uploading."), $file_name), MSG_ERR, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> 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__);
-                $this->errors[] = $file_name;
+                $this->errors[] = array('filename' => $file_name, 'errortype' => UPLOAD_USER_ERR_MOVE_FAILED);
                 continue;
             }
@@ -313 +310 @@
             App::logMsg(sprintf('Deleted file: %s', $file_path_name), LOG_INFO, __FILE__, __LINE__);
         } else {
-            $this->raiseMsg(sprintf(_("The file <strong>%s</strong> could not be deleted."), $file_name), MSG_ERR, __FILE__, __LINE__);
+            $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> could not be deleted."), $file_name), MSG_ERR, __FILE__, __LINE__);
             App::logMsg(sprintf(_("Failed deleting file: %s"), $file_path_name), LOG_ERR, __FILE__, __LINE__);
             return false;
@@ -339 +336 @@
         if (file_exists($old_file_path_name)) {
             if (rename($old_file_path_name, $new_file_path_name)) {
-                $this->raiseMsg(sprintf(_("The file <strong>%s</strong> has been renamed to <strong>%s</strong>."), basename($old_file_path_name), basename($new_file_path_name)), MSG_NOTICE, __FILE__, __LINE__);
+                $this->_raiseMsg(sprintf(_("The file <strong>%s</strong> has been renamed to <strong>%s</strong>."), 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__);
             } else {
-                $this->raiseMsg(sprintf(_("Error renaming file to %s"), $new_file_path_name), MSG_WARNING, __FILE__, __LINE__);
+                $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__);
                 return false;
             }
         } else {
-            $this->raiseMsg(sprintf(_("Couldn't rename nonexistent file <strong>%s</strong>."), $old_name), MSG_WARNING, __FILE__, __LINE__);
+            $this->_raiseMsg(sprintf(_("Couldn't rename nonexistent file <strong>%s</strong>."), $old_name), MSG_WARNING, __FILE__, __LINE__);
             App::logMsg(sprintf(_("Error renaming nonexistent file: %s"), $old_file_path_name), LOG_WARNING, __FILE__, __LINE__);
             return false;
@@ -455 +452 @@
      * @param string $line    __LINE__.
      */
-    function raiseMsg($message, $type, $file, $line)
-    {
-        if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && $this->getParam('display_messages') >= $type)) {
+    function _raiseMsg($message, $type, $file, $line)
+    {
+        if ($this->getParam('display_messages') === true || (is_int($this->getParam('display_messages')) && $this->getParam('display_messages') & $type > 0)) {
             App::raiseMsg($message, $type, $file, $line);
         }

trunk/services/templates/password.ihtml

@@ -8 +8 @@
         <td class="right"><label for="oldpassword"<?php $fv->err('oldpassword', ' class="error"') ?>><?php echo _("Old password"); ?></label></td>
         <td>
-            <input type="text" class="medium" size="50" name="oldpassword" />
+            <input type="password" class="medium" size="50" name="oldpassword" />
         </td>
     </tr>