From e29136567e2a12726f9ab40762bcb47a7cde759c Mon Sep 17 00:00:00 2001
From: Preetham <me@preetham.in>
Date: Thu, 4 Dec 2014 21:01:52 -0500
Subject: closing #51. Added img_id and img_name in capcha helper

Signed-off-by: Preetham <me@preetham.in>
---
 system/helpers/captcha_helper.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index 2ffa86d97..a105b344b 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -72,6 +72,8 @@ if ( ! function_exists('create_captcha'))
 			'expiration'	=> 7200,
 			'word_length'	=> 8,
 			'font_size'	=> 16,
+			'img_id'	=> '',
+			'img_name'	=> '',
 			'pool'		=> '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
 			'colors'	=> array(
 				'background'	=> array(255,255,255),
@@ -244,7 +246,7 @@ if ( ! function_exists('create_captcha'))
 			return FALSE;
 		}
 
-		$img = '<img src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
+		$img = '<img id="'.$img_id.'" name="'.$img_name.'" src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
 		ImageDestroy($im);
 
 		return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename);
-- 
cgit v1.2.3-24-g4f1b


From be7e493fd7a4dcc8f00b60201d4948f3618d9b6a Mon Sep 17 00:00:00 2001
From: Preetham <me@preetham.in>
Date: Fri, 5 Dec 2014 11:13:57 -0500
Subject: Removed img_name from captcha helper

Signed-off-by: Preetham <me@preetham.in>
---
 system/helpers/captcha_helper.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index a105b344b..373b1af9d 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -73,7 +73,6 @@ if ( ! function_exists('create_captcha'))
 			'word_length'	=> 8,
 			'font_size'	=> 16,
 			'img_id'	=> '',
-			'img_name'	=> '',
 			'pool'		=> '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
 			'colors'	=> array(
 				'background'	=> array(255,255,255),
@@ -246,7 +245,7 @@ if ( ! function_exists('create_captcha'))
 			return FALSE;
 		}
 
-		$img = '<img id="'.$img_id.'" name="'.$img_name.'" src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
+		$img = '<img '.($img_id === ''? NULL: 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
 		ImageDestroy($im);
 
 		return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename);
-- 
cgit v1.2.3-24-g4f1b


From 6157e52f1988c3640082fe6fd323ebbc07887259 Mon Sep 17 00:00:00 2001
From: Preetham <me@preetham.in>
Date: Fri, 5 Dec 2014 12:19:09 -0500
Subject: removing extra spaces

Signed-off-by: Preetham <me@preetham.in>
---
 system/helpers/captcha_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index 373b1af9d..5fa61e051 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -245,7 +245,7 @@ if ( ! function_exists('create_captcha'))
 			return FALSE;
 		}
 
-		$img = '<img '.($img_id === ''? NULL: 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
+		$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
 		ImageDestroy($im);
 
 		return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename);
-- 
cgit v1.2.3-24-g4f1b


From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 9 Jan 2015 17:48:58 +0200
Subject: Bulk (mostly documentation) update

 - Remove PHP version from license notices
 - Bump year number in copyright notices
 - Recommend PHP 5.4 or newer to be used
 - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version

Related: #3450
---
 system/helpers/captcha_helper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index 5fa61e051..7cdc0aff2 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -2,11 +2,11 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 5.2.4 or newer
+ * An open source application development framework for PHP
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	http://codeigniter.com
  * @since	Version 1.0.0
-- 
cgit v1.2.3-24-g4f1b