From ce2b69675075444c9e40b72bcdd42ab7edbbe633 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@server-speed.net>
Date: Fri, 28 Jan 2011 22:51:06 +0100
Subject: update to CI 2.0

Signed-off-by: Florian Pritz <bluewind@server-speed.net>
---
 system/helpers/security_helper.php | 64 +++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 system/helpers/security_helper.php

(limited to 'system/helpers/security_helper.php')

diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
old mode 100644
new mode 100755
index 1fc47b34b..61ebf46f9
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -2,11 +2,11 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 4.3.2 or newer
+ * An open source application development framework for PHP 5.1.6 or newer
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008 - 2010, EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
@@ -34,35 +34,69 @@
  * @param	string
  * @param	bool	whether or not the content is an image file
  * @return	string
- */	
+ */
 if ( ! function_exists('xss_clean'))
 {
 	function xss_clean($str, $is_image = FALSE)
 	{
 		$CI =& get_instance();
-		return $CI->input->xss_clean($str, $is_image);
+		return $CI->security->xss_clean($str, $is_image);
 	}
 }
 
-// --------------------------------------------------------------------
+// ------------------------------------------------------------------------
 
 /**
- * Hash encode a string
+ * Sanitize Filename
  *
  * @access	public
  * @param	string
  * @return	string
- */	
+ */
+if ( ! function_exists('sanitize_filename'))
+{
+	function sanitize_filename($filename)
+	{
+		$CI =& get_instance();
+		return $CI->security->sanitize_filename($filename);
+	}
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Hash encode a string
+ *
+ * This is simply an alias for do_hash()
+ * dohash() is now deprecated
+ */
 if ( ! function_exists('dohash'))
-{	
+{
 	function dohash($str, $type = 'sha1')
+	{
+		return do_hash($str, $type);
+	}
+}
+
+// --------------------------------------------------------------------
+
+/**
+ * Hash encode a string
+ *
+ * @access	public
+ * @param	string
+ * @return	string
+ */
+if ( ! function_exists('do_hash'))
+{
+	function do_hash($str, $type = 'sha1')
 	{
 		if ($type == 'sha1')
 		{
 			if ( ! function_exists('sha1'))
 			{
 				if ( ! function_exists('mhash'))
-				{	
+				{
 					require_once(BASEPATH.'libraries/Sha1'.EXT);
 					$SH = new CI_SHA;
 					return $SH->generate($str);
@@ -75,7 +109,7 @@ if ( ! function_exists('dohash'))
 			else
 			{
 				return sha1($str);
-			}	
+			}
 		}
 		else
 		{
@@ -83,7 +117,7 @@ if ( ! function_exists('dohash'))
 		}
 	}
 }
-	
+
 // ------------------------------------------------------------------------
 
 /**
@@ -92,18 +126,18 @@ if ( ! function_exists('dohash'))
  * @access	public
  * @param	string
  * @return	string
- */	
+ */
 if ( ! function_exists('strip_image_tags'))
 {
 	function strip_image_tags($str)
 	{
 		$str = preg_replace("#<img\s+.*?src\s*=\s*[\"'](.+?)[\"'].*?\>#", "\\1", $str);
 		$str = preg_replace("#<img\s+.*?src\s*=\s*(.+?).*?\>#", "\\1", $str);
-			
+
 		return $str;
 	}
 }
-	
+
 // ------------------------------------------------------------------------
 
 /**
@@ -112,7 +146,7 @@ if ( ! function_exists('strip_image_tags'))
  * @access	public
  * @param	string
  * @return	string
- */	
+ */
 if ( ! function_exists('encode_php_tags'))
 {
 	function encode_php_tags($str)
-- 
cgit v1.2.3-24-g4f1b