Index: branches/eli_branch/lib/ACL.inc.php
===================================================================
--- branches/eli_branch/lib/ACL.inc.php	(revision 438)
+++ branches/eli_branch/lib/ACL.inc.php	(revision 439)
@@ -40,5 +40,5 @@
 
     // Configuration parameters for this object.
-    var $_params = array(
+    private $_params = array(
         
         // If false nothing will be cached or retrieved. Useful for testing realtime data requests.
@@ -52,5 +52,5 @@
      * Constructor.
      */
-    function ACL()
+    public function __construct()
     {
 		$app =& App::getInstance();
@@ -73,5 +73,5 @@
      * @static
      */
-    static function &getInstance()
+    public static function &getInstance()
     {
         static $instance = null;
@@ -91,5 +91,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -110,5 +110,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -129,5 +129,5 @@
      * @since   04 Jun 2006 16:41:42
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
 		$app =& App::getInstance();
@@ -224,5 +224,5 @@
     * @since    14 Jun 2006 22:39:29
     */
-    function add($name, $parent=null, $type)
+    public function add($name, $parent=null, $type)
     {
         $app =& App::getInstance();
@@ -287,13 +287,13 @@
 
     // Alias functions for the different object types.
-    function addRequestObject($name, $parent=null)
+    public function addRequestObject($name, $parent=null)
     {
         return $this->add($name, $parent, 'aro');
     }
-    function addControlObject($name, $parent=null)
+    public function addControlObject($name, $parent=null)
     {
         return $this->add($name, $parent, 'aco');
     }
-    function addXtraObject($name, $parent=null)
+    public function addXtraObject($name, $parent=null)
     {
         return $this->add($name, $parent, 'axo');
@@ -311,5 +311,5 @@
     * @since    14 Jun 2006 22:39:29
     */
-    function remove($name, $type)
+    public function remove($name, $type)
     {
         $app =& App::getInstance();
@@ -368,13 +368,13 @@
     
     // Alias functions for the different object types.
-    function removeRequestObject($name)
+    public function removeRequestObject($name)
     {
         return $this->remove($name, 'aro');
     }
-    function removeControlObject($name)
+    public function removeControlObject($name)
     {
         return $this->remove($name, 'aco');
     }
-    function removeXtraObject($name)
+    public function removeXtraObject($name)
     {
         return $this->remove($name, 'axo');
@@ -393,5 +393,5 @@
     * @since    14 Jun 2006 22:39:29
     */
-    function move($name, $new_parent, $type)
+    public function move($name, $new_parent, $type)
     {
         $app =& App::getInstance();
@@ -490,13 +490,13 @@
     
     // Alias functions for the different object types.
-    function moveRequestObject($name, $new_parent=null)
+    public function moveRequestObject($name, $new_parent=null)
     {
         return $this->move($name, $new_parent, 'aro');
     }
-    function moveControlObject($name, $new_parent=null)
+    public function moveControlObject($name, $new_parent=null)
     {
         return $this->move($name, $new_parent, 'aco');
     }
-    function moveXtraObject($name, $new_parent=null)
+    public function moveXtraObject($name, $new_parent=null)
     {
         return $this->move($name, $new_parent, 'axo');
@@ -516,5 +516,5 @@
     * @since    15 Jun 2006 01:58:48
     */
-    function grant($aro=null, $aco=null, $axo=null, $access='allow')
+    public function grant($aro=null, $aco=null, $axo=null, $access='allow')
     {
         $app =& App::getInstance();
@@ -573,5 +573,5 @@
     * @since    15 Jun 2006 04:35:54
     */
-    function revoke($aro=null, $aco=null, $axo=null)
+    public function revoke($aro=null, $aco=null, $axo=null)
     {
         return $this->grant($aro, $aco, $axo, 'deny');
@@ -591,5 +591,5 @@
     * @since    20 Jun 2006 20:16:12
     */
-    function delete($aro=null, $aco=null, $axo=null)
+    public function delete($aro=null, $aco=null, $axo=null)
     {
         $app =& App::getInstance();
@@ -650,5 +650,5 @@
     * @since    15 Jun 2006 03:58:23
     */
-    function check($aro, $aco=null, $axo=null)
+    public function check($aro, $aco=null, $axo=null)
     {
         $app =& App::getInstance();
Index: branches/eli_branch/lib/App.inc.php
===================================================================
--- branches/eli_branch/lib/App.inc.php	(revision 438)
+++ branches/eli_branch/lib/App.inc.php	(revision 439)
@@ -43,20 +43,20 @@
 
     // Namespace of this application instance.
-    var $_ns;
+    private $_ns;
 
     // If $app->start has run successfully.
-    var $running = false;
+    public $running = false;
 
     // Instance of database object.
-    var $db;
+    public $db;
 
     // Array of query arguments will be carried persistently between requests.
-    var $_carry_queries = array();
+    private $_carry_queries = array();
 
     // Dictionary of global application parameters.
-    var $_params = array();
+    private $_params = array();
 
     // Default parameters.
-    var $_param_defaults = array(
+    private $_param_defaults = array(
 
         // Public name and email address for this application.
@@ -169,5 +169,5 @@
      * @static
      */
-    static function &getInstance($namespace='')
+    public static function &getInstance($namespace='')
     {
         static $instance = null;
@@ -183,5 +183,5 @@
      * Constructor.
      */
-    function App($namespace='')
+    public function __construct($namespace='')
     {
         // Set namespace of application instance.
@@ -203,5 +203,5 @@
      * @param  array    $param     Array of parameters (key => val pairs).
      */
-    function setParam($param=null)
+    public function setParam($param=null)
     {
         if (isset($param) && is_array($param)) {
@@ -218,5 +218,5 @@
      * @return  mixed               Parameter value, or null if not existing.
      */
-    function getParam($param=null)
+    public function getParam($param=null)
     {
         if ($param === null) {
@@ -237,5 +237,5 @@
      * @since   15 Jul 2005 00:32:21
      */
-    function start()
+    public function start()
     {
         if ($this->running) {
@@ -394,5 +394,5 @@
      * @since   17 Jul 2005 17:20:18
      */
-    function stop()
+    public function stop()
     {
         session_write_close();
@@ -421,5 +421,5 @@
      * @param string $line    __LINE__.
      */
-    function raiseMsg($message, $type=MSG_NOTICE, $file=null, $line=null)
+    public function raiseMsg($message, $type=MSG_NOTICE, $file=null, $line=null)
     {
         $message = trim($message);
@@ -463,5 +463,5 @@
      * @since   21 Dec 2005 13:09:20
      */
-    function getRaisedMessages()
+    public function getRaisedMessages()
     {
         if (!$this->running) {
@@ -480,5 +480,5 @@
      * @since   21 Dec 2005 13:21:54
      */
-    function clearRaisedMessages()
+    public function clearRaisedMessages()
     {
         if (!$this->running) {
@@ -501,5 +501,5 @@
      * @since   15 Jul 2005 01:39:14
      */
-    function printRaisedMessages($above='', $below='', $print_gotohash_js=false, $hash='sc-msg')
+    public function printRaisedMessages($above='', $below='', $print_gotohash_js=false, $hash='sc-msg')
     {
         if (!$this->running) {
@@ -574,5 +574,5 @@
      * @param string $line      The line of the file where the log event occurs.
      */
-    function logMsg($message, $priority=LOG_INFO, $file=null, $line=null)
+    public function logMsg($message, $priority=LOG_INFO, $file=null, $line=null)
     {
         static $previous_events = array();
@@ -704,5 +704,5 @@
      * @return                The string representation of $priority.
      */
-    function logPriorityToString($priority) {
+    public function logPriorityToString($priority) {
         $priorities = array(
             LOG_EMERG   => 'emergency',
@@ -733,5 +733,5 @@
      * @since   13 Oct 2007 11:34:51
      */
-    function setQuery($query_key, $val)
+    public function setQuery($query_key, $val)
     {
         if (!is_array($query_key)) {
@@ -755,5 +755,5 @@
      * @since   14 Nov 2005 19:24:52
      */
-    function carryQuery($query_key, $default=false)
+    public function carryQuery($query_key, $default=false)
     {
         if (!is_array($query_key)) {
@@ -780,5 +780,5 @@
      * @since   18 Jun 2007 20:57:29
      */
-    function dropQuery($query_key, $unset=false)
+    public function dropQuery($query_key, $unset=false)
     {
         if (!is_array($query_key)) {
@@ -816,5 +816,5 @@
      * @return string url with attached queries and, if not using cookies, the session id
      */
-    function url($url, $carry_args=null, $always_include_sid=false)
+    public function url($url, $carry_args=null, $always_include_sid=false)
     {
         if (!$this->running) {
@@ -907,5 +907,5 @@
      * @since   09 Dec 2005 17:58:45
      */
-    function oHREF($url, $carry_args=null, $always_include_sid=false)
+    public function oHREF($url, $carry_args=null, $always_include_sid=false)
     {
         $url = $this->url($url, $carry_args, $always_include_sid);
@@ -927,5 +927,5 @@
      *                                      false  <-- To not carry any queries. If URL already has queries those will be retained.
      */
-    function printHiddenSession($carry_args=null)
+    public function printHiddenSession($carry_args=null)
     {
         if (!$this->running) {
@@ -986,5 +986,5 @@
      * @param   bool    $always_include_sid     Force session id to be added to Location header.
      */
-    function dieURL($url, $carry_args=null, $always_include_sid=false)
+    public function dieURL($url, $carry_args=null, $always_include_sid=false)
     {
         if (!$this->running) {
@@ -1033,5 +1033,5 @@
     * @since    31 Mar 2006 19:17:00
     */
-    function dieBoomerangURL($id=null, $carry_args=null, $default_url=null, $queryless_referrer_comparison=false)
+    public function dieBoomerangURL($id=null, $carry_args=null, $default_url=null, $queryless_referrer_comparison=false)
     {
         if (!$this->running) {
@@ -1076,5 +1076,5 @@
      * FIXME: url garbage collection?
      */
-    function setBoomerangURL($url=null, $id=null)
+    public function setBoomerangURL($url=null, $id=null)
     {
         if (!$this->running) {
@@ -1115,5 +1115,5 @@
      * @param string  $id     An identification tag for this url.
      */
-    function getBoomerangURL($id=null)
+    public function getBoomerangURL($id=null)
     {
         if (!$this->running) {
@@ -1140,5 +1140,5 @@
      * @param string  $id     An identification tag for this url.
      */
-    function deleteBoomerangURL($id=null)
+    public function deleteBoomerangURL($id=null)
     {
         if (!$this->running) {
@@ -1162,5 +1162,5 @@
      * @return bool  True if it is set and valid, false otherwise.
      */
-    function validBoomerangURL($id=null, $use_nonspecificboomerang=false)
+    public function validBoomerangURL($id=null, $use_nonspecificboomerang=false)
     {
         if (!$this->running) {
@@ -1212,5 +1212,5 @@
      * the same page but with https.
      */
-    function sslOn()
+    public function sslOn()
     {
         if (function_exists('apache_get_modules')) {
@@ -1233,5 +1233,5 @@
      * a http version of the current url.
      */
-    function sslOff()
+    public function sslOff()
     {
         if ('' != getenv('HTTPS')) {
@@ -1242,4 +1242,2 @@
 
 } // End.
-
-?>
Index: branches/eli_branch/lib/Auth_File.inc.php
===================================================================
--- branches/eli_branch/lib/Auth_File.inc.php	(revision 438)
+++ branches/eli_branch/lib/Auth_File.inc.php	(revision 439)
@@ -4,5 +4,5 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11,10 +11,10 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -30,5 +30,5 @@
  * @version 1.2
  */
- 
+
 // Usage example:
 // $auth = new Auth_File();
@@ -47,35 +47,34 @@
 
 class Auth_File {
-    
+
     // Namespace of this auth object.
-    var $_ns;
-    
+    private $_ns;
+
     // Parameters to be specified by setParam().
-    var $_params = array();
-    var $_default_params = array(
-        
-        // Full path to htpasswd file.
-        'htpasswd_file' => null,
-
-        // The type of encryption to use for passwords stored in the db_table. Use one of the AUTH_ENCRYPT_* types specified above.
-        'encryption_type' => AUTH_ENCRYPT_CRYPT,
-
-        // The URL to the login script.
-        'login_url' => '/',
-
-        // The maximum amount of time a user is allowed to be logged in. They will be forced to login again if they expire.
-        // This applies to admins and users. In seconds. 21600 seconds = 6 hours.
-        'login_timeout' => 21600,
-
-        // The maximum amount of time a user is allowed to be idle before their session expires. They will be forced to login again if they expire.
-        // This applies to admins and users. In seconds. 3600 seconds = 1 hour.
-        'idle_timeout' => 3600,
-
-        // An array of IP blocks that are bypass the remote_ip comparison check. Useful for dynamic IPs or those behind proxy servers.
-        'trusted_networks' => array(),
-    );
+    private $_params = array();
+    private $_default_params = array(
+
+    // Full path to htpasswd file.
+    'htpasswd_file' => null,
+
+    // The type of encryption to use for passwords stored in the db_table. Use one of the AUTH_ENCRYPT_* types specified above.
+    'encryption_type' => AUTH_ENCRYPT_CRYPT,
+
+    // The URL to the login script.
+    'login_url' => '/',
+
+    // The maximum amount of time a user is allowed to be logged in. They will be forced to login again if they expire.
+    // This applies to admins and users. In seconds. 21600 seconds = 6 hours.
+    'login_timeout' => 21600,
+
+    // The maximum amount of time a user is allowed to be idle before their session expires. They will be forced to login again if they expire.
+    // This applies to admins and users. In seconds. 3600 seconds = 1 hour.
+    'idle_timeout' => 3600,
+
+    // An array of IP blocks that are bypass the remote_ip comparison check. Useful for dynamic IPs or those behind proxy servers.
+    'trusted_networks' => array(), );
 
     // Associative array of usernames to hashed passwords.
-    var $_users = array();
+    private $_users = array();
 
     /**
@@ -86,10 +85,9 @@
      * @param optional array $params  A hash containing parameters.
      */
-    function Auth_File($namespace='')
-    {
-        $this->_ns = $namespace;
+    public function __construct($namespace = '') {
+        $this -> _ns = $namespace;
 
         // Initialize default parameters.
-        $this->setParam($this->_default_params);
+        $this -> setParam($this -> _default_params);
     }
 
@@ -100,9 +98,8 @@
      * @return bool true on success, false on failure
      */
-    function setParam($params)
-    {
+    public function setParam($params) {
         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);
         }
     }
@@ -115,12 +112,11 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
-    {
-		$app =& App::getInstance();
-    
-        if (isset($this->_params[$param])) {
-            return $this->_params[$param];
+    public function getParam($param) {
+        $app = &App::getInstance();
+
+        if (isset($this -> _params[$param])) {
+            return $this -> _params[$param];
         } else {
-            $app->logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            $app -> logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -132,9 +128,7 @@
      * @access public
      */
-    function clear()
-    {
-        $_SESSION['_auth_file'][$this->_ns] = array('authenticated' => false);
-    }
-
+    public function clear() {
+        $_SESSION['_auth_file'][$this -> _ns] = array('authenticated' => false);
+    }
 
     /**
@@ -145,10 +139,9 @@
      * @param mixed $val      Value to set variable to.
      */
-    function set($key, $val)
-    {
-        if (!isset($_SESSION['_auth_file'][$this->_ns]['user_data'])) {
-            $_SESSION['_auth_file'][$this->_ns]['user_data'] = array();
-        }
-        $_SESSION['_auth_file'][$this->_ns]['user_data'][$key] = $val;
+    public function set($key, $val) {
+        if (!isset($_SESSION['_auth_file'][$this -> _ns]['user_data'])) {
+            $_SESSION['_auth_file'][$this -> _ns]['user_data'] = array();
+        }
+        $_SESSION['_auth_file'][$this -> _ns]['user_data'][$key] = $val;
     }
 
@@ -161,14 +154,14 @@
      * @return mixed          Value stored in session.
      */
-    function get($key, $default='')
-    {
-        if (isset($_SESSION['_auth_file'][$this->_ns][$key])) {
-            return $_SESSION['_auth_file'][$this->_ns][$key];
-        } else if (isset($_SESSION['_auth_file'][$this->_ns]['user_data'][$key])) {
-            return $_SESSION['_auth_file'][$this->_ns]['user_data'][$key];
+    public function get($key, $default = '') {
+        if (isset($_SESSION['_auth_file'][$this -> _ns][$key])) {
+            return $_SESSION['_auth_file'][$this -> _ns][$key];
+        } else if (isset($_SESSION['_auth_file'][$this -> _ns]['user_data'][$key])) {
+            return $_SESSION['_auth_file'][$this -> _ns]['user_data'][$key];
         } else {
             return $default;
         }
     }
+
     /**
      * Find out if a set of login credentials are valid. Only supports
@@ -182,26 +175,25 @@
      * @return boolean  Whether or not the credentials are valid.
      */
-    function authenticate($username, $password)
-    {
-		$app =& App::getInstance();
-    
+    public function authenticate($username, $password) {
+        $app = &App::getInstance();
+
         if ('' == trim($password)) {
-            $app->logMsg(_("No password provided for authentication."), LOG_INFO, __FILE__, __LINE__);
-            return false;
-        }
-        
+            $app -> logMsg(_("No password provided for authentication."), LOG_INFO, __FILE__, __LINE__);
+            return false;
+        }
+
         // Load users file.
-        $this->_loadHTPasswdFile();
-
-        if (!isset($this->_users[$username])) {
-            $app->logMsg(_("User ID provided does not exist."), LOG_INFO, __FILE__, __LINE__);
-            return false;
-        }
-
-        if ($this->_encrypt($password, $this->_users[$username]) != $this->_users[$username]) {
-            $app->logMsg(sprintf('Authentication failed for user %s', $username), LOG_INFO, __FILE__, __LINE__);
-            return false;
-        }
-        
+        $this -> _loadHTPasswdFile();
+
+        if (!isset($this -> _users[$username])) {
+            $app -> logMsg(_("User ID provided does not exist."), LOG_INFO, __FILE__, __LINE__);
+            return false;
+        }
+
+        if ($this -> _encrypt($password, $this -> _users[$username]) != $this -> _users[$username]) {
+            $app -> logMsg(sprintf('Authentication failed for user %s', $username), LOG_INFO, __FILE__, __LINE__);
+            return false;
+        }
+
         // Authentication successful!
         return true;
@@ -218,22 +210,15 @@
      * @return boolean  Whether or not the credentials are valid.
      */
-    function login($username, $password)
-    {
+    public function login($username, $password) {
         $username = mb_strtolower(trim($username));
 
-        $this->clear();
-
-        if (!$this->authenticate($username, $password)) {
+        $this -> clear();
+
+        if (!$this -> authenticate($username, $password)) {
             // No login: failed authentication!
             return false;
         }
-        
-        $_SESSION['_auth_file'][$this->_ns] = array(
-            'authenticated' => true,
-            'username' => $username,
-            'login_datetime' => date('Y-m-d H:i:s'),
-            'last_access_datetime' => date('Y-m-d H:i:s'),
-            'remote_ip' => getRemoteAddr()
-        );
+
+        $_SESSION['_auth_file'][$this -> _ns] = array('authenticated' => true, 'username' => $username, 'login_datetime' => date('Y-m-d H:i:s'), 'last_access_datetime' => date('Y-m-d H:i:s'), 'remote_ip' => getRemoteAddr());
 
         // We're logged-in!
@@ -251,15 +236,14 @@
      * @access public
      */
-    function isLoggedIn()
-    {
-		$app =& App::getInstance();
-    
+    public function isLoggedIn() {
+        $app = &App::getInstance();
+
         // Some users will access from networks with a changing IP number (i.e. behind a proxy server). These users must be allowed entry by adding their IP to the list of trusted_networks.
-        if ($trusted_net = ipInRange(getRemoteAddr(), $this->_params['trusted_networks'])) {
+        if ($trusted_net = ipInRange(getRemoteAddr(), $this -> _params['trusted_networks'])) {
             $user_in_trusted_network = true;
-            $app->logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION['_auth_file'][$this->_ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
+            $app -> logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION['_auth_file'][$this -> _ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
         } else if (preg_match('/proxy.aol.com$/i', getRemoteAddr(true))) {
             $user_in_trusted_network = true;
-            $app->logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION['_auth_file'][$this->_ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
+            $app -> logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION['_auth_file'][$this -> _ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             $user_in_trusted_network = false;
@@ -267,35 +251,29 @@
 
         // Test login with information stored in session. Skip IP matching for users from trusted networks.
-        if (isset($_SESSION['_auth_file'][$this->_ns])
-            && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']
-            && !empty($_SESSION['_auth_file'][$this->_ns]['username'])
-            && strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
-            && strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
-            && ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
-        ) {
+        if (isset($_SESSION['_auth_file'][$this -> _ns]) && true === $_SESSION['_auth_file'][$this -> _ns]['authenticated'] && !empty($_SESSION['_auth_file'][$this -> _ns]['username']) && strtotime($_SESSION['_auth_file'][$this -> _ns]['login_datetime']) > time() - $this -> _params['login_timeout'] && strtotime($_SESSION['_auth_file'][$this -> _ns]['last_access_datetime']) > time() - $this -> _params['idle_timeout'] && ($_SESSION['_auth_file'][$this -> _ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)) {
             // User is authenticated!
-            $_SESSION['_auth_file'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
+            $_SESSION['_auth_file'][$this -> _ns]['last_access_datetime'] = date('Y-m-d H:i:s');
             return true;
-        } else if (isset($_SESSION['_auth_file'][$this->_ns]) && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']) {
-            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - 43200) {
+        } else if (isset($_SESSION['_auth_file'][$this -> _ns]) && true === $_SESSION['_auth_file'][$this -> _ns]['authenticated']) {
+            if (strtotime($_SESSION['_auth_file'][$this -> _ns]['last_access_datetime']) > time() - 43200) {
                 // Only raise message if last session is less than 12 hours old.
-                $app->raiseMsg(_("Your session has closed. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
+                $app -> raiseMsg(_("Your session has closed. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
             }
 
             // Log the reason for login expiration.
             $expire_reasons = array();
-            if (empty($_SESSION['_auth_file'][$this->_ns]['username'])) {
+            if (empty($_SESSION['_auth_file'][$this -> _ns]['username'])) {
                 $expire_reasons[] = 'username not found';
             }
-            if (strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
+            if (strtotime($_SESSION['_auth_file'][$this -> _ns]['login_datetime']) <= time() - $this -> _params['login_timeout']) {
                 $expire_reasons[] = 'login_timeout expired';
             }
-            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
+            if (strtotime($_SESSION['_auth_file'][$this -> _ns]['last_access_datetime']) <= time() - $this -> _params['idle_timeout']) {
                 $expire_reasons[] = 'idle_timeout expired';
             }
-            if ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
-                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_file'][$this->_ns]['remote_ip'], getRemoteAddr());
-            }
-            $app->logMsg(sprintf('User %s session expired: %s', $_SESSION['_auth_file'][$this->_ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
+            if ($_SESSION['_auth_file'][$this -> _ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
+                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_file'][$this -> _ns]['remote_ip'], getRemoteAddr());
+            }
+            $app -> logMsg(sprintf('User %s session expired: %s', $_SESSION['_auth_file'][$this -> _ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
         }
 
@@ -313,18 +291,17 @@
      * @access public
      */
-    function requireLogin($message='', $type=MSG_NOTICE, $file=null, $line=null)
-    {
-		$app =& App::getInstance();
-    
-        if (!$this->isLoggedIn()) {
+    public function requireLogin($message = '', $type = MSG_NOTICE, $file = null, $line = null) {
+        $app = &App::getInstance();
+
+        if (!$this -> isLoggedIn()) {
             // Display message for requiring login. (RaiseMsg will ignore empty strings.)
-            $app->raiseMsg($message, $type, $file, $line);
+            $app -> raiseMsg($message, $type, $file, $line);
 
             // Login scripts must have the same 'login' tag for boomerangURL verification/manipulation.
-            $app->setBoomerangURL(absoluteMe(), 'login');
-            $app->dieURL($this->_params['login_url']);
-        }
-    }
-    
+            $app -> setBoomerangURL(absoluteMe(), 'login');
+            $app -> dieURL($this -> _params['login_url']);
+        }
+    }
+
     /**
      * Wrapper function for compatibility with lib/Lock.inc.php.
@@ -333,6 +310,5 @@
      * @return string               Username, or false if none found.
      */
-    function getUsername($username)
-    {
+    public function getUsername($username) {
         if ('' != $username) {
             return $username;
@@ -343,26 +319,25 @@
 
     /*
-    * Reads the configured htpasswd file into the _users array.
-    *
-    * @access   public
-    * @return   false on error, true on success.
-    * @author   Quinn Comendant <quinn@strangecode.com>
-    * @version  1.0
-    * @since    18 Apr 2006 18:17:48
-    */
-    function _loadHTPasswdFile()
-    {
-		$app =& App::getInstance();
-    
+     * Reads the configured htpasswd file into the _users array.
+     *
+     * @access   public
+     * @return   false on error, true on success.
+     * @author   Quinn Comendant <quinn@strangecode.com>
+     * @version  1.0
+     * @since    18 Apr 2006 18:17:48
+     */
+    private function _loadHTPasswdFile() {
+        $app = &App::getInstance();
+
         static $users = null;
-        
-        if (!file_exists($this->_params['htpasswd_file'])) {
-            $app->logMsg(sprintf('htpasswd file missing or not specified: %s', $this->_params['htpasswd_file']), LOG_ERR, __FILE__, __LINE__);
-            return false;
-        }
-        
+
+        if (!file_exists($this -> _params['htpasswd_file'])) {
+            $app -> logMsg(sprintf('htpasswd file missing or not specified: %s', $this -> _params['htpasswd_file']), LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+
         if (!isset($users)) {
-            if (false === ($users = file($this->_params['htpasswd_file']))) {
-                $app->logMsg(sprintf('Could not read htpasswd file: %s', $this->_params['htpasswd_file']), LOG_ERR, __FILE__, __LINE__);
+            if (false === ($users = file($this -> _params['htpasswd_file']))) {
+                $app -> logMsg(sprintf('Could not read htpasswd file: %s', $this -> _params['htpasswd_file']), LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -372,5 +347,5 @@
             foreach ($users as $u) {
                 list($user, $pass) = explode(':', $u, 2);
-                $this->_users[trim($user)] = trim($pass);
+                $this -> _users[trim($user)] = trim($pass);
             }
             return true;
@@ -388,26 +363,24 @@
      * @return string  The hashed password.
      */
-    function _encrypt($password, $encrypted_password=null)
-    {
+    private function _encrypt($password, $encrypted_password = null) {
         switch ($this->_params['encryption_type']) {
-        case AUTH_ENCRYPT_PLAINTEXT :
-            return $password;
-            break;
-
-        case AUTH_ENCRYPT_SHA1 :
-            return sha1($password);
-            break;
-
-        case AUTH_ENCRYPT_MD5 :
-            return md5($password);
-            break;
-
-        case AUTH_ENCRYPT_CRYPT :
-        default :
-            return crypt($password, $encrypted_password);
-            break;
+            case AUTH_ENCRYPT_PLAINTEXT :
+                return $password;
+                break;
+
+            case AUTH_ENCRYPT_SHA1 :
+                return sha1($password);
+                break;
+
+            case AUTH_ENCRYPT_MD5 :
+                return md5($password);
+                break;
+
+            case AUTH_ENCRYPT_CRYPT :
+            default :
+                return crypt($password, $encrypted_password);
+                break;
         }
     }
 
 } // end class
-?>
Index: branches/eli_branch/lib/Auth_SQL.inc.php
===================================================================
--- branches/eli_branch/lib/Auth_SQL.inc.php	(revision 438)
+++ branches/eli_branch/lib/Auth_SQL.inc.php	(revision 439)
@@ -41,12 +41,12 @@
         
     // Namespace of this auth object.
-    var $_ns;
+    private $_ns;
     
     // Static var for test.
-    var $_authentication_tested;
+    private $_authentication_tested;
 
     // Parameters to be configured by setParam.
-    var $_params = array();
-    var $_default_params = array(
+    private $_params = array();
+    private $_default_params = array(
 
         // Automatically create table and verify columns. Better set to false after site launch.
@@ -127,5 +127,5 @@
      * @param optional array $params  A hash containing parameters.
      */
-    function Auth_SQL($namespace='')
+    public function __construct($namespace='')
     {
 		$app =& App::getInstance();
@@ -153,5 +153,5 @@
      * @since   26 Aug 2005 17:09:36
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
 		$app =& App::getInstance();
@@ -253,5 +253,5 @@
      * @return bool true on success, false on failure
      */
-    function setParam($params)
+    public function setParam($params)
     {
         if (isset($params['match_remote_ip_exempt_usernames'])) {
@@ -274,5 +274,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -291,5 +291,5 @@
      * @access public
      */
-    function clear()
+    public function clear()
     {
 		$db =& DB::getInstance();
@@ -326,5 +326,5 @@
      * @param mixed $val      Value to set variable to.
      */
-    function set($key, $val)
+    public function set($key, $val)
     {
         if (!isset($_SESSION['_auth_sql'][$this->_ns]['user_data'])) {
@@ -342,5 +342,5 @@
      * @return mixed          Value stored in session.
      */
-    function get($key, $default='')
+    public function get($key, $default='')
     {
         if (isset($_SESSION['_auth_sql'][$this->_ns][$key])) {
@@ -361,5 +361,5 @@
      * @return mixed  False if credentials not found in DB, or returns DB row matching credentials.
      */
-    function authenticate($username, $password)
+    public function authenticate($username, $password)
     {
 		$app =& App::getInstance();
@@ -412,5 +412,5 @@
      * @return boolean  Whether or not the credentials are valid.
      */
-    function login($username, $password)
+    public function login($username, $password)
     {
 		$app =& App::getInstance();
@@ -534,5 +534,5 @@
      * @access public
      */
-    function isLoggedIn($user_id=null)
+    public function isLoggedIn($user_id=null)
     {
 		$app =& App::getInstance();
@@ -668,5 +668,5 @@
      * @access public
      */
-    function requireLogin($message='', $type=MSG_NOTICE, $file=null, $line=null)
+    public function requireLogin($message='', $type=MSG_NOTICE, $file=null, $line=null)
     {
 		$app =& App::getInstance();
@@ -690,5 +690,5 @@
      * @param  string   $reason      The reason for blocking the account.
      */
-    function blockAccount($user_id=null, $reason='')
+    public function blockAccount($user_id=null, $reason='')
     {
 		$app =& App::getInstance();
@@ -720,5 +720,5 @@
      * @return boolean              True if the user is blocked, false otherwise.
      */
-    function isBlocked($user_id=null)
+    public function isBlocked($user_id=null)
     {
     	$db =& DB::getInstance();
@@ -742,5 +742,5 @@
      * Unblocks a user in the db_table, and clears any blocked_reason.
      */
-    function unblockAccount($user_id=null)
+    public function unblockAccount($user_id=null)
     {
 		$db =& DB::getInstance();
@@ -766,5 +766,5 @@
      * @return bool                 True if username exists.
      */
-    function usernameExists($username)
+    public function usernameExists($username)
     {
 		$db =& DB::getInstance();
@@ -786,5 +786,5 @@
      * @return string               Username, or false if none found.
      */
-    function getUsername($user_id)
+    public function getUsername($user_id)
     {
 		$db =& DB::getInstance();
@@ -820,5 +820,5 @@
      * @return string           a password
      */
-    function generatePassword($pattern='CvcdCvc')
+    public function generatePassword($pattern='CvcdCvc')
     {
         $app =& App::getInstance();
@@ -843,5 +843,5 @@
      *
      */
-    function encryptPassword($password, $salt=null)
+    public function encryptPassword($password, $salt=null)
     {
         $app =& App::getInstance();
@@ -898,5 +898,5 @@
      *
      */
-    function setPassword($user_id=null, $password)
+    public function setPassword($user_id=null, $password)
     {
 		$app =& App::getInstance();
@@ -948,5 +948,5 @@
      * @return string            The user's new password.
      */
-    function resetPassword($user_id=null, $reason='')
+    public function resetPassword($user_id=null, $reason='')
     {
 		$app =& App::getInstance();
@@ -1013,5 +1013,5 @@
      * @return bool     true if user is a member of security zone, false otherwise
      */
-    function inClearanceZone($security_zone, $user_type='')
+    public function inClearanceZone($security_zone, $user_type='')
     {
         // return true; /// WTF?
@@ -1036,5 +1036,5 @@
      * @param  constant $security_zone   string of comma delimited privileges for the zone
      */
-    function requireAccessClearance($security_zone, $message='')
+    public function requireAccessClearance($security_zone, $message='')
     {
 		$app =& App::getInstance();
@@ -1094,3 +1094,2 @@
 // 128.0.0.0        10000000.00000000.00000000.00000000  /1
 // 0.0.0.0          00000000.00000000.00000000.00000000  /0   IP space
-?>
Index: branches/eli_branch/lib/AuthorizeNet.inc.php
===================================================================
--- branches/eli_branch/lib/AuthorizeNet.inc.php	(revision 438)
+++ branches/eli_branch/lib/AuthorizeNet.inc.php	(revision 439)
@@ -61,8 +61,8 @@
 class AuthorizeNet {
 
-    var $post_url = ''; // The URL to post data to.
-    var $_results = array();
-    var $_params = array();
-    var $_default_params = array(
+    public $post_url = ''; // The URL to post data to.
+    private $_results = array();
+    private $_params = array();
+    private $_default_params = array(
         'x_version'         => '3.1',
         'x_relay_response'  => 'FALSE',
@@ -80,5 +80,5 @@
 
     // Array of response names. Used in the results array.
-    var $_result_fields = Array(
+    private $_result_fields = Array(
         'x_response_code',
         'x_response_subcode',
@@ -129,5 +129,5 @@
      * @param optional array $_params  A hash containing parameters.
      */
-    function AuthorizeNet($params = array())
+    public function __construct($params = array())
     {
         $app =& App::getInstance();
@@ -153,5 +153,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -172,5 +172,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -192,5 +192,5 @@
      * @return mixed      False or x_response_code: false = error, 1 = accepted, 2 = declined, 3 = error
      */
-    function process()
+    public function process()
     {
 		$app =& App::getInstance();
@@ -245,5 +245,5 @@
      * @return array             Returns the results array.
      */
-    function getResult($key=null)
+    public function getResult($key=null)
     {
         if (isset($key)) {
@@ -265,5 +265,5 @@
      * @return bool             True if the hash is valid, false otherwise.
      */
-    function validMD5Hash()
+    public function validMD5Hash()
     {
         return (
@@ -282,5 +282,5 @@
      * @access public
      */
-    function reset()
+    public function reset()
     {
         $this->_results = Array();
@@ -297,5 +297,5 @@
      * @return integer      Transaction result code.
      */
-    function _processResult($result)
+    private function _processResult($result)
     {
         $this->_results = Array();
Index: branches/eli_branch/lib/CSS.inc.php
===================================================================
--- branches/eli_branch/lib/CSS.inc.php	(revision 438)
+++ branches/eli_branch/lib/CSS.inc.php	(revision 439)
@@ -32,8 +32,8 @@
 
     // Include these style sheets.
-    var $_css_files = array('default' => array());
+    private $_css_files = array('default' => array());
 
     // CSS object parameters.
-    var $_params = array(
+    private $_params = array(
         'character_set' => 'utf-8',
         'cache_css' => false,
@@ -48,5 +48,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -67,5 +67,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -87,5 +87,5 @@
      * @return  bool    True on success, false on failure.
      */
-    function setFile($file, $realms='')
+    public function setFile($file, $realms='')
     {
 		$app =& App::getInstance();
@@ -115,5 +115,5 @@
      * @return  bool    False if no files have been set.
      */
-    function headers($realm='')
+    public function headers($realm='')
     {
 		$app =& App::getInstance();
@@ -157,5 +157,5 @@
      * @return  bool    False if no files have been set.
      */
-    function output($realm='')
+    public function output($realm='')
     {
         $realm = '' == $realm ? 'default' : $realm;
@@ -181,3 +181,2 @@
     }
 }
-?>
Index: branches/eli_branch/lib/Cache.inc.php
===================================================================
--- branches/eli_branch/lib/Cache.inc.php	(revision 438)
+++ branches/eli_branch/lib/Cache.inc.php	(revision 439)
@@ -38,8 +38,8 @@
 
     // Namespace of this instance of Prefs.
-    var $_ns;
+    private $_ns;
 
     // Configuration parameters for this object.
-    var $_params = array(
+    private $_params = array(
         
         // If false nothing will be cached or retrieved. Useful for testing realtime data requests.
@@ -65,5 +65,5 @@
     * @since    05 Jun 2006 23:14:21
     */
-    function Cache($namespace='')
+    function __construct($namespace='')
     {
         $app =& App::getInstance();
@@ -88,5 +88,5 @@
      * @static
      */
-    static function &getInstance($namespace='')
+    public static function &getInstance($namespace='')
     {
         static $instances = array();
@@ -105,5 +105,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -124,5 +124,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -148,5 +148,5 @@
      * @return bool             True on success, false otherwise.
      */
-    function set($key, $var, $flags=0)
+    public function set($key, $var, $flags=0)
     {
 		$app =& App::getInstance();
@@ -197,5 +197,5 @@
      * @return mixed          The requested datum, or false on failure.
      */
-    function get($key)
+    public function get($key)
     {
         $app =& App::getInstance();
@@ -226,5 +226,5 @@
      * @return bool         True if a value exists for the given key.
      */
-    function exists($key)
+    public function exists($key)
     {
         $app =& App::getInstance();
@@ -244,5 +244,5 @@
      * @return bool         True if the value existed before being unset.
      */
-    function delete($key)
+    public function delete($key)
     {
         if (array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
@@ -262,5 +262,5 @@
     * @since    05 Jun 2006 23:51:34
     */
-    function clear()
+    public function clear()
     {
         $_SESSION['_cache'][$this->_ns] = array();
Index: branches/eli_branch/lib/Captcha.inc.php
===================================================================
--- branches/eli_branch/lib/Captcha.inc.php	(revision 438)
+++ branches/eli_branch/lib/Captcha.inc.php	(revision 439)
@@ -54,7 +54,7 @@
 class Captcha {
 
-    var $secret_key = 'some random seed text for the md5';
-    var $random_number;
-    var $ascii_numbers = array(
+    public $secret_key = 'some random seed text for the md5';
+    public $random_number;
+    public $ascii_numbers = array(
         array(
             '  #####   ',
@@ -147,5 +147,5 @@
      * @since   20 Jan 2006 13:08:22
      */
-    function Captcha()
+    public function __construct()
     {
 		$app =& App::getInstance();
@@ -164,5 +164,5 @@
      * @since   07 Dec 2005 21:59:25
      */
-    function getAsciiNumber($num=null)
+    public function getAsciiNumber($num=null)
     {
 		$app =& App::getInstance();
@@ -200,5 +200,5 @@
      * @since   07 Dec 2005 22:09:04
      */
-    function printAsciiNumber()
+    public function printAsciiNumber()
     {
         $ascii = $this->getAsciiNumber($this->random_number);
@@ -213,5 +213,5 @@
      * @since   07 Dec 2005 22:09:04
      */
-    function printForm()
+    public function printForm()
     {
         $hash = $this->_getMD5key($this->random_number);
@@ -231,5 +231,5 @@
      * @since   07 Dec 2005 22:19:33
      */
-    function valid()
+    public function valid()
     {
         $number = getFormData('sc-captcha-input');
@@ -251,5 +251,5 @@
      * @since   07 Dec 2005 21:40:25
      */
-    function _getRandomNumber()
+    public function _getRandomNumber()
     {
         return mb_substr(strval(rand(10000, 99999)), 0, rand(3, 5));
@@ -265,5 +265,5 @@
      * @since   07 Dec 2005 21:53:35
      */
-    function _getMD5key($input)
+    public function _getMD5key($input)
     {
         return md5($this->secret_key . $input);
@@ -272,3 +272,2 @@
 }
 
-?>
Index: branches/eli_branch/lib/Cart.inc.php
===================================================================
--- branches/eli_branch/lib/Cart.inc.php	(revision 438)
+++ branches/eli_branch/lib/Cart.inc.php	(revision 439)
@@ -71,8 +71,8 @@
 
     // Namespace of this instance.
-    var $_ns;
+    private $_ns;
 
     // Configuration parameters for this object.
-    var $_params = array(
+    private $_params = array(
     );
 
@@ -80,5 +80,5 @@
      * Cart constructor.
      */
-    function Cart($namespace='')
+    public function __construct($namespace='')
     {
 		$app =& App::getInstance();
@@ -97,5 +97,5 @@
      * @param  array $params   Array of param keys and values to set.
      */
-    function setParam($params=null)
+    public function setParam($params=null)
     {
         if (isset($params) && is_array($params)) {
@@ -112,5 +112,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -137,5 +137,5 @@
     * @since    11 Mar 2008 18:59:37
     */
-    function add($item_id, $price, $quantity=1, $specs=array())
+    public function add($item_id, $price, $quantity=1, $specs=array())
     {
         $app =& App::getInstance();
@@ -166,5 +166,5 @@
     * @since    10 May 2008 16:42:25
     */
-    function setQty($item_id, $quantity)
+    public function setQty($item_id, $quantity)
     {
         if ($quantity <= 0) {
@@ -195,5 +195,5 @@
     * @since    10 May 2008 16:42:25
     */
-    function setPrice($item_id, $price)
+    public function setPrice($item_id, $price)
     {
         if (isset($_SESSION['_cart'][$this->_ns]['items'][$item_id])) {
@@ -218,5 +218,5 @@
     * @since    11 Mar 2008 18:59:48
     */
-    function remove($item_id)
+    public function remove($item_id)
     {
         $app =& App::getInstance();
@@ -242,5 +242,5 @@
     * @since    11 Mar 2008 18:59:55
     */
-    function get($item_id, $spec_key)
+    public function get($item_id, $spec_key)
     {
         if (isset($_SESSION['_cart'][$this->_ns]['items'][$item_id][$spec_key])) {
@@ -259,5 +259,5 @@
     * @since    11 Mar 2008 18:59:55
     */
-    function getList()
+    public function getList()
     {
         return $_SESSION['_cart'][$this->_ns]['items'];
@@ -277,5 +277,5 @@
     * @since    11 Mar 2008 19:00:12
     */
-    function sum($key='extended_price')
+    public function sum($key='extended_price')
     {
 		$sum = 0;
@@ -306,5 +306,5 @@
      * as $auth->clear(), such as when logging out.
      */
-    function clear()
+    public function clear()
     {
         $_SESSION['_cart'][$this->_ns] = array(
@@ -313,5 +313,2 @@
     }
 }
-
-
-?>
Index: branches/eli_branch/lib/Currency.inc.php
===================================================================
--- branches/eli_branch/lib/Currency.inc.php	(revision 438)
+++ branches/eli_branch/lib/Currency.inc.php	(revision 439)
@@ -41,5 +41,5 @@
 
     // Configuration parameters for this object.
-    var $_params = array(
+    private $_params = array(
         'cache_result' => true,
         'cache_dir' => '',
@@ -52,5 +52,5 @@
      * Cart constructor.
      */
-    function Currency($params=array())
+    public function __construct($params=array())
     {
 		$app =& App::getInstance();
@@ -79,5 +79,5 @@
      * @param  array $params   Array of param keys and values to set.
      */
-    function setParam($params=null)
+    public function setParam($params=null)
     {
         if (isset($params) && is_array($params)) {
@@ -94,5 +94,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -118,5 +118,5 @@
     * @since    05 May 2008 23:50:59
     */
-    function getValue($amount, $base, $target)
+    public function getValue($amount, $base, $target)
     {
         if (false !== $rate = $this->getRate($base, $target)) {
@@ -138,5 +138,5 @@
     * @since    25 May 2011 01:26:24
     */
-    function getRate($base, $target)
+    public function getRate($base, $target)
     {
         $app =& App::getInstance();
@@ -180,5 +180,5 @@
      * @access private
      */
-    function _performAPICall($parameters=null)
+    private function _performAPICall($parameters=null)
     {
         $app =& App::getInstance();
Index: branches/eli_branch/lib/DB.inc.php
===================================================================
--- branches/eli_branch/lib/DB.inc.php	(revision 438)
+++ branches/eli_branch/lib/DB.inc.php	(revision 439)
@@ -33,17 +33,17 @@
 
     // If $db->connect has successfully opened a db connection.
-    var $_connected = false;
+    private $_connected = false;
 
     // Database handle.
-    var $dbh;
+    public $dbh;
     
     // Count how many queries run during the whole instance.
-    var $_query_count = 0;
+    private $_query_count = 0;
 
     // Hash of DB parameters.
-    var $_params = array();
+    private $_params = array();
 
     // Default parameters.
-    var $_param_defaults = array(
+    private $_param_defaults = array(
 
         // DB passwords should be set as apache environment variables in httpd.conf, readable only by root.
@@ -64,5 +64,5 @@
 
     // Translate between HTML and MySQL character set names.
-    var $mysql_character_sets = array(
+    public $mysql_character_sets = array(
         'utf-8' => 'utf8',
         'iso-8859-1' => 'latin1',
@@ -70,6 +70,6 @@
 
     // Caches.
-    var $existing_tables;
-    var $table_columns;
+    public $existing_tables;
+    public $table_columns;
 
     /**
@@ -80,5 +80,5 @@
      * @static
      */
-    static function &getInstance()
+    public static function &getInstance()
     {
         static $instance = null;
@@ -98,5 +98,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -117,5 +117,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -136,5 +136,5 @@
      * @since   28 Aug 2005 14:02:49
      */
-    function connect()
+    public function connect()
     {
 		$app =& App::getInstance();
@@ -185,5 +185,5 @@
      * @since   28 Aug 2005 14:32:01
      */
-    function close()
+    public function close()
     {
         if (!$this->_connected) {
@@ -204,5 +204,5 @@
     * @since    03 Jul 2013 14:50:23
     */
-    function reconnect()
+    public function reconnect()
     {
         $this->close();
@@ -221,5 +221,5 @@
     * @since    15 Jan 2007 15:59:00
     */
-    function _fail()
+    private function _fail()
     {
         if ($this->getParam('db_die_on_failure')) {
@@ -240,5 +240,5 @@
      * @since   20 Aug 2005 13:50:36
      */
-    function getDBH()
+    public function getDBH()
     {
         if (!$this->_connected) {
@@ -256,5 +256,5 @@
      * @since   28 Aug 2005 14:58:09
      */
-    function isConnected()
+    public function isConnected()
     {
         return (true === $this->_connected);
@@ -270,5 +270,5 @@
      * @since   06 Mar 2006 16:41:32
      */
-    function escapeString($string)
+    public function escapeString($string)
     {
         if (!$this->_connected) {
@@ -287,5 +287,5 @@
      * @return resource         Query identifier
      */
-    function query($query, $debug=false)
+    public function query($query, $debug=false)
     {    
         $app =& App::getInstance();
@@ -336,5 +336,5 @@
      * @return bool                         true if given $table exists.
      */
-    function tableExists($table, $use_cached_results=true)
+    public function tableExists($table, $use_cached_results=true)
     {
 		$app =& App::getInstance();
@@ -368,5 +368,5 @@
      * @return bool                         true if column(s) exist.
      */
-    function columnExists($table, $columns, $strict=true, $use_cached_results=true)
+    public function columnExists($table, $columns, $strict=true, $use_cached_results=true)
     {
         if (!$this->_connected) {
@@ -416,5 +416,5 @@
     * @since    15 Jun 2006 11:46:05
     */
-    function numQueries()
+    public function numQueries()
     {
         return $this->_query_count;
@@ -428,5 +428,5 @@
      * @since   28 Aug 2005 22:10:50
      */
-    function resetCache()
+    public function resetCache()
     {
         $this->existing_tables = null;
Index: branches/eli_branch/lib/DBSessionHandler.inc.php
===================================================================
--- branches/eli_branch/lib/DBSessionHandler.inc.php	(revision 438)
+++ branches/eli_branch/lib/DBSessionHandler.inc.php	(revision 439)
@@ -32,7 +32,7 @@
 class DBSessionHandler {
 
-    var $db; // DB object.
+    public $db; // DB object.
 
-    var $_params = array(
+    private $_params = array(
         'db_table' => 'session_tbl',
 
@@ -51,5 +51,5 @@
      * @since   18 Jul 2005 11:02:50
      */
-    function DBSessionHandler($db, $params=array())
+    public function __construct($db, $params=array())
     {
 		$app =& App::getInstance();
@@ -94,5 +94,5 @@
      * @since   26 Aug 2005 17:09:36
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
 		$app =& App::getInstance();
@@ -121,15 +121,15 @@
     }
 
-    function dbSessionOpen($save_path, $sess_name)
+    public function dbSessionOpen($save_path, $sess_name)
     {
         return true;
     }
 
-    function dbSessionClose()
+    public function dbSessionClose()
     {        
         return true;
     }
 
-    function dbSessionRead($session_id)
+    public function dbSessionRead($session_id)
     {
         // Select the data belonging to session $session_id from the session table
@@ -146,5 +146,5 @@
     }
 
-    function dbSessionWrite($session_id, $session_data)
+    public function dbSessionWrite($session_id, $session_data)
     {
         // Write the serialized session data ($session_data) to the session table
@@ -154,5 +154,5 @@
     }
 
-    function dbSessionDestroy($session_id)
+    public function dbSessionDestroy($session_id)
     {
         // Delete from the table all data for the session $session_id
@@ -162,5 +162,5 @@
     }
 
-    function dbSessionGarbage($max_lifetime=72000)
+    public function dbSessionGarbage($max_lifetime=72000)
     {
         // Delete old values from the session table.
Index: branches/eli_branch/lib/Email.inc.php
===================================================================
--- branches/eli_branch/lib/Email.inc.php	(revision 438)
+++ branches/eli_branch/lib/Email.inc.php	(revision 439)
@@ -55,5 +55,5 @@
 
     // Default parameters, to be overwritten by setParam() and read with getParam()
-    var $_params = array(
+    private $_params = array(
         'to' => null,
         'from' => null,
@@ -73,8 +73,8 @@
 
     // String that contains the email body.
-    var $_template;
+    private $_template;
 
     // String that contains the email body after replacements.
-    var $_template_replaced;
+    private $_template_replaced;
 
     /**
@@ -86,5 +86,5 @@
      * @since   28 Nov 2005 12:59:41
      */
-    function Email($params=null)
+    public function __construct($params=null)
     {
         // The regex used in validEmail(). Set here instead of in the default _params above so we can use the concatenation . dot.
@@ -117,5 +117,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -144,5 +144,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -164,5 +164,5 @@
      * @since   28 Nov 2005 12:56:23
      */
-    function setTemplate($template)
+    public function setTemplate($template)
     {
 		$app =& App::getInstance();
@@ -188,5 +188,5 @@
      * @since   28 Nov 2005 12:56:23
      */
-    function setString($string)
+    public function setString($string)
     {
 		$app =& App::getInstance();
@@ -212,5 +212,5 @@
      * @since   28 Nov 2005 13:08:51
      */
-    function replace($replacements)
+    public function replace($replacements)
     {
 		$app =& App::getInstance();
@@ -249,5 +249,5 @@
      * @since   28 Nov 2005 12:56:09
      */
-    function send($to=null, $from=null, $subject=null, $headers=null)
+    public function send($to=null, $from=null, $subject=null, $headers=null)
     {
 		$app =& App::getInstance();
@@ -363,5 +363,5 @@
      * @since   30 Nov 2005 22:00:50
      */
-    function validEmail($email)
+    public function validEmail($email)
     {
 		$app =& App::getInstance();
Index: branches/eli_branch/lib/FormValidator.inc.php
===================================================================
--- branches/eli_branch/lib/FormValidator.inc.php	(revision 438)
+++ branches/eli_branch/lib/FormValidator.inc.php	(revision 439)
@@ -61,5 +61,5 @@
 
     // Class parameters.
-    var $_params = array(
+    private $_params = array(
         'error' => ' sc-msg-error ',
         'warning' => ' sc-msg-warning ',
@@ -69,5 +69,5 @@
 
     // Array filling with error messages.
-    var $errors = array();
+    public $errors = array();
     
     /**
@@ -77,5 +77,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -96,5 +96,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -115,5 +115,5 @@
      *                  vals: the message to display for that error
      */
-    function getErrorList()
+    public function getErrorList()
     {
         return $this->errors;
@@ -130,5 +130,5 @@
      * @param   string $line        __LINE__.
      */
-    function addError($form_name, $msg='', $type=MSG_ERR, $file=null, $line=null)
+    public function addError($form_name, $msg='', $type=MSG_ERR, $file=null, $line=null)
     {
         $this->errors[] = array(
@@ -149,5 +149,5 @@
      *                a variable of $form_name, false otherwise
      */
-    function anyErrors($form_name=null)
+    public function anyErrors($form_name=null)
     {
         if (isset($form_name)) {
@@ -166,5 +166,5 @@
      * Reset the error list.
      */
-    function resetErrorList()
+    public function resetErrorList()
     {
         $this->errors = array();
@@ -182,5 +182,5 @@
      * @since   15 Jul 2005 01:39:14
      */
-    function printErrorMessages($above='', $below='', $print_gotohash_js=false, $hash='sc-msg-formvalidator')
+    public function printErrorMessages($above='', $below='', $print_gotohash_js=false, $hash='sc-msg-formvalidator')
     {
         $app =& App::getInstance();
@@ -238,5 +238,5 @@
      *                           not provided, use default.
      */
-    function err($form_name, $marker=null)
+    public function err($form_name, $marker=null)
     {
         if (false !== ($type = $this->anyErrors($form_name))) {
@@ -274,5 +274,5 @@
      * @return bool   true if form is not empty, false otherwise.
      */
-    function notEmpty($form_name, $msg='')
+    public function notEmpty($form_name, $msg='')
     {
         if (parent::notEmpty(getFormData($form_name))) {
@@ -290,5 +290,5 @@
     * @since    03 Jun 2006 22:56:46
     */
-    function isEmpty($form_name, $msg='')
+    public function isEmpty($form_name, $msg='')
     {
         $this->notEmpty($form_name, $msg);
@@ -303,5 +303,5 @@
      * @return bool   true if form is a string, false otherwise.
      */
-    function isString($form_name, $msg='')
+    public function isString($form_name, $msg='')
     {
         if (parent::isString(getFormData($form_name))) {
@@ -321,5 +321,5 @@
      * @return bool   true if no errors found, false otherwise
      */
-    function isNumber($form_name, $msg='')
+    public function isNumber($form_name, $msg='')
     {
         if (parent::isNumber(getFormData($form_name))) {
@@ -340,5 +340,5 @@
      * @return bool   true if value is an integer
      */
-    function isInteger($form_name, $msg='', $negative_ok=false)
+    public function isInteger($form_name, $msg='', $negative_ok=false)
     {
         if (parent::isInteger(getFormData($form_name), $negative_ok)) {
@@ -360,5 +360,5 @@
      * @return bool   true if value is a float
      */
-    function isFloat($form_name, $msg='', $negative_ok=false)
+    public function isFloat($form_name, $msg='', $negative_ok=false)
     {
         if (parent::isFloat(getFormData($form_name), $negative_ok)) {
@@ -378,5 +378,5 @@
      * @return bool   true if value is a float
      */
-    function isArray($form_name, $msg='')
+    public function isArray($form_name, $msg='')
     {
         if (parent::isArray(getFormData($form_name))) {
@@ -399,5 +399,5 @@
      * @return bool   true if value passes regex test
      */
-    function checkRegex($form_name, $regex, $valid_on_match, $msg='')
+    public function checkRegex($form_name, $regex, $valid_on_match, $msg='')
     {
         if (parent::checkRegex(getFormData($form_name), $regex, $valid_on_match)) {
@@ -419,5 +419,5 @@
      * @return bool   true if string length is within given boundaries
      */
-    function stringLength($form_name, $min, $max, $msg='')
+    public function stringLength($form_name, $min, $max, $msg='')
     {
         if (parent::stringLength(getFormData($form_name), $min, $max)) {
@@ -439,5 +439,5 @@
      * @return bool   true if no errors found, false otherwise
      */
-    function numericRange($form_name, $min, $max, $msg='')
+    public function numericRange($form_name, $min, $max, $msg='')
     {
         if (parent::numericRange(getFormData($form_name), $min, $max)) {
@@ -463,5 +463,5 @@
      * @author  Quinn Comendant <quinn@strangecode.com>
      */
-    function validateEmail($form_name)
+    public function validateEmail($form_name)
     {
 		$app =& App::getInstance();
@@ -513,5 +513,5 @@
      * @return bool    true if no errors found, false otherwise
      */
-    function validatePhone($form_name)
+    public function validatePhone($form_name)
     {
         $phone = getFormData($form_name);
@@ -531,5 +531,5 @@
      * @return bool    true if no errors found, false otherwise
      */
-    function validateStrDate($form_name, $msg='')
+    public function validateStrDate($form_name, $msg='')
     {
         $app =& App::getInstance();
@@ -554,5 +554,5 @@
      * @return bool    true if no errors found, false otherwise
      */
-    function validateCCNumber($form_name, $cc_type=null)
+    public function validateCCNumber($form_name, $cc_type=null)
     {
         $cc_num = getFormData($form_name);
@@ -574,5 +574,5 @@
      * @return bool   true if no errors found, false otherwise
      */
-    function fileUploaded($form_name, $msg='')
+    public function fileUploaded($form_name, $msg='')
     {
         if (parent::fileUploaded($form_name)) {
Index: branches/eli_branch/lib/Google_API.inc.php
===================================================================
--- branches/eli_branch/lib/Google_API.inc.php	(revision 438)
+++ branches/eli_branch/lib/Google_API.inc.php	(revision 439)
@@ -53,5 +53,5 @@
      * @access private
      */
-    var $_licenseKey = '';
+    private $_licenseKey = '';
 
     /**
@@ -59,5 +59,5 @@
      * @access private
      */
-    var $_soapClient = NULL;
+    private $_soapClient = NULL;
 
     /**
@@ -67,5 +67,5 @@
      * @access public
      */
-    function Google_API($licenseKey)
+    public function __construct($licenseKey)
     {
         $this->_licenseKey = $licenseKey;
@@ -82,5 +82,5 @@
      * @access public
      */
-    function getCachedPage($url)
+    public function getCachedPage($url)
     {
         $result = $this->_performAPICall(
@@ -104,5 +104,5 @@
      * @access public
      */
-    function getSpellingSuggestion($phrase)
+    public function getSpellingSuggestion($phrase)
     {
         return $this->_performAPICall(
@@ -122,5 +122,5 @@
      * @access public
      */
-    function search($parameters = array())
+    public function search($parameters = array())
     {
         if (!isset($parameters['query'])) {
@@ -150,5 +150,5 @@
      * @access private
      */
-    function _performAPICall($apiCall, $parameters)
+    private function _performAPICall($apiCall, $parameters)
     {
         $app =& App::getInstance();
@@ -167,5 +167,2 @@
     }
 }
-?>
-
-
Index: branches/eli_branch/lib/Hierarchy.inc.php
===================================================================
--- branches/eli_branch/lib/Hierarchy.inc.php	(revision 438)
+++ branches/eli_branch/lib/Hierarchy.inc.php	(revision 439)
@@ -52,5 +52,5 @@
      *
      */
-    var $params = array();
+    public $params = array();
 
 
@@ -59,5 +59,5 @@
      * @var string $child_type
      */
-    var $child_type;
+    public $child_type;
 
     /**
@@ -65,5 +65,5 @@
      * @var string $child_id
      */
-    var $child_id;
+    public $child_id;
 
     /**
@@ -72,5 +72,5 @@
      * @var bool $node_init
      */
-    var $node_init = false;
+    public $node_init = false;
 
     /**
@@ -80,5 +80,5 @@
      *                          configuration or connection parameters.
      */
-    function Hierarchy($params=array())
+    function __construct($params=array())
     {
         $this->params = $params;
@@ -92,5 +92,5 @@
      *                      if no new ones are specified.
      */
-    function currentNode($child_type=null, $child_id=null)
+    public function currentNode($child_type=null, $child_id=null)
     {
         $old_type = isset($this->child_type) ? $this->child_type : $child_type;
@@ -113,5 +113,5 @@
      *                  otherwise if an array is provided, an array of identifiers is returned.
      */
-    function toStringID($child_type=null, $child_id=null)
+    public function toStringID($child_type=null, $child_id=null)
     {
 			$app =& App::getInstance();
@@ -122,5 +122,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('toStringID failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('toStringID failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -147,5 +147,5 @@
      * @return mixed    Array of node type and id on success, false on failure.
      */
-    function toArrayID(&$node)
+    public function toArrayID(&$node)
     {
 			$app =& App::getInstance();
@@ -154,5 +154,5 @@
             return array('node_type' => $node_parts[1], 'node_id' => $node_parts[2]);
         } else {
-            $app->logMsg('Cannot parse node identifier, not formated correctly.'), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg('Cannot parse node identifier, not formated correctly.', LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -167,5 +167,5 @@
      * @return bool     true on success, false on error.
      */
-    function insertNode($parents, $child_type=null, $child_id=null, $relationship_type=null, $title='')
+    public function insertNode($parents, $child_type=null, $child_id=null, $relationship_type=null, $title='')
     {
 		$app =& App::getInstance();
@@ -177,5 +177,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('insertNode failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('insertNode failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -246,5 +246,5 @@
      * @return bool      false on error, true otherwise.
      */
-    function deleteNode($child_type=null, $child_id=null)
+    public function deleteNode($child_type=null, $child_id=null)
     {
 		$app =& App::getInstance();
@@ -256,5 +256,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('deleteNode failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('deleteNode failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -296,5 +296,5 @@
      * @return bool      false on error, true otherwise.
      */
-    function moveNode($new_parents=null, $child_type=null, $child_id=null, $relationship_type=null, $title='')
+    public function moveNode($new_parents=null, $child_type=null, $child_id=null, $relationship_type=null, $title='')
     {
 			$app =& App::getInstance();
@@ -306,5 +306,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('moveNode failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('moveNode failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -373,5 +373,5 @@
      * @return string   The parents as an array of serialized node identifiers.
      */
-    function getParents($child_type=null, $child_id=null, $type_constraint=null, $order='')
+    public function getParents($child_type=null, $child_id=null, $type_constraint=null, $order='')
     {
 		$app =& App::getInstance();
@@ -383,5 +383,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('getParents failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('getParents failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -424,5 +424,5 @@
      * @return array   type, id, title, subnode_quantity.
      */
-    function getNode($child_type=null, $child_id=null)
+    public function getNode($child_type=null, $child_id=null)
     {
 		$app =& App::getInstance();
@@ -434,5 +434,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('getNode failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('getNode failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -468,5 +468,5 @@
      * @return string  The children as an array of serialized node identifiers.
      */
-    function getChildren($child_type=null, $child_id=null, $type_constraint=null, $order='')
+    public function getChildren($child_type=null, $child_id=null, $type_constraint=null, $order='')
     {
 		$app =& App::getInstance();
@@ -478,5 +478,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('getChildren failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('getChildren failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -520,5 +520,5 @@
      * @return integer
      */
-    function getNumberChildren($child_type=null, $child_id=null, $type_constraint=null)
+    public function getNumberChildren($child_type=null, $child_id=null, $type_constraint=null)
     {
 		$app =& App::getInstance();
@@ -530,5 +530,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('getNumberChildren failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('getNumberChildren failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -561,5 +561,5 @@
      * @return bool      true if a leaf, or false if not or an error
      */
-    function isLeaf($child_type=null, $child_id=null)
+    public function isLeaf($child_type=null, $child_id=null)
     {
 		$app =& App::getInstance();
@@ -570,5 +570,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('isLeaf failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('isLeaf failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -595,5 +595,5 @@
      *                   parent, or false otherwise, or in case of failure.
      */
-    function isAncestor($child_type, $child_id, $considered_parent_type, $considered_parent_id)
+    public function isAncestor($child_type, $child_id, $considered_parent_type, $considered_parent_id)
     {
         $family_tree = $this->getAllAncestors($considered_parent_type, $considered_parent_id);
@@ -622,5 +622,5 @@
      * @return array     Array of serialized node identifiers.
      */
-    function getAllAncestors($child_type, $child_id, $go_linear=false, $_return_flag=true)
+    public function getAllAncestors($child_type, $child_id, $go_linear=false, $_return_flag=true)
     {
 		$db =& DB::getInstance();
@@ -676,5 +676,5 @@
      * @return bool      true if a leaf, or false if not or an error
      */
-    function nodeExists($child_type=null, $child_id=null, $parent_type=null, $parent_id=null, $relationship_type=null)
+    public function nodeExists($child_type=null, $child_id=null, $parent_type=null, $parent_id=null, $relationship_type=null)
     {
 		$app =& App::getInstance();
@@ -686,5 +686,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('nodeExists failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('nodeExists failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -728,5 +728,5 @@
      *                specified node: (type, id, title, indent level, selected status)
      */
-    function &getNodeList($preselected=null, $child_type=null, $child_id=null, $type_constraint=null, $include_curr=false, $order='', $_indent=0, $_return_flag=true)
+    public function &getNodeList($preselected=null, $child_type=null, $child_id=null, $type_constraint=null, $include_curr=false, $order='', $_indent=0, $_return_flag=true)
     {
 		$app =& App::getInstance();
@@ -740,5 +740,5 @@
                 $child_id =& $this->child_id;
             } else {
-                $app->logMsg('getNodeList failed. Arguments not specified properly.'), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg('getNodeList failed. Arguments not specified properly.', LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
@@ -801,5 +801,5 @@
      * @param  string  $type_constraint  An array of node types to restrict the search to.
      */
-    function rebuildSubnodeQty($type_constraint=null)
+    public function rebuildSubnodeQty($type_constraint=null)
     {
 		$db =& DB::getInstance();
@@ -825,5 +825,5 @@
      * all parents recursively.
      */
-    function setSubnodeQtyToParents($child_type, $child_id, $num_children)
+    public function setSubnodeQtyToParents($child_type, $child_id, $num_children)
     {
 		$db =& DB::getInstance();
@@ -848,6 +848,2 @@
 // THE END
 }
-
-
-
-
Index: branches/eli_branch/lib/Image.inc.php
===================================================================
--- branches/eli_branch/lib/Image.inc.php	(revision 438)
+++ branches/eli_branch/lib/Image.inc.php	(revision 439)
@@ -31,5 +31,5 @@
 
     // Object parameters.
-    var $_params = array();
+    private $_params = array();
 
     /**
@@ -41,5 +41,5 @@
      * @since   26 Jan 2005 01:54:50
      */
-    function Image($params=array())
+    public function __construct($params=array())
     {
         if (!is_array($params)) {
@@ -72,5 +72,5 @@
      * @since   26 Jan 2005 01:54:50
       */
-    function exists($id)
+    public function exists($id)
     {
         $src = $this->oSrc($id);
@@ -95,5 +95,5 @@
      * @since   26 Jan 2005 01:54:50
      */
-    function size($id, $key)
+    public function size($id, $key)
     {
         $src = $this->oSrc($id);
@@ -113,5 +113,5 @@
      * @since   26 Jan 2005 01:56:35
      */
-    function oSrc($id)
+    public function oSrc($id)
     {
         $file_name = '';
@@ -138,5 +138,5 @@
      * @since   26 Jan 2005 01:57:33
      */
-    function oImg($id, $alt='', $extra='')
+    public function oImg($id, $alt='', $extra='')
     {
         $src = $this->oSrc($id);
@@ -157,4 +157,2 @@
     }
 } // End class
-
-?>
Index: branches/eli_branch/lib/ImageThumb.inc.php
===================================================================
--- branches/eli_branch/lib/ImageThumb.inc.php	(revision 438)
+++ branches/eli_branch/lib/ImageThumb.inc.php	(revision 439)
@@ -43,5 +43,5 @@
     
     // General object parameters.
-    var $_params = array(
+    private $_params = array(
         // The location for images to create thumbnails from.
         'source_dir' => null,
@@ -72,5 +72,5 @@
     
     // Default image size specs.
-    var $_default_image_specs = array(
+    private $_default_image_specs = array(
         // The destination for an image thumbnail size. 
         // Use initial / to specify absolute paths, leave off to specify a path relative to source_dir (eg: ../thumbs).
@@ -108,5 +108,5 @@
 
     // Final specifications for image sizes, set with setSpec().
-    var $_image_specs = array();
+    private $_image_specs = array();
 
     /**
@@ -116,5 +116,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -160,5 +160,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -180,5 +180,5 @@
      *                          Use to overwrite existing spec array values.
      */
-    function setSpec($spec, $index=null)
+    public function setSpec($spec, $index=null)
     {
 		$app =& App::getInstance();
@@ -259,5 +259,5 @@
     * @since    08 May 2007 15:26:39
     */
-    function getSpec($key, $index=null)
+    public function getSpec($key, $index=null)
     {
         $index = isset($index) ? $index : 0;
@@ -271,5 +271,5 @@
      * @return  bool true on success, false on failure.
      */
-    function processAll($runtime_specs=null)
+    public function processAll($runtime_specs=null)
     {
 		$app =& App::getInstance();
@@ -313,5 +313,5 @@
      * @return  bool true on success, false on failure.
      */
-    function processFile($file_name, $runtime_specs=null)
+    public function processFile($file_name, $runtime_specs=null)
     {
 		$app =& App::getInstance();
@@ -452,5 +452,5 @@
     * @since    19 May 2006 13:55:46
     */
-    function _resizeWithNetpbm($source_file, $dest_file, $spec)
+    private function _resizeWithNetpbm($source_file, $dest_file, $spec)
     {
 		$app =& App::getInstance();
@@ -521,5 +521,5 @@
     * @since    19 May 2006 15:46:02
     */
-    function _resizeWithGD($source_file, $dest_file, $spec)
+    private function _resizeWithGD($source_file, $dest_file, $spec)
     {
 		$app =& App::getInstance();
@@ -662,5 +662,5 @@
      * @return  bool true on success, false on failure.
      */
-    function deleteThumbs($file_name, $use_glob=false)
+    public function deleteThumbs($file_name, $use_glob=false)
     {
 		$app =& App::getInstance();
@@ -700,5 +700,5 @@
      * @return  bool true on success, false on failure.
      */
-    function deleteOriginal($file_name)
+    public function deleteOriginal($file_name)
     {
 		$app =& App::getInstance();
@@ -733,5 +733,5 @@
      * @return  bool true on success, false on failure.
      */
-    function exists($file_name)
+    public function exists($file_name)
     {
 		$app =& App::getInstance();
@@ -754,5 +754,5 @@
      * @return  bool    True on success, false on failure.
      */
-    function _validFileExtension($file_name)
+    private function _validFileExtension($file_name)
     {
         preg_match('/.*?\.(\w+)$/i', $file_name, $ext);
@@ -766,5 +766,5 @@
      * @return  bool true on success, false on failure.
      */
-    function _createDestDirs($filename=null)
+    private function _createDestDirs($filename=null)
     {
 		$app =& App::getInstance();
@@ -844,5 +844,5 @@
      * @param string $line    __LINE__.
      */
-    function _raiseMsg($message, $type, $file, $line)
+    private function _raiseMsg($message, $type, $file, $line)
     {
 		$app =& App::getInstance();
@@ -864,5 +864,5 @@
      * @since   15 Nov 2005 20:55:22
      */
-    function _glob($pattern, $directory)
+    private function _glob($pattern, $directory)
     {
         $file_list = glob(sprintf('%s/%s', $directory, $pattern));
Index: branches/eli_branch/lib/Lock.inc.php
===================================================================
--- branches/eli_branch/lib/Lock.inc.php	(revision 438)
+++ branches/eli_branch/lib/Lock.inc.php	(revision 439)
@@ -32,5 +32,5 @@
 
     // Configuration of this object.
-    var $_params = array(
+    private $_params = array(
         'timeout' => 600,
         'auto_timeout' => 1800,
@@ -44,8 +44,8 @@
 
     // Store lock data from DB.
-    var $data = array();
+    private $data = array();
 
     // Auth_SQL object from which to access a current user_id.
-    var $_auth;
+    private $_auth;
 
     /**
@@ -56,5 +56,5 @@
      * @static
      */
-    static function &getInstance($auth_object)
+    public static function &getInstance($auth_object)
     {
         static $instance = null;
@@ -72,5 +72,5 @@
      * @param mixed  $auth_object  An Auth_SQL or Auth_FILE object.
      */
-    function Lock($auth_object)
+    public function __construct($auth_object)
     {
 		$app =& App::getInstance();
@@ -95,5 +95,5 @@
      * @since   26 Aug 2005 17:09:36
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
 		$app =& App::getInstance();
@@ -142,5 +142,5 @@
      * @param  array $params   Array of param keys and values to set.
      */
-    function setParam($params=null)
+    public function setParam($params=null)
     {
         if (isset($params) && is_array($params)) {
@@ -157,5 +157,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -178,5 +178,5 @@
      * @param string $title       A title to apply to the lock, for display purposes.
      */
-    function select($record_table_or_lock_id, $record_key=null, $record_val=null)
+    public function select($record_table_or_lock_id, $record_key=null, $record_val=null)
     {
 		$app =& App::getInstance();
@@ -219,5 +219,5 @@
      * @return bool            True if locked.
      */
-    function isLocked()
+    public function isLocked()
     {
         return isset($this->data['lock_id']);
@@ -230,5 +230,5 @@
      * @return bool            True if current user set the lock.
      */
-    function isMine()
+    public function isMine()
     {
 		$db =& DB::getInstance();
@@ -258,5 +258,5 @@
      * @return int            The id for the lock (mysql last insert id).
      */
-    function set($record_table, $record_key, $record_val, $title='')
+    public function set($record_table, $record_key, $record_val, $title='')
     {
 		$db =& DB::getInstance();
@@ -304,5 +304,5 @@
      * Unlock the currently selected record.
      */
-    function remove()
+    public function remove()
     {
 		$app =& App::getInstance();
@@ -326,5 +326,5 @@
      * Unlock all records, or all records for a specified user.
      */
-    function removeAll($user_id=null)
+    public function removeAll($user_id=null)
     {
 		$app =& App::getInstance();
@@ -350,5 +350,5 @@
      * Deletes all locks that are older than auto_timeout.
      */
-    function _auto_timeout()
+    private function _auto_timeout()
     {
 		$db =& DB::getInstance();
@@ -371,5 +371,5 @@
      * Redirect to record lock error page.
      */
-    function dieErrorPage()
+    public function dieErrorPage()
     {
 		$app =& App::getInstance();
@@ -381,5 +381,5 @@
      * Print error page.
      */
-    function printErrorHTML()
+    public function printErrorHTML()
     {
 		$app =& App::getInstance();
@@ -416,5 +416,5 @@
      * Return lock_id of locked record.
      */
-    function getID()
+    public function getID()
     {
         return $this->data['lock_id'];
@@ -424,5 +424,5 @@
      * Return title of locked record.
      */
-    function getTitle()
+    public function getTitle()
     {
         return $this->data['title'];
@@ -432,5 +432,5 @@
      * Return administrator username for locked record.
      */
-    function getEditor()
+    public function getEditor()
     {
         return $this->data['editor'];
@@ -440,5 +440,5 @@
      * Return total seconds since the record was locked.
      */
-    function getSecondsElapsed()
+    public function getSecondsElapsed()
     {
         if (isset($this->data['lock_datetime']) && strtotime($this->data['lock_datetime']) < time()) {
Index: branches/eli_branch/lib/Navigation.inc.php
===================================================================
--- branches/eli_branch/lib/Navigation.inc.php	(revision 438)
+++ branches/eli_branch/lib/Navigation.inc.php	(revision 439)
@@ -37,5 +37,5 @@
 
     // Configuration parameters for this object.
-    var $_params = array(        
+    private $_params = array(        
         'head_title' => true,
         'body_title' => true,
@@ -48,10 +48,10 @@
         'last_crumb_format' => '%s',
     );
-    var $pages = array();
+    public $pages = array();
 
     /**
      * Navigation constructor.
      */
-    function Navigation($params=null)
+    public function __construct($params=null)
     {
 		$app =& App::getInstance();
@@ -74,5 +74,5 @@
      * @param   array   $vars       Additional page variables.
      */
-    function add($title, $url=null, $vars=array())
+    public function add($title, $url=null, $vars=array())
     {
         $page = array(
@@ -91,5 +91,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -110,5 +110,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -127,5 +127,5 @@
      * @access  public
      */
-    function clear()
+    public function clear()
     {
         $this->pages = array();
@@ -139,5 +139,5 @@
      * @param mixed $val      Value to set variable to.
      */
-    function set($key, $val)
+    public function set($key, $val)
     {
         // Set params of current page.
@@ -154,5 +154,5 @@
      * @return mixed          Value stored in session.
      */
-    function get($key, $default='')
+    public function get($key, $default='')
     {
         $curr_page =& $this->pages[sizeof($this->pages) - 1];
@@ -205,5 +205,5 @@
      * @return  mixed           Path (string) or false if path param is not set.
      */
-    function getPath($key='title')
+    public function getPath($key='title')
     {
         if ($this->getParam('path')) {
@@ -227,5 +227,5 @@
      * @return  string   Breadcrumbs or empty string if breadcrumbs param not set.
      */
-    function getBreadcrumbs()
+    public function getBreadcrumbs()
     {
 		$app =& App::getInstance();
@@ -279,5 +279,5 @@
      * @return  mixed   The value set for $return, TRUE by default.
      */
-    function currentPage($page_uri, $return=true)
+    public function currentPage($page_uri, $return=true)
     {
         if (preg_match('/^' . preg_quote(urldecode($page_uri), '/') . '/i', $_SERVER['PHP_SELF'])) {
@@ -288,4 +288,2 @@
 }
 // End of class.
-
-?>
Index: branches/eli_branch/lib/PEdit.inc.php
===================================================================
--- branches/eli_branch/lib/PEdit.inc.php	(revision 438)
+++ branches/eli_branch/lib/PEdit.inc.php	(revision 439)
@@ -70,5 +70,5 @@
 
     // PEdit object parameters.
-    var $_params = array(
+    private $_params = array(
         'data_dir' => '',
         'character_set' => 'utf-8',
@@ -77,9 +77,9 @@
     );
 
-    var $_data = array(); // Array to store loaded data.
-    var $_data_file = ''; // Full file path to the pedit data file.
-    var $_authorized = false; // User is authenticated to see extended functions.
-    var $_data_loaded = false;
-    var $op = '';
+    private $_data = array(); // Array to store loaded data.
+    private $_data_file = ''; // Full file path to the pedit data file.
+    private $_authorized = false; // User is authenticated to see extended functions.
+    private $_data_loaded = false;
+    public $op = '';
 
     /**
@@ -93,5 +93,5 @@
      * @param optional array $params  A hash containing connection parameters.
      */
-    function PEdit($params)
+    public function __construct($params)
     {
         $this->setParam($params);
@@ -121,5 +121,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -140,5 +140,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -159,5 +159,5 @@
     * @since    12 Apr 2006 12:43:47
     */
-    function start($initialize_data_file=false)
+    public function start($initialize_data_file=false)
     {
 		$app =& App::getInstance();
@@ -217,5 +217,5 @@
      * @param array     $options         Additional options to store with this data.
      */
-    function set($name, $options=array())
+    public function set($name, $options=array())
     {
 		$app =& App::getInstance();
@@ -236,5 +236,5 @@
      * @return string        The trimmed content of the named data.
      */
-    function get($name)
+    public function get($name)
     {
         $name = preg_replace('/\s/', '_', $name);
@@ -251,5 +251,5 @@
      * @return bool  False if unauthorized or current page is a version.
      */
-    function formBegin()
+    public function formBegin()
     {
 		$app =& App::getInstance();
@@ -288,5 +288,5 @@
      * @access public
      */
-    function printAllForms()
+    public function printAllForms()
     {
         if ($this->_authorized && $this->op == 'Edit' && is_array($this->_data) && $this->_data_loaded) {
@@ -305,5 +305,5 @@
      * @param string $type      Type of form to print. Currently only 'text' and 'textarea' supported.
      */
-    function printForm($name, $type='text')
+    public function printForm($name, $type='text')
     {
         if ($this->_authorized && $this->op == 'Edit' && $this->_data_loaded) {        
@@ -345,5 +345,5 @@
      * @return bool  False if unauthorized or current page is a version.
      */
-    function formEnd()
+    public function formEnd()
     {
         if (!$this->_authorized || empty($this->_data)) {
@@ -399,5 +399,5 @@
      * @access public
      */
-    function printVersions()
+    public function printVersions()
     {
 		$app =& App::getInstance();
@@ -442,5 +442,5 @@
     * @since    12 Apr 2006 10:52:35
     */
-    function _fileHash()
+    private function _fileHash()
     {
 		$app =& App::getInstance();
@@ -457,5 +457,5 @@
     * @since    11 Apr 2006 20:36:26
     */
-    function _loadDataFile()
+    private function _loadDataFile()
     {
 		$app =& App::getInstance();
@@ -496,5 +496,5 @@
     * @since    11 Apr 2006 20:53:42
     */
-    function _initializeDataFile()
+    private function _initializeDataFile()
     {
 		$app =& App::getInstance();
@@ -512,5 +512,5 @@
      * @return bool  False if unauthorized or on failure. True on success.
      */
-    function _writeData()
+    private function _writeData()
     {
 		$app =& App::getInstance();
@@ -560,5 +560,5 @@
     * @since    11 Apr 2006 22:48:30
     */
-    function _filePutContents($filename, $content)
+    private function _filePutContents($filename, $content)
     {
 		$app =& App::getInstance();
@@ -610,5 +610,5 @@
      * @return bool  False on failure. True on success.
      */
-    function _createVersion()
+    private function _createVersion()
     {
 		$app =& App::getInstance();
@@ -648,5 +648,5 @@
     * @since    12 Apr 2006 11:08:11
     */
-    function _deleteOldVersions()
+    private function _deleteOldVersions()
     {
 		$app =& App::getInstance();
@@ -676,5 +676,5 @@
      * @return array  Array of versions.
      */
-    function _getVersions()
+    private function _getVersions()
     {
         $version_files = array();
@@ -707,5 +707,5 @@
      * @return bool  False on failure. True on success.
      */
-    function _restoreVersion($version)
+    private function _restoreVersion($version)
     {
 		$app =& App::getInstance();
@@ -742,4 +742,2 @@
 
 } // End class.
-
-?>
Index: branches/eli_branch/lib/PageNumbers.inc.php
===================================================================
--- branches/eli_branch/lib/PageNumbers.inc.php	(revision 438)
+++ branches/eli_branch/lib/PageNumbers.inc.php	(revision 439)
@@ -39,33 +39,33 @@
 class PageNumbers {
 
-    var $total_items;       // Total quantity of items.
-    var $total_pages;       // The total number of pages.
-    var $current_page = 1;  // Current page number.
-    var $first_item;        // The counter for the first item on this page (zero index).
-    var $last_item;         // The counter for the last item on this page (zero index).
-    var $max_num_links = 9; // The max number of links to show on page (odd numbers look best).
-    var $_num_links;        // The number of links to show on page.
-    var $_per_page = 25;    // Items per page.
+    public $total_items;       // Total quantity of items.
+    public $total_pages;       // The total number of pages.
+    public $current_page = 1;  // Current page number.
+    public $first_item;        // The counter for the first item on this page (zero index).
+    public $last_item;         // The counter for the last item on this page (zero index).
+    public $max_num_links = 9; // The max number of links to show on page (odd numbers look best).
+    private $_num_links;        // The number of links to show on page.
+    private $_per_page = 25;    // Items per page.
 
     // Flags to ensure all necessary values have been set before calling calculate().
-    var $set_per_page_initialized = false;
-    var $set_page_number_initialized = false;
-    var $set_total_items_initialized = false;
+    public $set_per_page_initialized = false;
+    public $set_page_number_initialized = false;
+    public $set_total_items_initialized = false;
 
     // These are initialized in the constructor.
-    var $per_page_options;
-    var $left_arrow;
-    var $left_arrow_disabled;
-    var $left_dbl_arrow;
-    var $left_dbl_arrow_disabled;
-    var $right_arrow;
-    var $right_arrow_disabled;
-    var $right_dbl_arrow;
-    var $right_dbl_arrow_disabled;
+    public $per_page_options;
+    public $left_arrow;
+    public $left_arrow_disabled;
+    public $left_dbl_arrow;
+    public $left_dbl_arrow_disabled;
+    public $right_arrow;
+    public $right_arrow_disabled;
+    public $right_dbl_arrow;
+    public $right_dbl_arrow_disabled;
 
     /**
      * PageNumbers constructor. All arguments are depreciated. Use set* functions instead.
      */
-    function PageNumbers()
+    public function __construct()
     {
         // Default options for the quantity per page links.
@@ -93,5 +93,5 @@
      * Set the number of items per page.
      */
-    function setPerPage($per_page, $default=25, $save_value=true)
+    public function setPerPage($per_page, $default=25, $save_value=true)
     {
     	// (1) By provided argument, if valid.
@@ -115,5 +115,5 @@
      * Set the current page number.
      */
-    function setPageNumber($page_number, $save_value=true)
+    public function setPageNumber($page_number, $save_value=true)
     {
         // (1) By provided argument, if valid.
@@ -139,5 +139,5 @@
      * Set the total number of items.
      */
-    function setTotalItems($total_items)
+    public function setTotalItems($total_items)
     {
         if (is_numeric($total_items) && $total_items > 0) {
@@ -158,5 +158,5 @@
      * @access public
      */
-    function calculate()
+    public function calculate()
     {
 		$app =& App::getInstance();
@@ -212,5 +212,5 @@
      * Returns the SQL code to limit query to items that are on current page.
      */
-    function getLimitSQL()
+    public function getLimitSQL()
     {
 		$app =& App::getInstance();
@@ -230,5 +230,5 @@
      * @access public
      */
-    function printPerPageLinks($query_key='per_page')
+    public function printPerPageLinks($query_key='per_page')
     {
 		$app =& App::getInstance();
@@ -260,5 +260,5 @@
      * @access public
      */
-    function getPageNumURL($page_number, $carry_args=null)
+    public function getPageNumURL($page_number, $carry_args=null)
     {
 		$app =& App::getInstance();
@@ -266,5 +266,5 @@
         return $app->oHREF($this->url_base . $page_number, $carry_args);
     }
-    function printPageNumURL($page_number, $carry_args=null)
+    public function printPageNumURL($page_number, $carry_args=null)
     {
         echo $this->getPageNumURL($page_number, $carry_args);
@@ -276,5 +276,5 @@
      * @access public
      */
-    function getPageNumbersArray($carry_args=null)
+    public function getPageNumbersArray($carry_args=null)
     {
         $page_numbers = array();
@@ -296,5 +296,5 @@
      * @access public
      */
-    function getPageNumbers($carry_args=null)
+    public function getPageNumbers($carry_args=null)
     {
         $page_numbers_string = '';
@@ -361,5 +361,5 @@
     }
 
-    function printPageNumbers($carry_args=null)
+    public function printPageNumbers($carry_args=null)
     {
         echo $this->getPageNumbers($carry_args);
@@ -368,3 +368,2 @@
 }
 
-?>
Index: branches/eli_branch/lib/PageSequence.inc.php
===================================================================
--- branches/eli_branch/lib/PageSequence.inc.php	(revision 438)
+++ branches/eli_branch/lib/PageSequence.inc.php	(revision 439)
@@ -35,9 +35,9 @@
 class PageSequence
 {
-    var $current_step_id = 0;
-    var $start_url;
-    var $sequence_title = '';
-    var $seq = '_sequence_';
-    var $idle_timeout;
+    public $current_step_id = 0;
+    public $start_url;
+    public $sequence_title = '';
+    public $seq = '_sequence_';
+    public $idle_timeout;
 
     /**
@@ -47,5 +47,5 @@
      * @access public
      */
-    function PageSequence($params)
+    public function __construct($params)
     {
         if (isset($params['sequence_title'])) {
@@ -84,5 +84,5 @@
      * @access public
      */
-    function addStep($step_id, $params)
+    public function addStep($step_id, $params)
     {
         // Keys for the steps array cannot be numeric.
@@ -114,5 +114,5 @@
      * @return bool true on success, false on failure
      */
-    function setFeature($step_id=null, $features)
+    public function setFeature($step_id=null, $features)
     {
         $pos = isset($step_id) ? $this->getPosition($step_id) : $this->getPosition();
@@ -134,5 +134,5 @@
      * @return mixed          Value stored in session.
      */
-    function getFeature($step_id, $key, $default='')
+    public function getFeature($step_id, $key, $default='')
     {
         $pos = isset($step_id) ? $this->getPosition($step_id) : $this->getPosition();
@@ -151,5 +151,5 @@
      * @access public
      */
-    function setCurrent($step_id)
+    public function setCurrent($step_id)
     {
 		$app =& App::getInstance();
@@ -171,5 +171,5 @@
      * @access public
      */
-    function getID($pos=null)
+    public function getID($pos=null)
     {
         if (isset($pos)) {
@@ -188,5 +188,5 @@
      * @access public
      */
-    function getPosition($step_id=null)
+    public function getPosition($step_id=null)
     {
         // Get current step id if step not provided.
@@ -217,5 +217,5 @@
      * @access public
      */
-    function getRequiredID($curr_step_id)
+    public function getRequiredID($curr_step_id)
     {
         if ('' === $curr_step_id) {
@@ -242,5 +242,5 @@
      * @access public
      */
-    function getNextID()
+    public function getNextID()
     {
         // Loop through all steps.
@@ -263,5 +263,5 @@
      * @access public
      */
-    function complete($step_id=null)
+    public function complete($step_id=null)
     {
         $pos = isset($step_id) ? $this->getPosition($step_id) : $this->getPosition();
@@ -277,5 +277,5 @@
      * @access public
      */
-    function printEditLink($step_id=null)
+    public function printEditLink($step_id=null)
     {
 		$app =& App::getInstance();
@@ -296,5 +296,5 @@
      * @access public
      */
-    function setDataDefault($data_key, $data_val)
+    public function setDataDefault($data_key, $data_val)
     {
         if (!isset($_SESSION[$this->seq]['data'][$data_key])) {
@@ -310,5 +310,5 @@
      * @access public
      */
-    function getData($data_key=null)
+    public function getData($data_key=null)
     {
         if (!isset($data_key)) {
@@ -328,5 +328,5 @@
      * @access public
      */
-    function clearData($data_key=null)
+    public function clearData($data_key=null)
     {
         if (isset($data_key)) {
@@ -342,5 +342,5 @@
      * Deletes all data that are older than auto_timeout. Set current time if not not expired or not set.
      */
-    function _auto_timeout()
+    private function _auto_timeout()
     {
 		$app =& App::getInstance();
@@ -363,5 +363,5 @@
      * @access public
      */
-    function registerData($step_data)
+    public function registerData($step_data)
     {
         $_SESSION[$this->seq]['data'] = array_merge($_SESSION[$this->seq]['data'], $step_data);
@@ -372,5 +372,5 @@
      *
      */
-    function startOver()
+    public function startOver()
     {
         $this->current_step_id = 0;
@@ -383,3 +383,2 @@
 } // END CLASS
 
-?>
Index: branches/eli_branch/lib/PayPal.inc.php
===================================================================
--- branches/eli_branch/lib/PayPal.inc.php	(revision 438)
+++ branches/eli_branch/lib/PayPal.inc.php	(revision 439)
@@ -33,5 +33,5 @@
 
     // General object parameters.
-    var $_params = array(
+    private $_params = array(
         'paypal_url' => 'https://www.paypal.com/cgi-bin/webscr',
         'test_mode' => false,
@@ -39,11 +39,11 @@
 
     // Options used for specific buttons and links.
-    var $_default_button_options = array();
+    private $_default_button_options = array();
 
     // Array of buttons created by newButton().
-    var $_buttons = array();
+    private $_buttons = array();
 
     // Store the response from the last IPN.
-    var $_ipn_response;
+    private $_ipn_response;
 
     /**
@@ -52,5 +52,5 @@
      * @param   bool    $test_mode  Use PayPal sandbox for testing.
      */
-    function PayPal($test_mode=false)
+    public function __construct($test_mode=false)
     {
         if ($test_mode) {
@@ -95,5 +95,5 @@
      * @return  bool    True on success, false on failure.
      */
-    function setButtonDefaults($type, $options)
+    public function setButtonDefaults($type, $options)
     {
 		$app =& App::getInstance();
@@ -127,5 +127,5 @@
      * @return  bool    True on success, false on failure.
      */
-    function newButton($type, $name, $options=null)
+    public function newButton($type, $name, $options=null)
     {
 		$app =& App::getInstance();
@@ -162,5 +162,5 @@
      * @return  mixed   Link of button, or false on failure.
      */
-    function getLink($name)
+    public function getLink($name)
     {
 		$app =& App::getInstance();
@@ -196,5 +196,5 @@
      * @param   string  $name   Name of button for which to generate link.
      */
-    function printLink($name)
+    public function printLink($name)
     {
         echo $this->getLink($name);
@@ -208,5 +208,5 @@
      * @param   string  $name   Name of button to print.
      */
-    function printButton($name)
+    public function printButton($name)
     {
         ?>
@@ -234,5 +234,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -253,5 +253,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -272,5 +272,5 @@
      * @return  bool    True if valid, false if invalid.
      */
-    function incomingIPNRequest()
+    public function incomingIPNRequest()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST'
@@ -290,5 +290,5 @@
      * @return  bool    True on success, false on failure.
      */
-    function processIPN()
+    public function processIPN()
     {
 		$app =& App::getInstance();
@@ -351,5 +351,5 @@
      * @return  bool    True if response contains VERIFIED, false otherwise.
      */
-    function verifiedIPN()
+    public function verifiedIPN()
     {
 		$app =& App::getInstance();
@@ -380,3 +380,2 @@
 } // End of class.
 
-?>
Index: branches/eli_branch/lib/ScriptTimer.inc.php
===================================================================
--- branches/eli_branch/lib/ScriptTimer.inc.php	(revision 438)
+++ branches/eli_branch/lib/ScriptTimer.inc.php	(revision 439)
@@ -26,15 +26,15 @@
 class ScriptTimer {
 
-    var $time_format = '%.3f';
-    var $_timing_start_times = array();
-    var $_timing_stop_times = array();
-    var $_timing_cumulative_times = array();
+    public $time_format = '%.3f';
+    private $_timing_start_times = array();
+    private $_timing_stop_times = array();
+    private $_timing_cumulative_times = array();
     
-	function start($name='default')
+	public function start($name='default')
 	{
         $this->_timing_start_times[$name] = explode(' ', microtime());
 	}
 	
-	function stop($name='default')
+	public function stop($name='default')
 	{
 	    if (!isset($this->_timing_stop_times[$name]) || !isset($this->_timing_cumulative_times[$name])) {
@@ -46,5 +46,5 @@
 	}
 	
-	function getTime($name='default')
+	public function getTime($name='default')
 	{
         if (!isset($this->_timing_start_times[$name])) {
@@ -62,5 +62,5 @@
 	}
 	
-	function printAll($sort_by_time=false)
+	public function printAll($sort_by_time=false)
 	{
 	    $names = array_map('strlen', array_keys($this->_timing_start_times));
@@ -81,4 +81,2 @@
 	}
 }
-
-?>
Index: branches/eli_branch/lib/SortOrder.inc.php
===================================================================
--- branches/eli_branch/lib/SortOrder.inc.php	(revision 438)
+++ branches/eli_branch/lib/SortOrder.inc.php	(revision 439)
@@ -37,11 +37,11 @@
 class SortOrder {
 
-    var $_columns;
-    var $sort_by;
-    var $order;
-    var $asc_widget;
-    var $desc_widget;
-    var $default_sort;
-    var $default_order;
+    private $_columns;
+    public $sort_by;
+    public $order;
+    public $asc_widget;
+    public $desc_widget;
+    public $default_sort;
+    public $default_order;
 
     /**
@@ -53,5 +53,5 @@
      *                               current order.
      */
-    function SortOrder($default_sort = '', $default_order = '')
+    public function __construct($default_sort = '', $default_order = '')
     {
         $app =& App::getInstance();
@@ -81,5 +81,5 @@
      * @param string $desc_sql  The sort SQL if $this->order is descending.
      */
-    function setColumn($name, $asc_sql, $desc_sql)
+    public function setColumn($name, $asc_sql, $desc_sql)
     {
         $this->_columns[$name] = array(
@@ -99,5 +99,5 @@
      *                               current order.
      */
-    function setDefault($default_sort = '', $default_order = '')
+    public function setDefault($default_sort = '', $default_order = '')
     {
         // Which column to sort by?
@@ -139,5 +139,5 @@
      *                               for example, for an alphabetical sort)
      */
-    function set($sort = null, $order = null)
+    public function set($sort = null, $order = null)
     {
         // Set new sort value.
@@ -158,5 +158,5 @@
      * Returns the SQL code to sort by set column and set order.
      */
-    function getSortOrderSQL()
+    public function getSortOrderSQL()
     {
 		$app =& App::getInstance();
@@ -189,5 +189,5 @@
      *                               for example, for an alphabetical sort)
      */
-    function printSortHeader($col, $col_name, $default_order='ASC')
+    public function printSortHeader($col, $col_name, $default_order='ASC')
     {
 		$app =& App::getInstance();
@@ -210,3 +210,2 @@
 }
 
-?>
Index: branches/eli_branch/lib/SpellCheck.inc.php
===================================================================
--- branches/eli_branch/lib/SpellCheck.inc.php	(revision 438)
+++ branches/eli_branch/lib/SpellCheck.inc.php	(revision 439)
@@ -61,5 +61,5 @@
 class SpellCheck {
 
-    var $_params = array(
+    private $_params = array(
         'language' => 'en',
         'personal_wordlist' => '', // Text file to save custom words to.
@@ -70,8 +70,8 @@
     );
 
-    var $_pspell_cfg_handle;
-    var $_pspell_handle;
-    var $_use_personal_wordlist = false;
-    var $_errors = array();
+    private $_pspell_cfg_handle;
+    private $_pspell_handle;
+    private $_use_personal_wordlist = false;
+    private $_errors = array();
 
     /**
@@ -80,5 +80,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function SpellCheck($params)
+    public function __construct($params)
     {
 		$app =& App::getInstance();
@@ -118,5 +118,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -137,5 +137,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -154,5 +154,5 @@
      * @return bool   True if any errors were found, false otherwise.
      */
-    function anyErrors()
+    public function anyErrors()
     {
         return (sizeof($this->_errors) > 0);
@@ -162,5 +162,5 @@
      * Reset the error list.
      */
-    function resetErrorList()
+    public function resetErrorList()
     {
         $this->_errors = array();
@@ -177,5 +177,5 @@
      * @since   09 Jun 2005 18:23:51
      */
-    function check($word)
+    public function check($word)
     {
         if (pspell_check($this->_pspell_handle, $word)) {
@@ -197,5 +197,5 @@
      * @since   09 Jun 2005 18:23:51
      */
-    function suggest($word)
+    public function suggest($word)
     {
         return pspell_suggest($this->_pspell_handle, $word);
@@ -212,5 +212,5 @@
      * @since   09 Jun 2005 18:23:51
      */
-    function add($word)
+    public function add($word)
     {
 		$app =& App::getInstance();
@@ -237,5 +237,5 @@
      * @since   09 Jun 2005 18:23:51
      */
-    function save()
+    public function save()
     {
 		$app =& App::getInstance();
@@ -263,5 +263,5 @@
      * @since   09 Jun 2005 21:29:49
      */
-    function getStringSuggestions($string)
+    public function getStringSuggestions($string)
     {
         $corrections = array();
@@ -299,5 +299,5 @@
      * @since   09 Jun 2005 22:11:27
      */
-    function checkString($string)
+    public function checkString($string)
     {
         $errors = array();
@@ -331,5 +331,5 @@
      * @since   09 Jun 2005 21:29:49
      */
-    function getStringHighlighted($string, $show_footnote=false)
+    public function getStringHighlighted($string, $show_footnote=false)
     {
         $words = preg_split('/([\W]+?)/', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -357,5 +357,5 @@
      * @since   09 Jun 2005 21:29:49
      */
-    function printCorrectionForm($form_name)
+    public function printCorrectionForm($form_name)
     {
         ?>
@@ -402,5 +402,5 @@
      * @since   09 Jun 2005 23:15:35
      */
-    function anyFormCorrections()
+    public function anyFormCorrections()
     {
         return (false !== getFormData('spelling_suggestions', false)) || (false !== getFormData('spelling_corrections', false));
@@ -417,5 +417,5 @@
      * @since   09 Jun 2005 23:18:51
      */
-    function applyFormCorrections($form_name)
+    public function applyFormCorrections($form_name)
     {
         $form_words = preg_split('/([\W]+?)/', getFormData($form_name), -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -445,3 +445,2 @@
 } // End.
 
-?>
Index: branches/eli_branch/lib/TemplateGlue.inc.php
===================================================================
--- branches/eli_branch/lib/TemplateGlue.inc.php	(revision 438)
+++ branches/eli_branch/lib/TemplateGlue.inc.php	(revision 439)
@@ -501,4 +501,2 @@
     }
 }
-
-?>
Index: branches/eli_branch/lib/Upload.inc.php
===================================================================
--- branches/eli_branch/lib/Upload.inc.php	(revision 438)
+++ branches/eli_branch/lib/Upload.inc.php	(revision 439)
@@ -41,5 +41,5 @@
 
     // General object parameters.
-    var $_params = array(
+    private $_params = array(
 
         // Which messages do we pass to raiseMsg?
@@ -63,8 +63,8 @@
 
     // Array of files with errors.
-    var $errors = array();
+    public $errors = array();
 
     // Array of file name extensions and corresponding mime-types.
-    var $mime_extension_map = array( 'ez' => 'application/andrew-inset', 'hqx' => 'application/mac-binhex40', 'cpt' => 'application/mac-compactpro', 'doc' => 'application/msword', 'bin' => 'application/octet-stream', 'class' => 'application/octet-stream', 'dll' => 'application/octet-stream', 'dms' => 'application/octet-stream', 'exe' => 'application/octet-stream', 'lha' => 'application/octet-stream', 'lzh' => 'application/octet-stream', 'so' => 'application/octet-stream', 'oda' => 'application/oda', 'pdf' => 'application/pdf', 'ai' => 'application/postscript', 'eps' => 'application/postscript', 'ps' => 'application/postscript', 'smi' => 'application/smil', 'smil' => 'application/smil', 'mif' => 'application/vnd.mif', 'xls' => 'application/vnd.ms-excel', 'ppt' => 'application/vnd.ms-powerpoint', 'sxc' => 'application/vnd.sun.xml.calc', 'stc' => 'application/vnd.sun.xml.calc.template', 'sxd' => 'application/vnd.sun.xml.draw', 'std' => 'application/vnd.sun.xml.draw.template', 'sxi' => 'application/vnd.sun.xml.impress', 'sti' => 'application/vnd.sun.xml.impress.template', 'sxm' => 'application/vnd.sun.xml.math', 'sxw' => 'application/vnd.sun.xml.writer', 'sxg' => 'application/vnd.sun.xml.writer.global', 'stw' => 'application/vnd.sun.xml.writer.template', 'vsd' => 'application/vnd.visio', 'wbxml' => 'application/vnd.wap.wbxml', 'wmlc' => 'application/vnd.wap.wmlc', 'wmlsc' => 'application/vnd.wap.wmlscriptc', 'bcpio' => 'application/x-bcpio', 'vcd' => 'application/x-cdlink', 'pgn' => 'application/x-chess-pgn', 'Z' => 'application/x-compress', 'cpio' => 'application/x-cpio', 'csh' => 'application/x-csh', 'dcr' => 'application/x-director', 'dir' => 'application/x-director', 'dxr' => 'application/x-director', 'dvi' => 'application/x-dvi', 'spl' => 'application/x-futuresplash', 'gtar' => 'application/x-gtar', 'tgz' => 'application/x-gtar', 'gz' => 'application/x-gzip', 'hdf' => 'application/x-hdf', 'php' => 'application/x-httpd-php', 'php3' => 'application/x-httpd-php3', 'js' => 'application/x-javascript', 'skd' => 'application/x-koan', 'skm' => 'application/x-koan', 'skp' => 'application/x-koan', 'skt' => 'application/x-koan', 'latex' => 'application/x-latex', 'wmd' => 'application/x-ms-wmd', 'wmz' => 'application/x-ms-wmz', 'cdf' => 'application/x-netcdf', 'nc' => 'application/x-netcdf', 'pl' => 'application/x-perl', 'pm' => 'application/x-perl', 'psd' => 'application/x-photoshop', 'sh' => 'application/x-sh', 'shar' => 'application/x-shar', 'swf' => 'application/x-shockwave-flash', 'sit' => 'application/x-stuffit', 'sv4cpio' => 'application/x-sv4cpio', 'sv4crc' => 'application/x-sv4crc', 'tar' => 'application/x-tar', 'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex', 'texi' => 'application/x-texinfo', 'texinfo' => 'application/x-texinfo', 'roff' => 'application/x-troff', 't' => 'application/x-troff', 'tr' => 'application/x-troff', 'man' => 'application/x-troff-man', 'me' => 'application/x-troff-me', 'ms' => 'application/x-troff-ms', 'ustar' => 'application/x-ustar', 'src' => 'application/x-wais-source', 'xht' => 'application/xhtml+xml', 'xhtml' => 'application/xhtml+xml', 'xml' => 'application/xml', 'zip' => 'application/zip', 'au' => 'audio/basic', 'snd' => 'audio/basic', 'kar' => 'audio/midi', 'mid' => 'audio/midi', 'midi' => 'audio/midi', 'mp2' => 'audio/mpeg', 'mp3' => 'audio/mpeg', 'mpga' => 'audio/mpeg', 'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff', 'm3u' => 'audio/x-mpegurl', 'wax' => 'audio/x-ms-wax', 'wma' => 'audio/x-ms-wma', 'ram' => 'audio/x-pn-realaudio', 'rm' => 'audio/x-pn-realaudio', 'rpm' => 'audio/x-pn-realaudio-plugin', 'ra' => 'audio/x-realaudio', 'wav' => 'audio/x-wav', 'pdb' => 'chemical/x-pdb', 'xyz' => 'chemical/x-xyz', 'bmp' => 'image/bmp', 'gif' => 'image/gif', 'ief' => 'image/ief', 'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'jpg' => 'image/jpeg', 'png' => 'image/png', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'wbmp' => 'image/vnd.wap.wbmp', 'ras' => 'image/x-cmu-raster', 'pnm' => 'image/x-portable-anymap', 'pbm' => 'image/x-portable-bitmap', 'pgm' => 'image/x-portable-graymap', 'ppm' => 'image/x-portable-pixmap', 'rgb' => 'image/x-rgb', 'xbm' => 'image/x-xbitmap', 'xpm' => 'image/x-xpixmap', 'xwd' => 'image/x-xwindowdump', 'iges' => 'model/iges', 'igs' => 'model/iges', 'mesh' => 'model/mesh', 'msh' => 'model/mesh', 'silo' => 'model/mesh', 'vrml' => 'model/vrml', 'wrl' => 'model/vrml', 'ics' => 'text/calendar', 'ifb' => 'text/calendar', 'vcs' => 'text/calendar', 'vfb' => 'text/calendar', 'css' => 'text/css', 'csv' => 'text/csv', 'diff' => 'text/diff', 'patch' => 'text/diff', 'htm' => 'text/html', 'html' => 'text/html', 'shtml' => 'text/html', 'asc' => 'text/plain', 'log' => 'text/plain', 'po' => 'text/plain', 'txt' => 'text/plain', 'rtx' => 'text/richtext', 'rtf' => 'text/rtf', 'sgm' => 'text/sgml', 'sgml' => 'text/sgml', 'tsv' => 'text/tab-separated-values', 'wml' => 'text/vnd.wap.wml', 'wmls' => 'text/vnd.wap.wmlscript', 'etx' => 'text/x-setext', 'vcf' => 'text/x-vcard', 'xsl' => 'text/xml', 'mp4' => 'video/mp4', 'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 'mpg' => 'video/mpeg', 'mov' => 'video/quicktime', 'qt' => 'video/quicktime', 'mxu' => 'video/vnd.mpegurl', 'asf' => 'video/x-ms-asf', 'asx' => 'video/x-ms-asf', 'wm' => 'video/x-ms-wm', 'wmv' => 'video/x-ms-wmv', 'wmx' => 'video/x-ms-wmx', 'wvx' => 'video/x-ms-wvx', 'avi' => 'video/x-msvideo', 'movie' => 'video/x-sgi-movie', 'ice' => 'x-conference/x-cooltalk', );
+    public $mime_extension_map = array( 'ez' => 'application/andrew-inset', 'hqx' => 'application/mac-binhex40', 'cpt' => 'application/mac-compactpro', 'doc' => 'application/msword', 'bin' => 'application/octet-stream', 'class' => 'application/octet-stream', 'dll' => 'application/octet-stream', 'dms' => 'application/octet-stream', 'exe' => 'application/octet-stream', 'lha' => 'application/octet-stream', 'lzh' => 'application/octet-stream', 'so' => 'application/octet-stream', 'oda' => 'application/oda', 'pdf' => 'application/pdf', 'ai' => 'application/postscript', 'eps' => 'application/postscript', 'ps' => 'application/postscript', 'smi' => 'application/smil', 'smil' => 'application/smil', 'mif' => 'application/vnd.mif', 'xls' => 'application/vnd.ms-excel', 'ppt' => 'application/vnd.ms-powerpoint', 'sxc' => 'application/vnd.sun.xml.calc', 'stc' => 'application/vnd.sun.xml.calc.template', 'sxd' => 'application/vnd.sun.xml.draw', 'std' => 'application/vnd.sun.xml.draw.template', 'sxi' => 'application/vnd.sun.xml.impress', 'sti' => 'application/vnd.sun.xml.impress.template', 'sxm' => 'application/vnd.sun.xml.math', 'sxw' => 'application/vnd.sun.xml.writer', 'sxg' => 'application/vnd.sun.xml.writer.global', 'stw' => 'application/vnd.sun.xml.writer.template', 'vsd' => 'application/vnd.visio', 'wbxml' => 'application/vnd.wap.wbxml', 'wmlc' => 'application/vnd.wap.wmlc', 'wmlsc' => 'application/vnd.wap.wmlscriptc', 'bcpio' => 'application/x-bcpio', 'vcd' => 'application/x-cdlink', 'pgn' => 'application/x-chess-pgn', 'Z' => 'application/x-compress', 'cpio' => 'application/x-cpio', 'csh' => 'application/x-csh', 'dcr' => 'application/x-director', 'dir' => 'application/x-director', 'dxr' => 'application/x-director', 'dvi' => 'application/x-dvi', 'spl' => 'application/x-futuresplash', 'gtar' => 'application/x-gtar', 'tgz' => 'application/x-gtar', 'gz' => 'application/x-gzip', 'hdf' => 'application/x-hdf', 'php' => 'application/x-httpd-php', 'php3' => 'application/x-httpd-php3', 'js' => 'application/x-javascript', 'skd' => 'application/x-koan', 'skm' => 'application/x-koan', 'skp' => 'application/x-koan', 'skt' => 'application/x-koan', 'latex' => 'application/x-latex', 'wmd' => 'application/x-ms-wmd', 'wmz' => 'application/x-ms-wmz', 'cdf' => 'application/x-netcdf', 'nc' => 'application/x-netcdf', 'pl' => 'application/x-perl', 'pm' => 'application/x-perl', 'psd' => 'application/x-photoshop', 'sh' => 'application/x-sh', 'shar' => 'application/x-shar', 'swf' => 'application/x-shockwave-flash', 'sit' => 'application/x-stuffit', 'sv4cpio' => 'application/x-sv4cpio', 'sv4crc' => 'application/x-sv4crc', 'tar' => 'application/x-tar', 'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex', 'texi' => 'application/x-texinfo', 'texinfo' => 'application/x-texinfo', 'roff' => 'application/x-troff', 't' => 'application/x-troff', 'tr' => 'application/x-troff', 'man' => 'application/x-troff-man', 'me' => 'application/x-troff-me', 'ms' => 'application/x-troff-ms', 'ustar' => 'application/x-ustar', 'src' => 'application/x-wais-source', 'xht' => 'application/xhtml+xml', 'xhtml' => 'application/xhtml+xml', 'xml' => 'application/xml', 'zip' => 'application/zip', 'au' => 'audio/basic', 'snd' => 'audio/basic', 'kar' => 'audio/midi', 'mid' => 'audio/midi', 'midi' => 'audio/midi', 'mp2' => 'audio/mpeg', 'mp3' => 'audio/mpeg', 'mpga' => 'audio/mpeg', 'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff', 'm3u' => 'audio/x-mpegurl', 'wax' => 'audio/x-ms-wax', 'wma' => 'audio/x-ms-wma', 'ram' => 'audio/x-pn-realaudio', 'rm' => 'audio/x-pn-realaudio', 'rpm' => 'audio/x-pn-realaudio-plugin', 'ra' => 'audio/x-realaudio', 'wav' => 'audio/x-wav', 'pdb' => 'chemical/x-pdb', 'xyz' => 'chemical/x-xyz', 'bmp' => 'image/bmp', 'gif' => 'image/gif', 'ief' => 'image/ief', 'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'jpg' => 'image/jpeg', 'png' => 'image/png', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'wbmp' => 'image/vnd.wap.wbmp', 'ras' => 'image/x-cmu-raster', 'pnm' => 'image/x-portable-anymap', 'pbm' => 'image/x-portable-bitmap', 'pgm' => 'image/x-portable-graymap', 'ppm' => 'image/x-portable-pixmap', 'rgb' => 'image/x-rgb', 'xbm' => 'image/x-xbitmap', 'xpm' => 'image/x-xpixmap', 'xwd' => 'image/x-xwindowdump', 'iges' => 'model/iges', 'igs' => 'model/iges', 'mesh' => 'model/mesh', 'msh' => 'model/mesh', 'silo' => 'model/mesh', 'vrml' => 'model/vrml', 'wrl' => 'model/vrml', 'ics' => 'text/calendar', 'ifb' => 'text/calendar', 'vcs' => 'text/calendar', 'vfb' => 'text/calendar', 'css' => 'text/css', 'csv' => 'text/csv', 'diff' => 'text/diff', 'patch' => 'text/diff', 'htm' => 'text/html', 'html' => 'text/html', 'shtml' => 'text/html', 'asc' => 'text/plain', 'log' => 'text/plain', 'po' => 'text/plain', 'txt' => 'text/plain', 'rtx' => 'text/richtext', 'rtf' => 'text/rtf', 'sgm' => 'text/sgml', 'sgml' => 'text/sgml', 'tsv' => 'text/tab-separated-values', 'wml' => 'text/vnd.wap.wml', 'wmls' => 'text/vnd.wap.wmlscript', 'etx' => 'text/x-setext', 'vcf' => 'text/x-vcard', 'xsl' => 'text/xml', 'mp4' => 'video/mp4', 'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 'mpg' => 'video/mpeg', 'mov' => 'video/quicktime', 'qt' => 'video/quicktime', 'mxu' => 'video/vnd.mpegurl', 'asf' => 'video/x-ms-asf', 'asx' => 'video/x-ms-asf', 'wm' => 'video/x-ms-wm', 'wmv' => 'video/x-ms-wmv', 'wmx' => 'video/x-ms-wmx', 'wvx' => 'video/x-ms-wvx', 'avi' => 'video/x-msvideo', 'movie' => 'video/x-sgi-movie', 'ice' => 'x-conference/x-cooltalk', );
 
     /**
@@ -74,5 +74,5 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
 		$app =& App::getInstance();
@@ -118,5 +118,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -144,5 +144,5 @@
      *                        In this case it is necessary to check the Upload::anyErrors method to discover if any did fail.
      */
-    function process($form_name, $custom_file_name=null)
+    public function process($form_name, $custom_file_name=null)
     {
 		$app =& App::getInstance();
@@ -351,5 +351,5 @@
      * @return  bool                Success of operation.
      */
-    function deleteFile($file_name, $use_glob=false)
+    public function deleteFile($file_name, $use_glob=false)
     {
 		$app =& App::getInstance();
@@ -384,5 +384,5 @@
      * @return  bool                Success of operation.
      */
-    function moveFile($old_name, $new_name)
+    public function moveFile($old_name, $new_name)
     {
 		$app =& App::getInstance();
@@ -419,5 +419,5 @@
      * @return  bool                Existence of file.
      */
-    function exists($file_name)
+    public function exists($file_name)
     {
 		$app =& App::getInstance();
@@ -442,5 +442,5 @@
      * @since   15 Nov 2005 20:55:22
      */
-    function getFilenameGlob($pattern)
+    public function getFilenameGlob($pattern)
     {
         $file_list = glob(sprintf('%s/%s', $this->getParam('upload_path'), $pattern));
@@ -458,5 +458,5 @@
      * @return  array   List of file names.
      */
-    function getErrors()
+    public function getErrors()
     {
         return $this->errors;
@@ -468,5 +468,5 @@
      * @access  public
      */
-    function anyErrors()
+    public function anyErrors()
     {
         return sizeof($this->errors) > 0;
@@ -480,5 +480,5 @@
      * @return  string              The same name, but cleaned.
      */
-    function cleanFileName($file_name)
+    public function cleanFileName($file_name)
     {
         $bad  = 'Ã¡Ã©Ã­Ã³ÃºÃ ÃšÃ¬Ã²Ã¹Ã€Ã«Ã¯Ã¶ÃŒÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃ¢ÃªÃ®ÃŽÃ»ÃÃÃÃÃÃ±Ã§Ã@';
@@ -499,5 +499,5 @@
      * @return  string              The value found after the dot
      */
-    function getFilenameExtension($file_name)
+    public function getFilenameExtension($file_name)
     {
         preg_match('/.*?\.(\w+)$/i', trim($file_name), $ext);
@@ -516,5 +516,5 @@
      * @param string $line    __LINE__.
      */
-    function _raiseMsg($message, $type, $file, $line)
+    public function _raiseMsg($message, $type, $file, $line)
     {
 		$app =& App::getInstance();
@@ -526,3 +526,2 @@
 }
 
-?>
Index: branches/eli_branch/lib/Utilities.inc.php
===================================================================
--- branches/eli_branch/lib/Utilities.inc.php	(revision 438)
+++ branches/eli_branch/lib/Utilities.inc.php	(revision 439)
@@ -1088,5 +1088,2 @@
     }
 }
-
-
-?>
Index: branches/eli_branch/lib/Validator.inc.php
===================================================================
--- branches/eli_branch/lib/Validator.inc.php	(revision 438)
+++ branches/eli_branch/lib/Validator.inc.php	(revision 439)
@@ -53,5 +53,5 @@
      * @return bool   true if form is not empty, false otherwise.
      */
-    function notEmpty($val)
+    public function notEmpty($val)
     {
         return '' != trim((string)$val);
@@ -64,5 +64,5 @@
      * @return bool   true if form is empty, false otherwise.
      */
-    function isEmpty($val)
+    public function isEmpty($val)
     {
         return '' == trim((string)$val);
@@ -75,5 +75,5 @@
      * @return bool   true if form is a string, false otherwise.
      */
-    function isString($val)
+    public function isString($val)
     {
         return '' == trim((string)$val) || is_string($val);
@@ -86,5 +86,5 @@
      * @return bool   True if no errors found, false otherwise.
      */
-    function isNumber($val)
+    public function isNumber($val)
     {
         return '' == trim((string)$val) || is_numeric($val);
@@ -98,5 +98,5 @@
      * @return bool   true if value is an integer
      */
-    function isInteger($val, $negative_ok=false)
+    public function isInteger($val, $negative_ok=false)
     {
         $pattern = $negative_ok ? '/^-?[[:digit:]]+$/' : '/^[[:digit:]]+$/';
@@ -112,5 +112,5 @@
      * @return bool   true if value is a float
      */
-    function isFloat($val, $negative_ok=false)
+    public function isFloat($val, $negative_ok=false)
     {
         $pattern = $negative_ok ? '/^-?[[:digit:]]*(?:\.?[[:digit:]]+)$/' : '/^[[:digit:]]*(?:\.?[[:digit:]]+)$/';
@@ -124,5 +124,5 @@
      * @return bool   true if value is a float
      */
-    function isArray($val)
+    public function isArray($val)
     {
         return (is_string($val) && '' == trim((string)$val)) || is_array($val);
@@ -138,5 +138,5 @@
      * @return bool   true if value passes regex test
      */
-    function checkRegex($val, $regex, $valid_on_match=true)
+    public function checkRegex($val, $regex, $valid_on_match=true)
     {
         return $valid_on_match ? preg_match($regex, $val) : !preg_match($regex, $val);
@@ -151,5 +151,5 @@
      * @return bool   true if string length is within given boundaries
      */
-    function stringLength($val, $min, $max)
+    public function stringLength($val, $min, $max)
     {
         return mb_strlen(trim((string)$val)) >= $min && mb_strlen($val) <= $max;
@@ -164,5 +164,5 @@
      * @return bool   True if no errors found, false otherwise.
      */
-    function numericRange($val, $min, $max)
+    public function numericRange($val, $min, $max)
     {
         return '' == trim((string)$val) || (is_numeric($val) && $val >= $min && $val <= $max);
@@ -183,5 +183,5 @@
      * @author  Quinn Comendant <quinn@strangecode.com>
      */
-    function validateEmail($val)
+    public function validateEmail($val)
     {
         require_once 'codebase/lib/Email.inc.php';
@@ -222,5 +222,5 @@
      * @return bool    True if no errors found, false otherwise.
      */
-    function validateStrDate($val)
+    public function validateStrDate($val)
     {
 		$app =& App::getInstance();
@@ -250,5 +250,5 @@
      * @return bool    True if no errors found, false otherwise.
      */
-     function validateCCNumber($val, $cc_type=null)
+     public function validateCCNumber($val, $cc_type=null)
      {
          // Get rid of any non-digits
@@ -319,5 +319,5 @@
      * @return bool   True if no errors found, false otherwise.
      */
-    function fileUploaded($form_name)
+    public function fileUploaded($form_name)
     {
         if (!isset($_FILES[$form_name]['name']) || empty($_FILES[$form_name]['name'])) {
@@ -342,3 +342,2 @@
 } // THE END
 
-?>
Index: branches/eli_branch/lib/Version.inc.php
===================================================================
--- branches/eli_branch/lib/Version.inc.php	(revision 438)
+++ branches/eli_branch/lib/Version.inc.php	(revision 439)
@@ -40,5 +40,5 @@
 
     // Configuration of this object.
-    var $_params = array(
+    private $_params = array(
         'max_qty' => 100, // Never have more than this many versions of each record.
         'min_qty' => 25, // Keep at least this many versions of each record.
@@ -54,5 +54,5 @@
 
     // Auth_SQL object from which to access a current user_id.
-    var $_auth;
+    private $_auth;
 
     /**
@@ -63,5 +63,5 @@
      * @static
      */
-    static function &getInstance($auth_object)
+    public static function &getInstance($auth_object)
     {
         static $instance = null;
@@ -79,5 +79,5 @@
      * @param mixed  $auth_object  An Auth_SQL object.
      */
-    function Version($auth_object)
+    public function __construct($auth_object)
     {
 		$app =& App::getInstance();
@@ -102,5 +102,5 @@
      * @since   26 Aug 2005 17:09:36
      */
-    function initDB($recreate_db=false)
+    public function initDB($recreate_db=false)
     {
 		$app =& App::getInstance();
@@ -155,5 +155,5 @@
      * @param  array $params   Array of param keys and values to set.
      */
-    function setParam($params=null)
+    public function setParam($params=null)
     {
         if (isset($params) && is_array($params)) {
@@ -170,5 +170,5 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
 		$app =& App::getInstance();
@@ -192,5 +192,5 @@
      * @return int                  The id for the version (mysql last insert id).
      */
-    function create($record_table, $record_key, $record_val, $title='', $notes='')
+    public function create($record_table, $record_key, $record_val, $title='', $notes='')
     {
 		$app =& App::getInstance();
@@ -253,5 +253,5 @@
      * @return int                  The id for the version (mysql last insert id).
      */
-    function restore($version_id)
+    public function restore($version_id)
     {
 		$app =& App::getInstance();
@@ -314,5 +314,5 @@
      * @return mixed                Array of versions, or false if none.
      */
-    function deleteOld($record_table, $record_key, $record_val)
+    public function deleteOld($record_table, $record_key, $record_val)
     {
 		$db =& DB::getInstance();
@@ -381,5 +381,5 @@
      * @return mixed                Array of versions, or false if none.
      */
-    function getList($record_table, $record_key, $record_val)
+    public function getList($record_table, $record_key, $record_val)
     {
 		$db =& DB::getInstance();
@@ -418,5 +418,5 @@
      * @return mixed                Array of data saved in version, or false if none.
      */
-    function getVerson($version_id)
+    public function getVerson($version_id)
     {
 		$db =& DB::getInstance();
@@ -439,5 +439,5 @@
      * @return mixed                Array of data saved in version, or false if none.
      */
-    function getData($version_id)
+    public function getData($version_id)
     {
 		$db =& DB::getInstance();
@@ -465,5 +465,5 @@
      * @return mixed                Array of data saved in version, or false if none.
      */
-    function getCurrent($record_table, $record_key, $record_val)
+    public function getCurrent($record_table, $record_key, $record_val)
     {
 		$db =& DB::getInstance();
@@ -484,3 +484,2 @@
 
 } // End of class.
-?>
