narfbg

<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
 * CodeIgniter
 *
 * An open source application development framework for PHP 5.2.4 or newer
 *
 * NOTICE OF LICENSE
 *
 * Licensed under the Open Software License version 3.0
 *

narfbg

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 698cb76..764d16d 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -98,7 +98,7 @@ class CI_Email {
 	 */
 	public function __construct($config = array())
 	{
-		$this->charset = strtoupper(config_item('charset'));
+		$this->charset = config_item('charset');

narfbg

diff --git a/system/core/Input.php b/system/core/Input.php
index 968a42a..c3d8980 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -328,34 +328,42 @@ class CI_Input {
                        return $this->ip_address;
                }
 
-               if (config_item('proxy_ips') != '' && $this->server('HTTP_X_FORWARDED_FOR') && $this->server('REMOTE_ADDR'))
+               $proxies = config_item('proxy_ips');

narfbg

diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 3536241..70421ce 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -459,6 +459,10 @@ class CI_Form_validation {
                        {
                                $this->_field_data[$field]['postdata'] = $validation_array[$field];
                        }
+                       elseif ( ! empty($row['rules']))
+                       {

narfbg

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 40ce807..add7f72 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -526,7 +526,7 @@ if ( ! function_exists('redirect'))
         * @param       int
         * @return      string
         */
-       function redirect($uri = '', $method = 'auto', $http_response_code = 302)
+       function redirect($uri = '', $method = 'auto', $code = NULL)

narfbg

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index c70144f..8968a84 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -704,11 +704,37 @@ class CI_Email {
 	 * Email Validation
 	 *
 	 * @param	string
+	 * @param	mixed	types of records to check
 	 * @return	bool

narfbg

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 7a0ea0c..cefaa77 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -343,8 +343,26 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
                // in the protect_identifiers to know whether to add a table prefix
                $this->_track_aliases($table);
 
-               // Strip apart the condition and protect the identifiers
-               if (preg_match('/([\[\w\.]+)([\W\s]+)(.+)/', $cond, $match))

narfbg

<IfModule mod_rewrite.c>
	RewriteEngine on
	RewriteCond $1 !^(index\.php|images\/.+\.(jpg|png|gif)|css\/.+\.(css|jpg|png|gif)|js\/.+\.js|robots\.txt)
	RewriteRule ^(.*)$ index.php/$1 [L]
</IfModule>

narfbg

#!/bin/bash
/sbin/iptables -A INPUT -s "$1" -j DROP