From fce2ed6d1d3026c485e79ce5bf236effc67981be Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sun, 11 Mar 2012 22:04:48 +0200
Subject: Added an Android <= 2.1 specific check to force_download()

---
 system/helpers/download_helper.php | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index f3f0ff2ca..34f9bc07d 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -60,19 +60,19 @@ if ( ! function_exists('force_download'))
 		// Set the default MIME type to send
 		$mime = 'application/octet-stream';
 
+		$x = explode('.', $filename);
+		$extension = end($x);
+
 		if ($set_mime === TRUE)
 		{
-			/* If we're going to detect the MIME type,
-			 * we'll need a file extension.
-			 */
-			if (FALSE === strpos($filename, '.'))
+			if (count($x) === 1 OR $extension === '')
 			{
+				/* If we're going to detect the MIME type,
+				 * we'll need a file extension.
+				 */
 				return FALSE;
 			}
 
-			$extension = explode('.', $filename);
-			$extension = end($extension);
-
 			// Load the mime types
 			if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 			{
@@ -90,6 +90,18 @@ if ( ! function_exists('force_download'))
 			}
 		}
 
+		/* It was reported that browsers on Android 2.1 (and possibly older as well)
+		 * need to have the filename extension upper-cased in order to be able to
+		 * download it.
+		 *
+		 * Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/
+		 */
+		if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT']) && preg_match('/Android\s(1|2\.[12])/', $_SERVER['HTTP_USER_AGENT']))
+		{
+			$x[count($x) - 1] = strtoupper($extension);
+			$filename = implode('.', $x);
+		}
+
 		// Generate the server headers
 		header('Content-Type: '.$mime);
 		header('Content-Disposition: attachment; filename="'.$filename.'"');
-- 
cgit v1.2.3-24-g4f1b


From 3d933b6fad72d4b92f18187dd57f1d3c35f8936a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sun, 11 Mar 2012 22:08:57 +0200
Subject: Fix erroneus regex from previous commit

---
 system/helpers/download_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers')

diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 34f9bc07d..96ff29dec 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -96,7 +96,7 @@ if ( ! function_exists('force_download'))
 		 *
 		 * Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/
 		 */
