commit 3ed8c51254a5b26d951fa675802fcf69adf9638e
author admin <devnull@localhost> Fri Sep 29 23:26:28 2006 +0000
committer admin <devnull@localhost> Fri Sep 29 23:26:28 2006 +0000
tree 8e5f5af90a7e73f4b1a55f78fa3542f5cb156cfa
parent 051402b4c281cf125c9b369b682128aaefb587cd

system/libraries/Controller.php

diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index be66b19..51f4550 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -189,8 +189,6 @@
 		}
 		
 		$remap = array(
-						'DB_export'		=> 'dbexport',
-						'DB_utility'	=> 'dbutility',
 						'Unit_test' 	=> 'unit'
 						);
 						
@@ -516,19 +514,15 @@
 	{
 		if ( ! $this->_ci_is_loaded('db'))
 		{
-			$this->_init_database();
+			$this->_ci_init_database();
 		}
 			
 		if ($class == 'dbutil')
 		{
 			require_once(BASEPATH.'database/DB_utility'.EXT);
 			require_once(BASEPATH.'database/drivers/'.$this->db->dbdriver.'/'.$this->db->dbdriver.'_utility'.EXT);
-			$this->init_class('CI_DB_'.$this->db->dbdriver.'_utility', 'dbutil');
-		}
-		elseif ($class == 'dbexport')
-		{
-			require_once(BASEPATH.'database/DB_export'.EXT);
-			$this->init_class('CI_DB_export', 'dbexport');
+			$class = 'CI_DB_'.$this->db->dbdriver.'_utility';
+			$this->dbutil = new $class();
 		}
 	}
 

system/libraries/Encrypt.php

diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index abc7694..537b1ab 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -27,6 +27,7 @@
  * @link		http://www.codeigniter.com/user_guide/libraries/encryption.html
  */
 class CI_Encrypt {
+	var $encryption_key	= '';
 	var $_hash_type	= 'sha1';
 	var $_mcrypt_exists = FALSE;
 	var $_mcrypt_cipher;
@@ -43,7 +44,6 @@
 		$this->_mcrypt_exists = ( ! function_exists('mcrypt_encrypt')) ? FALSE : TRUE;
 		log_message('debug', "Encrypt Class Initialized");
 	}
-  	// END CI_Encrypt()
   	
 	// --------------------------------------------------------------------
 
@@ -61,6 +61,11 @@
 	{
 		if ($key == '')
 		{	
+			if ($this->encryption_key != '')
+			{
+				return $this->encryption_key;
+			}
+		
 			$obj =& get_instance();
 			$key = $obj->config->item('encryption_key');
 
@@ -72,7 +77,20 @@
 		
 		return md5($key);
 	}
-  	// END get_key()
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Set the encryption key
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	void
+	 */
+	function set_key($key = '')
+	{
+		$this->encryption_key = $key;
+	}
   	
 	// --------------------------------------------------------------------
 
@@ -103,7 +121,6 @@
 		}
 		return base64_encode($enc);		
 	}
-  	// END encode()
   	
 	// --------------------------------------------------------------------
 
@@ -134,7 +151,6 @@
 		
 		return $this->_xor_decode($dec, $key);
 	}
-  	// END decode()
   	
 	// --------------------------------------------------------------------
 
@@ -167,7 +183,6 @@
 				
 		return $this->_xor_merge($enc, $key);
 	}
-  	// END _xor_encode()
   	
 	// --------------------------------------------------------------------
 
@@ -194,7 +209,6 @@
 	
 		return $dec;
 	}
-  	// END _xor_decode()
   	
 	// --------------------------------------------------------------------
 
@@ -219,7 +233,6 @@
 		
 		return $str;
 	}
-  	// END _xor_merge()
   	
 	// --------------------------------------------------------------------
 
@@ -238,7 +251,6 @@
 		$init_vect = mcrypt_create_iv($init_size, MCRYPT_RAND);
 		return mcrypt_encrypt($this->_mcrypt_cipher, $key, $data, $this->_mcrypt_mode, $init_vect);
 	}
-  	// END mcrypt_encode()
   	
 	// --------------------------------------------------------------------
 
@@ -257,7 +269,6 @@
 		$init_vect = mcrypt_create_iv($init_size, MCRYPT_RAND);
 		return rtrim(mcrypt_decrypt($this->_mcrypt_cipher, $key, $data, $this->_mcrypt_mode, $init_vect), "\0");
 	}
-  	// END mcrypt_decode()
   	
 	// --------------------------------------------------------------------
 
@@ -272,7 +283,6 @@
 	{
 		$this->_mcrypt_cipher = $cypher;
 	}
-  	// END set_cypher()
   	
 	// --------------------------------------------------------------------
 
@@ -287,7 +297,6 @@
 	{
 		$this->_mcrypt_mode = $mode;
 	}
-  	// END set_mode()
   	
 	// --------------------------------------------------------------------
 
@@ -309,7 +318,6 @@
 			$this->_mcrypt_mode = MCRYPT_MODE_ECB;
 		}
 	}
-  	// END _get_mcrypt()
   	
 	// --------------------------------------------------------------------
 
@@ -324,7 +332,6 @@
 	{
 		$this->_hash_type = ($type != 'sha1' AND $type != 'md5') ? 'sha1' : $type;
 	}
-  	// END set_hash()
   	
 	// --------------------------------------------------------------------
 
@@ -339,7 +346,6 @@
 	{
 		return ($this->_hash_type == 'sha1') ? $this->sha1($str) : md5($str);
 	}
-  	// END hash()
   	
 	// --------------------------------------------------------------------
 
@@ -370,7 +376,6 @@
 			return sha1($str);
 		}	
 	}  
-	// END sha1()
 	
 }
 

system/libraries/Loader.php

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index fff9e78..2534e69 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -135,20 +135,6 @@
 		$obj =& get_instance();
 		$obj->_ci_init_dbextra('dbutil');
 	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Database Export Loader
-	 *
-	 * @access	public
-	 * @return	object
-	 */	
-	function dbexport()
-	{
-		$obj =& get_instance();
-		$obj->_ci_init_dbextra('dbexport');
-	}
 
 	// --------------------------------------------------------------------