From f1b43d43385c81788dab9103a4f9be7e02432852 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Fri, 6 Jan 2012 14:41:50 +0200
Subject: Improve array, captcha & cookie helpers

---
 system/helpers/array_helper.php | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

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

diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index c46c4d103..881f57db3 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.1.6 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:
@@ -77,12 +77,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;
 	}
 }
 
@@ -105,22 +100,14 @@ if ( ! function_exists('elements'))
 	function elements($items, $array, $default = FALSE)
 	{
 		$return = array();
-		
 		if ( ! is_array($items))
 		{
 			$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 +115,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 4f2933d28370ad965059222553d8ace1dd2fe602 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sun, 8 Jan 2012 06:49:49 +0200
Subject: Some more misc. stuff

---
 system/helpers/array_helper.php | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index 881f57db3..a454f936d 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -25,8 +25,6 @@
  * @filesource
  */
 
-// ------------------------------------------------------------------------
-
 /**
  * CodeIgniter Array Helpers
  *
-- 
cgit v1.2.3-24-g4f1b


From 63a21005ec657aa004b5ffc2b0965c1a201e4637 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 19 Jan 2012 15:13:32 +0200
Subject: Some more cleaning

---
 system/helpers/array_helper.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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

diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index a454f936d..82f0eb16c 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -9,7 +9,7 @@
  * 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
+ * bundled with this package in the files license.txt / license.rst. It is
  * also available through the world wide web at this URL:
  * http://opensource.org/licenses/OSL-3.0
  * If you did not receive a copy of the license and are unable to obtain it
@@ -53,12 +53,7 @@ if ( ! function_exists('element'))
 {
 	function element($item, $array, $default = FALSE)
 	{
-		if ( ! isset($array[$item]) OR $array[$item] == "")
-		{
-			return $default;
-		}
-
-		return $array[$item];
+		return ( ! isset($array[$item]) OR $array[$item] == '') ? $default : $array[$item];
 	}
 }
 
@@ -75,7 +70,7 @@ if ( ! function_exists('random_element'))
 {
 	function random_element($array)
 	{
-		return (is_array($array)) ? $array[array_rand($array)] : $array;
+		return is_array($array) ? $array[array_rand($array)] : $array;
 	}
 }
 
@@ -105,7 +100,7 @@ if ( ! function_exists('elements'))
 
 		foreach ($items as $item)
 		{
-			$return[$item] = (isset($array[$item])) ? $array[$item] : $default;
+			$return[$item] = isset($array[$item]) ? $array[$item] : $default;
 		}
 
 		return $return;
-- 
cgit v1.2.3-24-g4f1b


From 51a22815994cfd4522c78177e41f064ab8e53415 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 24 Jan 2012 15:27:34 +0200
Subject: Revert a space in the license agreement :)

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

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

diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index 82f0eb16c..45eaa4c10 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -9,7 +9,7 @@
  * 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
+ * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
  * http://opensource.org/licenses/OSL-3.0
  * If you did not receive a copy of the license and are unable to obtain it
-- 
cgit v1.2.3-24-g4f1b


From e6f7d610b189e243ad48dcc3900a5c53cab2498d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 20 Mar 2012 15:39:22 +0200
Subject: Remove EOF newlines

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

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

diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index 464d1d112..6f56d9db9 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -103,4 +103,4 @@ if ( ! function_exists('elements'))
 }
 
 /* End of file array_helper.php */
-/* Location: ./system/helpers/array_helper.php */
+/* Location: ./system/helpers/array_helper.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b