mambax7 / smartobject

include/captcha/formcaptcha.php

Indentation +44 added lines, -44 removed lines

@@ -38,52 +38,52 @@
  */
 class XoopsFormCaptcha extends XoopsFormElement
 {
-    public $_captchaHandler;
+	public $_captchaHandler;
 
-    /**
-     * @param string  $caption        Caption of the form element, default value is defined in captcha/language/
-     * @param string  $name           Name for the input box
-     * @param boolean $skipmember     Skip CAPTCHA check for members
-     * @param int     $numchar        Number of characters in image mode, and input box size for text mode
-     * @param int     $minfontsize    Minimum font-size of characters in image mode
-     * @param int     $maxfontsize    Maximum font-size of characters in image mode
-     * @param int     $backgroundtype Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
-     * @param int     $backgroundnum  Number of background images in image mode
-     *
-     */
-    public function __construct($caption = '', $name = 'xoopscaptcha', $skipmember = null, $numchar = null, $minfontsize = null, $maxfontsize = null, $backgroundtype = null, $backgroundnum = null)
-    {
-        if (!class_exists('XoopsCaptcaha')) {
-            require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
-        }
+	/**
+	 * @param string  $caption        Caption of the form element, default value is defined in captcha/language/
+	 * @param string  $name           Name for the input box
+	 * @param boolean $skipmember     Skip CAPTCHA check for members
+	 * @param int     $numchar        Number of characters in image mode, and input box size for text mode
+	 * @param int     $minfontsize    Minimum font-size of characters in image mode
+	 * @param int     $maxfontsize    Maximum font-size of characters in image mode
+	 * @param int     $backgroundtype Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
+	 * @param int     $backgroundnum  Number of background images in image mode
+	 *
+	 */
+	public function __construct($caption = '', $name = 'xoopscaptcha', $skipmember = null, $numchar = null, $minfontsize = null, $maxfontsize = null, $backgroundtype = null, $backgroundnum = null)
+	{
+		if (!class_exists('XoopsCaptcaha')) {
+			require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
+		}
 
-        $this->_captchaHandler = XoopsCaptcha::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();
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
 
 /*
  * Usage
@@ -54,7 +54,7 @@ 
     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';
+            require_once SMARTOBJECT_ROOT_PATH.'/include/captcha/captcha.php';
         }
 
         $this->_captchaHandler = XoopsCaptcha::getInstance();

include/captcha/captcha.php

Indentation +230 added lines, -230 removed lines

@@ -13,239 +13,239 @@
  */
 class XoopsCaptcha
 {
-    public $active = true;
-    public $mode   = 'text';    // potential values: image, text
-    public $config = array();
-
-    public $message = array(); // Logging error messages
-
-    /**
-     * XoopsCaptcha constructor.
-     */
-    public function __construct()
-    {
-        // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
-
-        $this->setMode($this->config['mode']);
-    }
-
-    /**
-     * @return XoopsCaptcha
-     */
-    public static function 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;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 class XoopsCaptcha
 {
     public $active = true;
-    public $mode   = 'text';    // potential values: image, text
+    public $mode   = 'text'; // potential values: image, text
     public $config = array();
 
     public $message = array(); // Logging error messages
@@ -25,7 +25,7 @@ 
     public function __construct()
     {
         // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
+        $this->config = @include __DIR__.'/config.php';
 
         $this->setMode($this->config['mode']);
     }
@@ -127,7 +127,7 @@ 
     {
         $sessionName = @$_SESSION['XoopsCaptcha_name'];
         $skipMember  = ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $maxAttempts = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         $is_valid = false;
 
@@ -135,7 +135,7 @@ 
         if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
             $is_valid = true;
             // Kill too many attempts
-        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
+        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
             $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
 
             // Verify the code
@@ -147,13 +147,13 @@ 
         if (!empty($maxAttempts)) {
             if (!$is_valid) {
                 // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
+                $_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;
+                $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
             }
         }
         $this->destroyGarbage(true);
@@ -184,8 +184,8 @@ 
      */
     public function destroyGarbage($clearSession = false)
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         if (method_exists($captchaHandler, 'destroyGarbage')) {
             $captchaHandler->loadConfig($this->config);
@@ -224,7 +224,7 @@ 
          */
 
         // Fail on too many attempts
-        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
+        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config['name']] > $maxAttempts) {
             $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
             // Load the form element
         } else {
@@ -239,8 +239,8 @@ 
      */
     public function loadForm()
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         $captchaHandler->loadConfig($this->config);
 

include/captcha/image.php

Indentation +70 added lines, -70 removed lines

@@ -7,82 +7,82 @@
  */
 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;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -45,19 +45,19 @@ 
      */
     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; " .
+        $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']);
+            $rule .= ' | '.sprintf(constant('XOOPS_CAPTCHA_MAXATTEMPTS'), $this->config['maxattempt']);
         }
         $form .= "&nbsp;&nbsp;<small>{$rule}</small>";
 
@@ -70,17 +70,17 @@ 
     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) .
+        $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;

include/xoops_core_common_functions.php

Indentation +18 added lines, -18 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 function xoops_debug_dumbQuery($msg = '')
 {
     global $xoopsDB;
-    $xoopsDB->query('SELECT * ' . $msg . ' FROM dudewhereismycar2');
+    $xoopsDB->query('SELECT * '.$msg.' FROM dudewhereismycar2');
 }
 
 function xoops_debug_initiateQueryCount()

blocks/addto.php

Indentation +14 added lines, -14 removed lines

@@ -8,12 +8,12 @@ 
  */
 function smartobject_addto_show($options)
 {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
-    include_once(SMARTOBJECT_ROOT_PATH . 'class/smartaddto.php');
-    $smartaddto = new SmartAddTo($options[0]);
-    $block      = $smartaddto->renderForBlock();
+	include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+	include_once(SMARTOBJECT_ROOT_PATH . 'class/smartaddto.php');
+	$smartaddto = new SmartAddTo($options[0]);
+	$block      = $smartaddto->renderForBlock();
 
-    return $block;
+	return $block;
 }
 
 /**
@@ -22,16 +22,16 @@ 
  */
 function smartobject_addto_edit($options)
 {
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+	include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 
-    $form = '';
+	$form = '';
 
-    $layout_select = new XoopsFormSelect(_MB_SOBJECT_BLOCKS_ADDTO_LAYOUT, 'options[]', $options[0]);
-    $layout_select->addOption(0, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION0);
-    $layout_select->addOption(1, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION1);
-    $layout_select->addOption(2, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2);
-    $layout_select->addOption(3, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3);
-    $form .= $layout_select->getCaption() . ' ' . $layout_select->render() . '<br>';
+	$layout_select = new XoopsFormSelect(_MB_SOBJECT_BLOCKS_ADDTO_LAYOUT, 'options[]', $options[0]);
+	$layout_select->addOption(0, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION0);
+	$layout_select->addOption(1, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION1);
+	$layout_select->addOption(2, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2);
+	$layout_select->addOption(3, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3);
+	$form .= $layout_select->getCaption() . ' ' . $layout_select->render() . '<br>';
 
-    return $form;
+	return $form;
 }

Spacing +4 added lines, -4 removed lines

@@ -8,8 +8,8 @@ 
  */
 function smartobject_addto_show($options)
 {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
-    include_once(SMARTOBJECT_ROOT_PATH . 'class/smartaddto.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
+    include_once(SMARTOBJECT_ROOT_PATH.'class/smartaddto.php');
     $smartaddto = new SmartAddTo($options[0]);
     $block      = $smartaddto->renderForBlock();
 
@@ -22,7 +22,7 @@ 
  */
 function smartobject_addto_edit($options)
 {
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     $form = '';
 
@@ -31,7 +31,7 @@ 
     $layout_select->addOption(1, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION1);
     $layout_select->addOption(2, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2);
     $layout_select->addOption(3, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3);
-    $form .= $layout_select->getCaption() . ' ' . $layout_select->render() . '<br>';
+    $form .= $layout_select->getCaption().' '.$layout_select->render().'<br>';
 
     return $form;
 }

language/english/modinfo.php

Indentation +1 added lines, -1 removed lines

@@ -24,4 +24,4 @@
 
 define('_MI_SOBJECT_ADMFOOTER', 'Enabling admin footer for SmartModules');
 define('_MI_SOBJECT_ADMFOOTERDSC',
-       'By default SmartModules displays a footer in administrative pages to link on professionnal services available for this module. You can turn off the display of this footer here.');
+	   'By default SmartModules displays a footer in administrative pages to link on professionnal services available for this module. You can turn off the display of this footer here.');

language/english/common.php

Indentation +5 added lines, -5 removed lines

@@ -102,10 +102,10 @@ 
 define('_CO_SOBJECT_MAKE_SELECTION', 'Make a selection...');
 define('_CO_SOBJECT_META_DESCRIPTION', 'Meta Description');
 define('_CO_SOBJECT_META_DESCRIPTION_DSC',
-       'In order to help Search Engines, you can customize the meta description you would like to use for this article. If you leave this field empty when creating a category, it will automatically be populated with the Summary field of this article.');
+	   'In order to help Search Engines, you can customize the meta description you would like to use for this article. If you leave this field empty when creating a category, it will automatically be populated with the Summary field of this article.');
 define('_CO_SOBJECT_META_KEYWORDS', 'Meta Keywords');
 define('_CO_SOBJECT_META_KEYWORDS_DSC',
-       'In order to help Search Engines, you can customize the keywords you would like to use for this article. If you leave this field empty when creating an article, it will automatically be populated with words from the Summary field of this article.');
+	   'In order to help Search Engines, you can customize the keywords you would like to use for this article. If you leave this field empty when creating an article, it will automatically be populated with words from the Summary field of this article.');
 define('_CO_SOBJECT_MODIFY', 'Edit');
 define('_CO_SOBJECT_MODULE_BUG', 'Report a bug for this module');
 define('_CO_SOBJECT_MODULE_DEMO', 'Demo Site');
@@ -154,11 +154,11 @@ 
 define('_CO_SOBJECT_UPLOAD_IMAGE', 'Upload a new image:');
 define('_CO_SOBJECT_VERSION_HISTORY', 'Version History');
 define('_CO_SOBJECT_WARNING_BETA',
-       'This module comes as is, without any guarantees whatsoever. This module is BETA, meaning it is still under active development. This release is meant for <b>testing purposes only</b> and we <b>strongly</b> recommend that you do not use it on a live website or in a production environment.');
+	   'This module comes as is, without any guarantees whatsoever. This module is BETA, meaning it is still under active development. This release is meant for <b>testing purposes only</b> and we <b>strongly</b> recommend that you do not use it on a live website or in a production environment.');
 define('_CO_SOBJECT_WARNING_FINAL',
-       'This module comes as is, without any guarantees whatsoever. Although this module is not beta, it is still under active development. This release can be used in a live website or a production environment, but its use is under your own responsibility, which means the author is not responsible.');
+	   'This module comes as is, without any guarantees whatsoever. Although this module is not beta, it is still under active development. This release can be used in a live website or a production environment, but its use is under your own responsibility, which means the author is not responsible.');
 define('_CO_SOBJECT_WARNING_RC',
-       'This module comes as is, without any guarantees whatsoever. This module is a Release Candidate and should not be used on a production web site. The module is still under active development and its use is under your own responsibility, which means the author is not responsible.');
+	   'This module comes as is, without any guarantees whatsoever. This module is a Release Candidate and should not be used on a production web site. The module is still under active development and its use is under your own responsibility, which means the author is not responsible.');
 define('_CO_SOBJECT_WEIGHT_FORM_CAPTION', 'Weight');
 define('_CO_SOBJECT_WEIGHT_FORM_DSC', '');
 

