mambax7 / smartobject

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>";
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
     public function setCode()
     {
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
     }
 
     /**

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;

Spacing +11 added lines, -11 removed lines

@@ -14,20 +14,20 @@
 $config = array(
     'mode'       => 'image',
     'name'       => 'xoopscaptcha',
-    'skipmember' => true,                    // Skip CAPTCHA check for members
-    'maxattempt' => 100,                    // Maximum attempts for each session
+    '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
+    '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
 );
 

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;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 class XoopsCaptcha
 {
     public $active = true;
-    public $mode   = 'text';    // potential values: image, text
+    public $mode   = 'text'; // potential values: image, text
     public $config = array();
 
     public $message = array(); // Logging error messages
@@ -127,7 +127,7 @@ 
     {
         $sessionName = @$_SESSION['XoopsCaptcha_name'];
         $skipMember  = ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $maxAttempts = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         $is_valid = false;
 
@@ -185,7 +185,7 @@ 
     public function destroyGarbage($clearSession = false)
     {
         require_once __DIR__ . '/' . $this->mode . '.php';
-        $class           = 'XoopsCaptcha' . ucfirst($this->mode);
+        $class = 'XoopsCaptcha' . ucfirst($this->mode);
         $captchaHandler = new $class();
         if (method_exists($captchaHandler, 'destroyGarbage')) {
             $captchaHandler->loadConfig($this->config);
@@ -240,7 +240,7 @@ 
     public function loadForm()
     {
         require_once __DIR__ . '/' . $this->mode . '.php';
-        $class           = 'XoopsCaptcha' . ucfirst($this->mode);
+        $class = 'XoopsCaptcha' . ucfirst($this->mode);
         $captchaHandler = new $class();
         $captchaHandler->loadConfig($this->config);
 

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();
+		}
+	}
 }

admin/rating.php

Indentation +78 added lines, -78 removed lines

@@ -11,44 +11,44 @@ 
 
 function editclass($showmenu = false, $ratingid = 0)
 {
-    global $smartobjectRatingHandler;
-
-    $ratingObj = $smartobjectRatingHandler->get($ratingid);
-
-    if (!$ratingObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('ratingedit', _AM_SOBJECT_RATINGS_EDIT, _AM_SOBJECT_RATINGS_EDIT_INFO);
-
-        $sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_EDIT, 'addrating');
-        $sform->display();
-        smart_close_collapsable('ratingedit');
-    } else {
-        $ratingObj->hideFieldFromForm(array('item', 'itemid', 'uid', 'date', 'rate'));
-
-        if (isset($_POST['op'])) {
-            $controller = new SmartObjectController($smartobjectRatingHandler);
-            $controller->postDataToObject($ratingObj);
-
-            if ($_POST['op'] === 'changedField') {
-                switch ($_POST['changedField']) {
-                    case 'dirname':
-                        $ratingObj->showFieldOnForm(array('item', 'itemid', 'uid', 'date', 'rate'));
-                        break;
-                }
-            }
-        }
-
-        if ($showmenu) {
-            //smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('ratingcreate', _AM_SOBJECT_RATINGS_CREATE, _AM_SOBJECT_RATINGS_CREATE_INFO);
-        $sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_CREATE, 'addrating');
-        $sform->display();
-        smart_close_collapsable('ratingcreate');
-    }
+	global $smartobjectRatingHandler;
+
+	$ratingObj = $smartobjectRatingHandler->get($ratingid);
+
+	if (!$ratingObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('ratingedit', _AM_SOBJECT_RATINGS_EDIT, _AM_SOBJECT_RATINGS_EDIT_INFO);
+
+		$sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_EDIT, 'addrating');
+		$sform->display();
+		smart_close_collapsable('ratingedit');
+	} else {
+		$ratingObj->hideFieldFromForm(array('item', 'itemid', 'uid', 'date', 'rate'));
+
+		if (isset($_POST['op'])) {
+			$controller = new SmartObjectController($smartobjectRatingHandler);
+			$controller->postDataToObject($ratingObj);
+
+			if ($_POST['op'] === 'changedField') {
+				switch ($_POST['changedField']) {
+					case 'dirname':
+						$ratingObj->showFieldOnForm(array('item', 'itemid', 'uid', 'date', 'rate'));
+						break;
+				}
+			}
+		}
+
+		if ($showmenu) {
+			//smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('ratingcreate', _AM_SOBJECT_RATINGS_CREATE, _AM_SOBJECT_RATINGS_CREATE_INFO);
+		$sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_CREATE, 'addrating');
+		$sform->display();
+		smart_close_collapsable('ratingcreate');
+	}
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -60,60 +60,60 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
-    case 'mod':
-    case 'changedField';
+	case 'mod':
+	case 'changedField';
 
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
+		$ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $ratingid);
-        break;
+		editclass(true, $ratingid);
+		break;
 
-    case 'addrating':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectRatingHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
+	case 'addrating':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectRatingHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
 
-        break;
+		break;
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectRatingHandler);
-        $controller->handleObjectDeletion();
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectRatingHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(4, _AM_SOBJECT_RATINGS);
+		//smart_adminMenu(4, _AM_SOBJECT_RATINGS);
 
-        smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
+		smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectRatingHandler);
-        $objectTable->addColumn(new SmartObjectColumn('name', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn('dirname', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn('item', 'left', false, 'getItemValue'));
-        $objectTable->addColumn(new SmartObjectColumn('date', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectRatingHandler);
+		$objectTable->addColumn(new SmartObjectColumn('name', 'left'));
+		$objectTable->addColumn(new SmartObjectColumn('dirname', 'left'));
+		$objectTable->addColumn(new SmartObjectColumn('item', 'left', false, 'getItemValue'));
+		$objectTable->addColumn(new SmartObjectColumn('date', 'center', 150));
+		$objectTable->addColumn(new SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+		//      $objectTable->addCustomAction('getCreateItemLink');
+		//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
-        /*
+		$objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
+		/*
                 $criteria_upcoming = new CriteriaCompo();
                 $criteria_upcoming->add(new Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -138,13 +138,13 @@ 
                 ));
         */
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdratings');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('createdratings');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

