update pMachine to EllisLab

update copyright year
update Code Igniter to CodeIgniter

1 files changed, 193 insertions, 193 deletions

diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index 53425d1d9..33f408fb4 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -1,194 +1,194 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-/**
- * Code Igniter
- *
- * An open source application development framework for PHP 4.3.2 or newer
- *
- * @package		CodeIgniter
- * @author		Rick Ellis
- * @copyright	Copyright (c) 2006, pMachine, Inc.
- * @license		http://www.codeignitor.com/user_guide/license.html
- * @link		http://www.codeigniter.com
- * @since		Version 1.0
- * @filesource
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * Database Cache Class
- *
- * @category	Database
- * @author		Rick Ellis
- * @link		http://www.codeigniter.com/user_guide/database/
- */
-class CI_DB_Cache {
-
-	var $CI;
-
-	/**
-	 * Constructor
-	 *
-	 * Grabs the CI super object instance so we can access it.
-	 *
-	 */	
-	function CI_DB_Cache()
-	{
-		// Assign the main CI object to $this->CI
-		// and load the file helper since we use it a lot
-		$this->CI =& get_instance();
-		$this->CI->load->helper('file');	
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Set Cache Directory Path
-	 *
-	 * @access	public
-	 * @param	string	the path to the cache directory
-	 * @return	bool
-	 */		
-	function check_path($path = '')
-	{
-		if ($path == '')
-		{
-			if ($this->CI->db->cachedir == '')
-			{
-				return $this->CI->db->cache_off();
-			}
-		
-			$path = $this->CI->db->cachedir;
-		}
-	
-		// Add a trailing slash to the path if needed
-		$path = preg_replace("/(.+?)\/*$/", "\\1/",  $path);
-	
-		if ( ! is_dir($path) OR ! is_writable($path))
-		{
-			if ($this->CI->db->db_debug)
-			{
-				return $this->CI->db->display_error('db_invalid_cache_path');
-			}
-			
-			// If the path is wrong we'll turn off caching
-			return $this->CI->db->cache_off();
-		}
-		
-		$this->CI->db->cachedir = $path;
-		return TRUE;
-	}
-	
-	// --------------------------------------------------------------------
-
-	/**
-	 * Retrieve a cached query
-	 *
-	 * The URI being requested will become the name of the cache sub-folder.
-	 * An MD5 hash of the SQL statement will become the cache file name
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	function read($sql)
-	{
-		if ( ! $this->check_path())
-		{
-			return $this->CI->db->cache_off();
-		}
-	
-		$uri  = ($this->CI->uri->segment(1) == FALSE) ? 'default.'	: $this->CI->uri->segment(1).'+';
-		$uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index'		: $this->CI->uri->segment(2);
-		
-		$filepath = $uri.'/'.md5($sql);
-		
-		if (FALSE === ($cachedata = read_file($this->CI->db->cachedir.$filepath)))
-		{	
-			return FALSE;
-		}
-		
-		return unserialize($cachedata);			
-	}	
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Write a query to a cache file
-	 *
-	 * @access	public
-	 * @return	bool
-	 */
-	function write($sql, $object)
-	{
-		if ( ! $this->check_path())
-		{
-			return $this->CI->db->cache_off();
-		}
-
-		$uri  = ($this->CI->uri->segment(1) == FALSE) ? 'default.'	: $this->CI->uri->segment(1).'+';
-		$uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index'		: $this->CI->uri->segment(2);
-		
-		$dir_path = $this->CI->db->cachedir.$uri.'/';
-		
-		$filename = md5($sql);
-	
-		if ( ! @is_dir($dir_path))
-		{
-			if ( ! @mkdir($dir_path, 0777))
-			{
-				return FALSE;
-			}
-			
-			@chmod($dir_path, 0777);			
-		}
-		
-		if (write_file($dir_path.$filename, serialize($object)) === FALSE)
-		{
-			return FALSE;
-		}
-		
-		@chmod($dir_path.$filename, 0777);
-		return TRUE;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Delete cache files within a particular directory
-	 *
-	 * @access	public
-	 * @return	bool
-	 */
-	function delete($segment_one = '', $segment_two = '')
-	{	
-		if ($segment_one == '')
-		{
-			$segment_one  = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(2);
-		}
-		
-		if ($segment_two == '')
-		{
-			$segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2);
-		}
-		
-		$dir_path = $this->CI->db->cachedir.$segment_one.'+'.$segment_two.'/';
-		
-		delete_files($dir_path, TRUE);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Delete all existing cache files
-	 *
-	 * @access	public
-	 * @return	bool
-	 */
-	function delete_all()
-	{
-		delete_files($this->CI->db->cachedir, TRUE);
-	}
-
-}
-
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+/**

+ * CodeIgniter

+ *

+ * An open source application development framework for PHP 4.3.2 or newer

+ *

+ * @package		CodeIgniter

+ * @author		Rick Ellis

+ * @copyright	Copyright (c) 2006, EllisLab, Inc.

+ * @license		http://www.codeignitor.com/user_guide/license.html

+ * @link		http://www.codeigniter.com

+ * @since		Version 1.0

+ * @filesource

+ */

+

+// ------------------------------------------------------------------------

+

+/**

+ * Database Cache Class

+ *

+ * @category	Database

+ * @author		Rick Ellis

+ * @link		http://www.codeigniter.com/user_guide/database/

+ */

+class CI_DB_Cache {

+

+	var $CI;

+

+	/**

+	 * Constructor

+	 *

+	 * Grabs the CI super object instance so we can access it.

+	 *

+	 */	

+	function CI_DB_Cache()

+	{

+		// Assign the main CI object to $this->CI

+		// and load the file helper since we use it a lot

+		$this->CI =& get_instance();

+		$this->CI->load->helper('file');	

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Set Cache Directory Path

+	 *

+	 * @access	public

+	 * @param	string	the path to the cache directory

+	 * @return	bool

+	 */		

+	function check_path($path = '')

+	{

+		if ($path == '')

+		{

+			if ($this->CI->db->cachedir == '')

+			{

+				return $this->CI->db->cache_off();

+			}

+		

+			$path = $this->CI->db->cachedir;

+		}

+	

+		// Add a trailing slash to the path if needed

+		$path = preg_replace("/(.+?)\/*$/", "\\1/",  $path);

+	

+		if ( ! is_dir($path) OR ! is_writable($path))

+		{

+			if ($this->CI->db->db_debug)

+			{

+				return $this->CI->db->display_error('db_invalid_cache_path');

+			}

+			

+			// If the path is wrong we'll turn off caching

+			return $this->CI->db->cache_off();

+		}

+		

+		$this->CI->db->cachedir = $path;

+		return TRUE;

+	}

+	

+	// --------------------------------------------------------------------

+

+	/**

+	 * Retrieve a cached query

+	 *

+	 * The URI being requested will become the name of the cache sub-folder.

+	 * An MD5 hash of the SQL statement will become the cache file name

+	 *

+	 * @access	public

+	 * @return	string

+	 */

+	function read($sql)

+	{

+		if ( ! $this->check_path())

+		{

+			return $this->CI->db->cache_off();

+		}

+	

+		$uri  = ($this->CI->uri->segment(1) == FALSE) ? 'default.'	: $this->CI->uri->segment(1).'+';

+		$uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index'		: $this->CI->uri->segment(2);

+		

+		$filepath = $uri.'/'.md5($sql);

+		

+		if (FALSE === ($cachedata = read_file($this->CI->db->cachedir.$filepath)))

+		{	

+			return FALSE;

+		}

+		

+		return unserialize($cachedata);			

+	}	

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Write a query to a cache file

+	 *

+	 * @access	public

+	 * @return	bool

+	 */

+	function write($sql, $object)

+	{

+		if ( ! $this->check_path())

+		{

+			return $this->CI->db->cache_off();

+		}

+

+		$uri  = ($this->CI->uri->segment(1) == FALSE) ? 'default.'	: $this->CI->uri->segment(1).'+';

+		$uri .= ($this->CI->uri->segment(2) == FALSE) ? 'index'		: $this->CI->uri->segment(2);

+		

+		$dir_path = $this->CI->db->cachedir.$uri.'/';

+		

+		$filename = md5($sql);

+	

+		if ( ! @is_dir($dir_path))

+		{

+			if ( ! @mkdir($dir_path, 0777))

+			{

+				return FALSE;

+			}

+			

+			@chmod($dir_path, 0777);			

+		}

+		

+		if (write_file($dir_path.$filename, serialize($object)) === FALSE)

+		{

+			return FALSE;

+		}

+		

+		@chmod($dir_path.$filename, 0777);

+		return TRUE;

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Delete cache files within a particular directory

+	 *

+	 * @access	public

+	 * @return	bool

+	 */

+	function delete($segment_one = '', $segment_two = '')

+	{	

+		if ($segment_one == '')

+		{

+			$segment_one  = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(2);

+		}

+		

+		if ($segment_two == '')

+		{

+			$segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2);

+		}

+		

+		$dir_path = $this->CI->db->cachedir.$segment_one.'+'.$segment_two.'/';

+		

+		delete_files($dir_path, TRUE);

+	}

+

+	// --------------------------------------------------------------------

+

+	/**

+	 * Delete all existing cache files

+	 *

+	 * @access	public

+	 * @return	bool

+	 */

+	function delete_all()

+	{

+		delete_files($this->CI->db->cachedir, TRUE);

+	}

+

+}

+

 ?>
\ No newline at end of file