Spacing +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
 define('_CO_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2', 'Vertical with icons');
 define('_CO_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3', 'Vertical no icon');
 define('_CO_SOBJECT_CURRENT_FILE', 'Current file: ');
-define('_CO_SOBJECT_URL_FILE_DSC', "Alternatively, you can use an URL. If you select a file via 'Browse' button, URL will be ignored. You can use the tag {XOOPS_URL} to print " . XOOPS_URL);
+define('_CO_SOBJECT_URL_FILE_DSC', "Alternatively, you can use an URL. If you select a file via 'Browse' button, URL will be ignored. You can use the tag {XOOPS_URL} to print ".XOOPS_URL);
 define('_CO_SOBJECT_URL_FILE', 'URL: ');
 define('_CO_SOBJECT_UPLOAD', 'Select a file to upload: ');
 

language/english/smartdbupdater.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 define('_SDU_MSG_NEWFIELD', 'Successfully added field %s');
 define('_SDU_MSG_NEWFIELD_ERR', 'Error adding field %s');
 define('_SDU_NEEDUPDATE',
-       'Your database is out-of-date. Please upgrade your database tables!<br><b>Note: The SmartFactory strongly recommends you to backup all SmartSection tables before running this upgrade script.</b><br>');
+	   'Your database is out-of-date. Please upgrade your database tables!<br><b>Note: The SmartFactory strongly recommends you to backup all SmartSection tables before running this upgrade script.</b><br>');
 define('_SDU_NOUPDATE', 'Your database is up-to-date. No updates are necessary.');
 define('_SDU_UPDATE_DB', 'Updating Database');
 define('_SDU_UPDATE_ERR', 'Errors updating to version %s');