Switch Indentation +38 added lines, -38 removed lines

@@ -67,53 +67,53 @@ 
 }
 
 switch ($op) {
-    case 'mod':
-    case 'changedField';
+    	case 'mod':
+    	case 'changedField';
 
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
+        	$ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+        	smart_xoops_cp_header();
+        	echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $ratingid);
-        break;
+        	editclass(true, $ratingid);
+        	break;
 
-    case 'addrating':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectRatingHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
+    	case 'addrating':
+        	include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new SmartObjectController($smartobjectRatingHandler);
+        	$controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
 
-        break;
+        	break;
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectRatingHandler);
-        $controller->handleObjectDeletion();
+    	case 'del':
+        	include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new SmartObjectController($smartobjectRatingHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+        	smart_xoops_cp_header();
+        	echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(4, _AM_SOBJECT_RATINGS);
+        	//smart_adminMenu(4, _AM_SOBJECT_RATINGS);
 
-        smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
+        	smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectRatingHandler);
-        $objectTable->addColumn(new SmartObjectColumn('name', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn('dirname', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn('item', 'left', false, 'getItemValue'));
-        $objectTable->addColumn(new SmartObjectColumn('date', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
+        	include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new SmartObjectTable($smartobjectRatingHandler);
+        	$objectTable->addColumn(new SmartObjectColumn('name', 'left'));
+        	$objectTable->addColumn(new SmartObjectColumn('dirname', 'left'));
+        	$objectTable->addColumn(new SmartObjectColumn('item', 'left', false, 'getItemValue'));
+        	$objectTable->addColumn(new SmartObjectColumn('date', 'center', 150));
+        	$objectTable->addColumn(new SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+        	//      $objectTable->addCustomAction('getCreateItemLink');
+        	//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
-        /*
+        	$objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
+        	/*
                 $criteria_upcoming = new CriteriaCompo();
                 $criteria_upcoming->add(new Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -138,13 +138,13 @@ 
                 ));
         */
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdratings');
-        echo '<br>';
+        	echo '<br />';
+        	smart_close_collapsable('createdratings');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //smart_modFooter();

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
 include_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
 $smartobjectRatingHandler = xoops_getModuleHandler('rating');
-$indexAdmin                 = new ModuleAdmin();
+$indexAdmin = new ModuleAdmin();
 
 $op = '';
 
@@ -70,7 +70,7 @@ 
     case 'mod':
     case 'changedField';
 
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
+        $ratingid = isset($_GET['ratingid']) ? (int) $_GET['ratingid'] : 0;
 
         smart_xoops_cp_header();
         echo $indexAdmin->addNavigation(basename(__FILE__));

admin/adsense.php

Indentation +77 added lines, -77 removed lines

@@ -12,32 +12,32 @@ 
 
 function editclass($showmenu = false, $adsenseid = 0, $clone = false)
 {
-    global $smartobjectAdsenseHandler;
-
-    $adsenseObj = $smartobjectAdsenseHandler->get($adsenseid);
-
-    if (!$clone && !$adsenseObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('adsenseedit', _AM_SOBJECT_ADSENSES_EDIT, _AM_SOBJECT_ADSENSES_EDIT_INFO);
-
-        $sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_EDIT, 'addadsense');
-        $sform->display();
-        smart_close_collapsable('adsenseedit');
-    } else {
-        $adsenseObj->setVar('adsenseid', 0);
-        $adsenseObj->setVar('tag', '');
-
-        if ($showmenu) {
-            //smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('adsensecreate', _AM_SOBJECT_ADSENSES_CREATE, _AM_SOBJECT_ADSENSES_CREATE_INFO);
-        $sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_CREATE, 'addadsense', false, false, false, true);
-        $sform->display();
-        smart_close_collapsable('adsensecreate');
-    }
+	global $smartobjectAdsenseHandler;
+
+	$adsenseObj = $smartobjectAdsenseHandler->get($adsenseid);
+
+	if (!$clone && !$adsenseObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('adsenseedit', _AM_SOBJECT_ADSENSES_EDIT, _AM_SOBJECT_ADSENSES_EDIT_INFO);
+
+		$sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_EDIT, 'addadsense');
+		$sform->display();
+		smart_close_collapsable('adsenseedit');
+	} else {
+		$adsenseObj->setVar('adsenseid', 0);
+		$adsenseObj->setVar('tag', '');
+
+		if ($showmenu) {
+			//smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('adsensecreate', _AM_SOBJECT_ADSENSES_CREATE, _AM_SOBJECT_ADSENSES_CREATE_INFO);
+		$sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_CREATE, 'addadsense', false, false, false, true);
+		$sform->display();
+		smart_close_collapsable('adsensecreate');
+	}
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -50,73 +50,73 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
-    case 'mod':
+	case 'mod':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+		$adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid);
-        break;
+		editclass(true, $adsenseid);
+		break;
 
-    case 'clone':
+	case 'clone':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+		$adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid, true);
-        break;
+		editclass(true, $adsenseid, true);
+		break;
 
-    case 'addadsense':
-        if (@include_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
-            $xoopsCaptcha = XoopsCaptcha::instance();
-            if (!$xoopsCaptcha->verify()) {
-                redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
-                exit;
-            }
-        }
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectAdsenseHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
-        break;
+	case 'addadsense':
+		if (@include_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
+			$xoopsCaptcha = XoopsCaptcha::instance();
+			if (!$xoopsCaptcha->verify()) {
+				redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
+				exit;
+			}
+		}
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectAdsenseHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
+		break;
 
-    case 'del':
+	case 'del':
 
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectAdsenseHandler);
-        $controller->handleObjectDeletion();
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectAdsenseHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(3, _AM_SOBJECT_ADSENSES);
+		//smart_adminMenu(3, _AM_SOBJECT_ADSENSES);
 
-        smart_collapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
+		smart_collapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectAdsenseHandler);
-        $objectTable->addColumn(new SmartObjectColumn('description', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectAdsenseHandler);
+		$objectTable->addColumn(new SmartObjectColumn('description', 'left'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+		//      $objectTable->addCustomAction('getCreateItemLink');
+		//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
-        /*
+		$objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
+		/*
                 $criteria_upcoming = new CriteriaCompo();
                 $criteria_upcoming->add(new Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -140,16 +140,16 @@ 
                                             'criteria' => $criteria_last30days
                 ));
         */
-        $objectTable->addQuickSearch(array('title', 'summary', 'description'));
-        $objectTable->addCustomAction('getCloneLink');
+		$objectTable->addQuickSearch(array('title', 'summary', 'description'));
+		$objectTable->addCustomAction('getCloneLink');
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdadsenses');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('createdadsenses');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

Switch Indentation +49 added lines, -49 removed lines

@@ -57,66 +57,66 @@ 
 }
 
 switch ($op) {
-    case 'mod':
+    	case 'mod':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+        	$adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+        	smart_xoops_cp_header();
+        	echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid);
-        break;
+        	editclass(true, $adsenseid);
+        	break;
 
-    case 'clone':
+    	case 'clone':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+        	$adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+        	smart_xoops_cp_header();
+        	echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid, true);
-        break;
+        	editclass(true, $adsenseid, true);
+        	break;
 
-    case 'addadsense':
-        if (@include_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
-            $xoopsCaptcha = XoopsCaptcha::instance();
-            if (!$xoopsCaptcha->verify()) {
-                redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
-                exit;
-            }
-        }
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectAdsenseHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
-        break;
+    	case 'addadsense':
+        	if (@include_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
+            	$xoopsCaptcha = XoopsCaptcha::instance();
+            	if (!$xoopsCaptcha->verify()) {
+                	redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
+                	exit;
+            	}
+        	}
+        	include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new SmartObjectController($smartobjectAdsenseHandler);
+        	$controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
+        	break;
 
-    case 'del':
+    	case 'del':
 
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectAdsenseHandler);
-        $controller->handleObjectDeletion();
+        	include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new SmartObjectController($smartobjectAdsenseHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+        	smart_xoops_cp_header();
+        	echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(3, _AM_SOBJECT_ADSENSES);
+        	//smart_adminMenu(3, _AM_SOBJECT_ADSENSES);
 
-        smart_collapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
+        	smart_collapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectAdsenseHandler);
-        $objectTable->addColumn(new SmartObjectColumn('description', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
+        	include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new SmartObjectTable($smartobjectAdsenseHandler);
+        	$objectTable->addColumn(new SmartObjectColumn('description', 'left'));
+        	$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+        	//      $objectTable->addCustomAction('getCreateItemLink');
+        	//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
-        /*
+        	$objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
+        	/*
                 $criteria_upcoming = new CriteriaCompo();
                 $criteria_upcoming->add(new Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -140,16 +140,16 @@ 
                                             'criteria' => $criteria_last30days
                 ));
         */
-        $objectTable->addQuickSearch(array('title', 'summary', 'description'));
-        $objectTable->addCustomAction('getCloneLink');
+        	$objectTable->addQuickSearch(array('title', 'summary', 'description'));
+        	$objectTable->addCustomAction('getCloneLink');
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdadsenses');
-        echo '<br>';
+        	echo '<br />';
+        	smart_close_collapsable('createdadsenses');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //smart_modFooter();

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 switch ($op) {
     case 'mod':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+        $adsenseid = isset($_GET['adsenseid']) ? (int) $_GET['adsenseid'] : 0;
 
         smart_xoops_cp_header();
         echo $indexAdmin->addNavigation(basename(__FILE__));
@@ -69,7 +69,7 @@ 
 
     case 'clone':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+        $adsenseid = isset($_GET['adsenseid']) ? (int) $_GET['adsenseid'] : 0;
 
         smart_xoops_cp_header();
         echo $indexAdmin->addNavigation(basename(__FILE__));

admin/tag.php

Indentation +85 added lines, -85 removed lines

@@ -12,45 +12,45 @@ 
 
 function edittag($tagid = 0, $language = false, $fct = false)
 {
-    global $smartobjectTagHandler;
-
-    $tagObj = $smartobjectTagHandler->get($tagid);
-
-    if ($tagObj->isNew()) {
-        $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
-        $title                 = _AM_SOBJECT_TAG_CREATE;
-        $info                  = _AM_SOBJECT_TAG_CREATE_INFO;
-        $collaps_name          = 'tagcreate';
-        $form_name             = _AM_SOBJECT_TAG_CREATE;
-        $submit_button_caption = null;
-        //$tagObj->stripMultilanguageFields();
-    } else {
-        if ($language) {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
-            $title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
-            $info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
-            $collaps_name          = 'tageditlanguage';
-            $form_name             = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
-            $submit_button_caption = null;
-            $tagObj->makeNonMLFieldReadOnly();
-        } else {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
-            $title                 = _AM_SOBJECT_TAG_EDIT;
-            $info                  = _AM_SOBJECT_TAG_EDIT_INFO;
-            $collaps_name          = 'tagedit';
-            $form_name             = _AM_SOBJECT_TAG_EDIT;
-            $submit_button_caption = null;
-            $tagObj->stripMultilanguageFields();
-        }
-    }
-
-    //smart_adminMenu(2, $breadcrumb);
-
-    smart_collapsableBar($collaps_name, $title, $info);
-
-    $sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
-    $sform->display();
-    smart_close_collapsable($collaps_name);
+	global $smartobjectTagHandler;
+
+	$tagObj = $smartobjectTagHandler->get($tagid);
+
+	if ($tagObj->isNew()) {
+		$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
+		$title                 = _AM_SOBJECT_TAG_CREATE;
+		$info                  = _AM_SOBJECT_TAG_CREATE_INFO;
+		$collaps_name          = 'tagcreate';
+		$form_name             = _AM_SOBJECT_TAG_CREATE;
+		$submit_button_caption = null;
+		//$tagObj->stripMultilanguageFields();
+	} else {
+		if ($language) {
+			$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
+			$title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
+			$info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
+			$collaps_name          = 'tageditlanguage';
+			$form_name             = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
+			$submit_button_caption = null;
+			$tagObj->makeNonMLFieldReadOnly();
+		} else {
+			$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
+			$title                 = _AM_SOBJECT_TAG_EDIT;
+			$info                  = _AM_SOBJECT_TAG_EDIT_INFO;
+			$collaps_name          = 'tagedit';
+			$form_name             = _AM_SOBJECT_TAG_EDIT;
+			$submit_button_caption = null;
+			$tagObj->stripMultilanguageFields();
+		}
+	}
+
+	//smart_adminMenu(2, $breadcrumb);
+
+	smart_collapsableBar($collaps_name, $title, $info);
+
+	$sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
+	$sform->display();
+	smart_close_collapsable($collaps_name);
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -62,10 +62,10 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 $tagid    = isset($_GET['tagid']) ? $_GET['tagid'] : 0;
@@ -74,66 +74,66 @@ 
 
 switch ($op) {
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectTagHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectTagHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'addtag':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectTagHandler);
-        $tagObj     = $controller->storeSmartObject();
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-            exit;
-        }
+	case 'addtag':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectTagHandler);
+		$tagObj     = $controller->storeSmartObject();
+		if ($tagObj->hasError()) {
+			redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+			exit;
+		}
 
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-        } else {
-            redirect_header(smart_get_page_before_form(), 3, _CO_SOBJECT_SAVE_SUCCESS);
-        }
-        exit;
-        break;
+		if ($tagObj->hasError()) {
+			redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+		} else {
+			redirect_header(smart_get_page_before_form(), 3, _CO_SOBJECT_SAVE_SUCCESS);
+		}
+		exit;
+		break;
 
-    case 'mod':
-        smart_xoops_cp_header();
-        edittag($tagid, $language, $fct);
-        break;
+	case 'mod':
+		smart_xoops_cp_header();
+		edittag($tagid, $language, $fct);
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(2, _AM_SOBJECT_TAGS);
+		//smart_adminMenu(2, _AM_SOBJECT_TAGS);
 
-        smart_collapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
+		smart_collapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectTagHandler, false, array('delete'));
-        $objectTable->addColumn(new SmartObjectColumn('name'));
-        $objectTable->addColumn(new SmartObjectColumn('language'));
-        $objectTable->addColumn(new SmartObjectColumn('value'));
-        //      $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_TAGS_FROM, $align='left', $width=false, 'getFromInfo'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectTagHandler, false, array('delete'));
+		$objectTable->addColumn(new SmartObjectColumn('name'));
+		$objectTable->addColumn(new SmartObjectColumn('language'));
+		$objectTable->addColumn(new SmartObjectColumn('value'));
+		//      $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_TAGS_FROM, $align='left', $width=false, 'getFromInfo'));
 