-		if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT']) && preg_match('/Android\s(1|2\.[12])/', $_SERVER['HTTP_USER_AGENT']))
+		if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT']) && preg_match('/Android\s(1|2\.[01])/', $_SERVER['HTTP_USER_AGENT']))
 		{
 			$x[count($x) - 1] = strtoupper($extension);
 			$filename = implode('.', $x);
-- 
cgit v1.2.3-24-g4f1b


From 0ba29f5aa019b9c4a002fbecacf6ed33f3b68a3d Mon Sep 17 00:00:00 2001
From: nihaopaul <nihaopaul@gmail.com>
Date: Mon, 12 Mar 2012 16:46:58 +0800
Subject: form_dropdown() will now also take an array for unity with other form
 helpers.

---
 system/helpers/form_helper.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 4da07f283..9610cee98 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -314,6 +314,23 @@ if ( ! function_exists('form_dropdown'))
 {
 	function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '')
 	{
+    // If name is really an array then we'll call the function again using the array
+    if ( is_array($name) ) {
+      if ( ! isset($name['options'])) 
+      {
+        $name['selected'] = false;
+      }     
+      if ( ! isset($name['selected'])) 
+      {
+        $name['selected'] = false;
+      }
+      if ( ! isset($name['extra'])) 
+      {
+        $name['extra'] = false;
+      }
+      return form_dropdown($name['name'], $name['options'], $name['selected'], $name['extra']);
+    }
+    
 		if ( ! is_array($selected))
 		{
 			$selected = array($selected);
-- 
cgit v1.2.3-24-g4f1b


From ca5cabc29483921dba05343cd30734980b696fd1 Mon Sep 17 00:00:00 2001
From: nihaopaul <nihaopaul@gmail.com>
Date: Mon, 12 Mar 2012 16:54:04 +0800
Subject: form_dropdown() will now also take an array for unity with other form
 helpers., codestyle cleanup only

---
 system/helpers/form_helper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 9610cee98..efe5dbce1 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -315,7 +315,8 @@ if ( ! function_exists('form_dropdown'))
 	function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '')
 	{
     // If name is really an array then we'll call the function again using the array
-    if ( is_array($name) ) {
+    if (is_array($name)) 
+    {
       if ( ! isset($name['options'])) 
       {
         $name['selected'] = false;
-- 
cgit v1.2.3-24-g4f1b


From 10ecad5238fe1a408e9ecbe6ed3b37c4f3d33863 Mon Sep 17 00:00:00 2001
From: nihaopaul <nihaopaul@gmail.com>
Date: Mon, 12 Mar 2012 16:54:17 +0800
Subject: form_dropdown() will now also take an array for unity with other form
 helpers., codestyle cleanup only

---
 system/helpers/form_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index efe5dbce1..ab3a12961 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -315,7 +315,7 @@ if ( ! function_exists('form_dropdown'))
 	function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '')
 	{
     // If name is really an array then we'll call the function again using the array
-    if (is_array($name)) 
+    if (is_array($name))
     {
       if ( ! isset($name['options'])) 
       {
-- 
cgit v1.2.3-24-g4f1b


From 4252f8d2e72ed25883682e4a7e2c7a221a743dc8 Mon Sep 17 00:00:00 2001
From: nihaopaul <nihaopaul@gmail.com>
Date: Mon, 12 Mar 2012 16:57:44 +0800
Subject: form_dropdown() will now also take an array for unity with other form
 helpers., false => FALSE and the options check fixed

---
 system/helpers/form_helper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index ab3a12961..8ccab99a2 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -319,15 +319,15 @@ if ( ! function_exists('form_dropdown'))
     {
       if ( ! isset($name['options'])) 
       {
-        $name['selected'] = false;
+        $name['options'] = FALSE;
       }     
       if ( ! isset($name['selected'])) 
       {
-        $name['selected'] = false;
+        $name['selected'] = FALSE;
       }
       if ( ! isset($name['extra'])) 
       {
-        $name['extra'] = false;
+        $name['extra'] = FALSE;
       }
       return form_dropdown($name['name'], $name['options'], $name['selected'], $name['extra']);
     }
-- 
cgit v1.2.3-24-g4f1b


From 8abb67c6a941ea87156f2afe976724ae1cf88c03 Mon Sep 17 00:00:00 2001
From: nihaopaul <nihaopaul@gmail.com>
Date: Mon, 12 Mar 2012 17:00:32 +0800
Subject: code readability improvements

---
 system/helpers/form_helper.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 8ccab99a2..82a4b9f57 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -317,18 +317,22 @@ if ( ! function_exists('form_dropdown'))
     // If name is really an array then we'll call the function again using the array
     if (is_array($name))
     {
+      
       if ( ! isset($name['options'])) 
       {
         $name['options'] = FALSE;
-      }     
+      }
+      
       if ( ! isset($name['selected'])) 
       {
         $name['selected'] = FALSE;
       }
+      
       if ( ! isset($name['extra'])) 
       {
         $name['extra'] = FALSE;
       }
+      
       return form_dropdown($name['name'], $name['options'], $name['selected'], $name['extra']);
     }
     
-- 
cgit v1.2.3-24-g4f1b


From b6a84432400736bb7f7b835739b1ffff252f92cd Mon Sep 17 00:00:00 2001
From: nihaopaul <nihaopaul@gmail.com>
Date: Mon, 12 Mar 2012 17:06:42 +0800
Subject: test if isset(['name']) is actually set instead of assuming it to be

---
 system/helpers/form_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 82a4b9f57..df28d88eb 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -315,7 +315,7 @@ if ( ! function_exists('form_dropdown'))
 	function form_dropdown($name = '', $options = array(), $selected = array(), $extra = '')
 	{
     // If name is really an array then we'll call the function again using the array
-    if (is_array($name))
+    if (is_array($name) && isset($name['name']))
     {
       
       if ( ! isset($name['options'])) 
-- 
cgit v1.2.3-24-g4f1b


From 08631577a008b0d7544c6092652f6140885298a5 Mon Sep 17 00:00:00 2001
From: nihaopaul <nihaopaul@gmail.com>
Date: Mon, 12 Mar 2012 17:18:57 +0800
Subject: defaults for the function

---
 system/helpers/form_helper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index df28d88eb..37337d975 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -320,17 +320,17 @@ if ( ! function_exists('form_dropdown'))
       
       if ( ! isset($name['options'])) 
       {
-        $name['options'] = FALSE;
+        $name['options'] = array();
       }
       
       if ( ! isset($name['selected'])) 
       {
-        $name['selected'] = FALSE;
+        $name['selected'] = array();
       }
       
       if ( ! isset($name['extra'])) 
       {
-        $name['extra'] = FALSE;
+        $name['extra'] = '';
       }
       
       return form_dropdown($name['name'], $name['options'], $name['selected'], $name['extra']);
-- 
cgit v1.2.3-24-g4f1b


From 89338828264a6b50e0eb63c449a96f14f0f84076 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Mon, 12 Mar 2012 21:03:37 +0700
Subject: Path helper improvement

---
 system/helpers/path_helper.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php
index 2eb85fefa..1b9bdae75 100644
--- a/system/helpers/path_helper.php
+++ b/system/helpers/path_helper.php
@@ -58,21 +58,15 @@ if ( ! function_exists('set_realpath'))
 		}
 
 		// Resolve the path
-		if (function_exists('realpath') AND @realpath($path) !== FALSE)
-		{
-			$path = realpath($path);
-		}
-
-		// Add a trailing slash
-		$path = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
+		$realpath = realpath($path);
 
-		// Make sure the path exists
-		if ($check_existance == TRUE && ! is_dir($path))
+		if ( ! $realpath)
 		{
-			show_error('Not a valid path: '.$path);
+			return $check_existance ? show_error('Not a valid path: '.$path) : $path;
 		}
 
-		return $path;
+		// Add a trailing slash, if this is a directory
+		return is_dir($realpath) ? rtrim($realpath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $realpath;
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 4a7dd98ffd1d21f2b14b9eefa70e6cae2f9aa92d Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Mon, 12 Mar 2012 21:33:55 +0700
Subject: Left the function_exists due some security restriction in some
 hosting environment

---
 system/helpers/path_helper.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php
index 1b9bdae75..9c0af44c1 100644
--- a/system/helpers/path_helper.php
+++ b/system/helpers/path_helper.php
@@ -2,7 +2,7 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 5.2.4 or newer
+ * An open source application development framework for PHP 5.1.6 or newer
  *
  * NOTICE OF LICENSE
  *
@@ -58,7 +58,14 @@ if ( ! function_exists('set_realpath'))
 		}
 
 		// Resolve the path
-		$realpath = realpath($path);
+		if (function_exists('realpath'))
+		{
+			$realpath = realpath($path);
+		}
+		else
+		{
+			$realpath = (is_dir($path) or is_file($path)) ? $path : FALSE;
+		}
 
 		if ( ! $realpath)
 		{
-- 
cgit v1.2.3-24-g4f1b


From 7164cda9ab8aea8fc26aad21dd78c9f06839dec7 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Mon, 12 Mar 2012 21:36:04 +0700
Subject: Minimal PHP version annotation

---
 system/helpers/path_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers')

diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php
index 9c0af44c1..8c4730d73 100644
--- a/system/helpers/path_helper.php
+++ b/system/helpers/path_helper.php
@@ -2,7 +2,7 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
  *
  * NOTICE OF LICENSE
  *
-- 
cgit v1.2.3-24-g4f1b


From fc49a657af78b0fb248cc666b162dc894e3e04ba Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Tue, 13 Mar 2012 03:27:58 +0700
Subject: Extra

---
 system/helpers/path_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php
index 8c4730d73..e4fc6f157 100644
--- a/system/helpers/path_helper.php
+++ b/system/helpers/path_helper.php
@@ -58,13 +58,13 @@ if ( ! function_exists('set_realpath'))
 		}
 
 		// Resolve the path
-		if (function_exists('realpath'))
+		if (function_exists('realpath') && @realpath($path) !== FALSE)
 		{
 			$realpath = realpath($path);
 		}
 		else
 		{
-			$realpath = (is_dir($path) or is_file($path)) ? $path : FALSE;
+			$realpath = (is_dir($path) OR is_file($path)) ? $path : FALSE;
 		}
 
 		if ( ! $realpath)
-- 
cgit v1.2.3-24-g4f1b


From dbf4a5ad7b279b2833484e30f1168032cea9b7d3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 13 Mar 2012 12:08:59 +0200
Subject: Clean up the cookie helper

---
 system/helpers/cookie_helper.php | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php
index b46f80540..38a2f78fc 100644
--- a/system/helpers/cookie_helper.php
+++ b/system/helpers/cookie_helper.php
@@ -1,13 +1,13 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?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
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter Cookie Helpers
  *
@@ -45,7 +43,6 @@
  * Accepts six parameter, or you can submit an associative
  * array in the first parameter containing all the values.
  *
- * @access	public
  * @param	mixed
  * @param	string	the value of the cookie
  * @param	string	the number of seconds until expiration
@@ -69,7 +66,6 @@ if ( ! function_exists('set_cookie'))
 /**
  * Fetch an item from the COOKIE array
  *
- * @access	public
  * @param	string
  * @param	bool
  * @return	mixed
@@ -79,14 +75,7 @@ if ( ! function_exists('get_cookie'))
 	function get_cookie($index = '', $xss_clean = FALSE)
 	{
 		$CI =& get_instance();
-
-		$prefix = '';
-
-		if ( ! isset($_COOKIE[$index]) && config_item('cookie_prefix') != '')
-		{
-			$prefix = config_item('cookie_prefix');
-		}
-
+		$prefix = isset($_COOKIE[$index]) ? '' : config_item('cookie_prefix');
 		return $CI->input->cookie($prefix.$index, $xss_clean);
 	}
 }
@@ -97,7 +86,7 @@ if ( ! function_exists('get_cookie'))
  * Delete a COOKIE
  *
  * @param	mixed
- * @param	string	the cookie domain.  Usually:  .yourdomain.com
+ * @param	string	the cookie domain. Usually: .yourdomain.com
  * @param	string	the cookie path
  * @param	string	the cookie prefix
  * @return	void
@@ -110,6 +99,5 @@ if ( ! function_exists('delete_cookie'))
 	}
 }
 
-
 /* End of file cookie_helper.php */
-/* Location: ./system/helpers/cookie_helper.php */
\ No newline at end of file
+/* Location: ./system/helpers/cookie_helper.php */
-- 
cgit v1.2.3-24-g4f1b


From e5617335b5130718c43e5072ad003f677619d332 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 13 Mar 2012 12:22:17 +0200
Subject: Clean up the array helper

---
 system/helpers/array_helper.php | 47 ++++++++++-------------------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index e5e32c48d..464d1d112 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -1,13 +1,13 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?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
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter Array Helpers
  *
@@ -45,7 +43,6 @@
  * Lets you determine whether an array index is set and whether it has a value.
  * If the element is empty it returns FALSE (or whatever you specify as the default value.)
  *
- * @access	public
  * @param	string
  * @param	array
  * @param	mixed
@@ -55,12 +52,7 @@ if ( ! function_exists('element'))
 {
 	function element($item, $array, $default = FALSE)
 	{
-		if ( ! isset($array[$item]) OR $array[$item] == "")
-		{
-			return $default;
-		}
-
-		return $array[$item];
+		return empty($array[$item]) ? $default : $array[$item];
 	}
 }
 
@@ -69,7 +61,6 @@ if ( ! function_exists('element'))
 /**
  * Random Element - Takes an array as input and returns a random element
  *
- * @access	public
  * @param	array
  * @return	mixed	depends on what the array contains
  */
@@ -77,12 +68,7 @@ if ( ! function_exists('random_element'))
 {
 	function random_element($array)
 	{
-		if ( ! is_array($array))
-		{
-			return $array;
-		}
-
-		return $array[array_rand($array)];
+		return is_array($array) ? $array[array_rand($array)] : $array;
 	}
 }
 
@@ -91,10 +77,9 @@ if ( ! function_exists('random_element'))
 /**
  * Elements
  *
- * Returns only the array items specified.  Will return a default value if
+ * Returns only the array items specified. Will return a default value if
  * it is not set.
  *
- * @access	public
  * @param	array
  * @param	array
  * @param	mixed
@@ -105,22 +90,12 @@ if ( ! function_exists('elements'))
 	function elements($items, $array, $default = FALSE)
 	{
 		$return = array();
-		
-		if ( ! is_array($items))
-		{
-			$items = array($items);
-		}
-		
+
+		is_array($items) OR $items = array($items);
+
 		foreach ($items as $item)
 		{
-			if (isset($array[$item]))
-			{
-				$return[$item] = $array[$item];
-			}
-			else
-			{
-				$return[$item] = $default;
-			}
+			$return[$item] = isset($array[$item]) ? $array[$item] : $default;
 		}
 
 		return $return;
@@ -128,4 +103,4 @@ if ( ! function_exists('elements'))
 }
 
 /* End of file array_helper.php */
-/* Location: ./system/helpers/array_helper.php */
\ No newline at end of file
+/* Location: ./system/helpers/array_helper.php */
-- 
cgit v1.2.3-24-g4f1b


From d153002858256c6f206c8877f4952ed075902f9e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 13 Mar 2012 12:31:13 +0200
Subject: Clean up the directory helper

---
 system/helpers/directory_helper.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index 1d67e056d..d7ca13e85 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -1,13 +1,13 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?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
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter Directory Helpers
  *
@@ -43,12 +41,11 @@
  * Create a Directory Map
  *
  * Reads the specified directory and builds an array
- * representation of it.  Sub-folders contained with the
+ * representation of it. Sub-folders contained with the
  * directory will be mapped as well.
  *
- * @access	public
  * @param	string	path to source
- * @param	int		depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
+ * @param	int	depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
  * @return	array
  */
 if ( ! function_exists('directory_map'))
@@ -64,7 +61,7 @@ if ( ! function_exists('directory_map'))
 			while (FALSE !== ($file = readdir($fp)))
 			{
 				// Remove '.', '..', and hidden files [optional]
-				if ( ! trim($file, '.') OR ($hidden == FALSE && $file[0] == '.'))
+				if ( ! trim($file, '.') OR ($hidden == FALSE && $file[0] === '.'))
 				{
 					continue;
 				}
@@ -87,6 +84,5 @@ if ( ! function_exists('directory_map'))
 	}
 }
 
-
 /* End of file directory_helper.php */
-/* Location: ./system/helpers/directory_helper.php */
\ No newline at end of file
+/* Location: ./system/helpers/directory_helper.php */
-- 
cgit v1.2.3-24-g4f1b


From ce707b4cafd64b95031690cf927584b1d60c7ad7 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Wed, 14 Mar 2012 10:26:08 +0200
Subject: Further improve the path helper

---
 system/helpers/path_helper.php | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php
index e4fc6f157..c31f0bdc5 100644
--- a/system/helpers/path_helper.php
+++ b/system/helpers/path_helper.php
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter Path Helpers
  *
@@ -51,8 +49,8 @@ if ( ! function_exists('set_realpath'))
 {
 	function set_realpath($path, $check_existance = FALSE)
 	{
-		// Security check to make sure the path is NOT a URL.  No remote file inclusion!
-		if (preg_match("#^(http:\/\/|https:\/\/|www\.|ftp|[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})#i", $path))
+		// Security check to make sure the path is NOT a URL. No remote file inclusion!
+		if (preg_match('#^(http:\/\/|https:\/\/|www\.|ftp|[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})#i', $path))
 		{
 			show_error('The path you submitted must be a local server path, not a URL');
 		}
@@ -60,20 +58,15 @@ if ( ! function_exists('set_realpath'))
 		// Resolve the path
 		if (function_exists('realpath') && @realpath($path) !== FALSE)
 		{
-			$realpath = realpath($path);
+			$path = realpath($path);
 		}
-		else
-		{
-			$realpath = (is_dir($path) OR is_file($path)) ? $path : FALSE;
-		}
-
-		if ( ! $realpath)
+		elseif ($check_existance && ! is_dir($path) && ! is_file($path))
 		{
-			return $check_existance ? show_error('Not a valid path: '.$path) : $path;
+			show_error('Not a valid path: '.$path);
 		}
 
 		// Add a trailing slash, if this is a directory
-		return is_dir($realpath) ? rtrim($realpath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $realpath;
+		return is_dir($path) ? rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $path;
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b