mambax7 / smartobject

include/currency.php

Indentation +7 added lines, -7 removed lines

@@ -17,13 +17,13 @@
 $smartobjectCurrencyHandler = xoops_getModuleHandler('currency', 'smartobject');
 
 if (!$smartobjectCurrenciesObj) {
-    $smartobjectCurrenciesObj = $smartobjectCurrencyHandler->getCurrencies();
+	$smartobjectCurrenciesObj = $smartobjectCurrencyHandler->getCurrencies();
 }
 if (!$smartobjectCurrenciesArray) {
-    foreach ($smartobjectCurrenciesObj as $currencyid => $currencyObj) {
-        if ($currencyObj->getVar('default_currency', 'e')) {
-            $smartobjectDefaultCurrency = $currencyObj;
-        }
-        $smartobjectCurrenciesArray[$currencyid] = $currencyObj->getCode();
-    }
+	foreach ($smartobjectCurrenciesObj as $currencyid => $currencyObj) {
+		if ($currencyObj->getVar('default_currency', 'e')) {
+			$smartobjectDefaultCurrency = $currencyObj;
+		}
+		$smartobjectCurrenciesArray[$currencyid] = $currencyObj->getCode();
+	}
 }

include/update.php

Indentation +182 added lines, -182 removed lines

@@ -35,26 +35,26 @@ 
  */
 function xoops_module_update_smartobject($module)
 {
-    ob_start();
+	ob_start();
 
-    $dbVersion = smart_GetMeta('version', 'smartobject');
-    if (!$dbVersion) {
-        $dbVersion = 0;
-    }
+	$dbVersion = smart_GetMeta('version', 'smartobject');
+	if (!$dbVersion) {
+		$dbVersion = 0;
+	}
 
-    $dbupdater = new SmartobjectDbupdater();
+	$dbupdater = new SmartobjectDbupdater();
 
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br />';
+	echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br />';
 
-    // db migrate version = 1
-    $newDbVersion = 1;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br />';
+	// db migrate version = 1
+	$newDbVersion = 1;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br />';
 
-        // Create table smartobject_link
-        $table = new SmartDbTable('smartobject_link');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+		// Create table smartobject_link
+		$table = new SmartDbTable('smartobject_link');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `linkid` int(11) NOT NULL auto_increment,
               `from_uid` int(11) NOT NULL default '0',
               `from_email` varchar(255) NOT NULL default '',
@@ -71,63 +71,63 @@ 
               PRIMARY KEY  (`linkid`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-        // Create table smartobject_link
-        $table = new SmartDbTable('smartobject_link');
-        if (!$table->fieldExists('date')) {
-            $table->addNewField('date', "int(11) NOT NULL default '0'");
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-
-        // Create table smartobject_tag
-        $table = new SmartDbTable('smartobject_tag');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+		// Create table smartobject_link
+		$table = new SmartDbTable('smartobject_link');
+		if (!$table->fieldExists('date')) {
+			$table->addNewField('date', "int(11) NOT NULL default '0'");
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+
+		// Create table smartobject_tag
+		$table = new SmartDbTable('smartobject_tag');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `tagid` int(11) NOT NULL auto_increment,
               `name` varchar(255) NOT NULL default '',
               `description` TEXT NOT NULL,
               PRIMARY KEY  (`id`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        // Create table smartobject_tag_text
-        $table = new SmartDbTable('smartobject_tag_text');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		// Create table smartobject_tag_text
+		$table = new SmartDbTable('smartobject_tag_text');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `tagid` int(11) NOT NULL default 0,
               `language` varchar(255) NOT NULL default '',
               `value` TEXT NOT NULL,
               PRIMARY KEY  (`id`, `language`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        // Create table smartobject_adsense
-        $table = new SmartDbTable('smartobject_adsense');
-        if (!$table->exists()) {
-            $table->setStructure("
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		// Create table smartobject_adsense
+		$table = new SmartDbTable('smartobject_adsense');
+		if (!$table->exists()) {
+			$table->setStructure("
   `adsenseid` int(11) NOT NULL auto_increment,
   `format` VARCHAR(100) NOT NULL,
   `description` TEXT NOT NULL,
@@ -141,23 +141,23 @@ 
   `tag` varchar(50) NOT NULL default '',
   PRIMARY KEY  (`adsenseid`)
             ");
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-    // db migrate version = 2
-    $newDbVersion = 2;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br />';
-
-        // Create table smartobject_rating
-        $table = new SmartDbTable('smartobject_rating');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+	// db migrate version = 2
+	$newDbVersion = 2;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br />';
+
+		// Create table smartobject_rating
+		$table = new SmartDbTable('smartobject_rating');
+		if (!$table->exists()) {
+			$table->setStructure('
   `ratingid` int(11) NOT NULL auto_increment,
   `dirname` VARCHAR(255) NOT NULL,
   `item` VARCHAR(255) NOT NULL,
@@ -168,36 +168,36 @@ 
   PRIMARY KEY  (`ratingid`),
   UNIQUE (`dirname`, `item`, `itemid`, `uid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-
-        // Create table smartobject_currency
-        $table = new SmartDbTable('smartobject_currency');
-        $table->setData("2, 'EUR', 'Euro', '�', 0.65, 0");
-        $table->setData("3, 'USD', 'American dollar', '$', 0.9, 0");
-        $table->setData("1, 'CAD', 'Canadian dollar', '$', 1, 1");
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 3
-    $newDbVersion = 3;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br />';
-
-        // Create table smartobject_customtag
-        $table = new SmartDbTable('smartobject_customtag');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+
+		// Create table smartobject_currency
+		$table = new SmartDbTable('smartobject_currency');
+		$table->setData("2, 'EUR', 'Euro', '�', 0.65, 0");
+		$table->setData("3, 'USD', 'American dollar', '$', 0.9, 0");
+		$table->setData("1, 'CAD', 'Canadian dollar', '$', 1, 1");
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 3
+	$newDbVersion = 3;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br />';
+
+		// Create table smartobject_customtag
+		$table = new SmartDbTable('smartobject_customtag');
+		if (!$table->exists()) {
+			$table->setStructure('
               `customtagid` int(11) NOT NULL auto_increment,
               `name` VARCHAR(255) NOT NULL,
               `description` TEXT NOT NULL,
@@ -205,24 +205,24 @@ 
               `language` TEXT NOT NULL,
               PRIMARY KEY  (`customtagid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 4
-    $newDbVersion = 4;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br />';
-
-        // Create table smartobject_currency
-        $table = new SmartDbTable('smartobject_currency');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 4
+	$newDbVersion = 4;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br />';
+
+		// Create table smartobject_currency
+		$table = new SmartDbTable('smartobject_currency');
+		if (!$table->exists()) {
+			$table->setStructure('
               `currencyid` int(11) NOT NULL auto_increment,
               `iso4217` VARCHAR(5) NOT NULL,
               `name` VARCHAR(255) NOT NULL,
@@ -231,46 +231,46 @@ 
               `default_currency` int(1) NOT NULL,
               PRIMARY KEY  (`currencyid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 6
-    $newDbVersion = 6;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br />';
-    }
-
-    $newDbVersion = 7;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br />';
-
-        // Create table smartobject_file
-        $table = new SmartDbTable('smartobject_file');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 6
+	$newDbVersion = 6;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br />';
+	}
+
+	$newDbVersion = 7;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br />';
+
+		// Create table smartobject_file
+		$table = new SmartDbTable('smartobject_file');
+		if (!$table->exists()) {
+			$table->setStructure('
               `fileid` int(11) NOT NULL auto_increment,
               `caption` varchar(255) collate latin1_general_ci NOT NULL,
               `url` varchar(255) collate latin1_general_ci NOT NULL,
               `description` text collate latin1_general_ci NOT NULL,
                PRIMARY KEY  (`fileid`)
             ');
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-        // Create table smartobject_urllink
-        $table = new SmartDbTable('smartobject_urllink');
-        if (!$table->exists()) {
-            $table->setStructure('
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+		// Create table smartobject_urllink
+		$table = new SmartDbTable('smartobject_urllink');
+		if (!$table->exists()) {
+			$table->setStructure('
               `urllinkid` int(11) NOT NULL auto_increment,
               `caption` varchar(255) collate latin1_general_ci NOT NULL,
               `url` varchar(255) collate latin1_general_ci NOT NULL,
@@ -278,25 +278,25 @@ 
               `target` varchar(10) collate latin1_general_ci NOT NULL,
                 PRIMARY KEY  (`urllinkid`)
             ');
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-    }
-    echo '</code>';
-
-    $feedback = ob_get_clean();
-    if (method_exists($module, 'setMessage')) {
-        $module->setMessage($feedback);
-    } else {
-        echo $feedback;
-    }
-    smart_SetMeta('version', $newDbVersion, 'smartobject'); //Set meta version to current
-
-    return true;
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+	}
+	echo '</code>';
+
+	$feedback = ob_get_clean();
+	if (method_exists($module, 'setMessage')) {
+		$module->setMessage($feedback);
+	} else {
+		echo $feedback;
+	}
+	smart_SetMeta('version', $newDbVersion, 'smartobject'); //Set meta version to current
+
+	return true;
 }
 
 /**
@@ -305,10 +305,10 @@ 
  */
 function xoops_module_install_smartobject($module)
 {
-    ob_start();
+	ob_start();
 
-    echo 'Using the ImpressCMS onInstall event';
-    $feedback = ob_get_clean();
+	echo 'Using the ImpressCMS onInstall event';
+	$feedback = ob_get_clean();
 
-    return $feedback;
+	return $feedback;
 }

include/xoops_core_common_functions.php

Indentation +18 added lines, -18 removed lines

@@ -14,15 +14,15 @@ 
  */
 function xoops_debug_dumbQuery($msg = '')
 {
-    global $xoopsDB;
-    $xoopsDB->query('SELECT * ' . $msg . ' FROM dudewhereismycar2');
+	global $xoopsDB;
+	$xoopsDB->query('SELECT * ' . $msg . ' FROM dudewhereismycar2');
 }
 
 function xoops_debug_initiateQueryCount()
 {
-    global $smartfactory_query_count_activated, $smartfactory_query_count;
-    $smartfactory_query_count_activated = true;
-    $smartfactory_query_count           = 0;
+	global $smartfactory_query_count_activated, $smartfactory_query_count;
+	$smartfactory_query_count_activated = true;
+	$smartfactory_query_count           = 0;
 }
 
 /**
@@ -30,9 +30,9 @@ 
  */
 function xoops_debug_getQueryCount($msg = '')
 {
-    global $smartfactory_query_count;
+	global $smartfactory_query_count;
 
-    return xoops_debug("xoops debug Query count ($msg): $smartfactory_query_count");
+	return xoops_debug("xoops debug Query count ($msg): $smartfactory_query_count");
 }
 
 /**
@@ -41,10 +41,10 @@ 
  */
 function xoops_debug($msg, $exit = false)
 {
-    echo "<div style='padding: 5px; color: red; font-weight: bold'>debug:: $msg</div>";
-    if ($exit) {
-        die();
-    }
+	echo "<div style='padding: 5px; color: red; font-weight: bold'>debug:: $msg</div>";
+	if ($exit) {
+		die();
+	}
 }
 
 /**
@@ -52,7 +52,7 @@ 
  */
 function xoops_comment($msg)
 {
-    echo "<div style='padding: 5px; color: green; font-weight: bold'>=> $msg</div>";
+	echo "<div style='padding: 5px; color: green; font-weight: bold'>=> $msg</div>";
 }
 
 /**
@@ -60,10 +60,10 @@ 
  */
 function xoops_debug_vardump($var)
 {
-    if (class_exists('MyTextSanitizer')) {
-        $myts = MyTextSanitizer::getInstance();
-        xoops_debug($myts->displayTarea(var_export($var, true)));
-    } else {
-        xoops_debug(var_export($var, true));
-    }
+	if (class_exists('MyTextSanitizer')) {
+		$myts = MyTextSanitizer::getInstance();
+		xoops_debug($myts->displayTarea(var_export($var, true)));
+	} else {
+		xoops_debug(var_export($var, true));
+	}
 }

include/captcha/scripts/img.php

Indentation +409 added lines, -409 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * Image Creation script
- *
- * D.J.
- */
+	 * Image Creation script
+	 *
+	 * D.J.
+	 */
 
 include dirname(dirname(dirname(dirname(dirname(__DIR__))))) . '/mainfile.php';
 error_reporting(0);
 $xoopsLogger->activated = false;
 
 if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^' . preg_quote(XOOPS_URL, '/') . '/', $_SERVER['HTTP_REFERER'])) {
-    exit();
+	exit();
 }
 
 /**
@@ -18,185 +18,185 @@ 
  */
 class XoopsCaptchaImageHandler
 {
-    public $config = array();
-    //var $mode = "gd"; // GD or bmp
-    public $code;
-    public $invalid = false;
-
-    public $font;
-    public $spacing;
-    public $width;
-    public $height;
-
-    /**
-     * XoopsCaptchaImageHandler constructor.
-     */
-    public function __construct()
-    {
-        if (empty($_SESSION['XoopsCaptcha_name'])) {
-            $this->invalid = true;
-        }
-
-        if (!extension_loaded('gd')) {
-            $this->mode = 'bmp';
-        } else {
-            $required_functions = array('imagecreatetruecolor', 'imagecolorallocate', 'imagefilledrectangle', 'imagejpeg', 'imagedestroy', 'imageftbbox');
-            foreach ($required_functions as $func) {
-                if (!function_exists($func)) {
-                    $this->mode = 'bmp';
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Loading configs from CAPTCHA class
-     * @param array $config
-     */
-    public function setConfig($config = array())
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
-
-    public function loadImage()
-    {
-        $this->createCode();
-        $this->setCode();
-        $this->createImage();
-    }
-
-    /**
-     * Create Code
-     */
-    public function createCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        if ($this->mode === 'bmp') {
-            $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
-        } else {
-            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
-            if (!$this->config['casesensitive']) {
-                $this->code = strtoupper($this->code);
-            }
-        }
-    }
-
-    public function setCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
-
-        // Increase the attempt records on refresh
-        if (!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
-            if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
-                $this->invalid = true;
-            }
-        }
-    }
-
-    /**
-     * @param  string $file
-     * @return string|void
-     */
-    public function createImage($file = '')
-    {
-        if ($this->invalid) {
-            header('Content-type: image/gif');
-            readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
-
-            return;
-        }
-
-        if ($this->mode === 'bmp') {
-            return $this->createImageBmp();
-        } else {
-            return $this->createImageGd();
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with GD
-     *  Originated from DuGris' SecurityImage
-     * @param string $file
-     */
-    //  --------------------------------------------------------------------------- //
-    // Class: SecurityImage 1.5                                                    //
-    // Author: DuGris aka L. Jen <http://www.dugris.info>                           //
-    // Email: DuGris@wanadoo.fr                                                    //
-    // Licence: GNU                                                                 //
-    // Project: XOOPS Project                                                   //
-    //  --------------------------------------------------------------------------- //
-    public function createImageGd($file = '')
-    {
-        $this->loadFont();
-        $this->setImageSize();
-
-        $this->oImage = imagecreatetruecolor($this->width, $this->height);
-        $background   = imagecolorallocate($this->oImage, 255, 255, 255);
-        imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
-
-        switch ($this->config['background_type']) {
-            default:
-            case 0:
-                $this->drawBars();
-                break;
-
-            case 1:
-                $this->drawCircles();
-                break;
-
-            case 2:
-                $this->drawLines();
-                break;
-
-            case 3:
-                $this->drawRectangles();
-                break;
-
-            case 4:
-                $this->drawEllipses();
-                break;
-
-            case 5:
-                $this->drawPolygons();
-                break;
-
-            case 100:
-                $this->createFromFile();
-                break;
-        }
-        $this->drawBorder();
-        $this->drawCode();
-
-        if (empty($file)) {
-            header('Content-type: image/jpeg');
-            imagejpeg($this->oImage);
-        } else {
-            imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
-        }
-        imagedestroy($this->oImage);
-    }
-
-    /**
-     * @param         $name
-     * @param  string $extension
-     * @return array
-     */
-    public function _getList($name, $extension = '')
-    {
-        $items = array();
-        /*
+	public $config = array();
+	//var $mode = "gd"; // GD or bmp
+	public $code;
+	public $invalid = false;
+
+	public $font;
+	public $spacing;
+	public $width;
+	public $height;
+
+	/**
+	 * XoopsCaptchaImageHandler constructor.
+	 */
+	public function __construct()
+	{
+		if (empty($_SESSION['XoopsCaptcha_name'])) {
+			$this->invalid = true;
+		}
+
+		if (!extension_loaded('gd')) {
+			$this->mode = 'bmp';
+		} else {
+			$required_functions = array('imagecreatetruecolor', 'imagecolorallocate', 'imagefilledrectangle', 'imagejpeg', 'imagedestroy', 'imageftbbox');
+			foreach ($required_functions as $func) {
+				if (!function_exists($func)) {
+					$this->mode = 'bmp';
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Loading configs from CAPTCHA class
+	 * @param array $config
+	 */
+	public function setConfig($config = array())
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
+
+	public function loadImage()
+	{
+		$this->createCode();
+		$this->setCode();
+		$this->createImage();
+	}
+
+	/**
+	 * Create Code
+	 */
+	public function createCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		if ($this->mode === 'bmp') {
+			$this->config['num_chars'] = 4;
+			$this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
+		} else {
+			$this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
+			if (!$this->config['casesensitive']) {
+				$this->code = strtoupper($this->code);
+			}
+		}
+	}
+
+	public function setCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		$_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+		$maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+
+		// Increase the attempt records on refresh
+		if (!empty($maxAttempts)) {
+			$_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
+			if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+				$this->invalid = true;
+			}
+		}
+	}
+
+	/**
+	 * @param  string $file
+	 * @return string|void
+	 */
+	public function createImage($file = '')
+	{
+		if ($this->invalid) {
+			header('Content-type: image/gif');
+			readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
+
+			return;
+		}
+
+		if ($this->mode === 'bmp') {
+			return $this->createImageBmp();
+		} else {
+			return $this->createImageGd();
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with GD
+	 *  Originated from DuGris' SecurityImage
+	 * @param string $file
+	 */
+	//  --------------------------------------------------------------------------- //
+	// Class: SecurityImage 1.5                                                    //
+	// Author: DuGris aka L. Jen <http://www.dugris.info>                           //
+	// Email: DuGris@wanadoo.fr                                                    //
+	// Licence: GNU                                                                 //
+	// Project: XOOPS Project                                                   //
+	//  --------------------------------------------------------------------------- //
+	public function createImageGd($file = '')
+	{
+		$this->loadFont();
+		$this->setImageSize();
+
+		$this->oImage = imagecreatetruecolor($this->width, $this->height);
+		$background   = imagecolorallocate($this->oImage, 255, 255, 255);
+		imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
+
+		switch ($this->config['background_type']) {
+			default:
+			case 0:
+				$this->drawBars();
+				break;
+
+			case 1:
+				$this->drawCircles();
+				break;
+
+			case 2:
+				$this->drawLines();
+				break;
+
+			case 3:
+				$this->drawRectangles();
+				break;
+
+			case 4:
+				$this->drawEllipses();
+				break;
+
+			case 5:
+				$this->drawPolygons();
+				break;
+
+			case 100:
+				$this->createFromFile();
+				break;
+		}
+		$this->drawBorder();
+		$this->drawCode();
+
+		if (empty($file)) {
+			header('Content-type: image/jpeg');
+			imagejpeg($this->oImage);
+		} else {
+			imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
+		}
+		imagedestroy($this->oImage);
+	}
+
+	/**
+	 * @param         $name
+	 * @param  string $extension
+	 * @return array
+	 */
+	public function _getList($name, $extension = '')
+	{
+		$items = array();
+		/*
          if (@ include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.ini.php") {
          load_functions("cache");
          if ($items = mod_loadCacheFile("captcha_{$name}", "captcha")) {
@@ -204,231 +204,231 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $file_path = $this->config['rootpath'] . "/{$name}";
-        $files     = XoopsLists::getFileListAsArray($file_path);
-        foreach ($files as $item) {
-            if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
-                $items[] = $item;
-            }
-        }
-        if (function_exists('mod_createCacheFile')) {
-            mod_createCacheFile($items, "captcha_{$name}", 'captcha');
-        }
-
-        return $items;
-    }
-
-    public function loadFont()
-    {
-        $fonts      = $this->_getList('fonts', 'ttf');
-        $this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
-    }
-
-    public function setImageSize()
-    {
-        $MaxCharWidth  = 0;
-        $MaxCharHeight = 0;
-        $oImage        = imagecreatetruecolor(100, 100);
-        $text_color    = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-        $FontSize      = $this->config['fontsize_max'];
-        for ($Angle = -30; $Angle <= 30; ++$Angle) {
-            for ($i = 65; $i <= 90; ++$i) {
-                $CharDetails   = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
-                $_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
-                if ($_MaxCharWidth > $MaxCharWidth) {
-                    $MaxCharWidth = $_MaxCharWidth;
-                }
-                $_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
-                if ($_MaxCharHeight > $MaxCharHeight) {
-                    $MaxCharHeight = $_MaxCharHeight;
-                }
-            }
-        }
-        imagedestroy($oImage);
-
-        $this->height  = $MaxCharHeight + 2;
-        $this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
-        $this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
-    }
-
-    /**
-     * Return random background
-     *
-     * @return array
-     */
-    public function loadBackground()
-    {
-        $RandBackground = null;
-        if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
-            $RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
-        }
-
-        return $RandBackground;
-    }
-
-    /**
-     * Draw Image background
-     */
-    public function createFromFile()
-    {
-        if ($RandImage = $this->loadBackground()) {
-            $ImageType = @getimagesize($RandImage);
-            switch (@$ImageType[2]) {
-                case 1:
-                    $BackgroundImage = imagecreatefromgif($RandImage);
-                    break;
-
-                case 2:
-                    $BackgroundImage = imagecreatefromjpeg($RandImage);
-                    break;
-
-                case 3:
-                    $BackgroundImage = imagecreatefrompng($RandImage);
-                    break;
-            }
-        }
-        if (!empty($BackgroundImage)) {
-            imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
-            imagedestroy($BackgroundImage);
-        } else {
-            $this->drawBars();
-        }
-    }
-
-    /**
-     * Draw Code
-     */
-    public function drawCode()
-    {
-        for ($i = 0; $i < $this->config['num_chars']; ++$i) {
-            // select random greyscale colour
-            $text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-
-            // write text to image
-            $Angle = mt_rand(10, 30);
-            if ($i % 2) {
-                $Angle = mt_rand(-10, -30);
-            }
-
-            // select random font size
-            $FontSize = mt_rand($this->config['fontsize_min'], $this->config['fontsize_max']);
-
-            $CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
-            $CharHeight  = abs($CharDetails[1] + $CharDetails[5]);
-
-            // calculate character starting coordinates
-            $posX = ($this->spacing / 2) + ($i * $this->spacing);
-            $posY = 2 + ($this->height / 2) + ($CharHeight / 4);
-
-            imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
-        }
-    }
-
-    /**
-     * Draw Border
-     */
-    public function drawBorder()
-    {
-        $rgb          = mt_rand(50, 150);
-        $border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
-        imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
-    }
-
-    /**
-     * Draw Circles background
-     */
-    public function drawCircles()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Lines background
-     */
-    public function drawLines()
-    {
-        for ($i = 0; $i < $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Rectangles background
-     */
-    public function drawRectangles()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Bars background
-     */
-    public function drawBars()
-    {
-        for ($i = 0; $i <= $this->height;) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
-            $i = $i + 2.5;
-        }
-        for ($i = 0; $i <= $this->width;) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
-            $i = $i + 2.5;
-        }
-    }
-
-    /**
-     * Draw Ellipses background
-     */
-    public function drawEllipses()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw polygons background
-     */
-    public function drawPolygons()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            $coords      = array();
-            for ($j = 1; $j <= $this->config['polygon_point']; ++$j) {
-                $coords[] = mt_rand(0, $this->width);
-                $coords[] = mt_rand(0, $this->height);
-            }
-            imagefilledpolygon($this->oImage, $coords, $this->config['polygon_point'], $randomcolor);
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with BMP
-     *  TODO
-     * @param  string $file
-     * @return string
-     */
-    public function createImageBmp($file = '')
-    {
-        $image = '';
-
-        if (empty($file)) {
-            header('Content-type: image/bmp');
-            echo $image;
-        } else {
-            return $image;
-        }
-    }
+		require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+		$file_path = $this->config['rootpath'] . "/{$name}";
+		$files     = XoopsLists::getFileListAsArray($file_path);
+		foreach ($files as $item) {
+			if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
+				$items[] = $item;
+			}
+		}
+		if (function_exists('mod_createCacheFile')) {
+			mod_createCacheFile($items, "captcha_{$name}", 'captcha');
+		}
+
+		return $items;
+	}
+
+	public function loadFont()
+	{
+		$fonts      = $this->_getList('fonts', 'ttf');
+		$this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
+	}
+
+	public function setImageSize()
+	{
+		$MaxCharWidth  = 0;
+		$MaxCharHeight = 0;
+		$oImage        = imagecreatetruecolor(100, 100);
+		$text_color    = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+		$FontSize      = $this->config['fontsize_max'];
+		for ($Angle = -30; $Angle <= 30; ++$Angle) {
+			for ($i = 65; $i <= 90; ++$i) {
+				$CharDetails   = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
+				$_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
+				if ($_MaxCharWidth > $MaxCharWidth) {
+					$MaxCharWidth = $_MaxCharWidth;
+				}
+				$_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
+				if ($_MaxCharHeight > $MaxCharHeight) {
+					$MaxCharHeight = $_MaxCharHeight;
+				}
+			}
+		}
+		imagedestroy($oImage);
+
+		$this->height  = $MaxCharHeight + 2;
+		$this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
+		$this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
+	}
+
+	/**
+	 * Return random background
+	 *
+	 * @return array
+	 */
+	public function loadBackground()
+	{
+		$RandBackground = null;
+		if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
+			$RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
+		}
+
+		return $RandBackground;
+	}
+
+	/**
+	 * Draw Image background
+	 */
+	public function createFromFile()
+	{
+		if ($RandImage = $this->loadBackground()) {
+			$ImageType = @getimagesize($RandImage);
+			switch (@$ImageType[2]) {
+				case 1:
+					$BackgroundImage = imagecreatefromgif($RandImage);
+					break;
+
+				case 2:
+					$BackgroundImage = imagecreatefromjpeg($RandImage);
+					break;
+
+				case 3:
+					$BackgroundImage = imagecreatefrompng($RandImage);
+					break;
+			}
+		}
+		if (!empty($BackgroundImage)) {
+			imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
+			imagedestroy($BackgroundImage);
+		} else {
+			$this->drawBars();
+		}
+	}
+
+	/**
+	 * Draw Code
+	 */
+	public function drawCode()
+	{
+		for ($i = 0; $i < $this->config['num_chars']; ++$i) {
+			// select random greyscale colour
+			$text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+
+			// write text to image
+			$Angle = mt_rand(10, 30);
+			if ($i % 2) {
+				$Angle = mt_rand(-10, -30);
+			}
+
+			// select random font size
+			$FontSize = mt_rand($this->config['fontsize_min'], $this->config['fontsize_max']);
+
+			$CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
+			$CharHeight  = abs($CharDetails[1] + $CharDetails[5]);
+
+			// calculate character starting coordinates
+			$posX = ($this->spacing / 2) + ($i * $this->spacing);
+			$posY = 2 + ($this->height / 2) + ($CharHeight / 4);
+
+			imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
+		}
+	}
+
+	/**
+	 * Draw Border
+	 */
+	public function drawBorder()
+	{
+		$rgb          = mt_rand(50, 150);
+		$border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
+		imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
+	}
+
+	/**
+	 * Draw Circles background
+	 */
+	public function drawCircles()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Lines background
+	 */
+	public function drawLines()
+	{
+		for ($i = 0; $i < $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Rectangles background
+	 */
+	public function drawRectangles()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Bars background
+	 */
+	public function drawBars()
+	{
+		for ($i = 0; $i <= $this->height;) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
+			$i = $i + 2.5;
+		}
+		for ($i = 0; $i <= $this->width;) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
+			$i = $i + 2.5;
+		}
+	}
+
+	/**
+	 * Draw Ellipses background
+	 */
+	public function drawEllipses()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw polygons background
+	 */
+	public function drawPolygons()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			$coords      = array();
+			for ($j = 1; $j <= $this->config['polygon_point']; ++$j) {
+				$coords[] = mt_rand(0, $this->width);
+				$coords[] = mt_rand(0, $this->height);
+			}
+			imagefilledpolygon($this->oImage, $coords, $this->config['polygon_point'], $randomcolor);
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with BMP
+	 *  TODO
+	 * @param  string $file
+	 * @return string
+	 */
+	public function createImageBmp($file = '')
+	{
+		$image = '';
+
+		if (empty($file)) {
+			header('Content-type: image/bmp');
+			echo $image;
+		} else {
+			return $image;
+		}
+	}
 }
 
 $config        = @include '../config.php';

include/captcha/text.php

Indentation +61 added lines, -61 removed lines

@@ -7,75 +7,75 @@
  */
 class XoopsCaptchaText
 {
-    public $config = array();
-    public $code;
+	public $config = array();
+	public $code;
 
-    /**
-     * XoopsCaptchaText constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * XoopsCaptchaText constructor.
+	 */
+	public function __construct()
+	{
+	}
 
-    /**
-     * @return XoopsCaptchaText
-     */
-    public function &instance()
-    {
-        static $instance;
-        if (!isset($instance)) {
-            $instance = new XoopsCaptchaText();
-        }
+	/**
+	 * @return XoopsCaptchaText
+	 */
+	public function &instance()
+	{
+		static $instance;
+		if (!isset($instance)) {
+			$instance = new XoopsCaptchaText();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * Loading configs from CAPTCHA class
-     * @param array $config
-     */
-    public function loadConfig($config = array())
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
+	/**
+	 * Loading configs from CAPTCHA class
+	 * @param array $config
+	 */
+	public function loadConfig($config = array())
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
 
-    public function setCode()
-    {
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-    }
+	public function setCode()
+	{
+		$_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+	}
 
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        $form = $this->loadText() . "&nbsp;&nbsp; <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value='' />";
-        $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
-        if (!empty($rule)) {
-            $form .= "&nbsp;&nbsp;<small>{$rule}</small>";
-        }
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		$form = $this->loadText() . "&nbsp;&nbsp; <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value='' />";
+		$rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
+		if (!empty($rule)) {
+			$form .= "&nbsp;&nbsp;<small>{$rule}</small>";
+		}
 
-        $this->setCode();
+		$this->setCode();
 
-        return $form;
-    }
+		return $form;
+	}
 
-    /**
-     * @return string
-     */
-    public function loadText()
-    {
-        $val_a = mt_rand(0, 9);
-        $val_b = mt_rand(0, 9);
-        if ($val_a > $val_b) {
-            $expression = "{$val_a} - {$val_b} = ?";
-            $this->code = $val_a - $val_b;
-        } else {
-            $expression = "{$val_a} + {$val_b} = ?";
-            $this->code = $val_a + $val_b;
-        }
+	/**
+	 * @return string
+	 */
+	public function loadText()
+	{
+		$val_a = mt_rand(0, 9);
+		$val_b = mt_rand(0, 9);
+		if ($val_a > $val_b) {
+			$expression = "{$val_a} - {$val_b} = ?";
+			$this->code = $val_a - $val_b;
+		} else {
+			$expression = "{$val_a} + {$val_b} = ?";
+			$this->code = $val_a + $val_b;
+		}
 
-        return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
-    }
+		return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
+	}
 }

include/captcha/config.php

Indentation +26 added lines, -26 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CAPTCHA class For XOOPS
- *
- * Currently there are two types of CAPTCHA forms, text and image
- * The default mode is "text", it can be changed in the priority:
- * 1 If mode is set through XoopsFormCaptcha::setMode(), take it
- * 2 Elseif mode is set though captcha/config.php, take it
- * 3 Else, take "text"
- *
- * D.J.
- */
+	 * CAPTCHA class For XOOPS
+	 *
+	 * Currently there are two types of CAPTCHA forms, text and image
+	 * The default mode is "text", it can be changed in the priority:
+	 * 1 If mode is set through XoopsFormCaptcha::setMode(), take it
+	 * 2 Elseif mode is set though captcha/config.php, take it
+	 * 3 Else, take "text"
+	 *
+	 * D.J.
+	 */
 
 $config = array(
-    'mode'       => 'image',
-    'name'       => 'xoopscaptcha',
-    'skipmember' => true,                    // Skip CAPTCHA check for members
-    'maxattempt' => 100,                    // Maximum attempts for each session
+	'mode'       => 'image',
+	'name'       => 'xoopscaptcha',
+	'skipmember' => true,                    // Skip CAPTCHA check for members
+	'maxattempt' => 100,                    // Maximum attempts for each session
 
-    'num_chars'       => 4,                        // Maximum characters
+	'num_chars'       => 4,                        // Maximum characters
 
-    // For image mode, based on DuGris' SecurityImage
-    'rootpath'        => __DIR__,        // __Absolute__ Path to the root of fonts and backgrounds
-    'imagepath'       => 'uploads/captcha',        // Path to temporary image files, __relative__ to XOOPS_ROOT_PATH
-    'imageurl'        => 'modules/smartobject/include/captcha/scripts/img.php',        // Path to the script for creating image, __relative__ to XOOPS_ROOT_PATH
-    'casesensitive'   => false,                    // Characters in image mode is case-sensitive
-    'fontsize_min'    => 12,                    // Minimum font-size
-    'fontsize_max'    => 12,                    // Maximum font-size
-    'background_type' => 0,                        // Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
-    'background_num'  => 50,                        // Number of background images to generate
-    'polygon_point'   => 3
+	// For image mode, based on DuGris' SecurityImage
+	'rootpath'        => __DIR__,        // __Absolute__ Path to the root of fonts and backgrounds
+	'imagepath'       => 'uploads/captcha',        // Path to temporary image files, __relative__ to XOOPS_ROOT_PATH
+	'imageurl'        => 'modules/smartobject/include/captcha/scripts/img.php',        // Path to the script for creating image, __relative__ to XOOPS_ROOT_PATH
+	'casesensitive'   => false,                    // Characters in image mode is case-sensitive
+	'fontsize_min'    => 12,                    // Minimum font-size
+	'fontsize_max'    => 12,                    // Maximum font-size
+	'background_type' => 0,                        // Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
+	'background_num'  => 50,                        // Number of background images to generate
+	'polygon_point'   => 3
 );
 
 $language = preg_replace("/[^a-z0-9_\-]/i", '', $GLOBALS['xoopsConfig']['language']);
 
 if (!@include_once __DIR__ . "/language/{$language}.php") {
-    require_once __DIR__ . '/language/english.php';
+	require_once __DIR__ . '/language/english.php';
 }
 
 return $config;

include/captcha/image.php

Indentation +50 added lines, -50 removed lines

@@ -7,62 +7,62 @@
  */
 class XoopsCaptchaImage
 {
-    public $config = array();
+	public $config = array();
 
-    /**
-     * XoopsCaptchaImage constructor.
-     */
-    public function __construct()
-    {
-        //$this->name = md5( session_id() );
-    }
+	/**
+	 * XoopsCaptchaImage constructor.
+	 */
+	public function __construct()
+	{
+		//$this->name = md5( session_id() );
+	}
 
-    /**
-     * @return XoopsCaptchaImage
-     */
-    public function &instance()
-    {
-        static $instance;
-        if (!isset($instance)) {
-            $instance = new XoopsCaptchaImage();
-        }
+	/**
+	 * @return XoopsCaptchaImage
+	 */
+	public function &instance()
+	{
+		static $instance;
+		if (!isset($instance)) {
+			$instance = new XoopsCaptchaImage();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * Loading configs from CAPTCHA class
-     * @param array $config
-     */
-    public function loadConfig($config = array())
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
+	/**
+	 * Loading configs from CAPTCHA class
+	 * @param array $config
+	 */
+	public function loadConfig($config = array())
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
 
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        $form = "<input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value='' /> &nbsp; " . $this->loadImage();
-        $rule = htmlspecialchars(XOOPS_CAPTCHA_REFRESH, ENT_QUOTES);
-        if ($this->config['maxattempt']) {
-            $rule .= ' | ' . sprintf(constant('XOOPS_CAPTCHA_MAXATTEMPTS'), $this->config['maxattempt']);
-        }
-        $form .= "&nbsp;&nbsp;<small>{$rule}</small>";
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		$form = "<input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value='' /> &nbsp; " . $this->loadImage();
+		$rule = htmlspecialchars(XOOPS_CAPTCHA_REFRESH, ENT_QUOTES);
+		if ($this->config['maxattempt']) {
+			$rule .= ' | ' . sprintf(constant('XOOPS_CAPTCHA_MAXATTEMPTS'), $this->config['maxattempt']);
+		}
+		$form .= "&nbsp;&nbsp;<small>{$rule}</small>";
 
-        return $form;
-    }
+		return $form;
+	}
 
-    /**
-     * @return string
-     */
-    public function loadImage()
-    {
-        $rule = $this->config['casesensitive'] ? constant('XOOPS_CAPTCHA_RULE_CASESENSITIVE') : constant('XOOPS_CAPTCHA_RULE_CASEINSENSITIVE');
-        $ret  = "<img id='captcha' src='" . XOOPS_URL . '/' . $this->config['imageurl'] . "' onclick=\"this.src='" . XOOPS_URL . '/' . $this->config['imageurl'] . "?refresh='+Math.random()" . "\" align='absmiddle'  style='cursor: pointer;' alt='" . htmlspecialchars($rule, ENT_QUOTES) . "' />";
+	/**
+	 * @return string
+	 */
+	public function loadImage()
+	{
+		$rule = $this->config['casesensitive'] ? constant('XOOPS_CAPTCHA_RULE_CASESENSITIVE') : constant('XOOPS_CAPTCHA_RULE_CASEINSENSITIVE');
+		$ret  = "<img id='captcha' src='" . XOOPS_URL . '/' . $this->config['imageurl'] . "' onclick=\"this.src='" . XOOPS_URL . '/' . $this->config['imageurl'] . "?refresh='+Math.random()" . "\" align='absmiddle'  style='cursor: pointer;' alt='" . htmlspecialchars($rule, ENT_QUOTES) . "' />";
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

include/captcha/captcha.php

Indentation +230 added lines, -230 removed lines

@@ -13,239 +13,239 @@
  */
 class XoopsCaptcha
 {
-    public $active = true;
-    public $mode   = 'text';    // potential values: image, text
-    public $config = array();
-
-    public $message = array(); // Logging error messages
-
-    /**
-     * XoopsCaptcha constructor.
-     */
-    public function __construct()
-    {
-        // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
-
-        $this->setMode($this->config['mode']);
-    }
-
-    /**
-     * @return XoopsCaptcha
-     */
-    public static function instance()
-    {
-        static $instance;
-        if (!isset($instance)) {
-            $instance = new XoopsCaptcha();
-        }
-
-        return $instance;
-    }
-
-    /**
-     * @param $name
-     * @param $val
-     * @return bool
-     */
-    public function setConfig($name, $val)
-    {
-        if ($name === 'mode') {
-            $this->setMode($val);
-        } elseif (isset($this->$name)) {
-            $this->$name = $val;
-        } else {
-            $this->config[$name] = $val;
-        }
-
-        return true;
-    }
-
-    /**
-     * Set CAPTCHA mode
-     *
-     * For future possible modes, right now force to use text or image
-     *
-     * @param string $mode if no mode is set, just verify current mode
-     */
-    public function setMode($mode = null)
-    {
-        if (!empty($mode) && in_array($mode, array('text', 'image'))) {
-            $this->mode = $mode;
-
-            if ($this->mode !== 'image') {
-                return;
-            }
-        }
-
-        // Disable image mode
-        if (!extension_loaded('gd')) {
-            $this->mode = 'text';
-        } else {
-            $required_functions = array('imagecreatetruecolor', 'imagecolorallocate', 'imagefilledrectangle', 'imagejpeg', 'imagedestroy', 'imageftbbox');
-            foreach ($required_functions as $func) {
-                if (!function_exists($func)) {
-                    $this->mode = 'text';
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Initializing the CAPTCHA class
-     * @param string $name
-     * @param null   $skipmember
-     * @param null   $num_chars
-     * @param null   $fontsize_min
-     * @param null   $fontsize_max
-     * @param null   $background_type
-     * @param null   $background_num
-     */
-    public function init($name = 'xoopscaptcha', $skipmember = null, $num_chars = null, $fontsize_min = null, $fontsize_max = null, $background_type = null, $background_num = null)
-    {
-        // Loading RUN-TIME settings
-        foreach (array_keys($this->config) as $key) {
-            if (isset(${$key}) && ${$key} !== null) {
-                $this->config[$key] = ${$key};
-            }
-        }
-        $this->config['name'] = $name;
-
-        // Skip CAPTCHA for member if set
-        if ($this->config['skipmember'] && is_object($GLOBALS['xoopsUser'])) {
-            $this->active = false;
-        }
-    }
-
-    /**
-     * Verify user submission
-     * @param  null $skipMember
-     * @return bool
-     */
-    public function verify($skipMember = null)
-    {
-        $sessionName = @$_SESSION['XoopsCaptcha_name'];
-        $skipMember  = ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
-
-        $is_valid = false;
-
-        // Skip CAPTCHA for member if set
-        if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
-            $is_valid = true;
-            // Kill too many attempts
-        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
-            $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-
-            // Verify the code
-        } elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
-            $func     = $this->config['casesensitive'] ? 'strcmp' : 'strcasecmp';
-            $is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
-        }
-
-        if (!empty($maxAttempts)) {
-            if (!$is_valid) {
-                // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
-                // Log the error message
-                $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
-            } else {
-
-                // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
-            }
-        }
-        $this->destroyGarbage(true);
-
-        return $is_valid;
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function getCaption()
-    {
-        return defined('XOOPS_CAPTCHA_CAPTION') ? constant('XOOPS_CAPTCHA_CAPTION') : '';
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return implode('<br />', $this->message);
-    }
-
-    /**
-     * Destory historical stuff
-     * @param  bool $clearSession
-     * @return bool
-     */
-    public function destroyGarbage($clearSession = false)
-    {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class           = 'XoopsCaptcha' . ucfirst($this->mode);
-        $captchaHandler = new $class();
-        if (method_exists($captchaHandler, 'destroyGarbage')) {
-            $captchaHandler->loadConfig($this->config);
-            $captchaHandler->destroyGarbage();
-        }
-
-        if ($clearSession) {
-            $_SESSION['XoopsCaptcha_name']        = null;
-            $_SESSION['XoopsCaptcha_skipmember']  = null;
-            $_SESSION['XoopsCaptcha_sessioncode'] = null;
-            $_SESSION['XoopsCaptcha_maxattempts'] = null;
-        }
-
-        return true;
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function render()
-    {
-        $form = '';
-
-        if (!$this->active || empty($this->config['name'])) {
-            return $form;
-        }
-
-        $_SESSION['XoopsCaptcha_name']        = $this->config['name'];
-        $_SESSION['XoopsCaptcha_skipmember']  = $this->config['skipmember'];
-        $maxAttempts                          = $this->config['maxattempt'];
-        $_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
-        /*
+	public $active = true;
+	public $mode   = 'text';    // potential values: image, text
+	public $config = array();
+
+	public $message = array(); // Logging error messages
+
+	/**
+	 * XoopsCaptcha constructor.
+	 */
+	public function __construct()
+	{
+		// Loading default preferences
+		$this->config = @include __DIR__ . '/config.php';
+
+		$this->setMode($this->config['mode']);
+	}
+
+	/**
+	 * @return XoopsCaptcha
+	 */
+	public static function instance()
+	{
+		static $instance;
+		if (!isset($instance)) {
+			$instance = new XoopsCaptcha();
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * @param $name
+	 * @param $val
+	 * @return bool
+	 */
+	public function setConfig($name, $val)
+	{
+		if ($name === 'mode') {
+			$this->setMode($val);
+		} elseif (isset($this->$name)) {
+			$this->$name = $val;
+		} else {
+			$this->config[$name] = $val;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set CAPTCHA mode
+	 *
+	 * For future possible modes, right now force to use text or image
+	 *
+	 * @param string $mode if no mode is set, just verify current mode
+	 */
+	public function setMode($mode = null)
+	{
+		if (!empty($mode) && in_array($mode, array('text', 'image'))) {
+			$this->mode = $mode;
+
+			if ($this->mode !== 'image') {
+				return;
+			}
+		}
+
+		// Disable image mode
+		if (!extension_loaded('gd')) {
+			$this->mode = 'text';
+		} else {
+			$required_functions = array('imagecreatetruecolor', 'imagecolorallocate', 'imagefilledrectangle', 'imagejpeg', 'imagedestroy', 'imageftbbox');
+			foreach ($required_functions as $func) {
+				if (!function_exists($func)) {
+					$this->mode = 'text';
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Initializing the CAPTCHA class
+	 * @param string $name
+	 * @param null   $skipmember
+	 * @param null   $num_chars
+	 * @param null   $fontsize_min
+	 * @param null   $fontsize_max
+	 * @param null   $background_type
+	 * @param null   $background_num
+	 */
+	public function init($name = 'xoopscaptcha', $skipmember = null, $num_chars = null, $fontsize_min = null, $fontsize_max = null, $background_type = null, $background_num = null)
+	{
+		// Loading RUN-TIME settings
+		foreach (array_keys($this->config) as $key) {
+			if (isset(${$key}) && ${$key} !== null) {
+				$this->config[$key] = ${$key};
+			}
+		}
+		$this->config['name'] = $name;
+
+		// Skip CAPTCHA for member if set
+		if ($this->config['skipmember'] && is_object($GLOBALS['xoopsUser'])) {
+			$this->active = false;
+		}
+	}
+
+	/**
+	 * Verify user submission
+	 * @param  null $skipMember
+	 * @return bool
+	 */
+	public function verify($skipMember = null)
+	{
+		$sessionName = @$_SESSION['XoopsCaptcha_name'];
+		$skipMember  = ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
+		$maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+
+		$is_valid = false;
+
+		// Skip CAPTCHA for member if set
+		if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
+			$is_valid = true;
+			// Kill too many attempts
+		} elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
+			$this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+
+			// Verify the code
+		} elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
+			$func     = $this->config['casesensitive'] ? 'strcmp' : 'strcasecmp';
+			$is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
+		}
+
+		if (!empty($maxAttempts)) {
+			if (!$is_valid) {
+				// Increase the attempt records on failure
+				$_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
+				// Log the error message
+				$this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
+			} else {
+
+				// reset attempt records on success
+				$_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
+			}
+		}
+		$this->destroyGarbage(true);
+
+		return $is_valid;
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function getCaption()
+	{
+		return defined('XOOPS_CAPTCHA_CAPTION') ? constant('XOOPS_CAPTCHA_CAPTION') : '';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return implode('<br />', $this->message);
+	}
+
+	/**
+	 * Destory historical stuff
+	 * @param  bool $clearSession
+	 * @return bool
+	 */
+	public function destroyGarbage($clearSession = false)
+	{
+		require_once __DIR__ . '/' . $this->mode . '.php';
+		$class           = 'XoopsCaptcha' . ucfirst($this->mode);
+		$captchaHandler = new $class();
+		if (method_exists($captchaHandler, 'destroyGarbage')) {
+			$captchaHandler->loadConfig($this->config);
+			$captchaHandler->destroyGarbage();
+		}
+
+		if ($clearSession) {
+			$_SESSION['XoopsCaptcha_name']        = null;
+			$_SESSION['XoopsCaptcha_skipmember']  = null;
+			$_SESSION['XoopsCaptcha_sessioncode'] = null;
+			$_SESSION['XoopsCaptcha_maxattempts'] = null;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function render()
+	{
+		$form = '';
+
+		if (!$this->active || empty($this->config['name'])) {
+			return $form;
+		}
+
+		$_SESSION['XoopsCaptcha_name']        = $this->config['name'];
+		$_SESSION['XoopsCaptcha_skipmember']  = $this->config['skipmember'];
+		$maxAttempts                          = $this->config['maxattempt'];
+		$_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
+		/*
          if (!empty($maxAttempts)) {
          $_SESSION['XoopsCaptcha_maxattempts_'.$_SESSION['XoopsCaptcha_name']] = $maxAttempts;
          }
          */
 
-        // Fail on too many attempts
-        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
-            $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-            // Load the form element
-        } else {
-            $form = $this->loadForm();
-        }
-
-        return $form;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function loadForm()
-    {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class           = 'XoopsCaptcha' . ucfirst($this->mode);
-        $captchaHandler = new $class();
-        $captchaHandler->loadConfig($this->config);
-
-        $form = $captchaHandler->render();
-
-        return $form;
-    }
+		// Fail on too many attempts
+		if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
+			$form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+			// Load the form element
+		} else {
+			$form = $this->loadForm();
+		}
+
+		return $form;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function loadForm()
+	{
+		require_once __DIR__ . '/' . $this->mode . '.php';
+		$class           = 'XoopsCaptcha' . ucfirst($this->mode);
+		$captchaHandler = new $class();
+		$captchaHandler->loadConfig($this->config);
+
+		$form = $captchaHandler->render();
+
+		return $form;
+	}
 }

include/captcha/formcaptcha.php

Indentation +54 added lines, -54 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * Adding CAPTCHA
- *
- * Currently there are two types of CAPTCHA forms, text and image
- * The default mode is "text", it can be changed in the priority:
- * 1 If mode is set through XoopsFormCaptcha::setMode(), take it
- * 2 Elseif mode is set though captcha/config.php, take it
- * 3 Else, take "text"
- *
- * D.J.
- */
+	 * Adding CAPTCHA
+	 *
+	 * Currently there are two types of CAPTCHA forms, text and image
+	 * The default mode is "text", it can be changed in the priority:
+	 * 1 If mode is set through XoopsFormCaptcha::setMode(), take it
+	 * 2 Elseif mode is set though captcha/config.php, take it
+	 * 3 Else, take "text"
+	 *
+	 * D.J.
+	 */
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
@@ -38,52 +38,52 @@ 
  */
 class XoopsFormCaptcha extends XoopsFormElement
 {
-    public $_captchaHandler;
+	public $_captchaHandler;
 
-    /**
-     * @param string  $caption        Caption of the form element, default value is defined in captcha/language/
-     * @param string  $name           Name for the input box
-     * @param boolean $skipmember     Skip CAPTCHA check for members
-     * @param int     $numchar        Number of characters in image mode, and input box size for text mode
-     * @param int     $minfontsize    Minimum font-size of characters in image mode
-     * @param int     $maxfontsize    Maximum font-size of characters in image mode
-     * @param int     $backgroundtype Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
-     * @param int     $backgroundnum  Number of background images in image mode
-     *
-     */
-    public function __construct($caption = '', $name = 'xoopscaptcha', $skipmember = null, $numchar = null, $minfontsize = null, $maxfontsize = null, $backgroundtype = null, $backgroundnum = null)
-    {
-        if (!class_exists('XoopsCaptcaha')) {
-            require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
-        }
+	/**
+	 * @param string  $caption        Caption of the form element, default value is defined in captcha/language/
+	 * @param string  $name           Name for the input box
+	 * @param boolean $skipmember     Skip CAPTCHA check for members
+	 * @param int     $numchar        Number of characters in image mode, and input box size for text mode
+	 * @param int     $minfontsize    Minimum font-size of characters in image mode
+	 * @param int     $maxfontsize    Maximum font-size of characters in image mode
+	 * @param int     $backgroundtype Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
+	 * @param int     $backgroundnum  Number of background images in image mode
+	 *
+	 */
+	public function __construct($caption = '', $name = 'xoopscaptcha', $skipmember = null, $numchar = null, $minfontsize = null, $maxfontsize = null, $backgroundtype = null, $backgroundnum = null)
+	{
+		if (!class_exists('XoopsCaptcaha')) {
+			require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
+		}
 
-        $this->_captchaHandler = XoopsCaptcha::instance();
-        $this->_captchaHandler->init($name, $skipmember, $numchar, $minfontsize, $maxfontsize, $backgroundtype, $backgroundnum);
-        if (!$this->_captchaHandler->active) {
-            $this->setHidden();
-        } else {
-            $caption = !empty($caption) ? $caption : $this->_captchaHandler->getCaption();
-            $this->setCaption($caption);
-        }
-    }
+		$this->_captchaHandler = XoopsCaptcha::instance();
+		$this->_captchaHandler->init($name, $skipmember, $numchar, $minfontsize, $maxfontsize, $backgroundtype, $backgroundnum);
+		if (!$this->_captchaHandler->active) {
+			$this->setHidden();
+		} else {
+			$caption = !empty($caption) ? $caption : $this->_captchaHandler->getCaption();
+			$this->setCaption($caption);
+		}
+	}
 
-    /**
-     * @param $name
-     * @param $val
-     * @return bool
-     */
-    public function setConfig($name, $val)
-    {
-        return $this->_captchaHandler->setConfig($name, $val);
-    }
+	/**
+	 * @param $name
+	 * @param $val
+	 * @return bool
+	 */
+	public function setConfig($name, $val)
+	{
+		return $this->_captchaHandler->setConfig($name, $val);
+	}
 
-    /**
-     * @return mixed|string
-     */
-    public function render()
-    {
-        if (!$this->isHidden()) {
-            return $this->_captchaHandler->render();
-        }
-    }
+	/**
+	 * @return mixed|string
+	 */
+	public function render()
+	{
+		if (!$this->isHidden()) {
+			return $this->_captchaHandler->render();
+		}
+	}
 }