mambax7 / smartobject

include/projax/projax.php

Indentation +10 added lines, -10 removed lines

@@ -14,16 +14,16 @@
  */
 
 if (!class_exists('Projax')) {
-    include __DIR__ . '/classes/JavaScript.php';
-    include __DIR__ . '/classes/Prototype.php';
-    include __DIR__ . '/classes/Scriptaculous.php';
+	include __DIR__ . '/classes/JavaScript.php';
+	include __DIR__ . '/classes/Prototype.php';
+	include __DIR__ . '/classes/Scriptaculous.php';
 
-    // For $projax = new Projax();
+	// For $projax = new Projax();
 
-    /**
-     * Class projax
-     */
-    class projax extends Scriptaculous
-    {
-    }
+	/**
+	 * Class projax
+	 */
+	class projax extends Scriptaculous
+	{
+	}
 }

include/captcha/captcha.php

Indentation +244 added lines, -244 removed lines

@@ -13,253 +13,253 @@
  */
 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 getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
-
-        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 getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
+
+		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/scripts/img.php

Indentation +412 added lines, -412 removed lines

@@ -10,7 +10,7 @@ 
 $xoopsLogger->activated = false;
 
 if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^' . preg_quote(XOOPS_URL, '/') . '/', $_SERVER['HTTP_REFERER'])) {
-    exit();
+	exit();
 }
 
 /**
@@ -18,192 +18,192 @@ 
  */
 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 (@ require_once XOOPS_ROOT_PATH."/Frameworks/art/functions.ini.php") {
          load_functions("cache");
          if ($items = mod_loadCacheFile("captcha_{$name}", "captcha")) {
@@ -211,231 +211,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 += 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 += 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 += 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 += 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 __DIR__ . '/../config.php';

include/captcha/formcaptcha.php

Indentation +52 added lines, -52 removed lines

@@ -38,60 +38,60 @@
  */
 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::getInstance();
-        $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::getInstance();
+		$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();
+		}
+	}
 }

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 static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
+	/**
+	 * @return XoopsCaptchaText
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
 
-        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/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 static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
+	/**
+	 * @return XoopsCaptchaImage
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
 
-        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/config.php

Indentation +27 added lines, -27 removed lines

@@ -12,40 +12,40 @@
  */
 
 $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 (!@require_once __DIR__ . "/language/{$language}.php") {
-    require_once __DIR__ . '/language/english.php';
+	require_once __DIR__ . '/language/english.php';
 }
 
 return $config;

include/functions.php

Indentation +710 added lines, -710 removed lines

@@ -11,9 +11,9 @@ 
 
 function smart_get_css_link($cssfile)
 {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
+	$ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -21,9 +21,9 @@ 
  */
 function smart_get_page_before_form()
 {
-    global $smart_previous_page;
+	global $smart_previous_page;
 
-    return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
+	return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
 }
 
 /**
@@ -34,29 +34,29 @@ 
  */
 function smart_userIsAdmin($module = false)
 {
-    global $xoopsUser;
-    static $smart_isAdmin;
-    if (!$module) {
-        global $xoopsModule;
-        $module = $xoopsModule->getVar('dirname');
-    }
-    if (isset($smart_isAdmin[$module])) {
-        return $smart_isAdmin[$module];
-    }
-    if (!$xoopsUser) {
-        $smart_isAdmin[$module] = false;
-
-        return $smart_isAdmin[$module];
-    }
-    $smart_isAdmin[$module] = false;
-    $smartModule            = smart_getModuleInfo($module);
-    if (!is_object($smartModule)) {
-        return false;
-    }
-    $module_id              = $smartModule->getVar('mid');
-    $smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
-
-    return $smart_isAdmin[$module];
+	global $xoopsUser;
+	static $smart_isAdmin;
+	if (!$module) {
+		global $xoopsModule;
+		$module = $xoopsModule->getVar('dirname');
+	}
+	if (isset($smart_isAdmin[$module])) {
+		return $smart_isAdmin[$module];
+	}
+	if (!$xoopsUser) {
+		$smart_isAdmin[$module] = false;
+
+		return $smart_isAdmin[$module];
+	}
+	$smart_isAdmin[$module] = false;
+	$smartModule            = smart_getModuleInfo($module);
+	if (!is_object($smartModule)) {
+		return false;
+	}
+	$module_id              = $smartModule->getVar('mid');
+	$smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
+
+	return $smart_isAdmin[$module];
 }
 
 /**
@@ -64,13 +64,13 @@ 
  */
 function smart_isXoops22()
 {
-    $xoops22 = false;
-    $xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
-    if (substr($xv, 2, 1) == '2') {
-        $xoops22 = true;
-    }
+	$xoops22 = false;
+	$xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
+	if (substr($xv, 2, 1) == '2') {
+		$xoops22 = true;
+	}
 
-    return $xoops22;
+	return $xoops22;
 }
 
 /**
@@ -81,36 +81,36 @@ 
  */
 function smart_getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false)
 {
-    if (!$moduleName) {
-        global $xoopsModule;
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (!isset($smartModule)) {
-        return '';
-    }
-
-    if ($forBreadCrumb
-        && (isset($smartModuleConfig['show_mod_name_breadcrumb'])
-            && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
-        return '';
-    }
-    if (!$withLink) {
-        return $smartModule->getVar('name');
-    } else {
-        $seoMode = smart_getModuleModeSEO($moduleName);
-        if ($seoMode === 'rewrite') {
-            $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
-        } elseif ($seoMode === 'pathinfo') {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
-        } else {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
-        }
-
-        return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
-    }
+	if (!$moduleName) {
+		global $xoopsModule;
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (!isset($smartModule)) {
+		return '';
+	}
+
+	if ($forBreadCrumb
+		&& (isset($smartModuleConfig['show_mod_name_breadcrumb'])
+			&& !$smartModuleConfig['show_mod_name_breadcrumb'])) {
+		return '';
+	}
+	if (!$withLink) {
+		return $smartModule->getVar('name');
+	} else {
+		$seoMode = smart_getModuleModeSEO($moduleName);
+		if ($seoMode === 'rewrite') {
+			$seoModuleName = smart_getModuleNameForSEO($moduleName);
+			$ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+		} elseif ($seoMode === 'pathinfo') {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+		} else {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+		}
+
+		return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+	}
 }
 
 /**
@@ -119,14 +119,14 @@ 
  */
 function smart_getModuleNameForSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (isset($smartModuleConfig['seo_module_name'])) {
-        return $smartModuleConfig['seo_module_name'];
-    }
-    $ret = smart_getModuleName(false, false, $moduleName);
-
-    return strtolower($ret);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (isset($smartModuleConfig['seo_module_name'])) {
+		return $smartModuleConfig['seo_module_name'];
+	}
+	$ret = smart_getModuleName(false, false, $moduleName);
+
+	return strtolower($ret);
 }
 
 /**
@@ -135,10 +135,10 @@ 
  */
 function smart_getModuleModeSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
+	return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
 }
 
 /**
@@ -147,10 +147,10 @@ 
  */
 function smart_getModuleIncludeIdSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return !empty($smartModuleConfig['seo_inc_id']);
+	return !empty($smartModuleConfig['seo_inc_id']);
 }
 
 /**
@@ -159,25 +159,25 @@ 
  */
 function smart_getenv($key)
 {
-    $ret = '';
-    $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
+	$ret = '';
+	$ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
 
-    return $ret;
+	return $ret;
 }
 
 function smart_xoops_cp_header()
 {
-    xoops_cp_header();
-    global $xoopsModule, $xoopsConfig;
-    /**
-     * include SmartObject admin language file
-     */
-    $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    if (file_exists($fileName)) {
-        require_once $fileName;
-    } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    } ?>
+	xoops_cp_header();
+	global $xoopsModule, $xoopsConfig;
+	/**
+	 * include SmartObject admin language file
+	 */
+	$fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	if (file_exists($fileName)) {
+		require_once $fileName;
+	} else {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	} ?>
     <script type='text/javascript'>
         <!--
         var smart_url = '<?php echo SMARTOBJECT_URL ?>';
