From: <sam...@us...> - 2010-06-23 21:49:10
|
Revision: 27757 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27757&view=rev Author: sampaioprimo Date: 2010-06-23 21:49:04 +0000 (Wed, 23 Jun 2010) Log Message: ----------- [ENH] removed preference rnd_num_reg (replaced by feature_antibot) Modified Paths: -------------- trunk/antibot.php trunk/lib/registration/registrationlib.php trunk/lib/setup/prefs.php trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/templates/tiki-admin-include-login.tpl trunk/templates/tiki-admin-include-security.tpl trunk/templates/tiki-register.tpl Removed Paths: ------------- trunk/lib/prefs/rnd.php Modified: trunk/antibot.php =================================================================== --- trunk/antibot.php 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/antibot.php 2010-06-23 21:49:04 UTC (rev 27757) @@ -1,7 +1,7 @@ <? require_once ('tiki-setup.php'); -if ($prefs['feature_antibot'] == 'n' || $prefs['rnd_num_reg'] == 'n') { +if (!$prefs['feature_antibot'] == 'y') { die; } Deleted: trunk/lib/prefs/rnd.php =================================================================== --- trunk/lib/prefs/rnd.php 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/lib/prefs/rnd.php 2010-06-23 21:49:04 UTC (rev 27757) @@ -1,16 +0,0 @@ -<?php -// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project -// -// All Rights Reserved. See copyright.txt for details and a complete list of authors. -// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. -// $Id$ - -function prefs_rnd_list() { - return array( - 'rnd_num_reg' => array( - 'name' => tra('Use CAPTCHA to prevent automatic/robot registrations'), - 'type' => 'flag', - 'help' => 'Spam+Protection', - ), - ); -} Modified: trunk/lib/registration/registrationlib.php =================================================================== --- trunk/lib/registration/registrationlib.php 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/lib/registration/registrationlib.php 2010-06-23 21:49:04 UTC (rev 27757) @@ -213,7 +213,7 @@ if ($userlib->user_exists($registration['name'])) return new RegistrationError('name', tra("User already exists")); - if (!$user && $prefs['rnd_num_reg'] == 'y') { + if (!$user && $prefs['feature_antibot'] == 'y') { if (!$captchalib->validate()) return new RegistrationError('antibotcode', $captchalib->getErrors()); } Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/lib/setup/prefs.php 2010-06-23 21:49:04 UTC (rev 27757) @@ -1037,7 +1037,6 @@ 'pass_due' => -1, 'email_due' => -1, 'unsuccessful_logins' => 20, - 'rnd_num_reg' => 'y', 'generate_password' => 'n', 'auth_method' => 'tiki', 'auth_pear' => 'tiki', Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_tracker.php 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/lib/wiki-plugins/wikiplugin_tracker.php 2010-06-23 21:49:04 UTC (rev 27757) @@ -1077,7 +1077,7 @@ $smarty->security = true; $back .= $smarty->fetch('wiki:'.$wiki); } - if ($prefs['feature_antibot'] == 'y' && empty($user) && ($registration != 'y' || $prefs['rnd_num_reg'] == 'y')) { + if ($prefs['feature_antibot'] == 'y' && empty($user) && $registration != 'y') { // in_tracker session var checking is for tiki-register.php $back .= $smarty->fetch('antibot.tpl'); } Modified: trunk/templates/tiki-admin-include-login.tpl =================================================================== --- trunk/templates/tiki-admin-include-login.tpl 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/templates/tiki-admin-include-login.tpl 2010-06-23 21:49:04 UTC (rev 27757) @@ -35,7 +35,6 @@ {preference name=registerPasscode} </div> - {preference name=rnd_num_reg} {if $gd_lib_found neq 'y'} <div class="highlight"> {icon _id=information} {tr}Requires PHP GD library{/tr}. Modified: trunk/templates/tiki-admin-include-security.tpl =================================================================== --- trunk/templates/tiki-admin-include-security.tpl 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/templates/tiki-admin-include-security.tpl 2010-06-23 21:49:04 UTC (rev 27757) @@ -27,7 +27,6 @@ <fieldset> <legend>{tr}Spam protection{/tr}</legend> - {preference name=rnd_num_reg} {preference name=feature_antibot} {preference name=recaptcha_enabled} <div class="adminoptionboxchild" id="recaptcha_enabled_childcontainer"> Modified: trunk/templates/tiki-register.tpl =================================================================== --- trunk/templates/tiki-register.tpl 2010-06-23 21:33:14 UTC (rev 27756) +++ trunk/templates/tiki-register.tpl 2010-06-23 21:49:04 UTC (rev 27757) @@ -95,7 +95,7 @@ <form action="tiki-register.php" method="post" name="RegForm"> <table class="form"> {include file="register-form.tpl"} - {if $prefs.rnd_num_reg eq 'y'}{include file='antibot.tpl' td_style='formcolor'}{/if} + {if $prefs.feature_antibot eq 'y'}{include file='antibot.tpl' td_style='formcolor'}{/if} <tr> <td class="formcolor"> </td> <td class="formcolor"><input type="submit" name="register" value="{tr}Register{/tr}" /></td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |