From: <tr...@us...> - 2012-12-02 19:22:51
|
Revision: 10306 http://sourceforge.net/p/xoops/svn/10306 Author: trabis Date: 2012-12-02 19:22:48 +0000 (Sun, 02 Dec 2012) Log Message: ----------- Removing duplicate construct Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php 2012-12-02 19:11:27 UTC (rev 10305) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/xcaptcha.php 2012-12-02 19:22:48 UTC (rev 10306) @@ -28,7 +28,7 @@ public $xcaptcha_path_plugin; public function __construct() - { + { $this->captchaHandler = XoopsCaptcha::getInstance(); $this->config = $this->loadConfig(); $this->plugin_List = $this->getPluginList(); @@ -36,11 +36,6 @@ $this->xcaptcha_path_plugin = XOOPS_ROOT_PATH . '/modules/xcaptcha/plugins'; } - public function Xcaptcha() - { - $this->__construct(); - } - static function getInstance() { static $instance; @@ -84,18 +79,18 @@ } public function loadConfigPlugin() - { + { $config = array(); - foreach ($this->plugin_List as $key ) { - $config = $this->loadConfig( $key ); + foreach ($this->plugin_List as $key ) { + $config = $this->loadConfig( $key ); } return $config; } public function VerifyData() - { - global $system; - $config = array(); + { + global $system; + $config = array(); $_POST['disabled'] = $system->CleanVars($_POST, 'disabled', false, 'boolean'); $_POST['mode'] = $system->CleanVars($_POST, 'mode', 'image', 'string'); $_POST['name'] = $system->CleanVars($_POST, 'name', 'xoopscaptcha', 'string'); |