YetiForceCompany / YetiForceCRM

libraries/HTTP_Session/Session/Container.php

Indentation +194 added lines, -194 removed lines

@@ -44,237 +44,237 @@
  */
 class HTTP_Session_Container
 {
-    /**
-     * Additional options for the container object
-     *
-     * @var array
-     * @access private
-     */
-    public $options = array();
+	/**
+	 * Additional options for the container object
+	 *
+	 * @var array
+	 * @access private
+	 */
+	public $options = array();
 
-    /**
-     * Constrtuctor method
-     *
-     * @param array $options Additional options for the container object
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container($options = null)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions();
-        }
-    }
+	/**
+	 * Constrtuctor method
+	 *
+	 * @param array $options Additional options for the container object
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container($options = null)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions();
+		}
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+	}
 
-    /**
-     * Parse options passed to the container class
-     *
-     * @param array $options Options
-     *
-     * @access private
-     * @return void
-     */
-    public function _parseOptions($options)
-    {
-        foreach ($options as $option => $value) {
-            if (in_array($option, array_keys($this->options))) {
-                $this->options[$option] = $value;
-            }
-        }
-    }
+	/**
+	 * Parse options passed to the container class
+	 *
+	 * @param array $options Options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _parseOptions($options)
+	{
+		foreach ($options as $option => $value) {
+			if (in_array($option, array_keys($this->options))) {
+				$this->options[$option] = $value;
+			}
+		}
+	}
 
-    /**
-     * This function is called by the session handler to initialize things
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @access public
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        return true;
-    }
+	/**
+	 * This function is called by the session handler to initialize things
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		return true;
+	}
 
-    /**
-     * This function is called when the page is finished
-     * executing and the session handler needs to close things off
-     *
-     * Has to be overwritten by each container class
-     *
-     * @access public
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * This function is called when the page is finished
+	 * executing and the session handler needs to close things off
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * This function is called by the session handler
-     * to read the data associated with a given session ID.
-     * This function must retrieve and return the session data
-     * for the session identified by $id.
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $id ID of the session
-     *
-     * @access public
-     * @return string
-     */
-    public function read($id)
-    {
-        return '';
-    }
+	/**
+	 * This function is called by the session handler
+	 * to read the data associated with a given session ID.
+	 * This function must retrieve and return the session data
+	 * for the session identified by $id.
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $id ID of the session
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function read($id)
+	{
+		return '';
+	}
 
-    /**
-     * This function is called when the session handler
-     * has session data to save, which usually happens
-     * at the end of your script
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $id   ID of the session
-     * @param mixed  $data The data associated with a given session ID
-     *
-     * @access public
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        return true;
-    }
+	/**
+	 * This function is called when the session handler
+	 * has session data to save, which usually happens
+	 * at the end of your script
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $id   ID of the session
+	 * @param mixed  $data The data associated with a given session ID
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		return true;
+	}
 
-    /**
-     * This function is called when a session is destroyed.
-     * It is responsible for deleting the session and cleaning things up.
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $id ID of the session
-     *
-     * @access public
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        return true;
-    }
+	/**
+	 * This function is called when a session is destroyed.
+	 * It is responsible for deleting the session and cleaning things up.
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $id ID of the session
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		return true;
+	}
 
-    /**
-     * This function copies session data of specified id to specified table
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $targetTable Table to replicate data to
-     * @param string $id          ID of the session
-     *
-     * @access public
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        return true;
-    }
+	/**
+	 * This function copies session data of specified id to specified table
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $targetTable Table to replicate data to
+	 * @param string $id          ID of the session
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		return true;
+	}
 
-    /**
-     * This function is responsible for garbage collection.
-     * In the case of session handling, it is responsible
-     * for deleting old, stale sessions that are hanging around.
-     * The session handler will call this every now and then.
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param integer $maxlifetime Maximum lifetime
-     *
-     * @access public
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        return true;
-    }
+	/**
+	 * This function is responsible for garbage collection.
+	 * In the case of session handling, it is responsible
+	 * for deleting old, stale sessions that are hanging around.
+	 * The session handler will call this every now and then.
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param integer $maxlifetime Maximum lifetime
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		return true;
+	}
 
-    /**
-     * Set session save handler
-     *
-     * @access public
-     * @return void
-     */
-    public function set()
-    {
-        $GLOBALS['HTTP_Session_Container'] =& $this;
-        session_module_name('user');
-        session_set_save_handler('HTTP_Session_Open',
-                                 'HTTP_Session_Close',
-                                 'HTTP_Session_Read',
-                                 'HTTP_Session_Write',
-                                 'HTTP_Session_Destroy',
-                                 'HTTP_Session_GC');
-    }
+	/**
+	 * Set session save handler
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function set()
+	{
+		$GLOBALS['HTTP_Session_Container'] =& $this;
+		session_module_name('user');
+		session_set_save_handler('HTTP_Session_Open',
+								 'HTTP_Session_Close',
+								 'HTTP_Session_Read',
+								 'HTTP_Session_Write',
+								 'HTTP_Session_Destroy',
+								 'HTTP_Session_GC');
+	}
 
-    /**
-     * Destructor for compatibility with PHP >= 5.0.5
-     *
-     * @access private
-     * @return void
-     */
-    public function __destruct()
-    {
-        $GLOBALS['HTTP_Session_Container'] =& $this;
-        session_write_close();
-    }
+	/**
+	 * Destructor for compatibility with PHP >= 5.0.5
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function __destruct()
+	{
+		$GLOBALS['HTTP_Session_Container'] =& $this;
+		session_write_close();
+	}
 }
 
 // Delegate function calls to the object's methods
 /** @ignore */
 function HTTP_Session_Open($save_path, $session_name)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->open($save_path, $session_name)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->open($save_path, $session_name)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Close()
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->close()
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->close()
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Read($id)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->read($id)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->read($id)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Write($id, $data)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->write($id, $data)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->write($id, $data)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Destroy($id)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->destroy($id)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->destroy($id)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_GC($maxlifetime)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->gc($maxlifetime)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->gc($maxlifetime)
+													   : false;
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container/DB.php

Indentation +279 added lines, -279 removed lines

@@ -59,306 +59,306 @@
  */
 class HTTP_Session_Container_DB extends HTTP_Session_Container
 {
-    /**
-     * DB connection object
-     *
-     * @var object DB
-     * @access private
-     */
-    public $db = null;
+	/**
+	 * DB connection object
+	 *
+	 * @var object DB
+	 * @access private
+	 */
+	public $db = null;
 
-    /**
-     * Session data cache id
-     *
-     * @var mixed
-     * @access private
-     */
-    public $crc = false;
+	/**
+	 * Session data cache id
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	public $crc = false;
 
-    /**
-     * Constrtuctor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'dsn' - The DSN string</li>
-     * <li>'table' - Table with session data, default is 'sessiondata'</li>
-     * <li>'autooptimize' - Boolean, 'true' to optimize
-     * the table on garbage collection, default is 'false'.</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container_DB($options)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        } else {
-            $this->options['dsn'] = $options;
-        }
-    }
+	/**
+	 * Constrtuctor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'dsn' - The DSN string</li>
+	 * <li>'table' - Table with session data, default is 'sessiondata'</li>
+	 * <li>'autooptimize' - Boolean, 'true' to optimize
+	 * the table on garbage collection, default is 'false'.</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container_DB($options)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		} else {
+			$this->options['dsn'] = $options;
+		}
+	}
 
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $dsn DSN string
-     *
-     * @access private
-     * @return mixed   Object on error, otherwise bool
-     */
-    public function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-            $this->db = DB::connect($dsn);
-        } else if (is_object($dsn) && is_a($dsn, "db_common")) {
-            $this->db = $dsn;
-        } else if (is_object($dsn) && DB::isError($dsn)) {
-            return new DB_Error($dsn->code, PEAR_ERROR_DIE);
-        } else {
-            return new PEAR_Error("The given dsn was not valid in file " . __FILE__
-                                  . " at line " . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                  );
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $dsn DSN string
+	 *
+	 * @access private
+	 * @return mixed   Object on error, otherwise bool
+	 */
+	public function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			$this->db = DB::connect($dsn);
+		} else if (is_object($dsn) && is_a($dsn, "db_common")) {
+			$this->db = $dsn;
+		} else if (is_object($dsn) && DB::isError($dsn)) {
+			return new DB_Error($dsn->code, PEAR_ERROR_DIE);
+		} else {
+			return new PEAR_Error("The given dsn was not valid in file " . __FILE__
+								  . " at line " . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								  );
 
-        }
+		}
 
