From e29136567e2a12726f9ab40762bcb47a7cde759c Mon Sep 17 00:00:00 2001 From: Preetham 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 --- system/helpers/captcha_helper.php | 4 +++- user_guide_src/source/changelog.rst | 3 ++- user_guide_src/source/helpers/captcha_helper.rst | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) 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 = ' '; ImageDestroy($im); return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename); diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 38fd75971..3dc87b555 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -135,7 +135,8 @@ Release Date: Not Released - Added *filename* to the returned array elements. - Updated to use `imagepng()` in case that `imagejpeg()` isn't available. - Added **font_size** option to allow customization of font size. - + - Added **img_id** and **img_name** options to set id and name attributes of captcha image. + - :doc:`Text Helper ` changes include: - Changed the default tag for use in :func:`highlight_phrase()` to ```` (formerly ````). diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 3cf51330b..7d7f30de8 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -34,6 +34,8 @@ Once loaded you can generate a CAPTCHA like this:: 'expiration' => 7200, 'word_length' => 8, 'font_size' => 16, + 'img_id' => 'Image id', + 'img_name' => 'Image name', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // White background and border, black text and red grid @@ -60,7 +62,9 @@ Once loaded you can generate a CAPTCHA like this:: in the captcha folder before it will be deleted. The default is two hours. - **word_length** defaults to 8, **pool** defaults to '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' -- **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. +- **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. +- The **img_id** will be set as the "id" of the captcha image. +- The **img_name** will be set as the "name" of the captcha image. - If any of the **colors** values is missing, it will be replaced by the default. Adding a Database -- cgit v1.2.3-24-g4f1b From be7e493fd7a4dcc8f00b60201d4948f3618d9b6a Mon Sep 17 00:00:00 2001 From: Preetham Date: Fri, 5 Dec 2014 11:13:57 -0500 Subject: Removed img_name from captcha helper Signed-off-by: Preetham --- system/helpers/captcha_helper.php | 3 +-- user_guide_src/source/changelog.rst | 2 +- user_guide_src/source/helpers/captcha_helper.rst | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) 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 = ' '; ImageDestroy($im); return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename); diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3dc87b555..5dc36502e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -135,7 +135,7 @@ Release Date: Not Released - Added *filename* to the returned array elements. - Updated to use `imagepng()` in case that `imagejpeg()` isn't available. - Added **font_size** option to allow customization of font size. - - Added **img_id** and **img_name** options to set id and name attributes of captcha image. + - Added **img_id** option to set id attribute of captcha image. - :doc:`Text Helper ` changes include: diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 7d7f30de8..6e0cfc979 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -35,7 +35,6 @@ Once loaded you can generate a CAPTCHA like this:: 'word_length' => 8, 'font_size' => 16, 'img_id' => 'Image id', - 'img_name' => 'Image name', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // White background and border, black text and red grid @@ -64,7 +63,6 @@ Once loaded you can generate a CAPTCHA like this:: - **word_length** defaults to 8, **pool** defaults to '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' - **font_size** defaults to 16, the native GD font has a size limit. Specify a "true type" font for bigger sizes. - The **img_id** will be set as the "id" of the captcha image. -- The **img_name** will be set as the "name" of the captcha image. - If any of the **colors** values is missing, it will be replaced by the default. Adding a Database -- cgit v1.2.3-24-g4f1b From 6157e52f1988c3640082fe6fd323ebbc07887259 Mon Sep 17 00:00:00 2001 From: Preetham Date: Fri, 5 Dec 2014 12:19:09 -0500 Subject: removing extra spaces Signed-off-by: Preetham --- system/helpers/captcha_helper.php | 2 +- user_guide_src/source/changelog.rst | 2 +- user_guide_src/source/helpers/captcha_helper.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 = ' '; ImageDestroy($im); return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename); diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 5dc36502e..57a7dc770 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -136,7 +136,7 @@ Release Date: Not Released - Updated to use `imagepng()` in case that `imagejpeg()` isn't available. - Added **font_size** option to allow customization of font size. - Added **img_id** option to set id attribute of captcha image. - + - :doc:`Text Helper ` changes include: - Changed the default tag for use in :func:`highlight_phrase()` to ```` (formerly ````). diff --git a/user_guide_src/source/helpers/captcha_helper.rst b/user_guide_src/source/helpers/captcha_helper.rst index 6e0cfc979..4aacafd49 100644 --- a/user_guide_src/source/helpers/captcha_helper.rst +++ b/user_guide_src/source/helpers/captcha_helper.rst @@ -34,7 +34,7 @@ Once loaded you can generate a CAPTCHA like this:: 'expiration' => 7200, 'word_length' => 8, 'font_size' => 16, - 'img_id' => 'Image id', + 'img_id' => 'Imageid', 'pool' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // White background and border, black text and red grid -- cgit v1.2.3-24-g4f1b