Fix up and tidy :)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9532 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2009-06-04 13:30:01 +00:00
parent 5478ef15d3
commit a975f8454a
8 changed files with 41 additions and 30 deletions

6
phpBB/includes/captcha/captcha_factory.php Executable file → Normal file
View file

@ -1,8 +1,8 @@
<? <?php
/** /**
* *
* @package VC * @package VC
* @version $Id: $ * @version $Id$
* @copyright (c) 2008 phpBB Group * @copyright (c) 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
@ -90,3 +90,5 @@ class phpbb_captcha_factory
return $captchas; return $captchas;
} }
} }
?>

4
phpBB/includes/captcha/captcha_gd_wave.php Executable file → Normal file
View file

@ -2,7 +2,7 @@
/** /**
* *
* @package VC * @package VC
* @version $Id: captcha_gd.php,v 1.19 2007/01/26 16:07:43 acydburn Exp $ * @version $Id$
* @copyright (c) 2006 phpBB Group * @copyright (c) 2006 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
@ -10,7 +10,7 @@
/** /**
Wave3D CAPTCHA by Robert Hetzler * Wave3D CAPTCHA by Robert Hetzler
*/ */
class captcha class captcha
{ {

4
phpBB/includes/captcha/captcha_plugin.php Executable file → Normal file
View file

@ -1,4 +1,4 @@
<? <?php
interface phpbb_captcha_plugin interface phpbb_captcha_plugin
{ {
@ -95,3 +95,5 @@ interface phpbb_captcha_plugin
function get_attempt_count(); function get_attempt_count();
} }
?>

7
phpBB/includes/captcha/plugins/captcha_abstract.php Executable file → Normal file
View file

@ -1,9 +1,9 @@
<? <?php
/** /**
* *
* @package VC * @package VC
* @version $Id: $ * @version $Id$
* @copyright (c) 2006 2008 phpBB Group * @copyright (c) 2006, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
*/ */
@ -330,3 +330,4 @@ class phpbb_default_captcha
} }
?>

View file

@ -1,12 +1,13 @@
<? <?php
/** /**
* *
* @package VC * @package VC
* @version $Id: $ * @version $Id$
* @copyright (c) 2006 2008 phpBB Group * @copyright (c) 2006, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
*/ */
/** /**
* @ignore * @ignore
*/ */
@ -20,18 +21,18 @@ if (!defined('IN_PHPBB'))
*/ */
if (!class_exists('phpbb_default_captcha')) if (!class_exists('phpbb_default_captcha'))
{ {
include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx); include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
} }
class phpbb_captcha_gd extends phpbb_default_captcha class phpbb_captcha_gd extends phpbb_default_captcha
{ {
function phpbb_captcha_gd() function phpbb_captcha_gd()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
if (!class_exists('captcha')) if (!class_exists('captcha'))
{ {
include_once($phpbb_root_path . "includes/captcha/captcha_gd." . $phpEx); include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx);
} }
} }
@ -120,3 +121,4 @@ class phpbb_captcha_gd extends phpbb_default_captcha
} }
} }
?>

View file

@ -3,10 +3,11 @@
* *
* @package VC * @package VC
* @version $Id$ * @version $Id$
* @copyright (c) 2006 2008 phpBB Group * @copyright (c) 2006, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
*/ */
/** /**
* @ignore * @ignore
*/ */
@ -29,6 +30,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
function phpbb_captcha_gd_wave() function phpbb_captcha_gd_wave()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
if (!class_exists('captcha')) if (!class_exists('captcha'))
{ {
include_once($phpbb_root_path . 'includes/captcha/captcha_gd_wave.' . $phpEx); include_once($phpbb_root_path . 'includes/captcha/captcha_gd_wave.' . $phpEx);

View file

@ -1,12 +1,13 @@
<? <?php
/** /**
* *
* @package VC * @package VC
* @version $Id: $ * @version $Id$
* @copyright (c) 2006 2008 phpBB Group * @copyright (c) 2006, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
*/ */
/** /**
* @ignore * @ignore
*/ */
@ -20,7 +21,7 @@ if (!defined('IN_PHPBB'))
*/ */
if (!class_exists('phpbb_default_captcha')) if (!class_exists('phpbb_default_captcha'))
{ {
include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx); include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
} }
class phpbb_captcha_nogd extends phpbb_default_captcha class phpbb_captcha_nogd extends phpbb_default_captcha
@ -29,9 +30,10 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
function phpbb_captcha_nogd() function phpbb_captcha_nogd()
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
if (!class_exists('captcha')) if (!class_exists('captcha'))
{ {
include_once($phpbb_root_path . "includes/captcha/captcha_non_gd." . $phpEx); include_once($phpbb_root_path . 'includes/captcha/captcha_non_gd.' . $phpEx);
} }
} }

View file

@ -1,9 +1,9 @@
<? <?php
/** /**
* *
* @package VC * @package VC
* @version $Id: $ * @version $Id$
* @copyright (c) 2006 2008 phpBB Group * @copyright (c) 2006, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
*/ */
@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
if (!class_exists('phpbb_default_captcha')) if (!class_exists('phpbb_default_captcha'))
{ {
// we need the classic captcha code for tracking solutions and attempts // we need the classic captcha code for tracking solutions and attempts
include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx); include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
} }
class phpbb_recaptcha extends phpbb_default_captcha class phpbb_recaptcha extends phpbb_default_captcha