-        if (DB::isError($this->db)) {
-            return new DB_Error($this->db->code, PEAR_ERROR_DIE);
-        }
+		if (DB::isError($this->db)) {
+			return new DB_Error($this->db->code, PEAR_ERROR_DIE);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['dsn']          = null;
-        $this->options['table']        = 'sessiondata';
-        $this->options['autooptimize'] = false;
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['dsn']          = null;
+		$this->options['table']        = 'sessiondata';
+		$this->options['autooptimize'] = false;
+	}
 
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        if (DB::isError($this->_connect($this->options['dsn']))) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		if (DB::isError($this->_connect($this->options['dsn']))) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Free resources
-     *
-     * @return void
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * Free resources
+	 *
+	 * @return void
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @return void
-     */
-    public function read($id)
-    {
-        $query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
-                         $this->options['table'],
-                         $this->db->quoteSmart(md5($id)),
-                         time());
-        $result = $this->db->getOne($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        $this->crc = strlen($result) . crc32($result);
-        return $result;
-    }
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return void
+	 */
+	public function read($id)
+	{
+		$query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
+						 $this->options['table'],
+						 $this->db->quoteSmart(md5($id)),
+						 time());
+		$result = $this->db->getOne($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		$this->crc = strlen($result) . crc32($result);
+		return $result;
+	}
 
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Data
-     *
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        if ((false !== $this->crc) &&
-            ($this->crc === strlen($data) . crc32($data))) {
-            // $_SESSION hasn't been touched, no need to update the blob column
-            $query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
-                             $this->options['table'],
-                             time() + ini_get('session.gc_maxlifetime'),
-                             $this->db->quoteSmart(md5($id)));
-        } else {
-            // Check if table row already exists
-            $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                             $this->options['table'],
-                             $this->db->quoteSmart(md5($id)));
-            $result = $this->db->getOne($query);
-            if (DB::isError($result)) {
-                new DB_Error($result->code, PEAR_ERROR_DIE);
-                return false;
-            }
-            if (0 == intval($result)) {
-                // Insert new row into table
-                $query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
-                                 $this->options['table'],
-                                 $this->db->quoteSmart(md5($id)),
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quoteSmart($data));
-            } else {
-                // Update existing row
-                $query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
-                                 $this->options['table'],
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quoteSmart($data),
-                                 $this->db->quoteSmart(md5($id)));
-            }
-        }
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Data
+	 *
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		if ((false !== $this->crc) &&
+			($this->crc === strlen($data) . crc32($data))) {
+			// $_SESSION hasn't been touched, no need to update the blob column
+			$query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
+							 $this->options['table'],
+							 time() + ini_get('session.gc_maxlifetime'),
+							 $this->db->quoteSmart(md5($id)));
+		} else {
+			// Check if table row already exists
+			$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+							 $this->options['table'],
+							 $this->db->quoteSmart(md5($id)));
+			$result = $this->db->getOne($query);
+			if (DB::isError($result)) {
+				new DB_Error($result->code, PEAR_ERROR_DIE);
+				return false;
+			}
+			if (0 == intval($result)) {
+				// Insert new row into table
+				$query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
+								 $this->options['table'],
+								 $this->db->quoteSmart(md5($id)),
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quoteSmart($data));
+			} else {
+				// Update existing row
+				$query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
+								 $this->options['table'],
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quoteSmart($data),
+								 $this->db->quoteSmart(md5($id)));
+			}
+		}
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @return void
-     */
-    public function destroy($id)
-    {
-        $query = sprintf("DELETE FROM %s WHERE id = %s",
-                         $this->options['table'],
-                         $this->db->quoteSmart(md5($id)));
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return void
+	 */
+	public function destroy($id)
+	{
+		$query = sprintf("DELETE FROM %s WHERE id = %s",
+						 $this->options['table'],
+						 $this->db->quoteSmart(md5($id)));
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Replicate session data to table specified in option 'replicateBeforeDestroy'
-     *
-     * @param string $targetTable Table to replicate to
-     * @param string $id          Id of record to replicate
-     *
-     * @access private
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        if (is_null($id)) {
-            $id = HTTP_Session::id();
-        }
+	/**
+	 * Replicate session data to table specified in option 'replicateBeforeDestroy'
+	 *
+	 * @param string $targetTable Table to replicate to
+	 * @param string $id          Id of record to replicate
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		if (is_null($id)) {
+			$id = HTTP_Session::id();
+		}
 
-        // Check if table row already exists
-        $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                         $targetTable,
-                         $this->db->quoteSmart(md5($id)));
-        $result = $this->db->getOne($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		// Check if table row already exists
+		$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+						 $targetTable,
+						 $this->db->quoteSmart(md5($id)));
+		$result = $this->db->getOne($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        // Insert new row into dest table
-        if (0 == intval($result)) {
-            $query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quoteSmart(md5($id)));
+		// Insert new row into dest table
+		if (0 == intval($result)) {
+			$query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quoteSmart(md5($id)));
 
-        } else {
-            // Update existing row
-            $query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quoteSmart(md5($id)));
-        }
+		} else {
+			// Update existing row
+			$query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quoteSmart(md5($id)));
+		}
 
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        $query = sprintf("DELETE FROM %s WHERE expiry < %d",
-                         $this->options['table'],
-                         time());
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
-            }
-            if (isset($query)) {
-                $result = $this->db->query($query);
-                if (DB::isError($result)) {
-                    new DB_Error($result->code, PEAR_ERROR_DIE);
-                    return false;
-                }
-            }
-        }
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		$query = sprintf("DELETE FROM %s WHERE expiry < %d",
+						 $this->options['table'],
+						 time());
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		if ($this->options['autooptimize']) {
+			switch($this->db->phptype) {
+			case 'mysql':
+				$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+				break;
+			case 'pgsql':
+				$query = sprintf("VACUUM %s", $this->options['table']);
+				break;
+			default:
+				$query = null;
+				break;
+			}
+			if (isset($query)) {
+				$result = $this->db->query($query);
+				if (DB::isError($result)) {
+					new DB_Error($result->code, PEAR_ERROR_DIE);
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container/MDB.php

Indentation +279 added lines, -279 removed lines

@@ -60,305 +60,305 @@
 class HTTP_Session_Container_MDB extends HTTP_Session_Container
 {
 
-    /**
-     * MDB connection object
-     *
-     * @var object MDB
-     * @access private
-     */
-    public $db = null;
+	/**
+	 * MDB connection object
+	 *
+	 * @var object MDB
+	 * @access private
+	 */
+	public $db = null;
 
-    /**
-     * Session data cache id
-     *
-     * @var mixed
-     * @access private
-     */
-    public $crc = false;
+	/**
+	 * Session data cache id
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	public $crc = false;
 
-    /**
-     * Constructor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'dsn' - The DSN string</li>
-     * <li>'table' - Table with session data, default is 'sessiondata'</li>
-     * <li>'autooptimize' - Boolean, 'true' to optimize
-     * the table on garbage collection, default is 'false'.</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container_MDB($options)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        } else {
-            $this->options['dsn'] = $options;
-        }
-    }
+	/**
+	 * Constructor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'dsn' - The DSN string</li>
+	 * <li>'table' - Table with session data, default is 'sessiondata'</li>
+	 * <li>'autooptimize' - Boolean, 'true' to optimize
+	 * the table on garbage collection, default is 'false'.</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container_MDB($options)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		} else {
+			$this->options['dsn'] = $options;
+		}
+	}
 
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $dsn DSN string
-     *
-     * @access private
-     * @return mixed  Object on error, otherwise bool
-     */
-    public function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-            $this->db = MDB::connect($dsn);
-        } else if (is_object($dsn) && is_a($dsn, 'mdb_common')) {
-            $this->db = $dsn;
-        } else if (is_object($dsn) && MDB::isError($dsn)) {
-            return new MDB_Error($dsn->code, PEAR_ERROR_DIE);
-        } else {
-            return new PEAR_Error("The given dsn was not valid in file " . __FILE__ 
-                                  . " at line " . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                  );
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $dsn DSN string
+	 *
+	 * @access private
+	 * @return mixed  Object on error, otherwise bool
+	 */
+	public function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			$this->db = MDB::connect($dsn);
+		} else if (is_object($dsn) && is_a($dsn, 'mdb_common')) {
+			$this->db = $dsn;
+		} else if (is_object($dsn) && MDB::isError($dsn)) {
+			return new MDB_Error($dsn->code, PEAR_ERROR_DIE);
+		} else {
+			return new PEAR_Error("The given dsn was not valid in file " . __FILE__ 
+								  . " at line " . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								  );
 
-        }
+		}
 