@@ -190,14 +190,14 @@ 
             src='<?php echo SMARTOBJECT_URL ?>include/smart.js'></script>
     <?php
 
-    /**
-     * Include the admin language constants for the SmartObject Framework
-     */
-    $admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
-    if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
-    }
-    require_once $admin_file;
+	/**
+	 * Include the admin language constants for the SmartObject Framework
+	 */
+	$admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
+	if (!file_exists($admin_file)) {
+		$admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
+	}
+	require_once $admin_file;
 }
 
 /**
@@ -211,21 +211,21 @@ 
  */
 function smart_TableExists($table)
 {
-    $bRetVal = false;
-    //Verifies that a MySQL table exists
-    $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
-    $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
-    $ret      = $xoopsDB->queryF($sql);
-    while (list($m_table) = $xoopsDB->fetchRow($ret)) {
-        if ($m_table == $realname) {
-            $bRetVal = true;
-            break;
-        }
-    }
-    $xoopsDB->freeRecordSet($ret);
-
-    return $bRetVal;
+	$bRetVal = false;
+	//Verifies that a MySQL table exists
+	$xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
+	$realname = $xoopsDB->prefix($table);
+	$sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+	$ret      = $xoopsDB->queryF($sql);
+	while (list($m_table) = $xoopsDB->fetchRow($ret)) {
+		if ($m_table == $realname) {
+			$bRetVal = true;
+			break;
+		}
+	}
+	$xoopsDB->freeRecordSet($ret);
+
+	return $bRetVal;
 }
 
 /**
@@ -240,19 +240,19 @@ 
  */
 function smart_GetMeta($key, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
-    $ret     = $xoopsDB->query($sql);
-    if (!$ret) {
-        $value = false;
-    } else {
-        list($value) = $xoopsDB->fetchRow($ret);
-    }
-
-    return $value;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+	$ret     = $xoopsDB->query($sql);
+	if (!$ret) {
+		$value = false;
+	} else {
+		list($value) = $xoopsDB->fetchRow($ret);
+	}
+
+	return $value;
 }
 
 /**
@@ -260,12 +260,12 @@ 
  */
 function smart_getCurrentModuleName()
 {
-    global $xoopsModule;
-    if (is_object($xoopsModule)) {
-        return $xoopsModule->getVar('dirname');
-    } else {
-        return false;
-    }
+	global $xoopsModule;
+	if (is_object($xoopsModule)) {
+		return $xoopsModule->getVar('dirname');
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -281,22 +281,22 @@ 
  */
 function smart_SetMeta($key, $value, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $ret     = smart_GetMeta($key, $moduleName);
-    if ($ret === '0' || $ret > 0) {
-        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
-    } else {
-        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
-    }
-    $ret = $xoopsDB->queryF($sql);
-    if (!$ret) {
-        return false;
-    }
-
-    return true;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$ret     = smart_GetMeta($key, $moduleName);
+	if ($ret === '0' || $ret > 0) {
+		$sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+	} else {
+		$sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+	}
+	$ret = $xoopsDB->queryF($sql);
+	if (!$ret) {
+		return false;
+	}
+
+	return true;
 }
 
 // Thanks to Mithrandir:-)
@@ -309,20 +309,20 @@ 
  */
 function smart_substr($str, $start, $length, $trimmarker = '...')
 {
-    // if the string is empty, let's get out ;-)
-    if ($str === '') {
-        return $str;
-    }
-    // reverse a string that is shortened with '' as trimmarker
-    $reversed_string = strrev(xoops_substr($str, $start, $length, ''));
-    // find first space in reversed string
-    $position_of_space = strpos($reversed_string, ' ', 0);
-    // truncate the original string to a length of $length
-    // minus the position of the last space
-    // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
-
-    return $truncated_string;
+	// if the string is empty, let's get out ;-)
+	if ($str === '') {
+		return $str;
+	}
+	// reverse a string that is shortened with '' as trimmarker
+	$reversed_string = strrev(xoops_substr($str, $start, $length, ''));
+	// find first space in reversed string
+	$position_of_space = strpos($reversed_string, ' ', 0);
+	// truncate the original string to a length of $length
+	// minus the position of the last space
+	// plus the length of the $trimmarker
+	$truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
+
+	return $truncated_string;
 }
 
 /**
@@ -333,19 +333,19 @@ 
  */
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined')
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $configs = smart_getModuleConfig($moduleName);
-    if (isset($configs[$key])) {
-        return $configs[$key];
-    } else {
-        if ($default === 'default_is_undefined') {
-            return null;
-        } else {
-            return $default;
-        }
-    }
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$configs = smart_getModuleConfig($moduleName);
+	if (isset($configs[$key])) {
+		return $configs[$key];
+	} else {
+		if ($default === 'default_is_undefined') {
+			return null;
+		} else {
+			return $default;
+		}
+	}
 }
 
 /**
@@ -358,32 +358,32 @@ 
  */
 function smart_copyr($source, $dest)
 {
-    // Simple copy for a file
-    if (is_file($source)) {
-        return copy($source, $dest);
-    }
-    // Make destination directory
-    if (!is_dir($dest)) {
-        mkdir($dest);
-    }
-    // Loop through the folder
-    $dir = dir($source);
-    while (false !== $entry = $dir->read()) {
-        // Skip pointers
-        if ($entry === '.' || $entry === '..') {
-            continue;
-        }
-        // Deep copy directories
-        if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
-            copyr("$source/$entry", "$dest/$entry");
-        } else {
-            copy("$source/$entry", "$dest/$entry");
-        }
-    }
-    // Clean up
-    $dir->close();
-
-    return true;
+	// Simple copy for a file
+	if (is_file($source)) {
+		return copy($source, $dest);
+	}
+	// Make destination directory
+	if (!is_dir($dest)) {
+		mkdir($dest);
+	}
+	// Loop through the folder
+	$dir = dir($source);
+	while (false !== $entry = $dir->read()) {
+		// Skip pointers
+		if ($entry === '.' || $entry === '..') {
+			continue;
+		}
+		// Deep copy directories
+		if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
+			copyr("$source/$entry", "$dest/$entry");
+		} else {
+			copy("$source/$entry", "$dest/$entry");
+		}
+	}
+	// Clean up
+	$dir->close();
+
+	return true;
 }
 
 /**
@@ -393,26 +393,26 @@ 
  */
 function smart_admin_mkdir($target)
 {
-    // http://www.php.net/manual/en/function.mkdir.php
-    // saint at corenova.com
-    // bart at cdasites dot com
-    if (is_dir($target) || empty($target)) {
-        return true; // best case check first
-    }
-    if (file_exists($target) && !is_dir($target)) {
-        return false;
-    }
-    if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
-        if (!file_exists($target)) {
-            $res = mkdir($target, 0777); // crawl back up & create dir tree
-            smart_admin_chmod($target);
-
-            return $res;
-        }
-    }
-    $res = is_dir($target);
-
-    return $res;
+	// http://www.php.net/manual/en/function.mkdir.php
+	// saint at corenova.com
+	// bart at cdasites dot com
+	if (is_dir($target) || empty($target)) {
+		return true; // best case check first
+	}
+	if (file_exists($target) && !is_dir($target)) {
+		return false;
+	}
+	if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
+		if (!file_exists($target)) {
+			$res = mkdir($target, 0777); // crawl back up & create dir tree
+			smart_admin_chmod($target);
+
+			return $res;
+		}
+	}
+	$res = is_dir($target);
+
+	return $res;
 }
 
 /**
@@ -423,7 +423,7 @@ 
  */
 function smart_admin_chmod($target, $mode = 0777)
 {
-    return @ chmod($target, $mode);
+	return @ chmod($target, $mode);
 }
 
 /**
@@ -434,31 +434,31 @@ 
  */
 function smart_imageResize($src, $maxWidth, $maxHeight)
 {
-    $width  = '';
-    $height = '';
-    $type   = '';
-    $attr   = '';
-    if (file_exists($src)) {
-        list($width, $height, $type, $attr) = getimagesize($src);
-        if ($width > $maxWidth) {
-            $originalWidth = $width;
-            $width         = $maxWidth;
-            $height        = $width * $height / $originalWidth;
-        }
-        if ($height > $maxHeight) {
-            $originalHeight = $height;
-            $height         = $maxHeight;
-            $width          = $height * $width / $originalHeight;
-        }
-        $attr = " width='$width' height='$height'";
-    }
-
-    return array(
-        $width,
-        $height,
-        $type,
-        $attr
-    );
+	$width  = '';
+	$height = '';
+	$type   = '';
+	$attr   = '';
+	if (file_exists($src)) {
+		list($width, $height, $type, $attr) = getimagesize($src);
+		if ($width > $maxWidth) {
+			$originalWidth = $width;
+			$width         = $maxWidth;
+			$height        = $width * $height / $originalWidth;
+		}
+		if ($height > $maxHeight) {
+			$originalHeight = $height;
+			$height         = $maxHeight;
+			$width          = $height * $width / $originalHeight;
+		}
+		$attr = " width='$width' height='$height'";
+	}
+
+	return array(
+		$width,
+		$height,
+		$type,
+		$attr
+	);
 }
 
 /**
@@ -467,34 +467,34 @@ 
  */
 function smart_getModuleInfo($moduleName = false)
 {
-    static $smartModules;
-    if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
-
-            return $smartModules[$xoopsModule->getVar('dirname')];
-        }
-    }
-    if (!isset($smartModules[$moduleName])) {
-        if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-            $smartModules[$moduleName] = $xoopsModule;
-        } else {
-            $hModule = xoops_getHandler('module');
-            if ($moduleName !== 'xoops') {
-                $smartModules[$moduleName] = $hModule->getByDirname($moduleName);
-            } else {
-                $smartModules[$moduleName] = $hModule->getByDirname('system');
-            }
-        }
-    }
-
-    return $smartModules[$moduleName];
+	static $smartModules;
+	if (isset($smartModules[$moduleName])) {
+		$ret =& $smartModules[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
+
+			return $smartModules[$xoopsModule->getVar('dirname')];
+		}
+	}
+	if (!isset($smartModules[$moduleName])) {
+		if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+			$smartModules[$moduleName] = $xoopsModule;
+		} else {
+			$hModule = xoops_getHandler('module');
+			if ($moduleName !== 'xoops') {
+				$smartModules[$moduleName] = $hModule->getByDirname($moduleName);
+			} else {
+				$smartModules[$moduleName] = $hModule->getByDirname('system');
+			}
+		}
+	}
+
+	return $smartModules[$moduleName];
 }
 
 /**
@@ -503,40 +503,40 @@ 
  */
 function smart_getModuleConfig($moduleName = false)
 {
-    static $smartConfigs;
-    if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule, $xoopsModuleConfig;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
-
-            return $smartConfigs[$xoopsModule->getVar('dirname')];
-        }
-    }
-    // if we still did not found the xoopsModule, this is because there is none
-    if (!$moduleName) {
-        $ret = false;
-
-        return $ret;
-    }
-    if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-        $smartConfigs[$moduleName] = $xoopsModuleConfig;
-    } else {
-        $module = smart_getModuleInfo($moduleName);
-        if (!is_object($module)) {
-            $ret = false;
-
-            return $ret;
-        }
-        $hModConfig                = xoops_getHandler('config');
-        $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
-    }
-
-    return $smartConfigs[$moduleName];
+	static $smartConfigs;
+	if (isset($smartConfigs[$moduleName])) {
+		$ret =& $smartConfigs[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule, $xoopsModuleConfig;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
+
+			return $smartConfigs[$xoopsModule->getVar('dirname')];
+		}
+	}
+	// if we still did not found the xoopsModule, this is because there is none
+	if (!$moduleName) {
+		$ret = false;
+
+		return $ret;
+	}
+	if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+		$smartConfigs[$moduleName] = $xoopsModuleConfig;
+	} else {
+		$module = smart_getModuleInfo($moduleName);
+		if (!is_object($module)) {
+			$ret = false;
+
+			return $ret;
+		}
+		$hModConfig                = xoops_getHandler('config');
+		$smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+	}
+
+	return $smartConfigs[$moduleName];
 }
 
 /**
@@ -545,10 +545,10 @@ 
  */
 function smart_deleteFile($dirname)
 {
-    // Simple delete for a file
-    if (is_file($dirname)) {
-        return unlink($dirname);
-    }
+	// Simple delete for a file
+	if (is_file($dirname)) {
+		return unlink($dirname);
+	}
 }
 
 /**
@@ -557,12 +557,12 @@ 
  */
 function smart_formatErrors($errors = array())
 {
-    $ret = '';
-    foreach ($errors as $key => $value) {
-        $ret .= '<br> - ' . $value;
-    }
+	$ret = '';
+	foreach ($errors as $key => $value) {
+		$ret .= '<br> - ' . $value;
+	}
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -576,46 +576,46 @@ 
  */
 function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array(), $withContact = false)
 {
-    if (!is_numeric($userid)) {
-        return $userid;
-    }
-    $userid = (int)$userid;
-    if ($userid > 0) {
-        if ($users == array()) {
-            //fetching users
-            $memberHandler = xoops_getHandler('member');
-            $user          =& $memberHandler->getUser($userid);
-        } else {
-            if (!isset($users[$userid])) {
-                return $GLOBALS['xoopsConfig']['anonymous'];
-            }
-            $user =& $users[$userid];
-        }
-        if (is_object($user)) {
-            $ts        = MyTextSanitizer:: getInstance();
-            $username  = $user->getVar('uname');
-            $fullname  = '';
-            $fullname2 = $user->getVar('name');
-            if ($name && !empty($fullname2)) {
-                $fullname = $user->getVar('name');
-            }
-            if (!empty($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
-            } else {
-                $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
-            }
-            // add contact info: email + PM
-            if ($withContact) {
-                $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
-                $js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
-            }
-
-            return $linkeduser;
-        }
-    }
-
-    return $GLOBALS['xoopsConfig']['anonymous'];
+	if (!is_numeric($userid)) {
+		return $userid;
+	}
+	$userid = (int)$userid;
+	if ($userid > 0) {
+		if ($users == array()) {
+			//fetching users
+			$memberHandler = xoops_getHandler('member');
+			$user          =& $memberHandler->getUser($userid);
+		} else {
+			if (!isset($users[$userid])) {
+				return $GLOBALS['xoopsConfig']['anonymous'];
+			}
+			$user =& $users[$userid];
+		}
+		if (is_object($user)) {
+			$ts        = MyTextSanitizer:: getInstance();
+			$username  = $user->getVar('uname');
+			$fullname  = '';
+			$fullname2 = $user->getVar('name');
+			if ($name && !empty($fullname2)) {
+				$fullname = $user->getVar('name');
+			}
+			if (!empty($fullname)) {
+				$linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+			} else {
+				$linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+			}
+			// add contact info: email + PM
+			if ($withContact) {
+				$linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
+				$js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
+				$linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
+			}
+
+			return $linkeduser;
+		}
+	}
+
+	return $GLOBALS['xoopsConfig']['anonymous'];
 }
 
 /**
@@ -626,33 +626,33 @@ 
  */
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
 {
-    global $xoopsModule, $xoopsConfig;
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
-    } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
-    }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    } else {
-        require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    $headermenu  = array();
-    $adminObject = array();
-    include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
-    $tpl = new XoopsTpl();
-    $tpl->assign(array(
-                     'headermenu'      => $headermenu,
-                     'adminmenu'       => $adminObject,
-                     'current'         => $currentoption,
-                     'breadcrumb'      => $breadcrumb,
-                     'headermenucount' => count($headermenu),
-                     'submenus'        => $submenus,
-                     'currentsub'      => $currentsub,
-                     'submenuscount'   => count($submenus)
-                 ));
-    $tpl->display('db:smartobject_admin_menu.tpl');
+	global $xoopsModule, $xoopsConfig;
+	require_once XOOPS_ROOT_PATH . '/class/template.php';
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+	} else {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+	}
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	} else {
+		require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	$headermenu  = array();
+	$adminObject = array();
+	include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+	$tpl = new XoopsTpl();
+	$tpl->assign(array(
+					 'headermenu'      => $headermenu,
+					 'adminmenu'       => $adminObject,
+					 'current'         => $currentoption,
+					 'breadcrumb'      => $breadcrumb,
+					 'headermenucount' => count($headermenu),
+					 'submenus'        => $submenus,
+					 'currentsub'      => $currentsub,
+					 'submenuscount'   => count($submenus)
+				 ));
+	$tpl->display('db:smartobject_admin_menu.tpl');
 }
 
 /**
@@ -662,13 +662,13 @@ 
  */
 function smart_collapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ($dsc !== '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ($dsc !== '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -678,15 +678,15 @@ 
  */
 function smart_ajaxCollapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    $onClick = "ajaxtogglecollapse('$id')";
-    //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ($dsc !== '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	$onClick = "ajaxtogglecollapse('$id')";
+	//$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
+	echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ($dsc !== '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -713,20 +713,20 @@ 
  */
 function smart_openclose_collapsable($name)
 {
-    $urls        = smart_getCurrentUrls();
-    $path        = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
-    $cookie_name = str_replace('.', '_', $cookie_name);
-    $cookie      = smart_getCookieVar($cookie_name, '');
-    if ($cookie === 'none') {
-        echo '
+	$urls        = smart_getCurrentUrls();
+	$path        = $urls['phpself'];
+	$cookie_name = $path . '_smart_collaps_' . $name;
+	$cookie_name = str_replace('.', '_', $cookie_name);
+	$cookie      = smart_getCookieVar($cookie_name, '');
+	if ($cookie === 'none') {
+		echo '
                 <script type="text/javascript"><!--
                 togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
                     //-->
                 </script>
                 ';
-    }
-    /*  if ($cookie == 'none') {
+	}
+	/*  if ($cookie == 'none') {
      echo '
      <script type="text/javascript"><!--
      hideElement("' . $name . '");
@@ -742,9 +742,9 @@ 
  */
 function smart_close_collapsable($name)
 {
-    echo '</div>';
-    smart_openclose_collapsable($name);
-    echo '<br>';
+	echo '</div>';
+	smart_openclose_collapsable($name);
+	echo '<br>';
 }
 
 /**
@@ -754,11 +754,11 @@ 
  */
 function smart_setCookieVar($name, $value, $time = 0)
 {
-    if ($time == 0) {
-        $time = time() + 3600 * 24 * 365;
-        //$time = '';
-    }
-    setcookie($name, $value, $time, '/');
+	if ($time == 0) {
+		$time = time() + 3600 * 24 * 365;
+		//$time = '';
+	}
+	setcookie($name, $value, $time, '/');
 }
 
 /**
@@ -768,12 +768,12 @@ 
  */
 function smart_getCookieVar($name, $default = '')
 {
-    $name = str_replace('.', '_', $name);
-    if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
-        return $_COOKIE[$name];
-    } else {
-        return $default;
-    }
+	$name = str_replace('.', '_', $name);
+	if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
+		return $_COOKIE[$name];
+	} else {
+		return $default;
+	}
 }
 
 /**
@@ -781,25 +781,25 @@ 
  */
 function smart_getCurrentUrls()
 {
-    $urls        = array();
-    $http        = (strpos(XOOPS_URL, 'https://') === false) ? 'http://' : 'https://';
-    $phpself     = $_SERVER['PHP_SELF'];
-    $httphost    = $_SERVER['HTTP_HOST'];
-    $querystring = $_SERVER['QUERY_STRING'];
-    if ($querystring !== '') {
-        $querystring = '?' . $querystring;
-    }
-    $currenturl           = $http . $httphost . $phpself . $querystring;
-    $urls                 = array();
-    $urls['http']         = $http;
-    $urls['httphost']     = $httphost;
-    $urls['phpself']      = $phpself;
-    $urls['querystring']  = $querystring;
-    $urls['full_phpself'] = $http . $httphost . $phpself;
-    $urls['full']         = $currenturl;
-    $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
-
-    return $urls;
+	$urls        = array();
+	$http        = (strpos(XOOPS_URL, 'https://') === false) ? 'http://' : 'https://';
+	$phpself     = $_SERVER['PHP_SELF'];
+	$httphost    = $_SERVER['HTTP_HOST'];
+	$querystring = $_SERVER['QUERY_STRING'];
+	if ($querystring !== '') {
+		$querystring = '?' . $querystring;
+	}
+	$currenturl           = $http . $httphost . $phpself . $querystring;
+	$urls                 = array();
+	$urls['http']         = $http;
+	$urls['httphost']     = $httphost;
+	$urls['phpself']      = $phpself;
+	$urls['querystring']  = $querystring;
+	$urls['full_phpself'] = $http . $httphost . $phpself;
+	$urls['full']         = $currenturl;
+	$urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+
+	return $urls;
 }
 
 /**
@@ -807,9 +807,9 @@ 
  */
 function smart_getCurrentPage()
 {
-    $urls = smart_getCurrentUrls();
+	$urls = smart_getCurrentUrls();
 
-    return $urls['full'];
+	return $urls['full'];
 }
 
 /**
@@ -872,29 +872,29 @@ 
  */
 function smart_modFooter()
 {
-    global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
-
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    $tpl = new XoopsTpl();
-
-    $hModule      = xoops_getHandler('module');
-    $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-    $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-    $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
-    $tpl->assign('modfooter', $modfooter);
-
-    if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
-        define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br>Do you need new features not yet available?');
-    }
-    $smartobjectConfig = smart_getModuleConfig('smartobject');
-    $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
+	global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+
+	require_once XOOPS_ROOT_PATH . '/class/template.php';
+	$tpl = new XoopsTpl();
+
+	$hModule      = xoops_getHandler('module');
+	$versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
+	$modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
+	$modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+	$tpl->assign('modfooter', $modfooter);
+
+	if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
+		define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br>Do you need new features not yet available?');
+	}
+	$smartobjectConfig = smart_getModuleConfig('smartobject');
+	$tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
+	$tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
 }
 
 function smart_xoops_cp_footer()
 {
-    smart_modFooter();
-    xoops_cp_footer();
+	smart_modFooter();
+	xoops_cp_footer();
 }
 
 /**
@@ -903,11 +903,11 @@ 
  */
 function smart_sanitizeForCommonTags($text)
 {
-    global $xoopsConfig;
-    $text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
-    $text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
+	global $xoopsConfig;
+	$text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
+	$text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -915,7 +915,7 @@ 
  */
 function smart_addScript($src)
 {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+	echo '<script src="' . $src . '" type="text/javascript"></script>';
 }
 
 /**
@@ -923,17 +923,17 @@ 
  */
 function smart_addStyle($src)
 {
-    if ($src === 'smartobject') {
-        $src = SMARTOBJECT_URL . 'assets/css/module.css';
-    }
-    echo smart_get_css_link($src);
+	if ($src === 'smartobject') {
+		$src = SMARTOBJECT_URL . 'assets/css/module.css';
+	}
+	echo smart_get_css_link($src);
 }
 
 function smart_addAdminAjaxSupport()
 {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
 }
 
 /**
@@ -942,11 +942,11 @@ 
  */
 function smart_sanitizeForSmartpopupLink($text)
 {
-    $patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
-    $replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
-    $ret            = preg_replace($patterns, $replacements, $text);
+	$patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
+	$replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
+	$ret            = preg_replace($patterns, $replacements, $text);
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -961,25 +961,25 @@ 
  */
 function smart_getImageSize($url, & $width, & $height)
 {
-    if (empty($width) || empty($height)) {
-        if (!$dimension = @ getimagesize($url)) {
-            return false;
-        }
-        if (!empty($width)) {
-            $height = $dimension[1] * $width / $dimension[0];
-        } elseif (!empty($height)) {
-            $width = $dimension[0] * $height / $dimension[1];
-        } else {
-            list($width, $height) = array(
-                $dimension[0],
-                $dimension[1]
-            );
-        }
-
-        return true;
-    } else {
-        return true;
-    }
+	if (empty($width) || empty($height)) {
+		if (!$dimension = @ getimagesize($url)) {
+			return false;
+		}
+		if (!empty($width)) {
+			$height = $dimension[1] * $width / $dimension[0];
+		} elseif (!empty($height)) {
+			$width = $dimension[0] * $height / $dimension[1];
+		} else {
+			list($width, $height) = array(
+				$dimension[0],
+				$dimension[1]
+			);
+		}
+
+		return true;
+	} else {
+		return true;
+	}
 }
 
 /**
@@ -992,10 +992,10 @@ 
  */
 function smart_htmlnumericentities($str)
 {
-    //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
-        return '&#' . ord($m[0]) . chr(59);
-    }, $str);
+	//    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
+	return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
+		return '&#' . ord($m[0]) . chr(59);
+	}, $str);
 }
 
 /**
@@ -1005,24 +1005,24 @@ 
  */
 function smart_getcorehandler($name, $optional = false)
 {
-    static $handlers;
-    $name = strtolower(trim($name));
-    if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
-            require_once $hnd_file;
-        }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
-        if (class_exists($class)) {
-            $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
-        }
-    }
-    if (!isset($handlers[$name]) && !$optional) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
-    }
-    if (isset($handlers[$name])) {
-        return $handlers[$name];
-    }
-    $inst = false;
+	static $handlers;
+	$name = strtolower(trim($name));
+	if (!isset($handlers[$name])) {
+		if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+			require_once $hnd_file;
+		}
+		$class = 'Xoops' . ucfirst($name) . 'Handler';
+		if (class_exists($class)) {
+			$handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
+		}
+	}
+	if (!isset($handlers[$name]) && !$optional) {
+		trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+	}
+	if (isset($handlers[$name])) {
+		return $handlers[$name];
+	}
+	$inst = false;
 }
 
 /**
@@ -1031,15 +1031,15 @@ 
  */
 function smart_sanitizeAdsenses_callback($matches)
 {
-    global $smartobjectAdsenseHandler;
-    if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
-        $adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
-        $ret        = $adsenseObj->render();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectAdsenseHandler;
+	if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
+		$adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
+		$ret        = $adsenseObj->render();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1048,13 +1048,13 @@ 
  */
 function smart_sanitizeAdsenses($text)
 {
-    $patterns     = array();
-    $replacements = array();
+	$patterns     = array();
+	$replacements = array();
 
-    $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
+	$patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1063,15 +1063,15 @@ 
  */
 function smart_sanitizeCustomtags_callback($matches)
 {
-    global $smartobjectCustomtagHandler;
-    if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
-        $customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
-        $ret       = $customObj->renderWithPhp();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectCustomtagHandler;
+	if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
+		$customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
+		$ret       = $customObj->renderWithPhp();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1080,13 +1080,13 @@ 
  */
 function smart_sanitizeCustomtags($text)
 {
-    $patterns     = array();
-    $replacements = array();
+	$patterns     = array();
+	$replacements = array();
 
-    $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
+	$patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1095,20 +1095,20 @@ 
  */
 function smart_loadLanguageFile($module, $file)
 {
-    global $xoopsConfig;
-
-    $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
-    if (!file_exists($filename)) {
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
-    }
-    if (file_exists($filename)) {
-        require_once $filename;
-    }
+	global $xoopsConfig;
+
+	$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+	if (!file_exists($filename)) {
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+	}
+	if (file_exists($filename)) {
+		require_once $filename;
+	}
 }
 
 function smart_loadCommonLanguageFile()
 {
-    smart_loadLanguageFile('smartobject', 'common');
+	smart_loadLanguageFile('smartobject', 'common');
 }
 
 /**
@@ -1118,35 +1118,35 @@ 
  */
 function smart_purifyText($text, $keyword = false)
 {
-    global $myts;
-    $text = str_replace('&nbsp;', ' ', $text);
-    $text = str_replace('<br>', ' ', $text);
-    $text = str_replace('<br>', ' ', $text);
-    $text = str_replace('<br', ' ', $text);
-    $text = strip_tags($text);
-    $text = html_entity_decode($text);
-    $text = $myts->undoHtmlSpecialChars($text);
-    $text = str_replace(')', ' ', $text);
-    $text = str_replace('(', ' ', $text);
-    $text = str_replace(':', ' ', $text);
-    $text = str_replace('&euro', ' euro ', $text);
-    $text = str_replace('&hellip', '...', $text);
-    $text = str_replace('&rsquo', ' ', $text);
-    $text = str_replace('!', ' ', $text);
-    $text = str_replace('?', ' ', $text);
-    $text = str_replace('"', ' ', $text);
-    $text = str_replace('-', ' ', $text);
-    $text = str_replace('\n', ' ', $text);
-    $text = str_replace('&#8213;', ' ', $text);
-
-    if ($keyword) {
-        $text = str_replace('.', ' ', $text);
-        $text = str_replace(',', ' ', $text);
-        $text = str_replace('\'', ' ', $text);
-    }
-    $text = str_replace(';', ' ', $text);
-
-    return $text;
+	global $myts;
+	$text = str_replace('&nbsp;', ' ', $text);
+	$text = str_replace('<br>', ' ', $text);
+	$text = str_replace('<br>', ' ', $text);
+	$text = str_replace('<br', ' ', $text);
+	$text = strip_tags($text);
+	$text = html_entity_decode($text);
+	$text = $myts->undoHtmlSpecialChars($text);
+	$text = str_replace(')', ' ', $text);
+	$text = str_replace('(', ' ', $text);
+	$text = str_replace(':', ' ', $text);
+	$text = str_replace('&euro', ' euro ', $text);
+	$text = str_replace('&hellip', '...', $text);
+	$text = str_replace('&rsquo', ' ', $text);
+	$text = str_replace('!', ' ', $text);
+	$text = str_replace('?', ' ', $text);
+	$text = str_replace('"', ' ', $text);
+	$text = str_replace('-', ' ', $text);
+	$text = str_replace('\n', ' ', $text);
+	$text = str_replace('&#8213;', ' ', $text);
+
+	if ($keyword) {
+		$text = str_replace('.', ' ', $text);
+		$text = str_replace(',', ' ', $text);
+		$text = str_replace('\'', ' ', $text);
+	}
+	$text = str_replace(';', ' ', $text);
+
+	return $text;
 }
 
 /**
@@ -1155,51 +1155,51 @@ 
  */
 function smart_html2text($document)
 {
-    // PHP Manual:: function preg_replace
-    // $document should contain an HTML document.
-    // This will remove HTML tags, javascript sections
-    // and white space. It will also convert some
-    // common HTML entities to their text equivalent.
-    // Credits: newbb2
-    $search = array(
-        "'<script[^>]*?>.*?</script>'si", // Strip out javascript
-        "'<img.*?>'si", // Strip out img tags
-        "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
-        "'([\r\n])[\s]+'", // Strip out white space
-        "'&(quot|#34);'i", // Replace HTML entities
-        "'&(amp|#38);'i",
-        "'&(lt|#60);'i",
-        "'&(gt|#62);'i",
-        "'&(nbsp|#160);'i",
-        "'&(iexcl|#161);'i",
-        "'&(cent|#162);'i",
-        "'&(pound|#163);'i",
-        "'&(copy|#169);'i"
-    ); // evaluate as php
-
-    $replace = array(
-        '',
-        '',
-        '',
-        "\\1",
-        "\"",
-        '&',
-        '<',
-        '>',
-        ' ',
-        chr(161),
-        chr(162),
-        chr(163),
-        chr(169),
-    );
-
-    $text = preg_replace($search, $replace, $document);
-
-    preg_replace_callback('/&#(\d+);/', function ($matches) {
-        return chr($matches[1]);
-    }, $document);
-
-    return $text;
+	// PHP Manual:: function preg_replace
+	// $document should contain an HTML document.
+	// This will remove HTML tags, javascript sections
+	// and white space. It will also convert some
+	// common HTML entities to their text equivalent.
+	// Credits: newbb2
+	$search = array(
+		"'<script[^>]*?>.*?</script>'si", // Strip out javascript
+		"'<img.*?>'si", // Strip out img tags
+		"'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+		"'([\r\n])[\s]+'", // Strip out white space
+		"'&(quot|#34);'i", // Replace HTML entities
+		"'&(amp|#38);'i",
+		"'&(lt|#60);'i",
+		"'&(gt|#62);'i",
+		"'&(nbsp|#160);'i",
+		"'&(iexcl|#161);'i",
+		"'&(cent|#162);'i",
+		"'&(pound|#163);'i",
+		"'&(copy|#169);'i"
+	); // evaluate as php
+
+	$replace = array(
+		'',
+		'',
+		'',
+		"\\1",
+		"\"",
+		'&',
+		'<',
+		'>',
+		' ',
+		chr(161),
+		chr(162),
+		chr(163),
+		chr(169),
+	);
+
+	$text = preg_replace($search, $replace, $document);
+
+	preg_replace_callback('/&#(\d+);/', function ($matches) {
+		return chr($matches[1]);
+	}, $document);
+
+	return $text;
 }
 
 /**
@@ -1213,32 +1213,32 @@ 
  */
 function smart_getfloat($str, $set = false)
 {
-    if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
-        // Found number in $str, so set $str that number
-        $str = $match[0];
-        if (false !== strpos($str, ',')) {
-            // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
-
-            return (float)$str;
-        } else {
-            // No comma exists, so we have to decide, how a single dot shall be treated
-            if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) === true && $set['single_dot_as_decimal'] === true) {
-                // Treat single dot as decimal separator
-                return (float)$str;
-            } else {
-                //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
-                // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-
-                return (float)$str;
-            }
-        }
-    } else {
-        // No number found, return zero
-        return 0;
-    }
+	if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
+		// Found number in $str, so set $str that number
+		$str = $match[0];
+		if (false !== strpos($str, ',')) {
+			// A comma exists, that makes it easy, cos we assume it separates the decimal part.
+			$str = str_replace('.', '', $str);    // Erase thousand seps
+			$str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+
+			return (float)$str;
+		} else {
+			// No comma exists, so we have to decide, how a single dot shall be treated
+			if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) === true && $set['single_dot_as_decimal'] === true) {
+				// Treat single dot as decimal separator
+				return (float)$str;
+			} else {
+				//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
+				// Else, treat all dots as thousand seps
+				$str = str_replace('.', '', $str);    // Erase thousand seps
+
+				return (float)$str;
+			}
+		}
+	} else {
+		// No number found, return zero
+		return 0;
+	}
 }
 
 /**
@@ -1248,26 +1248,26 @@ 
  */
 function smart_currency($var, $currencyObj = false)
 {
-    $ret = smart_getfloat($var, array('single_dot_as_decimal' => true));
-    $ret = round($ret, 2);
-    // make sur we have at least .00 in the $var
-    $decimal_section_original = strstr($ret, '.');
-    $decimal_section          = $decimal_section_original;
-    if ($decimal_section) {
-        if (strlen($decimal_section) == 1) {
-            $decimal_section = '.00';
-        } elseif (strlen($decimal_section) == 2) {
-            $decimal_section .= '0';
-        }
-        $ret = str_replace($decimal_section_original, $decimal_section, $ret);
-    } else {
-        $ret .= '.00';
-    }
-    if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
-    }
-
-    return $ret;
+	$ret = smart_getfloat($var, array('single_dot_as_decimal' => true));
+	$ret = round($ret, 2);
+	// make sur we have at least .00 in the $var
+	$decimal_section_original = strstr($ret, '.');
+	$decimal_section          = $decimal_section_original;
+	if ($decimal_section) {
+		if (strlen($decimal_section) == 1) {
+			$decimal_section = '.00';
+		} elseif (strlen($decimal_section) == 2) {
+			$decimal_section .= '0';
+		}
+		$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+	} else {
+		$ret .= '.00';
+	}
+	if ($currencyObj) {
+		$ret = $ret . ' ' . $currencyObj->getCode();
+	}
+
+	return $ret;
 }
 
 /**
@@ -1276,7 +1276,7 @@ 
  */
 function smart_float($var)
 {
-    return smart_currency($var);
+	return smart_currency($var);
 }
 
 /**
@@ -1285,16 +1285,16 @@ 
  */
 function smart_getModuleAdminLink($moduleName = false)
 {
-    global $xoopsModule;
-    if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $ret = '';
-    if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
-    }
-
-    return $ret;
+	global $xoopsModule;
+	if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$ret = '';
+	if ($moduleName) {
+		$ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+	}
+
+	return $ret;
 }
 
 /**
@@ -1302,19 +1302,19 @@ 
  */
 function smart_getEditors()
 {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
-    if (!file_exists($filename)) {
-        return false;
-    }
-    require_once $filename;
-    $xoopseditorHandler = XoopsEditorHandler::getInstance();
-    $aList              = $xoopseditorHandler->getList();
-    $ret                = array();
-    foreach ($aList as $k => $v) {
-        $ret[$v] = $k;
-    }
-
-    return $ret;
+	$filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+	if (!file_exists($filename)) {
+		return false;
+	}
+	require_once $filename;
+	$xoopseditorHandler = XoopsEditorHandler::getInstance();
+	$aList              = $xoopseditorHandler->getList();
+	$ret                = array();
+	foreach ($aList as $k => $v) {
+		$ret[$v] = $k;
+	}
+
+	return $ret;
 }
 
 /**
@@ -1324,11 +1324,11 @@ 
  */
 function smart_getTablesArray($moduleName, $items)
 {
-    $ret = array();
-    foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
-    }
-    $ret[] = $moduleName . '_meta';
+	$ret = array();
+	foreach ($items as $item) {
+		$ret[] = $moduleName . '_' . $item;
+	}
+	$ret[] = $moduleName . '_meta';
 
