massive captcha cleanup, centralised captcha verification, added option to use freecap (settings in liberty admin screen), only one captcha verification needed per session

1 files changed, 26 insertions, 8 deletions

diff --git a/templates/admin_liberty.tpl b/templates/admin_liberty.tpl
index 8ce629f..97265ea 100644
--- a/templates/admin_liberty.tpl
+++ b/templates/admin_liberty.tpl
@@ -14,7 +14,7 @@
 		<div class="row">
 			{formlabel label="Auto-Display Attachment Thumbnails" for="liberty_auto_display_attachment_thumbs"}
 			{forminput}
-				{html_options options=$thumbSizes name="liberty_auto_display_attachment_thumbs" selected=$gBitSystem->getConfig('liberty_auto_display_attachment_thumbs')}
+				{html_options options=$thumbSizes name="liberty_auto_display_attachment_thumbs" id="liberty_auto_display_attachment_thumbs" selected=$gBitSystem->getConfig('liberty_auto_display_attachment_thumbs')}
 				{formhelp note='This will automatically display thumbnails of all attachments of a given page (usually in the top right corner of the page). You can still display the items inline as well.' page=''}
 			{/forminput}
 		</div>
@@ -49,6 +49,24 @@
 		</div>
 	{/legend}
 
+	{legend legend="Captcha Settings"}
+		{foreach from=$formCaptcha key=item item=output}
+			<div class="row">
+				{formlabel label=`$output.label` for=$item}
+				{forminput}
+					{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
+					{formhelp note=`$output.note` page=`$output.page`}
+					{if $item == "liberty_use_captcha_freecap"}
+						<p>{tr}If you can see the image below, you can use freecap{/tr}</p>
+						<img src="{$smarty.const.UTIL_PKG_URL}freecap/freecap.php" alt="{tr}Random Image{/tr}" title="{tr}Random Image{/tr}" />
+					{/if}
+				{/forminput}
+			</div>
+		{/foreach}
+		<p class="help">{tr}To set additional parameters and options please view and edit the freecap captcha file itself:{/tr} <code>{$smarty.const.UTIL_PKG_PATH}freecap/freecap.php</code></p>
+		<p class="warning">{tr}If you can access the following file, please view the freecap.php file for details on how to secure your site against spammers{/tr}: <a href="{$smarty.const.UTIL_PKG_URL}freecap/.ht_freecap_words">{tr}Dictionary{/tr}</a></p>
+	{/legend}
+
 	{legend legend="Image Processing System"}
 		<input type="hidden" name="page" value="{$page}" />
 		{php}if( extension_loaded( 'gd' ) ) {{/php}{assign var=gdInstalled value=TRUE}{php}}{/php}
@@ -62,9 +80,9 @@
 					<input type="radio" id="gd" name="image_processor" value="gd" {if !$gdInstalled}disabled="disabled"{/if} {if !$gBitSystem->getConfig('image_processor') || $gBitSystem->getConfig('image_processor')=='gd'}checked="checked"{/if} />
 					<br />
 					{if !$gdInstalled}
-						{biticon ipackage=icons iname="large/image-missing" iexplain="Not Installed"}
+						{biticon ipackage=icons iname="large/image-missing" iexplain="Not Installed"} {tr}Library is <strong>not</strong> installed{/tr}
 					{else}
-						{biticon ipackage=icons iname="large/image-x-generic" iexplain="Installed"}
+						{biticon ipackage=icons iname="large/image-x-generic" iexplain="Installed"} {tr}Library is installed{/tr}
 					{/if}
 				</label>
 			{/forminput}
@@ -81,9 +99,9 @@
 					<input type="radio" id="wand" name="image_processor" value="magickwand" {if !$magickwandInstalled}disabled="disabled"{/if} {if $gBitSystem->getConfig('image_processor')=='magickwand'}checked="checked"{/if}/>
 					<br />
 					{if !$magickwandInstalled}
-						{biticon ipackage=icons iname="large/image-missing" iexplain="Not Installed"}
+						{biticon ipackage=icons iname="large/image-missing" iexplain="Not Installed"} {tr}Library is <strong>not</strong> installed{/tr}
 					{else}
-						{biticon ipackage=icons iname="large/image-x-generic" iexplain="Installed"}
+						{biticon ipackage=icons iname="large/image-x-generic" iexplain="Installed"} {tr}Library is installed{/tr}
 					{/if}
 				</label>
 			{/forminput}
@@ -91,7 +109,7 @@
 
 		{php}if( extension_loaded( 'imagick' ) ) {{/php}{assign var=imagickInstalled value=TRUE}{php}}{/php}
 		{if !$imagickInstalled}
-			{formfeedback warning='php-imagick is a no longer supported PECL extension for PHP + ImageMagick. We recommend using the much better supported magickwand option above. If you need to install the php-imagick extension, linux users can find RPM files at <a href="http://phprpms.sourceforge.net/imagick">PHPRPMs</a> (or compile a <a href="http://sourceforge.net/project/showfiles.php?group_id=112092&package_id=139307&release_id=292417">source rpm</a>). Windows users can try <a href="http://www.bitweaver.org/builds/php_imagick.dll">this dll</a> however it has not been tested well.'}
+			{formfeedback warning='php-imagick is a no longer supported PECL extension for PHP + ImageMagick. We recommend using the much better supported magickwand option above. If you need to install the php-imagick extension, linux users can find RPM files at <a href="http://phprpms.sourceforge.net/imagick">PHPRPMs</a> (or compile a <a href="http://sourceforge.net/project/showfiles.php?group_id=112092&amp;package_id=139307&amp;release_id=292417">source rpm</a>). Windows users can try <a href="http://www.bitweaver.org/builds/php_imagick.dll">this dll</a> however it has not been tested well.'}
 		{/if}
 		<div class="row">
 			{formlabel label="ImageMagick" for="magick"}
@@ -100,9 +118,9 @@
 					<input type="radio" id="magick" name="image_processor" value="imagick" {if !$imagickInstalled}disabled="disabled"{/if} {if $gBitSystem->getConfig('image_processor')=='imagick'}checked="checked"{/if}/>
 					<br />
 					{if !$imagickInstalled}
-						{biticon ipackage=icons iname="large/image-missing" iexplain="Not Installed"}
+						{biticon ipackage=icons iname="large/image-missing" iexplain="Not Installed"} {tr}Library is <strong>not</strong> installed{/tr}
 					{else}
-						{biticon ipackage=icons iname="large/image-x-generic" iexplain="Installed"}
+						{biticon ipackage=icons iname="large/image-x-generic" iexplain="Installed"} {tr}Library is installed{/tr}
 					{/if}
 				</label>
 			{/forminput}