-        $objectTable->addFilter('language', 'getLanguages');
+		$objectTable->addFilter('language', 'getLanguages');
 
-        $objectTable->addCustomAction('getEditLanguageLink');
-        $objectTable->addCustomAction('getEditItemLink');
+		$objectTable->addCustomAction('getEditLanguageLink');
+		$objectTable->addCustomAction('getEditItemLink');
 
-        $objectTable->setDefaultSort('tagid');
+		$objectTable->setDefaultSort('tagid');
 
-        $objectTable->addIntroButton('addtag', 'tag.php?op=mod', _AM_SOBJECT_TAG_CREATE);
+		$objectTable->addIntroButton('addtag', 'tag.php?op=mod', _AM_SOBJECT_TAG_CREATE);
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('tags');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('tags');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

admin/link.php

Indentation +47 added lines, -47 removed lines

@@ -21,81 +21,81 @@
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectLinkHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'view':
-        $linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+	case 'view':
+		$linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
+		$linkObj = $smartobjectLinkHandler->get($linkid);
 
-        if ($linkObj->isNew()) {
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
-        }
+		if ($linkObj->isNew()) {
+			redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
+		}
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+		//smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+		smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+		include_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        // ---
-        // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
-        //      $xoopsTpl = new XoopsTpl();
-        $xoopsTpl = new XoopsTpl();
-        //---
+		// ---
+		// 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
+		//      $xoopsTpl = new XoopsTpl();
+		$xoopsTpl = new XoopsTpl();
+		//---
 