-    return $ret;
+	return $ret;
 }

include/projax_/classes/Scriptaculous.php

Indentation +314 added lines, -314 removed lines

@@ -15,319 +15,319 @@ 
  */
 class Scriptaculous extends Prototype
 {
-    public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
-
-    /**
-     * Scriptaculous constructor.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param         $element_id
-     * @param  null   $options
-     * @return string
-     */
-    public function dragable_element($element_id, $options = null)
-    {
-        return $this->tag($this->_dragable_element_js($element_id, $options));
-    }
-
-    /**
-     * @param         $element_id
-     * @param  null   $options
-     * @return string
-     */
-    public function drop_receiving_element($element_id, $options = null)
-    {
-        return $this->tag($this->_drop_receiving_element($element_id, $options));
-    }
-
-    /**
-     * @param         $name
-     * @param  bool   $element_id
-     * @param  null   $js_options
-     * @return string
-     */
-    public function visual_effect($name, $element_id = false, $js_options = null)
-    {
-        $element = $element_id ? "'$element_id'" : 'element';
-
-        $js_queue = '';
-        if (isset($js_options) && is_array($js_options['queue'])) {
-        } elseif (isset($js_options)) {
-            $js_queue = "'$js_options'";
-        }
-
-        if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
-        } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
-        }
-    }
-
-    /**
-     * @param         $element_id
-     * @param  null   $options
-     * @return string
-     */
-    public function sortabe_element($element_id, $options = null)
-    {
-        return $this->tag($this->_sortabe_element($element_id, $options));
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _sortabe_element($element_id, $options)
-    {
-        //if (isset($options['with'])) {
-        $options['with'] = "Sortable.serialize('$element_id')";
-        //    }
-
-        //if (isset($option['onUpdate'])) {
-        $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
-        //}
-
-        foreach ($options as $var => $val) {
-            if (in_array($var, $this->AJAX_OPTIONS)) {
-                unset($options[$var]);
-            }
-        }
-
-        $arr = array('tag', 'overlap', 'contraint', 'handle');
-
-        foreach ($arr as $var) {
-            if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
-            }
-        }
-
-        if (isset($options['containment'])) {
-            $options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
-        }
-
-        if (isset($options['only'])) {
-            $options['only'] = $this->_array_or_string_for_javascript($options['only']);
-        }
-
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _dragable_element_js($element_id, $options)
-    {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _drop_receiving_element($element_id, $options)
-    {
-
-        //if (isset($options['with'])) {
-        $options['with'] = '\'id=\' + encodeURIComponent(element.id)';
-        //    }
-
-        //if (isset($option['onDrop']))
-
-        {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
-        }
-
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (in_array($var, $this->AJAX_OPTIONS)) {
-                    unset($options[$var]);
-                }
-            }
-        }
-
-        if (isset($options['accept'])) {
-            $options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
-        }
-
-        if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
-        }
-
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                            Merged Javascript macro
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param         $field_id
-     * @param         $options
-     * @param  bool   $tag
-     * @return string
-     */
-    public function in_place_editor($field_id, $options, $tag = true)
-    {
-        $function = 'new Ajax.InPlaceEditor(';
-        $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['cancel_text'])) {
-            $js_options['cancelText'] = $options['cancel_text'];
-        }
-        if (isset($options['save_text'])) {
-            $js_options['okText'] = $options['save_text'];
-        }
-        if (isset($options['loading_text'])) {
-            $js_options['loadingText'] = $options['loading_text'];
-        }
-        if (isset($options['rows'])) {
-            $js_options['rows'] = $options['rows'];
-        }
-        if (isset($options['cols'])) {
-            $js_options['cols'] = $options['cols'];
-        }
-        if (isset($options['size'])) {
-            $js_options['size'] = $options['size'];
-        }
-        if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
-        }
-        if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
-        }
-        if (isset($options['options'])) {
-            $js_options['ajaxOptions'] = $options['options'];
-        }
-        if (isset($options['script'])) {
-            $js_options['evalScripts'] = $options['script'];
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-        if ($tag) {
-            return $this->tag($function);
-        } else {
-            return $function;
-        }
-    }
-
-    /**
-     * @param         $object
-     * @param  null   $tag_options
-     * @param  null   $in_place_editor_options
-     * @return string
-     */
-    public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
-    {
-        $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
-        $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @param $field_id
-     * @param $options
-     * @return mixed
-     */
-    public function auto_complete_field($field_id, $options)
-    {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
-        $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['tokens'])) {
-            $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
-        }
-        if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
-        }
-        if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
-        }
-
-        foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
-            if (isset($options[$var])) {
-                $js_options['$val'] = $options['var'];
-            }
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-
-        return $this->tag($function);
-    }
-
-    /**
-     * @param      $entries
-     * @param      $field
-     * @param null $phrase
-     */
-    public function auto_complete_results($entries, $field, $phrase = null)
-    {
-        if (!is_array($entries)) {
-            return;
-        }
-        $ret_val = '<ul>';
-        //  Complete this function
-    }
-
-    /**
-     * @param         $object
-     * @param  null   $tag_options
-     * @param  null   $completion_options
-     * @return string
-     */
-    public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
-    {
-        $ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
-        $ret_val .= '<input autocomplete="off" id="'
-                    . $object
-                    . '" name="'
-                    . $object
-                    . '" size="'
-                    . (isset($tag_options['size']) ? $tag_options['size'] : 30)
-                    . '" type="text" value="'
-                    . (isset($tag_options['size']) ? $tag_options['value'] : '')
-                    . '" '
-                    . (isset($tag_options['class']) ? 'class = "'
-                                                      . $tag_options['class']
-                                                      . '" ' : '')
-                    . '>';
-
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
-        $ret_val .= $this->auto_complete_field($object, $completion_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @return string
-     */
-    public function _auto_complete_stylesheet()
-    {
-        return '<style> div.auto_complete {
+	public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
+
+	/**
+	 * Scriptaculous constructor.
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * @param         $element_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function dragable_element($element_id, $options = null)
+	{
+		return $this->tag($this->_dragable_element_js($element_id, $options));
+	}
+
+	/**
+	 * @param         $element_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function drop_receiving_element($element_id, $options = null)
+	{
+		return $this->tag($this->_drop_receiving_element($element_id, $options));
+	}
+
+	/**
+	 * @param         $name
+	 * @param  bool   $element_id
+	 * @param  null   $js_options
+	 * @return string
+	 */
+	public function visual_effect($name, $element_id = false, $js_options = null)
+	{
+		$element = $element_id ? "'$element_id'" : 'element';
+
+		$js_queue = '';
+		if (isset($js_options) && is_array($js_options['queue'])) {
+		} elseif (isset($js_options)) {
+			$js_queue = "'$js_options'";
+		}
+
+		if (in_array($name, $this->TOGGLE_EFFECTS)) {
+			return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+		} else {
+			return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+		}
+	}
+
+	/**
+	 * @param         $element_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function sortabe_element($element_id, $options = null)
+	{
+		return $this->tag($this->_sortabe_element($element_id, $options));
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _sortabe_element($element_id, $options)
+	{
+		//if (isset($options['with'])) {
+		$options['with'] = "Sortable.serialize('$element_id')";
+		//    }
+
+		//if (isset($option['onUpdate'])) {
+		$options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+		//}
+
+		foreach ($options as $var => $val) {
+			if (in_array($var, $this->AJAX_OPTIONS)) {
+				unset($options[$var]);
+			}
+		}
+
+		$arr = array('tag', 'overlap', 'contraint', 'handle');
+
+		foreach ($arr as $var) {
+			if (isset($options[$var])) {
+				$options[$var] = "'" . $options[$var] . "'";
+			}
+		}
+
+		if (isset($options['containment'])) {
+			$options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
+		}
+
+		if (isset($options['only'])) {
+			$options['only'] = $this->_array_or_string_for_javascript($options['only']);
+		}
+
+		return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _dragable_element_js($element_id, $options)
+	{
+		return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _drop_receiving_element($element_id, $options)
+	{
+
+		//if (isset($options['with'])) {
+		$options['with'] = '\'id=\' + encodeURIComponent(element.id)';
+		//    }
+
+		//if (isset($option['onDrop']))
+
+		{
+			$options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+		}
+
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (in_array($var, $this->AJAX_OPTIONS)) {
+					unset($options[$var]);
+				}
+			}
+		}
+
+		if (isset($options['accept'])) {
+			$options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
+		}
+
+		if (isset($options['hoverclass'])) {
+			$options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+		}
+
+		return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                            Merged Javascript macro
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param         $field_id
+	 * @param         $options
+	 * @param  bool   $tag
+	 * @return string
+	 */
+	public function in_place_editor($field_id, $options, $tag = true)
+	{
+		$function = 'new Ajax.InPlaceEditor(';
+		$function .= "'$field_id', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['cancel_text'])) {
+			$js_options['cancelText'] = $options['cancel_text'];
+		}
+		if (isset($options['save_text'])) {
+			$js_options['okText'] = $options['save_text'];
+		}
+		if (isset($options['loading_text'])) {
+			$js_options['loadingText'] = $options['loading_text'];
+		}
+		if (isset($options['rows'])) {
+			$js_options['rows'] = $options['rows'];
+		}
+		if (isset($options['cols'])) {
+			$js_options['cols'] = $options['cols'];
+		}
+		if (isset($options['size'])) {
+			$js_options['size'] = $options['size'];
+		}
+		if (isset($options['external_control'])) {
+			$js_options['externalControl'] = "'" . $options['external_control'] . "'";
+		}
+		if (isset($options['load_text_url'])) {
+			$js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+		}
+		if (isset($options['options'])) {
+			$js_options['ajaxOptions'] = $options['options'];
+		}
+		if (isset($options['script'])) {
+			$js_options['evalScripts'] = $options['script'];
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+		if ($tag) {
+			return $this->tag($function);
+		} else {
+			return $function;
+		}
+	}
+
+	/**
+	 * @param         $object
+	 * @param  null   $tag_options
+	 * @param  null   $in_place_editor_options
+	 * @return string
+	 */
+	public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
+	{
+		$ret_val = '';
+		$ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+		$ret_val .= $this->in_place_editor($object, $in_place_editor_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @param $field_id
+	 * @param $options
+	 * @return mixed
+	 */
+	public function auto_complete_field($field_id, $options)
+	{
+		$function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+		$function .= "'$field_id', ";
+		$function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['tokens'])) {
+			$js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+		}
+		if (isset($options['indicator'])) {
+			$js_options['indicator'] = "'" . $options['indicator'] . "'";
+		}
+		if (isset($options['select'])) {
+			$js_options['select'] = "'" . $options['select'] . "'";
+		}
+
+		foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
+			if (isset($options[$var])) {
+				$js_options['$val'] = $options['var'];
+			}
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+
+		return $this->tag($function);
+	}
+
+	/**
+	 * @param      $entries
+	 * @param      $field
+	 * @param null $phrase
+	 */
+	public function auto_complete_results($entries, $field, $phrase = null)
+	{
+		if (!is_array($entries)) {
+			return;
+		}
+		$ret_val = '<ul>';
+		//  Complete this function
+	}
+
+	/**
+	 * @param         $object
+	 * @param  null   $tag_options
+	 * @param  null   $completion_options
+	 * @return string
+	 */
+	public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
+	{
+		$ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
+		$ret_val .= '<input autocomplete="off" id="'
+					. $object
+					. '" name="'
+					. $object
+					. '" size="'
+					. (isset($tag_options['size']) ? $tag_options['size'] : 30)
+					. '" type="text" value="'
+					. (isset($tag_options['size']) ? $tag_options['value'] : '')
+					. '" '
+					. (isset($tag_options['class']) ? 'class = "'
+													  . $tag_options['class']
+													  . '" ' : '')
+					. '>';
+
+		$ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+		$ret_val .= $this->auto_complete_field($object, $completion_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function _auto_complete_stylesheet()
+	{
+		return '<style> div.auto_complete {
                   width: 350px;
                   background: #fff;
                  }
@@ -351,5 +351,5 @@ 
                    padding:0;
                  }
                  </style>';
-    }
+	}
 }