-        if (MDB::isError($this->db)) {
-            return new MDB_Error($this->db->code, PEAR_ERROR_DIE);
-        }
+		if (MDB::isError($this->db)) {
+			return new MDB_Error($this->db->code, PEAR_ERROR_DIE);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['dsn']          = null;
-        $this->options['table']        = 'sessiondata';
-        $this->options['autooptimize'] = false;
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['dsn']          = null;
+		$this->options['table']        = 'sessiondata';
+		$this->options['autooptimize'] = false;
+	}
 
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        if (MDB::isError($this->_connect($this->options['dsn']))) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		if (MDB::isError($this->_connect($this->options['dsn']))) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Free resources
-     *
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * Free resources
+	 *
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @return mixed
-     */
-    public function read($id)
-    {
-        $query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
-                         $this->options['table'],
-                         $this->db->getTextValue(md5($id)),
-                         time());
-        $result = $this->db->getOne($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        $this->crc = strlen($result) . crc32($result);
-        return $result;
-    }
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return mixed
+	 */
+	public function read($id)
+	{
+		$query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
+						 $this->options['table'],
+						 $this->db->getTextValue(md5($id)),
+						 time());
+		$result = $this->db->getOne($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		$this->crc = strlen($result) . crc32($result);
+		return $result;
+	}
 
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Data
-     *
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        if ((false !== $this->crc) && 
-            ($this->crc === strlen($data) . crc32($data))) {
-            // $_SESSION hasn't been touched, no need to update the blob column
-            $query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
-                             $this->options['table'],
-                             time() + ini_get('session.gc_maxlifetime'),
-                             $this->db->getTextValue(md5($id)));
-        } else {
-            // Check if table row already exists
-            $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                             $this->options['table'],
-                             $this->db->getTextValue(md5($id)));
-            $result = $this->db->getOne($query);
-            if (MDB::isError($result)) {
-                new MDB_Error($result->code, PEAR_ERROR_DIE);
-                return false;
-            }
-            if (0 == intval($result)) {
-                // Insert new row into table
-                $query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
-                                 $this->options['table'],
-                                 $this->db->getTextValue(md5($id)),
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->getTextValue($data));
-            } else {
-                // Update existing row
-                $query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
-                                 $this->options['table'],
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->getTextValue($data),
-                                 $this->db->getTextValue(md5($id)));
-            }
-        }
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Data
+	 *
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		if ((false !== $this->crc) && 
+			($this->crc === strlen($data) . crc32($data))) {
+			// $_SESSION hasn't been touched, no need to update the blob column
+			$query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
+							 $this->options['table'],
+							 time() + ini_get('session.gc_maxlifetime'),
+							 $this->db->getTextValue(md5($id)));
+		} else {
+			// Check if table row already exists
+			$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+							 $this->options['table'],
+							 $this->db->getTextValue(md5($id)));
+			$result = $this->db->getOne($query);
+			if (MDB::isError($result)) {
+				new MDB_Error($result->code, PEAR_ERROR_DIE);
+				return false;
+			}
+			if (0 == intval($result)) {
+				// Insert new row into table
+				$query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
+								 $this->options['table'],
+								 $this->db->getTextValue(md5($id)),
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->getTextValue($data));
+			} else {
+				// Update existing row
+				$query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
+								 $this->options['table'],
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->getTextValue($data),
+								 $this->db->getTextValue(md5($id)));
+			}
+		}
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        $query = sprintf("DELETE FROM %s WHERE id = %s",
-                         $this->options['table'],
-                         $this->db->getTextValue(md5($id)));
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		$query = sprintf("DELETE FROM %s WHERE id = %s",
+						 $this->options['table'],
+						 $this->db->getTextValue(md5($id)));
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Replicate session data to table specified in option 'replicateBeforeDestroy'
-     *
-     * @param string $targetTable Table to replicate to
-     * @param string $id          Id of record to replicate
-     *
-     * @access private
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        if (is_null($id)) {
-            $id = HTTP_Session::id();
-        }
+	/**
+	 * Replicate session data to table specified in option 'replicateBeforeDestroy'
+	 *
+	 * @param string $targetTable Table to replicate to
+	 * @param string $id          Id of record to replicate
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		if (is_null($id)) {
+			$id = HTTP_Session::id();
+		}
 
-        // Check if table row already exists
-        $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                         $targetTable,
-                         $this->db->getTextValue(md5($id)));
-        $result = $this->db->getOne($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		// Check if table row already exists
+		$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+						 $targetTable,
+						 $this->db->getTextValue(md5($id)));
+		$result = $this->db->getOne($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        // Insert new row into dest table
-        if (0 == intval($result)) {
-            $query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->getTextValue(md5($id)));
-        } else {
-            // Update existing row
-            $query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->getTextValue(md5($id)));
-        }
+		// Insert new row into dest table
+		if (0 == intval($result)) {
+			$query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->getTextValue(md5($id)));
+		} else {
+			// Update existing row
+			$query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->getTextValue(md5($id)));
+		}
 
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        $query = sprintf("DELETE FROM %s WHERE expiry < %d",
-                         $this->options['table'],
-                         time());
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
-            }
-            if (isset($query)) {
-                $result = $this->db->query($query);
-                if (MDB::isError($result)) {
-                    new MDB_Error($result->code, PEAR_ERROR_DIE);
-                    return false;
-                }
-            }
-        }
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		$query = sprintf("DELETE FROM %s WHERE expiry < %d",
+						 $this->options['table'],
+						 time());
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		if ($this->options['autooptimize']) {
+			switch($this->db->phptype) {
+			case 'mysql':
+				$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+				break;
+			case 'pgsql':
+				$query = sprintf("VACUUM %s", $this->options['table']);
+				break;
+			default:
+				$query = null;
+				break;
+			}
+			if (isset($query)) {
+				$result = $this->db->query($query);
+				if (MDB::isError($result)) {
+					new MDB_Error($result->code, PEAR_ERROR_DIE);
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container/Memcache.php

Indentation +155 added lines, -155 removed lines

@@ -43,160 +43,160 @@
  */
 class HTTP_Session_Container_Memcache extends HTTP_Session_Container
 {
-    /**
-     * Memcache connection object
-     *
-     * @var     object  Memcache
-     * @access  private
-     */
-    public $mc;
-
-    /**
-     * Constructor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'memcache' - Memcache object
-     * <li>'prefix' - Key prefix, default is 'sessiondata:'</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container_Memcache($options)
-    {
-        $this->_setDefaults();
-
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        }
-    }
-
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $mc Memcache object
-     *
-     * @access private
-     * @return mixed   Object on error, otherwise bool
-     */
-    public function _connect($mc)
-    {
-        if (is_object($mc) && is_a($mc, 'Memcache')) {
-            $this->mc = $mc;
-
-        } else {
-
-            return new PEAR_Error('The given memcache object was not valid in file '
-                                  . __FILE__ . ' at line ' . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                 );
-        }
-
-        return true;
-    }
-
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['prefix']   = 'sessiondata:';
-        $this->options['memcache'] = null;
-    }
-
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @access public
-     * @return mixed  Object on error, otherwise bool
-     */
-    public function open($save_path, $session_name)
-    {
-        return $this->_connect($this->options['memcache']);
-    }
-
-    /**
-     * Free resources
-     *
-     * @access public
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @access public
-     * @return mixed
-     */
-    public function read($id)
-    {
-        $result = $this->mc->get($this->options['prefix'] . $id);
-        return $result;
-    }
-
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Session data
-     *
-     * @access public
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        $this->mc->set($this->options['prefix'] . $id,
-                       $data,
-                       MEMCACHE_COMPRESSED,
-                       time() + ini_get('session.gc_maxlifetime'));
-
-        return true;
-    }
-
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @access public
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        $this->mc->delete($this->options['prefix'] . $id);
-        return true;
-    }
-
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @access public
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        return true;
-    }
+	/**
+	 * Memcache connection object
+	 *
+	 * @var     object  Memcache
+	 * @access  private
+	 */
+	public $mc;
+
+	/**
+	 * Constructor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'memcache' - Memcache object
+	 * <li>'prefix' - Key prefix, default is 'sessiondata:'</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container_Memcache($options)
+	{
+		$this->_setDefaults();
+
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		}
+	}
+
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $mc Memcache object
+	 *
+	 * @access private
+	 * @return mixed   Object on error, otherwise bool
+	 */
+	public function _connect($mc)
+	{
+		if (is_object($mc) && is_a($mc, 'Memcache')) {
+			$this->mc = $mc;
+
+		} else {
+
+			return new PEAR_Error('The given memcache object was not valid in file '
+								  . __FILE__ . ' at line ' . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								 );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['prefix']   = 'sessiondata:';
+		$this->options['memcache'] = null;
+	}
+
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @access public
+	 * @return mixed  Object on error, otherwise bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		return $this->_connect($this->options['memcache']);
+	}
+
+	/**
+	 * Free resources
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
+
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @access public
+	 * @return mixed
+	 */
+	public function read($id)
+	{
+		$result = $this->mc->get($this->options['prefix'] . $id);
+		return $result;
+	}
+
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Session data
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		$this->mc->set($this->options['prefix'] . $id,
+					   $data,
+					   MEMCACHE_COMPRESSED,
+					   time() + ini_get('session.gc_maxlifetime'));
+
+		return true;
+	}
+
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		$this->mc->delete($this->options['prefix'] . $id);
+		return true;
+	}
+
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container/MDB2.php

Indentation +279 added lines, -279 removed lines

@@ -59,306 +59,306 @@
  */
 class HTTP_Session_Container_MDB2 extends HTTP_Session_Container
 {
-    /**
-     * MDB2 connection object
-     *
-     * @var object MDB2
-     * @access private
-     */
-    public $db = null;
+	/**
+	 * MDB2 connection object
+	 *
+	 * @var object MDB2
+	 * @access private
+	 */
+	public $db = null;
 
-    /**
-     * Session data cache id
-     *
-     * @var mixed
-     * @access private
-     */
-    public $crc = false;
+	/**
+	 * Session data cache id
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	public $crc = false;
 
-    /**
-     * Constructor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'dsn' - The DSN string</li>
-     * <li>'table' - Table with session data, default is 'sessiondata'</li>
-     * <li>'autooptimize' - Boolean, 'true' to optimize
-     * the table on garbage collection, default is 'false'.</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return void
-     */
-    public function HTTP_Session_Container_MDB2($options)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        } else {
-            $this->options['dsn'] = $options;
-        }
-    }
+	/**
+	 * Constructor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'dsn' - The DSN string</li>
+	 * <li>'table' - Table with session data, default is 'sessiondata'</li>
+	 * <li>'autooptimize' - Boolean, 'true' to optimize
+	 * the table on garbage collection, default is 'false'.</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function HTTP_Session_Container_MDB2($options)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		} else {
+			$this->options['dsn'] = $options;
+		}
+	}
 
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $dsn DSN string
-     *
-     * @access private
-     * @return mixed   Object on error, otherwise bool
-     */
-    public function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-            $this->db = MDB2::connect($dsn);
-        } else if (is_object($dsn) && is_a($dsn, 'MDB2_Driver_Common')) {
-            $this->db = $dsn;
-        } else if (is_object($dsn) && MDB2::isError($dsn)) {
-            return $dsn;
-        } else {
-            return new PEAR_Error("The given dsn was not valid in file " . __FILE__
-                                  . " at line " . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                  );
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $dsn DSN string
+	 *
+	 * @access private
+	 * @return mixed   Object on error, otherwise bool
+	 */
+	public function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			$this->db = MDB2::connect($dsn);
+		} else if (is_object($dsn) && is_a($dsn, 'MDB2_Driver_Common')) {
+			$this->db = $dsn;
+		} else if (is_object($dsn) && MDB2::isError($dsn)) {
+			return $dsn;
+		} else {
+			return new PEAR_Error("The given dsn was not valid in file " . __FILE__
+								  . " at line " . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								  );
 
-        }
+		}
 