-        $xoopsTpl->assign('link', $linkObj->toArray());
-        $xoopsTpl->display('db:smartobject_sentlink_display.tpl');
+		$xoopsTpl->assign('link', $linkObj->toArray());
+		$xoopsTpl->display('db:smartobject_sentlink_display.tpl');
 
-        echo '<br />';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
+		//smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+		smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectLinkHandler, null, array('delete'));
-        $objectTable->addColumn(new SmartObjectColumn('date'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new SmartObjectColumn('link'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectLinkHandler, null, array('delete'));
+		$objectTable->addColumn(new SmartObjectColumn('date'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+		$objectTable->addColumn(new SmartObjectColumn('link'));
 
-        $objectTable->addCustomAction('getViewItemLink');
+		$objectTable->addCustomAction('getViewItemLink');
 
-        $objectTable->setDefaultSort('date');
-        $objectTable->setDefaultOrder('DESC');
+		$objectTable->setDefaultSort('date');
+		$objectTable->setDefaultOrder('DESC');
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

Switch Indentation +45 added lines, -45 removed lines

@@ -29,73 +29,73 @@
 
 switch ($op) {
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+    	case 'del':
+        	include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new SmartObjectController($smartobjectLinkHandler);
+        	$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+        	break;
 
-    case 'view':
-        $linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+    	case 'view':
+        	$linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
+        	$linkObj = $smartobjectLinkHandler->get($linkid);
 
-        if ($linkObj->isNew()) {
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
-        }
+        	if ($linkObj->isNew()) {
+            	redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
+        	}
 
-        smart_xoops_cp_header();
+        	smart_xoops_cp_header();
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+        	//smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+        	smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+        	include_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        // ---
-        // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
-        //      $xoopsTpl = new XoopsTpl();
-        $xoopsTpl = new XoopsTpl();
-        //---
+        	// ---
+        	// 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
+        	//      $xoopsTpl = new XoopsTpl();
+        	$xoopsTpl = new XoopsTpl();
+        	//---
 
-        $xoopsTpl->assign('link', $linkObj->toArray());
-        $xoopsTpl->display('db:smartobject_sentlink_display.tpl');
+        	$xoopsTpl->assign('link', $linkObj->toArray());
+        	$xoopsTpl->display('db:smartobject_sentlink_display.tpl');
 
-        echo '<br />';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+        	echo '<br />';
+        	smart_close_collapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        smart_xoops_cp_header();
+        	smart_xoops_cp_header();
 
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+        	echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
+        	//smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+        	smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectLinkHandler, null, array('delete'));
-        $objectTable->addColumn(new SmartObjectColumn('date'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new SmartObjectColumn('link'));
+        	include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new SmartObjectTable($smartobjectLinkHandler, null, array('delete'));
+        	$objectTable->addColumn(new SmartObjectColumn('date'));
+        	$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+        	$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+        	$objectTable->addColumn(new SmartObjectColumn('link'));
 
-        $objectTable->addCustomAction('getViewItemLink');
+        	$objectTable->addCustomAction('getViewItemLink');
 
-        $objectTable->setDefaultSort('date');
-        $objectTable->setDefaultOrder('DESC');
+        	$objectTable->setDefaultSort('date');
+        	$objectTable->setDefaultOrder('DESC');
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+        	echo '<br />';
+        	smart_close_collapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //smart_modFooter();