sendlink.php

Indentation +76 added lines, -76 removed lines

@@ -26,82 +26,82 @@
 $op = isset($_POST['op']) ? $_POST['op'] : '';
 
 switch ($op) {
-    case 'sendlink':
-
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectLinkHandler);
-
-        $linkObj = $controller->storeSmartObject();
-        if ($linkObj->hasError()) {
-            /**
-             * @todo inform user and propose to close the window if a problem occured when saving the link
-             */
-        }
-
-        $xoopsMailer =& getMailer();
-        $xoopsMailer->useMail();
-        $xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
-
-        $xoopsMailer->setTemplate('sendlink.tpl');
-        $xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
-        $xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
-        $xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
-        $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-        $xoopsMailer->assign('MESSAGE', $_POST['body']);
-        $xoopsMailer->setToEmails($linkObj->getVar('to_email'));
-        $xoopsMailer->setFromEmail($linkObj->getVar('from_email'));
-        $xoopsMailer->setFromName($xoopsConfig['sitename']);
-        $xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
-
-        if (!$xoopsMailer->send(true)) {
-            $xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
-        } else {
-            $xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
-        }
-
-        break;
-
-    default:
-        if (isset($_GET['mid'])) {
-            $mid = $_GET['mid'];
-        } else {
-            /**
-             * @todo close the window if no mid is passed as GET
-             */
-        }
-
-        $hModule = xoops_getHandler('module');
-        $module  = $hModule->get($mid);
-        $linkObj->setVar('mid', $module->getVar('mid'));
-        $linkObj->setVar('mid_name', $module->getVar('name'));
-
-        if (isset($_GET['link'])) {
-            $link = $_GET['link'];
-        } else {
-            /**
-             * @todo close the window if no link is passed as GET
-             */
-        }
-        $linkObj->setVar('link', $link);
-
-        if (is_object($xoopsUser)) {
-            $linkObj->setVar('from_uid', $xoopsUser->getVar('uid'));
-            $linkObj->setVar('from_name', $xoopsUser->getVar('name') !== '' ? $xoopsUser->getVar('name') : $xoopsUser->getVar('uname'));
-            $linkObj->setVar('from_email', $xoopsUser->getVar('email'));
-        }
-
-        $linkObj->setVar('subject', sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $xoopsConfig['sitename']));
-        $linkObj->setVar('body', sprintf(_CO_SOBJECT_BODY_DEFAULT, $xoopsConfig['sitename'], $link));
-        $linkObj->setVar('date', time());
-        $linkObj->hideFieldFromForm(array('from_uid', 'to_uid', 'link', 'mid', 'mid_name'));
-
-        $form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND, 'javascript:window.close();');
-
-        $form->assign($xoopsTpl);
-
-        $xoopsTpl->assign('showform', true);
-        break;
+	case 'sendlink':
+
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectLinkHandler);
+
+		$linkObj = $controller->storeSmartObject();
+		if ($linkObj->hasError()) {
+			/**
+			 * @todo inform user and propose to close the window if a problem occured when saving the link
+			 */
+		}
+
+		$xoopsMailer =& getMailer();
+		$xoopsMailer->useMail();
+		$xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
+
+		$xoopsMailer->setTemplate('sendlink.tpl');
+		$xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
+		$xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
+		$xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
+		$xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+		$xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+		$xoopsMailer->assign('MESSAGE', $_POST['body']);
+		$xoopsMailer->setToEmails($linkObj->getVar('to_email'));
+		$xoopsMailer->setFromEmail($linkObj->getVar('from_email'));
+		$xoopsMailer->setFromName($xoopsConfig['sitename']);
+		$xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
+
+		if (!$xoopsMailer->send(true)) {
+			$xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
+		} else {
+			$xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
+		}
+
+		break;
+
+	default:
+		if (isset($_GET['mid'])) {
+			$mid = $_GET['mid'];
+		} else {
+			/**
+			 * @todo close the window if no mid is passed as GET
+			 */
+		}
+
+		$hModule = xoops_getHandler('module');
+		$module  = $hModule->get($mid);
+		$linkObj->setVar('mid', $module->getVar('mid'));
+		$linkObj->setVar('mid_name', $module->getVar('name'));
+
+		if (isset($_GET['link'])) {
+			$link = $_GET['link'];
+		} else {
+			/**
+			 * @todo close the window if no link is passed as GET
+			 */
+		}
+		$linkObj->setVar('link', $link);
+
+		if (is_object($xoopsUser)) {
+			$linkObj->setVar('from_uid', $xoopsUser->getVar('uid'));
+			$linkObj->setVar('from_name', $xoopsUser->getVar('name') !== '' ? $xoopsUser->getVar('name') : $xoopsUser->getVar('uname'));
+			$linkObj->setVar('from_email', $xoopsUser->getVar('email'));
+		}
+
+		$linkObj->setVar('subject', sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $xoopsConfig['sitename']));
+		$linkObj->setVar('body', sprintf(_CO_SOBJECT_BODY_DEFAULT, $xoopsConfig['sitename'], $link));
+		$linkObj->setVar('date', time());
+		$linkObj->hideFieldFromForm(array('from_uid', 'to_uid', 'link', 'mid', 'mid_name'));
+
+		$form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND, 'javascript:window.close();');
+
+		$form->assign($xoopsTpl);
+
+		$xoopsTpl->assign('showform', true);
+		break;
 }
 
 $xoopsTpl->display('db:smartobject_sendlink.html');