-        if (MDB2::isError($this->db)) {
-            return new MDB2_Error($this->db->code, PEAR_ERROR_DIE);
-        }
+		if (MDB2::isError($this->db)) {
+			return new MDB2_Error($this->db->code, PEAR_ERROR_DIE);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['dsn']          = null;
-        $this->options['table']        = 'sessiondata';
-        $this->options['autooptimize'] = false;
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['dsn']          = null;
+		$this->options['table']        = 'sessiondata';
+		$this->options['autooptimize'] = false;
+	}
 
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        if (MDB2::isError($this->_connect($this->options['dsn']))) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		if (MDB2::isError($this->_connect($this->options['dsn']))) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Free resources
-     *
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * Free resources
+	 *
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @return mixed
-     */
-    public function read($id)
-    {
-        $query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
-                         $this->options['table'],
-                         $this->db->quote(md5($id), 'text'),
-                         time());
-        $result = $this->db->queryOne($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        $this->crc = strlen($result) . crc32($result);
-        return $result;
-    }
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return mixed
+	 */
+	public function read($id)
+	{
+		$query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
+						 $this->options['table'],
+						 $this->db->quote(md5($id), 'text'),
+						 time());
+		$result = $this->db->queryOne($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		$this->crc = strlen($result) . crc32($result);
+		return $result;
+	}
 
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Data
-     *
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        if ((false !== $this->crc) &&
-            ($this->crc === strlen($data) . crc32($data))) {
-            // $_SESSION hasn't been touched, no need to update the blob column
-            $query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
-                             $this->options['table'],
-                             time() + ini_get('session.gc_maxlifetime'),
-                             $this->db->quote(md5($id), 'text'));
-        } else {
-            // Check if table row already exists
-            $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
-            $result = $this->db->queryOne($query);
-            if (MDB2::isError($result)) {
-                $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-                return false;
-            }
-            if (0 == intval($result)) {
-                // Insert new row into table
-                $query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
-                                 $this->options['table'],
-                                 $this->db->quote(md5($id), 'text'),
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quote($data, 'text'));
-            } else {
-                // Update existing row
-                $query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
-                                 $this->options['table'],
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quote($data, 'text'),
-                                 $this->db->quote(md5($id), 'text'));
-            }
-        }
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Data
+	 *
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		if ((false !== $this->crc) &&
+			($this->crc === strlen($data) . crc32($data))) {
+			// $_SESSION hasn't been touched, no need to update the blob column
+			$query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
+							 $this->options['table'],
+							 time() + ini_get('session.gc_maxlifetime'),
+							 $this->db->quote(md5($id), 'text'));
+		} else {
+			// Check if table row already exists
+			$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
+			$result = $this->db->queryOne($query);
+			if (MDB2::isError($result)) {
+				$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+				return false;
+			}
+			if (0 == intval($result)) {
+				// Insert new row into table
+				$query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
+								 $this->options['table'],
+								 $this->db->quote(md5($id), 'text'),
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quote($data, 'text'));
+			} else {
+				// Update existing row
+				$query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
+								 $this->options['table'],
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quote($data, 'text'),
+								 $this->db->quote(md5($id), 'text'));
+			}
+		}
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        $query = sprintf("DELETE FROM %s WHERE id = %s",
-                         $this->options['table'],
-                         $this->db->quote(md5($id), 'text'));
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		$query = sprintf("DELETE FROM %s WHERE id = %s",
+						 $this->options['table'],
+						 $this->db->quote(md5($id), 'text'));
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Replicate session data to table specified in option 'replicateBeforeDestroy'
-     *
-     * @param string $targetTable Table to replicate to
-     * @param string $id          Id of record to replicate
-     *
-     * @access private
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        if (is_null($id)) {
-            $id = HTTP_Session::id();
-        }
+	/**
+	 * Replicate session data to table specified in option 'replicateBeforeDestroy'
+	 *
+	 * @param string $targetTable Table to replicate to
+	 * @param string $id          Id of record to replicate
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		if (is_null($id)) {
+			$id = HTTP_Session::id();
+		}
 
-        // Check if table row already exists
-        $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                         $targetTable,
-                         $this->db->quote(md5($id), 'text'));
-        $result = $this->db->queryOne($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		// Check if table row already exists
+		$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+						 $targetTable,
+						 $this->db->quote(md5($id), 'text'));
+		$result = $this->db->queryOne($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        // Insert new row into dest table
-        if (0 == intval($result)) {
-            $query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
+		// Insert new row into dest table
+		if (0 == intval($result)) {
+			$query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
 
-        } else {
-            // Update existing row
-            $query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
-        }
+		} else {
+			// Update existing row
+			$query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
+		}
 
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        $query = sprintf("DELETE FROM %s WHERE expiry < %d",
-                         $this->options['table'],
-                         time());
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
-            }
-            if (isset($query)) {
-                $result = $this->db->query($query);
-                if (MDB2::isError($result)) {
-                    $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-                    return false;
-                }
-            }
-        }
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		$query = sprintf("DELETE FROM %s WHERE expiry < %d",
+						 $this->options['table'],
+						 time());
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		if ($this->options['autooptimize']) {
+			switch($this->db->phptype) {
+			case 'mysql':
+				$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+				break;
+			case 'pgsql':
+				$query = sprintf("VACUUM %s", $this->options['table']);
+				break;
+			default:
+				$query = null;
+				break;
+			}
+			if (isset($query)) {
+				$result = $this->db->query($query);
+				if (MDB2::isError($result)) {
+					$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/freetag/freetag.class.php

Spacing +52 added lines, -52 removed lines

@@ -65,7 +65,7 @@ 
 	 * @access private
 	 * @param string Whether to prevent multiple vtiger_users from tagging the same object. By default, set to block (ala Upcoming.org)
 	 */
-	public $_block_multiuser_tag_on_object =0;
+	public $_block_multiuser_tag_on_object = 0;
 
 	/**
 	 * @access private
@@ -151,7 +151,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag($tag, $offset = 0, $limit = 100, $tagger_id = NULL) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -159,7 +159,7 @@ 
 		$where = "tag = ? ";
 		$params = array($tag);
 
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
@@ -197,7 +197,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag_all($tag, $tagger_id = NULL) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -205,7 +205,7 @@ 
 		$where = "tag = ? ";
 		$params = array($tag);
 
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
@@ -249,7 +249,7 @@ 
 			return $retarr;
 		}
 		$params = array($tagArray);
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -270,7 +270,7 @@ 
 		$sql = "SELECT ${prefix}freetagged_objects.object_id, tag, COUNT(DISTINCT tag) AS uniques
 			FROM ${prefix}freetagged_objects 
 			INNER JOIN ${prefix}freetags ON (${prefix}freetagged_objects.tag_id = ${prefix}freetags.id)
-			WHERE ${prefix}freetags.tag IN (". generateQuestionMarks($tagArray) .")
+			WHERE ${prefix}freetags.tag IN (" . generateQuestionMarks($tagArray) . ")
 			$tagger_sql
 			GROUP BY ${prefix}freetagged_objects.object_id
 			HAVING uniques = $numTags
@@ -300,7 +300,7 @@ 
 	 * @return An array of Object ID numbers that reference your original objects.
 	 */ 
 	public function get_objects_with_tag_id($tag_id, $offset = 0, $limit = 100, $tagger_id = NULL) {
-		if(!isset($tag_id)) {
+		if (!isset($tag_id)) {
 			return false;
 		}		
 		$adb = PearDatabase::getInstance();
@@ -308,7 +308,7 @@ 
 		$where = "id = ? ";
 		$params = array($tag_id);
 		
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} 
@@ -349,19 +349,19 @@ 
 	 *	 - 'tagger_id' => The unique ID of the person who tagged the object with this tag.
 	 */ 
 	public function get_tags_on_object($object_id, $offset = 0, $limit = 10, $tagger_id = NULL) {
-		if(!isset($object_id)) {
+		if (!isset($object_id)) {
 			return false;
 		}	
 		
 		$where = "object_id = ? ";
 		$params = array($object_id);
 			
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$where .= "AND tagger_id = ? ";
 			array_push($params, $tagger_id);
 		} 
 
-		if($limit <= 0) {
+		if ($limit <= 0) {
 			$limit_sql = "";
 		} else {
 			$limit_sql = "LIMIT $offset, $limit";
@@ -406,7 +406,7 @@ 
 	 */ 
 
 	public function safe_tag($tagger_id, $object_id, $tag, $module) {
-		if(!isset($tagger_id)||!isset($object_id)||!isset($tag)) {
+		if (!isset($tagger_id) || !isset($object_id) || !isset($tag)) {
 			die("safe_tag argument missing");
 			return false;
 		}
@@ -433,7 +433,7 @@ 
 			
 		array_push($params, $object_id, $normalized_tag);
 		$rs = $adb->pquery($sql, $params);
-		if($rs->fields['count'] > 0) {
+		if ($rs->fields['count'] > 0) {
 			return true;
 		}
 		// Then see if a raw tag in this form exists.
@@ -442,7 +442,7 @@ 
 			WHERE raw_tag = ? ";
 		$rs = $adb->pquery($sql, array($tag));
 		$row = $adb->fetch_array($rs);
-		if($row) {
+		if ($row) {
 			$tag_id = $row['id'];
 		} else {
 			// Add new tag! 
@@ -452,7 +452,7 @@ 
 			$rs = $adb->pquery($sql, $params);
 			
 		}
-		if(!($tag_id > 0)) {
+		if (!($tag_id > 0)) {
 			return false;
 		}
 		$sql = "INSERT INTO ${prefix}freetagged_objects
@@ -509,14 +509,14 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */ 
 	public function delete_object_tag($tagger_id, $object_id, $tag) {
-		if(!isset($tagger_id)||!isset($object_id)||!isset($tag)) {
+		if (!isset($tagger_id) || !isset($object_id) || !isset($tag)) {
 			die("delete_object_tag argument missing");
 			return false;
 		}
 		$adb = PearDatabase::getInstance();
 		$tag_id = $this->get_raw_tag_id($tag);
 		$prefix = $this->_table_prefix;
-		if($tag_id > 0) {
+		if ($tag_id > 0) {
 
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE tagger_id = ? && object_id = ? && tag_id = ? LIMIT 1";
@@ -543,7 +543,7 @@ 
 	public function delete_all_object_tags($object_id) {
 		$adb = PearDatabase::getInstance();
 		$prefix = $this->_table_prefix;
-		if($object_id > 0) {
+		if ($object_id > 0) {
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE object_id = ? ";	
 				$rs = $adb->pquery($sql, array($object_id));	
@@ -570,13 +570,13 @@ 
 	 */ 
 
 	public function delete_all_object_tags_for_user($tagger_id, $object_id) {
-		if(!isset($tagger_id)||!isset($object_id)) {
+		if (!isset($tagger_id) || !isset($object_id)) {
 			die("delete_all_object_tags_for_user argument missing");
 			return false;
 		}
 		$adb = PearDatabase::getInstance();
 		$prefix = $this->_table_prefix;
-		if($object_id > 0) {
+		if ($object_id > 0) {
 
 			$sql = "DELETE FROM ${prefix}freetagged_objects
 				WHERE tagger_id = ? && object_id = ?";	
@@ -600,7 +600,7 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */ 
 	public function get_tag_id($tag) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			die("get_tag_id argument missing");
 			return false;
 		}
@@ -628,7 +628,7 @@ 
 	 */ 
 
 	public function get_raw_tag_id($tag) {
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			die("get_tag_id argument missing");
 			return false;
 		}
@@ -661,7 +661,7 @@ 
 	 * @return string Returns the tag in normalized form.
 	 */
 	public function tag_object($tagger_id, $object_id, $tag_string, $module, $skip_updates = 1) {
-		if($tag_string == '') {
+		if ($tag_string == '') {
 			// If an empty string was passed, just return true, don't die.
 			// die("Empty tag string passed");
 			return true;
@@ -702,10 +702,10 @@ 
 	 * @return boolean True if successful, false otherwise.
 	 */
 	public function _tag_object_array($tagger_id, $object_id, $tagArray, $module) {
-		foreach($tagArray as $tag) {
+		foreach ($tagArray as $tag) {
 			$tag = trim($tag);
-			if(($tag != '') && (strlen($tag) <= $this->_MAX_TAG_LENGTH)) {
-				if(get_magic_quotes_gpc()) {
+			if (($tag != '') && (strlen($tag) <= $this->_MAX_TAG_LENGTH)) {
+				if (get_magic_quotes_gpc()) {
 					$tag = addslashes($tag);
 				}
 				$this->safe_tag($tagger_id, $object_id, $tag, $module);
@@ -731,12 +731,12 @@ 
 			return $newwords;
 		}
 		# Perform tag parsing
-		if(get_magic_quotes_gpc()) {
+		if (get_magic_quotes_gpc()) {
 			$query = stripslashes(trim($tag_string));
 		} else {
 			$query = trim($tag_string);
 		}
-		$words = preg_split('/(")/', $query,-1,PREG_SPLIT_NO_EMPTY|PREG_SPLIT_DELIM_CAPTURE);
+		$words = preg_split('/(")/', $query, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 		$delim = 0;
 		foreach ($words as $key => $word)
 		{
@@ -782,7 +782,7 @@ 
 	public function get_most_popular_tags($tagger_id = NULL, $offset = 0, $limit = 25) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -826,7 +826,7 @@ 
 	public function count_tags($tagger_id = NULL) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = "AND tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
@@ -870,11 +870,11 @@ 
 	 * @return string Returns an HTML snippet that can be used directly as a tag cloud.
 	 */
 
-	public function get_tag_cloud_html($module="",$tagger_id = NULL,$obj_id= NULL,$num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
+	public function get_tag_cloud_html($module = "", $tagger_id = NULL, $obj_id = NULL, $num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
 		global $theme;
-		$theme_path="themes/".$theme."/";
-		$image_path=$theme_path."images/";	
-		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id,$module,$obj_id);
+		$theme_path = "themes/" . $theme . "/";
+		$image_path = $theme_path . "images/";	
+		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id, $module, $obj_id);
 		if (count($tag_list[0])) {
 			// Get the maximum qty of tagged objects in the set
 			$max_qty = max(array_values($tag_list[0]));
@@ -890,7 +890,7 @@ 
 		if (0 == $spread) { // Divide by zero
 			$spread = 1;
 		}
-		$step = ($max_font_size - $min_font_size)/($spread);
+		$step = ($max_font_size - $min_font_size) / ($spread);
 
 		// Since the original tag_list is alphabetically ordered,
 		// we can now create the tag cloud by just putting a span
@@ -898,18 +898,18 @@ 
 		// by $step.
 		$cloud_html = '';
 		$cloud_spans = array();
-		if($module =='')
+		if ($module == '')
 			$module = 'All';
-		if($module != 'All') {
+		if ($module != 'All') {
 			foreach ($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * $step;
-				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&search_tag=tag_search&query_string='. urlencode($tag) . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].','.$obj_id.');"><img src="' . vtiger_imageurl('del_tag.gif', $theme) . '"></span></span>';
+				$cloud_span[] = '<span id="tag_' . $tag_list[1][$tag] . '" class="' . $span_class . '" onMouseOver=$("tagspan_' . $tag_list[1][$tag] . '").style.display="inline"; onMouseOut=$("tagspan_' . $tag_list[1][$tag] . '").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module=' . $module . '&search_tag=tag_search&query_string=' . urlencode($tag) . '" style="font-size: ' . $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="' . $span_class . '" id="tagspan_' . $tag_list[1][$tag] . '" style="display:none;cursor:pointer;" onClick="DeleteTag(' . $tag_list[1][$tag] . ',' . $obj_id . ');"><img src="' . vtiger_imageurl('del_tag.gif', $theme) . '"></span></span>';
 
 			}
 		} else {
-			foreach($tag_list[0] as $tag => $qty) {
+			foreach ($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * $step;
-				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&search_tag=tag_search&query_string='. urlencode($tag) . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
+				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module=' . $module . '&search_tag=tag_search&query_string=' . urlencode($tag) . '" style="font-size: ' . $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
 			}
 		}
 		$cloud_html = join("\n ", $cloud_span);
@@ -934,24 +934,24 @@ 
 	 * values are numeric quantity of objects tagged with that tag.
 	 */
 
-	public function get_tag_cloud_tags($max = 100, $tagger_id = NULL,$module = "",$obj_id = NULL) {
+	public function get_tag_cloud_tags($max = 100, $tagger_id = NULL, $module = "", $obj_id = NULL) {
 		$adb = PearDatabase::getInstance();
 		$params = array();
-		if(isset($tagger_id) && ($tagger_id > 0)) {
+		if (isset($tagger_id) && ($tagger_id > 0)) {
 			$tagger_sql = " && tagger_id = ?";
 			array_push($params, $tagger_id);
 		} else {
 			$tagger_sql = "";
 		}
 
-		if($module != "") {
+		if ($module != "") {
 			$tagger_sql .= " && module = ?";
 			array_push($params, $module);
 		} else {
 			$tagger_sql .= "";
 		}
 
-		if(isset($obj_id) && $obj_id > 0) {
+		if (isset($obj_id) && $obj_id > 0) {
   			$tagger_sql .= " && object_id = ?";
 			array_push($params, $obj_id);
 		} else {
@@ -974,10 +974,10 @@ 
 			$retarr[$row['tag']] = $row['quantity'];
 			$retarr1[$row['tag']] = $row['tag_id'];
 		}
-		if($retarr) ksort($retarr);
-		if($retarr1) ksort($retarr1);
-		$return_value[]=$retarr;
-		$return_value[]=$retarr1;
+		if ($retarr) ksort($retarr);
+		if ($retarr1) ksort($retarr1);
+		$return_value[] = $retarr;
+		$return_value[] = $retarr1;
 		return $return_value;
 
 	}
@@ -1010,7 +1010,7 @@ 
 
 	public function similar_tags($tag, $max = 100) {
 		$retarr = array();
-		if(!isset($tag)) {
+		if (!isset($tag)) {
 			return $retarr;
 		}
 		$adb = PearDatabase::getInstance();
@@ -1099,7 +1099,7 @@ 
 		$sql = "SELECT matches.object_id, COUNT( matches.object_id ) AS num_common_tags
 			FROM ${prefix}freetagged_objects as matches
 			INNER JOIN ${prefix}freetags as tags ON ( tags.id = matches.tag_id )
-			WHERE tags.tag IN (". generateQuestionMarks($tagArray) .")
+			WHERE tags.tag IN (" . generateQuestionMarks($tagArray) . ")
 			GROUP BY matches.object_id
 			HAVING num_common_tags >= ?
 			ORDER BY num_common_tags DESC
@@ -1107,7 +1107,7 @@ 
 
 		$rs = $adb->pquery($sql, array($tagArray, $threshold, $max_objects));
 		while ($row = $adb->fetch_array($rs)) {
-			$retarr[] = array (
+			$retarr[] = array(
 				'object_id' => $row['object_id'],
 				'strength' => ($row['num_common_tags'] / $numTags)
 				);

libraries/log4php.debug/layouts/LoggerLayoutHtml.php

Indentation +185 added lines, -185 removed lines

@@ -23,17 +23,17 @@ 
 if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
 
 if (!defined('LOG4PHP_LINE_SEP')) {
-    if (substr(php_uname(), 0, 7) == "Windows") { 
-        /**
-         * @ignore
-         */
-        define('LOG4PHP_LINE_SEP', "\r\n");
-    } else {
-        /**
-         * @ignore
-         */
-        define('LOG4PHP_LINE_SEP', "\n");
-    }
+	if (substr(php_uname(), 0, 7) == "Windows") { 
+		/**
+		 * @ignore
+		 */
+		define('LOG4PHP_LINE_SEP', "\r\n");
+	} else {
+		/**
+		 * @ignore
+		 */
+		define('LOG4PHP_LINE_SEP', "\n");
+	}
 }
  
 /**
@@ -53,204 +53,204 @@ 
  */
 class LoggerLayoutHtml extends LoggerLayout {
 
-    /**
-     * The <b>LocationInfo</b> option takes a boolean value. By
-     * default, it is set to false which means there will be no location
-     * information output by this layout. If the the option is set to
-     * true, then the file name and line number of the statement
-     * at the origin of the log statement will be output.
-     *
-     * <p>If you are embedding this layout within a {@link LoggerAppenderMail}
-     * or a {@link LoggerAppenderMailEvent} then make sure to set the
-     * <b>LocationInfo</b> option of that appender as well.
-     * @var boolean
-     */
-    public $locationInfo = false;
+	/**
+	 * The <b>LocationInfo</b> option takes a boolean value. By
+	 * default, it is set to false which means there will be no location
+	 * information output by this layout. If the the option is set to
+	 * true, then the file name and line number of the statement
+	 * at the origin of the log statement will be output.
+	 *
+	 * <p>If you are embedding this layout within a {@link LoggerAppenderMail}
+	 * or a {@link LoggerAppenderMailEvent} then make sure to set the
+	 * <b>LocationInfo</b> option of that appender as well.
+	 * @var boolean
+	 */
+	public $locationInfo = false;
     
-    /**
-     * The <b>Title</b> option takes a String value. This option sets the
-     * document title of the generated HTML document.
-     * Defaults to 'Log4php Log Messages'.
-     * @var string
-     */
-    public $title = "Log4php Log Messages";
+	/**
+	 * The <b>Title</b> option takes a String value. This option sets the
+	 * document title of the generated HTML document.
+	 * Defaults to 'Log4php Log Messages'.
+	 * @var string
+	 */
+	public $title = "Log4php Log Messages";
     
-    /**
-     * Constructor
-     */
-    public function LoggerLayoutHtml()
-    {
-        return;
-    }
+	/**
+	 * Constructor
+	 */
+	public function LoggerLayoutHtml()
+	{
+		return;
+	}
     
-    /**
-     * The <b>LocationInfo</b> option takes a boolean value. By
-     * default, it is set to false which means there will be no location
-     * information output by this layout. If the the option is set to
-     * true, then the file name and line number of the statement
-     * at the origin of the log statement will be output.
-     *
-     * <p>If you are embedding this layout within a {@link LoggerAppenderMail}
-     * or a {@link LoggerAppenderMailEvent} then make sure to set the
-     * <b>LocationInfo</b> option of that appender as well.
-     */
-    public function setLocationInfo($flag)
-    {
-        if (is_bool($flag)) {
-            $this->locationInfo = $flag;
-        } else {
-            $this->locationInfo = (bool)(strtolower($flag) == 'true');
-        }
-    }
+	/**
+	 * The <b>LocationInfo</b> option takes a boolean value. By
+	 * default, it is set to false which means there will be no location
+	 * information output by this layout. If the the option is set to
+	 * true, then the file name and line number of the statement
+	 * at the origin of the log statement will be output.
+	 *
+	 * <p>If you are embedding this layout within a {@link LoggerAppenderMail}
+	 * or a {@link LoggerAppenderMailEvent} then make sure to set the
+	 * <b>LocationInfo</b> option of that appender as well.
+	 */
+	public function setLocationInfo($flag)
+	{
+		if (is_bool($flag)) {
+			$this->locationInfo = $flag;
+		} else {
+			$this->locationInfo = (bool)(strtolower($flag) == 'true');
+		}
+	}
 
-    /**
-     * Returns the current value of the <b>LocationInfo</b> option.
-     */
-    public function getLocationInfo()
-    {
-        return $this->locationInfo;
-    }
+	/**
+	 * Returns the current value of the <b>LocationInfo</b> option.
+	 */
+	public function getLocationInfo()
+	{
+		return $this->locationInfo;
+	}
     
-    /**
-     * The <b>Title</b> option takes a String value. This option sets the
-     * document title of the generated HTML document.
-     * Defaults to 'Log4php Log Messages'.
-     */
-    public function setTitle($title)
-    {
-        $this->title = $title;
-    }
+	/**
+	 * The <b>Title</b> option takes a String value. This option sets the
+	 * document title of the generated HTML document.
+	 * Defaults to 'Log4php Log Messages'.
+	 */
+	public function setTitle($title)
+	{
+		$this->title = $title;
+	}
 
-    /**
-     * @return string Returns the current value of the <b>Title</b> option.
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
+	/**
+	 * @return string Returns the current value of the <b>Title</b> option.
+	 */
+	public function getTitle()
+	{
+		return $this->title;
+	}
     
-    /**
-     * @return string Returns the content type output by this layout, i.e "text/html".
-     */
-    public function getContentType()
-    {
-        return "text/html";
-    }
+	/**
+	 * @return string Returns the content type output by this layout, i.e "text/html".
+	 */
+	public function getContentType()
+	{
+		return "text/html";
+	}
     
-    /**
-     * No options to activate.
-     */
-    public function activateOptions()
-    {
-        return true;
-    }
+	/**
+	 * No options to activate.
+	 */
+	public function activateOptions()
+	{
+		return true;
+	}
     
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function format($event)
-    {
-        $sbuf = LOG4PHP_LINE_SEP . "<tr>" . LOG4PHP_LINE_SEP;
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function format($event)
+	{
+		$sbuf = LOG4PHP_LINE_SEP . "<tr>" . LOG4PHP_LINE_SEP;
     
-        $sbuf .= "<td>";
+		$sbuf .= "<td>";
         
-        $eventTime = (float)$event->getTimeStamp();
-        $eventStartTime = (float)LoggerLoggingEvent::getStartTime();
-        $sbuf .= number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
-        $sbuf .= "</td>" . LOG4PHP_LINE_SEP;
+		$eventTime = (float)$event->getTimeStamp();
+		$eventStartTime = (float)LoggerLoggingEvent::getStartTime();
+		$sbuf .= number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
+		$sbuf .= "</td>" . LOG4PHP_LINE_SEP;
     
-        $sbuf .= "<td title=\"" . $event->getThreadName() . " thread\">";
-        $sbuf .= $event->getThreadName();
-        $sbuf .= "</td>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<td title=\"" . $event->getThreadName() . " thread\">";
+		$sbuf .= $event->getThreadName();
+		$sbuf .= "</td>" . LOG4PHP_LINE_SEP;
     
-        $sbuf .= "<td title=\"Level\">";
+		$sbuf .= "<td title=\"Level\">";
         
-        $level = $event->getLevel();
+		$level = $event->getLevel();
         
-        if ($level->equals(LoggerLevel::getLevelDebug())) {
-          $sbuf .= "<font color=\"#339933\">";
-          $sbuf .= $level->toString();
-          $sbuf .= "</font>";
-        }elseif($level->equals(LoggerLevel::getLevelWarn())) {
-          $sbuf .= "<font color=\"#993300\"><strong>";
-          $sbuf .= $level->toString();
-          $sbuf .= "</strong></font>";
-        } else {
-          $sbuf .= $level->toString();
-        }
-        $sbuf .= "</td>" . LOG4PHP_LINE_SEP;
+		if ($level->equals(LoggerLevel::getLevelDebug())) {
+		  $sbuf .= "<font color=\"#339933\">";
+		  $sbuf .= $level->toString();
+		  $sbuf .= "</font>";
+		}elseif($level->equals(LoggerLevel::getLevelWarn())) {
+		  $sbuf .= "<font color=\"#993300\"><strong>";
+		  $sbuf .= $level->toString();
+		  $sbuf .= "</strong></font>";
+		} else {
+		  $sbuf .= $level->toString();
+		}
+		$sbuf .= "</td>" . LOG4PHP_LINE_SEP;
     
-        $sbuf .= "<td title=\"" . htmlentities($event->getLoggerName(), ENT_QUOTES) . " category\">";
-        $sbuf .= htmlentities($event->getLoggerName(), ENT_QUOTES);
-        $sbuf .= "</td>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<td title=\"" . htmlentities($event->getLoggerName(), ENT_QUOTES) . " category\">";
+		$sbuf .= htmlentities($event->getLoggerName(), ENT_QUOTES);
+		$sbuf .= "</td>" . LOG4PHP_LINE_SEP;
     
-        if ($this->locationInfo) {
-            $locInfo = $event->getLocationInformation();
-            $sbuf .= "<td>";
-            $sbuf .= htmlentities($locInfo->getFileName(), ENT_QUOTES). ':' . $locInfo->getLineNumber();
-            $sbuf .= "</td>" . LOG4PHP_LINE_SEP;
-        }
+		if ($this->locationInfo) {
+			$locInfo = $event->getLocationInformation();
+			$sbuf .= "<td>";
+			$sbuf .= htmlentities($locInfo->getFileName(), ENT_QUOTES). ':' . $locInfo->getLineNumber();
+			$sbuf .= "</td>" . LOG4PHP_LINE_SEP;
+		}
 
-        $sbuf .= "<td title=\"Message\">";
-        $sbuf .= htmlentities($event->getRenderedMessage(), ENT_QUOTES);
-        $sbuf .= "</td>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<td title=\"Message\">";
+		$sbuf .= htmlentities($event->getRenderedMessage(), ENT_QUOTES);
+		$sbuf .= "</td>" . LOG4PHP_LINE_SEP;
 
-        $sbuf .= "</tr>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "</tr>" . LOG4PHP_LINE_SEP;
         
-        if ($event->getNDC() != null) {
-            $sbuf .= "<tr><td bgcolor=\"#EEEEEE\" style=\"font-size : xx-small;\" colspan=\"6\" title=\"Nested Diagnostic Context\">";
-            $sbuf .= "NDC: " . htmlentities($event->getNDC(), ENT_QUOTES);
-            $sbuf .= "</td></tr>" . LOG4PHP_LINE_SEP;
-        }
+		if ($event->getNDC() != null) {
+			$sbuf .= "<tr><td bgcolor=\"#EEEEEE\" style=\"font-size : xx-small;\" colspan=\"6\" title=\"Nested Diagnostic Context\">";
+			$sbuf .= "NDC: " . htmlentities($event->getNDC(), ENT_QUOTES);
+			$sbuf .= "</td></tr>" . LOG4PHP_LINE_SEP;
+		}
 
-        return $sbuf;
-    }
+		return $sbuf;
+	}
 
-    /**
-     * @return string Returns appropriate HTML headers.
-     */
-    public function getHeader()
-    {
-        $sbuf = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<html>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<head>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<title>" . $this->title . "</title>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<style type=\"text/css\">" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<!--" . LOG4PHP_LINE_SEP;
-        $sbuf .= "body, table {font-family: arial,sans-serif; font-size: x-small;}" . LOG4PHP_LINE_SEP;
-        $sbuf .= "th {background: #336699; color: #FFFFFF; text-align: left;}" . LOG4PHP_LINE_SEP;
-        $sbuf .= "-->" . LOG4PHP_LINE_SEP;
-        $sbuf .= "</style>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "</head>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<body bgcolor=\"#FFFFFF\" topmargin=\"6\" leftmargin=\"6\">" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<hr size=\"1\" noshade>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "Log session start time " . strftime('%c', time()) . "<br>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<br>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<table cellspacing=\"0\" cellpadding=\"4\" border=\"1\" bordercolor=\"#224466\" width=\"100%\">" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<tr>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<th>Time</th>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<th>Thread</th>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<th>Level</th>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<th>Category</th>" . LOG4PHP_LINE_SEP;
-        if ($this->locationInfo)
-            $sbuf .= "<th>File:Line</th>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<th>Message</th>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "</tr>" . LOG4PHP_LINE_SEP;
+	/**
+	 * @return string Returns appropriate HTML headers.
+	 */
+	public function getHeader()
+	{
+		$sbuf = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<html>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<head>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<title>" . $this->title . "</title>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<style type=\"text/css\">" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<!--" . LOG4PHP_LINE_SEP;
+		$sbuf .= "body, table {font-family: arial,sans-serif; font-size: x-small;}" . LOG4PHP_LINE_SEP;
+		$sbuf .= "th {background: #336699; color: #FFFFFF; text-align: left;}" . LOG4PHP_LINE_SEP;
+		$sbuf .= "-->" . LOG4PHP_LINE_SEP;
+		$sbuf .= "</style>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "</head>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<body bgcolor=\"#FFFFFF\" topmargin=\"6\" leftmargin=\"6\">" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<hr size=\"1\" noshade>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "Log session start time " . strftime('%c', time()) . "<br>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<br>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<table cellspacing=\"0\" cellpadding=\"4\" border=\"1\" bordercolor=\"#224466\" width=\"100%\">" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<tr>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<th>Time</th>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<th>Thread</th>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<th>Level</th>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<th>Category</th>" . LOG4PHP_LINE_SEP;
+		if ($this->locationInfo)
+			$sbuf .= "<th>File:Line</th>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<th>Message</th>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "</tr>" . LOG4PHP_LINE_SEP;
 
-        return $sbuf;
-    }
+		return $sbuf;
+	}
 
-    /**
-     * @return string Returns the appropriate HTML footers.
-     */
-    public function getFooter()
-    {
-        $sbuf = "</table>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "<br>" . LOG4PHP_LINE_SEP;
-        $sbuf .= "</body></html>";
+	/**
+	 * @return string Returns the appropriate HTML footers.
+	 */
+	public function getFooter()
+	{
+		$sbuf = "</table>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "<br>" . LOG4PHP_LINE_SEP;
+		$sbuf .= "</body></html>";
 
-        return $sbuf;
-    }
+		return $sbuf;
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/layouts/LoggerLayoutTTCC.php

Indentation +147 added lines, -147 removed lines

@@ -23,17 +23,17 @@ 
 if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
 
 if (!defined('LOG4PHP_LINE_SEP')) {
-    if (substr(php_uname(), 0, 7) == "Windows") { 
-        /**
-         * @ignore
-         */
-        define('LOG4PHP_LINE_SEP', "\r\n");
-    } else {
-        /**
-         * @ignore
-         */
-        define('LOG4PHP_LINE_SEP', "\n");
-    }
+	if (substr(php_uname(), 0, 7) == "Windows") { 
+		/**
+		 * @ignore
+		 */
+		define('LOG4PHP_LINE_SEP', "\r\n");
+	} else {
+		/**
+		 * @ignore
+		 */
+		define('LOG4PHP_LINE_SEP', "\n");
+	}
 }
  
 /**
@@ -76,165 +76,165 @@ 
  */
 class LoggerLayoutTTCC extends LoggerLayout {
 
-    // Internal representation of options
-    public $threadPrinting    = true;
-    public $categoryPrefixing = true;
-    public $contextPrinting   = true;
-    public $microSecondsPrinting = true;
+	// Internal representation of options
+	public $threadPrinting    = true;
+	public $categoryPrefixing = true;
+	public $contextPrinting   = true;
+	public $microSecondsPrinting = true;
     
-    /**
-     * @var string date format. See {@link PHP_MANUAL#strftime} for details
-     */
-    public $dateFormat = '%c';
+	/**
+	 * @var string date format. See {@link PHP_MANUAL#strftime} for details
+	 */
+	public $dateFormat = '%c';
 
-    /**
-     * Constructor
-     *
-     * @param string date format
-     * @see dateFormat
-     */
-    public function LoggerLayoutTTCC($dateFormat = '')
-    {
-        if (!empty($dateFormat))
-            $this->dateFormat = $dateFormat;
-        return;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param string date format
+	 * @see dateFormat
+	 */
+	public function LoggerLayoutTTCC($dateFormat = '')
+	{
+		if (!empty($dateFormat))
+			$this->dateFormat = $dateFormat;
+		return;
+	}
 
-    /**
-     * The <b>ThreadPrinting</b> option specifies whether the name of the
-     * current thread is part of log output or not. This is true by default.
-     */
-    public function setThreadPrinting($threadPrinting)
-    {
+	/**
+	 * The <b>ThreadPrinting</b> option specifies whether the name of the
+	 * current thread is part of log output or not. This is true by default.
+	 */
+	public function setThreadPrinting($threadPrinting)
+	{
         
-        $this->threadPrinting = is_bool($threadPrinting) ? 
-            $threadPrinting : 
-            (bool)(strtolower($threadPrinting) == 'true'); 
-    }
+		$this->threadPrinting = is_bool($threadPrinting) ? 
+			$threadPrinting : 
+			(bool)(strtolower($threadPrinting) == 'true'); 
+	}
 
-    /**
-     * @return boolean Returns value of the <b>ThreadPrinting</b> option.
-     */
-    public function getThreadPrinting() {
-        return $this->threadPrinting;
-    }
+	/**
+	 * @return boolean Returns value of the <b>ThreadPrinting</b> option.
+	 */
+	public function getThreadPrinting() {
+		return $this->threadPrinting;
+	}
 
-    /**
-     * The <b>CategoryPrefixing</b> option specifies whether {@link Category}
-     * name is part of log output or not. This is true by default.
-     */
-    public function setCategoryPrefixing($categoryPrefixing)
-    {
-        $this->categoryPrefixing = is_bool($categoryPrefixing) ?
-            $categoryPrefixing :
-            (bool)(strtolower($categoryPrefixing) == 'true');
-    }
+	/**
+	 * The <b>CategoryPrefixing</b> option specifies whether {@link Category}
+	 * name is part of log output or not. This is true by default.
+	 */
+	public function setCategoryPrefixing($categoryPrefixing)
+	{
+		$this->categoryPrefixing = is_bool($categoryPrefixing) ?
+			$categoryPrefixing :
+			(bool)(strtolower($categoryPrefixing) == 'true');
+	}
 
-    /**
-     * @return boolean Returns value of the <b>CategoryPrefixing</b> option.
-     */
-    public function getCategoryPrefixing() {
-        return $this->categoryPrefixing;
-    }
+	/**
+	 * @return boolean Returns value of the <b>CategoryPrefixing</b> option.
+	 */
+	public function getCategoryPrefixing() {
+		return $this->categoryPrefixing;
+	}
 
-    /**
-     * The <b>ContextPrinting</b> option specifies log output will include
-     * the nested context information belonging to the current thread.
-     * This is true by default.
-     */
-    public function setContextPrinting($contextPrinting) {
-        $this->contextPrinting = is_bool($contextPrinting) ? 
-            $contextPrinting : 
-            (bool)(strtolower($contextPrinting) == 'true'); 
-    }
+	/**
+	 * The <b>ContextPrinting</b> option specifies log output will include
+	 * the nested context information belonging to the current thread.
+	 * This is true by default.
+	 */
+	public function setContextPrinting($contextPrinting) {
+		$this->contextPrinting = is_bool($contextPrinting) ? 
+			$contextPrinting : 
+			(bool)(strtolower($contextPrinting) == 'true'); 
+	}
 
-    /**
-     * @return boolean Returns value of the <b>ContextPrinting</b> option.
-     */
-    public function getContextPrinting()
-    {
-        return $this->contextPrinting;
-    }
+	/**
+	 * @return boolean Returns value of the <b>ContextPrinting</b> option.
+	 */
+	public function getContextPrinting()
+	{
+		return $this->contextPrinting;
+	}
     
-    /**
-     * The <b>MicroSecondsPrinting</b> option specifies if microseconds infos
-     * should be printed at the end of timestamp.
-     * This is true by default.
-     */
-    public function setMicroSecondsPrinting($microSecondsPrinting) {
-        $this->microSecondsPrinting = is_bool($microSecondsPrinting) ? 
-            $microSecondsPrinting : 
-            (bool)(strtolower($microSecondsPrinting) == 'true'); 
-    }
+	/**
+	 * The <b>MicroSecondsPrinting</b> option specifies if microseconds infos
+	 * should be printed at the end of timestamp.
+	 * This is true by default.
+	 */
+	public function setMicroSecondsPrinting($microSecondsPrinting) {
+		$this->microSecondsPrinting = is_bool($microSecondsPrinting) ? 
+			$microSecondsPrinting : 
+			(bool)(strtolower($microSecondsPrinting) == 'true'); 
+	}
 
-    /**
-     * @return boolean Returns value of the <b>MicroSecondsPrinting</b> option.
-     */
-    public function getMicroSecondsPrinting()
-    {
-        return $this->microSecondsPrinting;
-    }
+	/**
+	 * @return boolean Returns value of the <b>MicroSecondsPrinting</b> option.
+	 */
+	public function getMicroSecondsPrinting()
+	{
+		return $this->microSecondsPrinting;
+	}
     
     
-    public function setDateFormat($dateFormat)
-    {
-        $this->dateFormat = $dateFormat;
-    }
+	public function setDateFormat($dateFormat)
+	{
+		$this->dateFormat = $dateFormat;
+	}
     
-    /**
-     * @return string
-     */
-    public function getDateFormat()
-    {
-        return $this->dateFormat;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDateFormat()
+	{
+		return $this->dateFormat;
+	}
 
-    /**
-     * In addition to the level of the statement and message, the
-     * returned string includes time, thread, category.
-     * <p>Time, thread, category are printed depending on options.
-     *
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function format($event)
-    {
-        $timeStamp = (float)$event->getTimeStamp();
-        $format = strftime($this->dateFormat, (int)$timeStamp);
+	/**
+	 * In addition to the level of the statement and message, the
+	 * returned string includes time, thread, category.
+	 * <p>Time, thread, category are printed depending on options.
+	 *
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function format($event)
+	{
+		$timeStamp = (float)$event->getTimeStamp();
+		$format = strftime($this->dateFormat, (int)$timeStamp);
         
-        if ($this->microSecondsPrinting) {
-            $usecs = round(($timeStamp - (int)$timeStamp) * 1000);
-            $format .= sprintf(',%03d', $usecs);
-        }
+		if ($this->microSecondsPrinting) {
+			$usecs = round(($timeStamp - (int)$timeStamp) * 1000);
+			$format .= sprintf(',%03d', $usecs);
+		}
             
-        $format .= ' ';
+		$format .= ' ';
         
-        if ($this->threadPrinting)
-            $format .= '['.getmypid().'] ';
+		if ($this->threadPrinting)
+			$format .= '['.getmypid().'] ';
        
-        $level = $event->getLevel();
-        $format .= $level->toString().' ';
+		$level = $event->getLevel();
+		$format .= $level->toString().' ';
         
-        if($this->categoryPrefixing) {
-            $format .= $event->getLoggerName().' ';
-        }
+		if($this->categoryPrefixing) {
+			$format .= $event->getLoggerName().' ';
+		}
        
-        if($this->contextPrinting) {
-            $ndc = $event->getNDC();
-            if($ndc != null) {
-    	        $format .= $ndc.' ';
-            }
-        }
+		if($this->contextPrinting) {
+			$ndc = $event->getNDC();
+			if($ndc != null) {
+				$format .= $ndc.' ';
+			}
+		}
         
-        $format .= '- '.$event->getRenderedMessage();
-        $format .= LOG4PHP_LINE_SEP;
+		$format .= '- '.$event->getRenderedMessage();
+		$format .= LOG4PHP_LINE_SEP;
         
-        return $format;
-    }
+		return $format;
+	}
 
-    public function ignoresThrowable()
-    {
-        return true;
-    }
+	public function ignoresThrowable()
+	{
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/layouts/LoggerXmlLayout.php

Indentation +138 added lines, -138 removed lines

@@ -50,157 +50,157 @@
  */
 class LoggerXmlLayout extends LoggerLayout {
 
-    /**
-     * The <b>LocationInfo</b> option takes a boolean value. By default,
-     * it is set to false which means there will be no location
-     * information output by this layout. If the the option is set to
-     * true, then the file name and line number of the statement at the
-     * origin of the log statement will be output.
-     * @var boolean
-     */
-    public $locationInfo = true;
+	/**
+	 * The <b>LocationInfo</b> option takes a boolean value. By default,
+	 * it is set to false which means there will be no location
+	 * information output by this layout. If the the option is set to
+	 * true, then the file name and line number of the statement at the
+	 * origin of the log statement will be output.
+	 * @var boolean
+	 */
+	public $locationInfo = true;
   
-    /**
-     * @var boolean set the elements namespace
-     */
-    public $log4jNamespace = false;
+	/**
+	 * @var boolean set the elements namespace
+	 */
+	public $log4jNamespace = false;
     
     
-    /**
-     * @var string namespace
-     * @private
-     */
-    public $_namespace = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS;
+	/**
+	 * @var string namespace
+	 * @private
+	 */
+	public $_namespace = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS;
     
-    /**
-     * @var string namespace prefix
-     * @private
-     */
-    public $_namespacePrefix = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS_PREFIX;
+	/**
+	 * @var string namespace prefix
+	 * @private
+	 */
+	public $_namespacePrefix = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS_PREFIX;
      
-    /** 
-     * No options to activate. 
-     */
-    public function activateOptions()
-    {
-        if ($this->getLog4jNamespace()) {
-            $this->_namespace        = LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS;
-            $this->_namespacePrefix  = LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS_PREFIX;
-        } else {
-            $this->_namespace        = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS;
-            $this->_namespacePrefix  = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS_PREFIX;
-        }     
-    }
+	/** 
+	 * No options to activate. 
+	 */
+	public function activateOptions()
+	{
+		if ($this->getLog4jNamespace()) {
+			$this->_namespace        = LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS;
+			$this->_namespacePrefix  = LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS_PREFIX;
+		} else {
+			$this->_namespace        = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS;
+			$this->_namespacePrefix  = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS_PREFIX;
+		}     
+	}
     
-    /**
-     * @return string
-     */
-    public function getHeader()
-    {
-        return "<{$this->_namespacePrefix}:eventSet ".
-                    "xmlns:{$this->_namespacePrefix}=\"{$this->_namespace}\" ".
-                    "version=\"0.3\" ".
-                    "includesLocationInfo=\"".($this->getLocationInfo() ? "true" : "false")."\"".
-               ">\r\n";
-    }
-
-    /**
-     * Formats a {@link LoggerLoggingEvent} in conformance with the log4php.dtd.
-     *
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function format($event)
-    {
-        $loggerName = $event->getLoggerName();
-        $timeStamp  = number_format((float)($event->getTimeStamp() * 1000), 0, '', '');
-        $thread     = $event->getThreadName();
-        $level      = $event->getLevel();
-        $levelStr   = $level->toString();
-
-        $buf = "<{$this->_namespacePrefix}:event logger=\"{$loggerName}\" level=\"{$levelStr}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">\r\n";
-        $buf .= "<{$this->_namespacePrefix}:message><![CDATA["; 
-        LoggerTransform::appendEscapingCDATA($buf, $event->getRenderedMessage()); 
-        $buf .= "]]></{$this->_namespacePrefix}:message>\r\n";        
-
-        $ndc = $event->getNDC();
-        if($ndc != null) {
-            $buf .= "<{$this->_namespacePrefix}:NDC><![CDATA[";
-            LoggerTransform::appendEscapingCDATA($buf, $ndc);
-            $buf .= "]]></{$this->_namespacePrefix}:NDC>\r\n";       
-        }
-
-        if ($this->getLocationInfo()) {
-            $locationInfo = $event->getLocationInformation();
-            $buf .= "<{$this->_namespacePrefix}:locationInfo ". 
-                    "class=\"" . $locationInfo->getClassName() . "\" ".
-                    "file=\"" .  htmlentities($locationInfo->getFileName(), ENT_QUOTES) . "\" ".
-                    "line=\"" .  $locationInfo->getLineNumber() . "\" ".
-                    "method=\"" . $locationInfo->getMethodName() . "\" ";
-            $buf .= "/>\r\n";
-
-        }
-
-        $buf .= "</{$this->_namespacePrefix}:event>\r\n\r\n";
+	/**
+	 * @return string
+	 */
+	public function getHeader()
+	{
+		return "<{$this->_namespacePrefix}:eventSet ".
+					"xmlns:{$this->_namespacePrefix}=\"{$this->_namespace}\" ".
+					"version=\"0.3\" ".
+					"includesLocationInfo=\"".($this->getLocationInfo() ? "true" : "false")."\"".
+			   ">\r\n";
+	}
+
+	/**
+	 * Formats a {@link LoggerLoggingEvent} in conformance with the log4php.dtd.
+	 *
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function format($event)
+	{
+		$loggerName = $event->getLoggerName();
+		$timeStamp  = number_format((float)($event->getTimeStamp() * 1000), 0, '', '');
+		$thread     = $event->getThreadName();
+		$level      = $event->getLevel();
+		$levelStr   = $level->toString();
+
+		$buf = "<{$this->_namespacePrefix}:event logger=\"{$loggerName}\" level=\"{$levelStr}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">\r\n";
+		$buf .= "<{$this->_namespacePrefix}:message><![CDATA["; 
+		LoggerTransform::appendEscapingCDATA($buf, $event->getRenderedMessage()); 
+		$buf .= "]]></{$this->_namespacePrefix}:message>\r\n";        
+
+		$ndc = $event->getNDC();
+		if($ndc != null) {
+			$buf .= "<{$this->_namespacePrefix}:NDC><![CDATA[";
+			LoggerTransform::appendEscapingCDATA($buf, $ndc);
+			$buf .= "]]></{$this->_namespacePrefix}:NDC>\r\n";       
+		}
+
+		if ($this->getLocationInfo()) {
+			$locationInfo = $event->getLocationInformation();
+			$buf .= "<{$this->_namespacePrefix}:locationInfo ". 
+					"class=\"" . $locationInfo->getClassName() . "\" ".
+					"file=\"" .  htmlentities($locationInfo->getFileName(), ENT_QUOTES) . "\" ".
+					"line=\"" .  $locationInfo->getLineNumber() . "\" ".
+					"method=\"" . $locationInfo->getMethodName() . "\" ";
+			$buf .= "/>\r\n";
+
+		}
+
+		$buf .= "</{$this->_namespacePrefix}:event>\r\n\r\n";
         
-        return $buf;
+		return $buf;
 
-    }
+	}
     
-    /**
-     * @return string
-     */
-    public function getFooter()
-    {
-
-        return "</{$this->_namespacePrefix}:eventSet>\r\n";
-    }
+	/**
+	 * @return string
+	 */
+	public function getFooter()
+	{
+
+		return "</{$this->_namespacePrefix}:eventSet>\r\n";
+	}
     
-    /**
-     * @return boolean
-     */
-    public function getLocationInfo()
-    {
-        return $this->locationInfo;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function getLocationInfo()
+	{
+		return $this->locationInfo;
+	}
   
-    /**
-     * @return boolean
-     */
-    public function getLog4jNamespace()
-    {
-        return $this->log4jNamespace;
-    }
-
-    /**
-     * The XMLLayout prints and does not ignore exceptions. Hence the
-     * return value <b>false</b>.
-     * @return boolean
-     */
-    public function ignoresThrowable()
-    {
-        return false;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function getLog4jNamespace()
+	{
+		return $this->log4jNamespace;
+	}
+
+	/**
+	 * The XMLLayout prints and does not ignore exceptions. Hence the
+	 * return value <b>false</b>.
+	 * @return boolean
+	 */
+	public function ignoresThrowable()
+	{
+		return false;
+	}
     
-    /**
-     * The {@link $locationInfo} option takes a boolean value. By default,
-     * it is set to false which means there will be no location
-     * information output by this layout. If the the option is set to
-     * true, then the file name and line number of the statement at the
-     * origin of the log statement will be output.
-     */
-    public function setLocationInfo($flag)
-    {
-        $this->locationInfo = LoggerOptionConverter::toBoolean($flag, true);
-    }
+	/**
+	 * The {@link $locationInfo} option takes a boolean value. By default,
+	 * it is set to false which means there will be no location
+	 * information output by this layout. If the the option is set to
+	 * true, then the file name and line number of the statement at the
+	 * origin of the log statement will be output.
+	 */
+	public function setLocationInfo($flag)
+	{
+		$this->locationInfo = LoggerOptionConverter::toBoolean($flag, true);
+	}
   
-    /**
-     * @param boolean
-     */
-    public function setLog4jNamespace($flag)
-    {
-        $this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, true);
-    }
+	/**
+	 * @param boolean
+	 */
+	public function setLog4jNamespace($flag)
+	{
+		$this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, true);
+	}
 }
 
 ?>
\ No newline at end of file