Spacing +10 added lines, -10 removed lines

@@ -7,17 +7,17 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/header.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartloader.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectlink.php';
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+include_once __DIR__.'/header.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartloader.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectlink.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 
 $xoopsTpl                = new XoopsTpl();
 $myts                    = MyTextSanitizer::getInstance();
 $xoopsConfig['sitename'] = $myts->displayTarea($xoopsConfig['sitename']);
 
 xoops_header(false);
-echo smart_get_css_link(SMARTOBJECT_URL . 'assets/css/module.css');
+echo smart_get_css_link(SMARTOBJECT_URL.'assets/css/module.css');
 echo '</head><body>';
 
 $smartobjectLinkHandler = xoops_getModuleHandler('link', 'smartobject');
@@ -28,7 +28,7 @@ 
 switch ($op) {
     case 'sendlink':
 
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new SmartObjectController($smartobjectLinkHandler);
 
         $linkObj = $controller->storeSmartObject();
@@ -38,15 +38,15 @@ 
              */
         }
 
-        $xoopsMailer =& getMailer();
+        $xoopsMailer = & getMailer();
         $xoopsMailer->useMail();
-        $xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
+        $xoopsMailer->setTemplateDir('language/'.$xoopsConfig['language'].'/mail_template');
 
         $xoopsMailer->setTemplate('sendlink.tpl');
         $xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
         $xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
         $xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+        $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
         $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
         $xoopsMailer->assign('MESSAGE', $_POST['body']);
         $xoopsMailer->setToEmails($linkObj->getVar('to_email'));
@@ -55,7 +55,7 @@ 
         $xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
 
         if (!$xoopsMailer->send(true)) {
-            $xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
+            $xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']).'<br>'.$xoopsMailer->getErrors(true));
         } else {
             $xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
         }