mambax7 / smartobject

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 = [];
-
-    public $message = []; // 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, ['text', 'image'])) {
-            $this->mode = $mode;
-
-            if ($this->mode !== 'image') {
-                return;
-            }
-        }
-
-        // Disable image mode
-        if (!extension_loaded('gd')) {
-            $this->mode = 'text';
-        } else {
-            $required_functions = [
-                '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 = [];
+
+	public $message = []; // 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, ['text', 'image'])) {
+			$this->mode = $mode;
+
+			if ($this->mode !== 'image') {
+				return;
+			}
+		}
+
+		// Disable image mode
+		if (!extension_loaded('gd')) {
+			$this->mode = 'text';
+		} else {
+			$required_functions = [
+				'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 = [];
 
     public $message = []; // 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']);
     }
@@ -141,7 +141,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;
 
@@ -149,7 +149,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
@@ -161,13 +161,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);
@@ -198,8 +198,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);
@@ -238,7 +238,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 {
@@ -253,8 +253,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/rating.rate.php

Indentation +46 added lines, -46 removed lines

@@ -9,7 +9,7 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
 require_once SMARTOBJECT_ROOT_PATH . 'include/functions.php';
@@ -23,52 +23,52 @@ 
 $smartobjectPluginHandler = new SmartPluginHandler();
 $pluginObj                = $smartobjectPluginHandler->getPlugin($module_dirname);
 if ($pluginObj) {
-    $rating_item = $pluginObj->getItem();
-    if ($rating_item) {
-        $rating_itemid = $pluginObj->getItemIdForItem($rating_item);
-        $stats         = $smartobjectRatingHandler->getRatingAverageByItemId($rating_itemid, $module_dirname, $rating_item);
-        $xoopsTpl->assign('smartobject_rating_stats_total', $stats['sum']);
-        $xoopsTpl->assign('smartobject_rating_stats_average', $stats['average']);
-        $xoopsTpl->assign('smartobject_rating_item', $rating_item);
-        if (is_object($xoopsUser)) {
-            $ratingObj = $smartobjectRatingHandler->already_rated($rating_item, $rating_itemid, $module_dirname, $xoopsUser->getVar('uid'));
-            $xoopsTpl->assign('smartobject_user_can_rate', true);
-        }
-        if (isset($ratingObj) && is_object($ratingObj)) {
-            $xoopsTpl->assign('smartobject_user_rate', $ratingObj->getVar('rate'));
-            $xoopsTpl->assign('smartobject_rated', true);
-        } else {
-            $xoopsTpl->assign('smartobject_rating_dirname', $module_dirname);
-            $xoopsTpl->assign('smartobject_rating_itemid', $rating_itemid);
-            $urls = smart_getCurrentUrls();
-            $xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
-            if (isset($xoTheme) && is_object($xoTheme)) {
-                $xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
-            } else {
-                //probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
-                //$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");
-            }
-        }
-    }
+	$rating_item = $pluginObj->getItem();
+	if ($rating_item) {
+		$rating_itemid = $pluginObj->getItemIdForItem($rating_item);
+		$stats         = $smartobjectRatingHandler->getRatingAverageByItemId($rating_itemid, $module_dirname, $rating_item);
+		$xoopsTpl->assign('smartobject_rating_stats_total', $stats['sum']);
+		$xoopsTpl->assign('smartobject_rating_stats_average', $stats['average']);
+		$xoopsTpl->assign('smartobject_rating_item', $rating_item);
+		if (is_object($xoopsUser)) {
+			$ratingObj = $smartobjectRatingHandler->already_rated($rating_item, $rating_itemid, $module_dirname, $xoopsUser->getVar('uid'));
+			$xoopsTpl->assign('smartobject_user_can_rate', true);
+		}
+		if (isset($ratingObj) && is_object($ratingObj)) {
+			$xoopsTpl->assign('smartobject_user_rate', $ratingObj->getVar('rate'));
+			$xoopsTpl->assign('smartobject_rated', true);
+		} else {
+			$xoopsTpl->assign('smartobject_rating_dirname', $module_dirname);
+			$xoopsTpl->assign('smartobject_rating_itemid', $rating_itemid);
+			$urls = smart_getCurrentUrls();
+			$xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
+			if (isset($xoTheme) && is_object($xoTheme)) {
+				$xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
+			} else {
+				//probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
+				//$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");
+			}
+		}
+	}
 }
 
 if (isset($_POST['smartobject_rating_submit'])) {
-    // The rating form has just been posted. Let's save the info
-    $ratingObj = $smartobjectRatingHandler->create();
-    $ratingObj->setVar('dirname', $module_dirname);
-    $ratingObj->setVar('item', $rating_item);
-    $ratingObj->setVar('itemid', $rating_itemid);
-    $ratingObj->setVar('uid', $xoopsUser->getVar('uid'));
-    $ratingObj->setVar('date', time());
-    $ratingObj->setVar('rate', $_POST['smartobject_rating_value']);
-    if (!$smartobjectRatingHandler->insert($ratingObj)) {
-        if ($xoopsDB->errno() == 1062) {
-            $message = _SOBJECT_RATING_DUPLICATE_ENTRY;
-        } else {
-            $message = _SOBJECT_RATING_ERROR;
-        }
-    } else {
-        $message = _SOBJECT_RATING_SUCCESS;
-    }
-    redirect_header('', 3, $message);
+	// The rating form has just been posted. Let's save the info
+	$ratingObj = $smartobjectRatingHandler->create();
+	$ratingObj->setVar('dirname', $module_dirname);
+	$ratingObj->setVar('item', $rating_item);
+	$ratingObj->setVar('itemid', $rating_itemid);
+	$ratingObj->setVar('uid', $xoopsUser->getVar('uid'));
+	$ratingObj->setVar('date', time());
+	$ratingObj->setVar('rate', $_POST['smartobject_rating_value']);
+	if (!$smartobjectRatingHandler->insert($ratingObj)) {
+		if ($xoopsDB->errno() == 1062) {
+			$message = _SOBJECT_RATING_DUPLICATE_ENTRY;
+		} else {
+			$message = _SOBJECT_RATING_ERROR;
+		}
+	} else {
+		$message = _SOBJECT_RATING_SUCCESS;
+	}
+	redirect_header('', 3, $message);
 }

Spacing +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
-require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
-require_once SMARTOBJECT_ROOT_PATH . 'include/functions.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/rating.php';
+require_once SMARTOBJECT_ROOT_PATH.'include/functions.php';
 
 smart_loadLanguageFile('smartobject', 'rating');
 
@@ -43,7 +43,7 @@ 
             $urls = smart_getCurrentUrls();
             $xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
             if (isset($xoTheme) && is_object($xoTheme)) {
-                $xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
+                $xoTheme->addStylesheet(SMARTOBJECT_URL.'assets/css/module.css');
             } else {
                 //probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
                 //$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");

class/smartaddto.php

Indentation +51 added lines, -51 removed lines

@@ -10,66 +10,66 @@
 
 class SmartAddTo
 {
-    public $_layout;
-    public $_method;
+	public $_layout;
+	public $_method;
 
-    /**
-     * Constructor of SmartAddTo
-     *
-     * @param int $layout 0=Horizontal 1 row, 1=Horizontal 2 rows, 2=Vertical with icons, 3=Vertical no icons
-     * @param int $method 0=directpage, 1=popup
-     */
-    public function __construct($layout = 0, $method = 1)
-    {
-        $layout = (int)$layout;
-        if ($layout < 0 || $layout > 3) {
-            $layout = 0;
-        }
-        $this->_layout = $layout;
+	/**
+	 * Constructor of SmartAddTo
+	 *
+	 * @param int $layout 0=Horizontal 1 row, 1=Horizontal 2 rows, 2=Vertical with icons, 3=Vertical no icons
+	 * @param int $method 0=directpage, 1=popup
+	 */
+	public function __construct($layout = 0, $method = 1)
+	{
+		$layout = (int)$layout;
+		if ($layout < 0 || $layout > 3) {
+			$layout = 0;
+		}
+		$this->_layout = $layout;
 
-        $method = (int)$method;
-        if ($method < 0 || $method > 1) {
-            $method = 1;
-        }
-        $this->_method = $method;
-    }
+		$method = (int)$method;
+		if ($method < 0 || $method > 1) {
+			$method = 1;
+		}
+		$this->_method = $method;
+	}
 
-    /**
-     * @param  bool $fetchOnly
-     * @return mixed|string|void
-     */
-    public function render($fetchOnly = false)
-    {
-        global $xoTheme, $xoopsTpl;
+	/**
+	 * @param  bool $fetchOnly
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false)
+	{
+		global $xoTheme, $xoopsTpl;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+		$xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
 
-        $xoopsTpl->assign('smartobject_addto_method', $this->_method);
-        $xoopsTpl->assign('smartobject_addto_layout', $this->_layout);
+		$xoopsTpl->assign('smartobject_addto_method', $this->_method);
+		$xoopsTpl->assign('smartobject_addto_layout', $this->_layout);
 
-        $xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL . 'include/addto/');
+		$xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL . 'include/addto/');
 
-        if ($fetchOnly) {
-            return $xoopsTpl->fetch('db:smartobject_addto.tpl');
-        } else {
-            $xoopsTpl->display('db:smartobject_addto.tpl');
-        }
-    }
+		if ($fetchOnly) {
+			return $xoopsTpl->fetch('db:smartobject_addto.tpl');
+		} else {
+			$xoopsTpl->display('db:smartobject_addto.tpl');
+		}
+	}
 
-    /**
-     * @return array
-     */
-    public function renderForBlock()
-    {
-        global $xoTheme;
+	/**
+	 * @return array
+	 */
+	public function renderForBlock()
+	{
+		global $xoTheme;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+		$xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
 
-        $block                             = [];
-        $block['smartobject_addto_method'] = $this->_method;
-        $block['smartobject_addto_layout'] = $this->_layout;
-        $block['smartobject_addto_url']    = SMARTOBJECT_URL . 'include/addto/';
+		$block                             = [];
+		$block['smartobject_addto_method'] = $this->_method;
+		$block['smartobject_addto_layout'] = $this->_layout;
+		$block['smartobject_addto_url']    = SMARTOBJECT_URL . 'include/addto/';
 
-        return $block;
-    }
+		return $block;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -21,13 +21,13 @@ 
      */
     public function __construct($layout = 0, $method = 1)
     {
-        $layout = (int)$layout;
+        $layout = (int) $layout;
         if ($layout < 0 || $layout > 3) {
             $layout = 0;
         }
         $this->_layout = $layout;
 
-        $method = (int)$method;
+        $method = (int) $method;
         if ($method < 0 || $method > 1) {
             $method = 1;
         }
@@ -42,12 +42,12 @@ 
     {
         global $xoTheme, $xoopsTpl;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+        $xoTheme->addStylesheet(SMARTOBJECT_URL.'include/addto/addto.css');
 
         $xoopsTpl->assign('smartobject_addto_method', $this->_method);
         $xoopsTpl->assign('smartobject_addto_layout', $this->_layout);
 
-        $xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL . 'include/addto/');
+        $xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL.'include/addto/');
 
         if ($fetchOnly) {
             return $xoopsTpl->fetch('db:smartobject_addto.tpl');
@@ -63,12 +63,12 @@ 
     {
         global $xoTheme;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+        $xoTheme->addStylesheet(SMARTOBJECT_URL.'include/addto/addto.css');
 
         $block                             = [];
         $block['smartobject_addto_method'] = $this->_method;
         $block['smartobject_addto_layout'] = $this->_layout;
-        $block['smartobject_addto_url']    = SMARTOBJECT_URL . 'include/addto/';
+        $block['smartobject_addto_url']    = SMARTOBJECT_URL.'include/addto/';
 
         return $block;
     }

class/smarttip.php

Indentation +39 added lines, -39 removed lines

@@ -11,45 +11,45 @@
 
 class SmartTip
 {
-    public $id;
-    public $caption;
-    public $message;
-    public $visible;
-    public $_tpl;
+	public $id;
+	public $caption;
+	public $message;
+	public $visible;
+	public $_tpl;
 
-    /**
-     * SmartTip constructor.
-     * @param      $id
-     * @param      $caption
-     * @param      $message
-     * @param bool $visible
-     */
-    public function __construct($id, $caption, $message, $visible = false)
-    {
-        $this->id      = $id;
-        $this->caption = $caption;
-        $this->message = $message;
-        $this->visible = $visible;
-        $this->_tpl    = new XoopsTpl();
-    }
+	/**
+	 * SmartTip constructor.
+	 * @param      $id
+	 * @param      $caption
+	 * @param      $message
+	 * @param bool $visible
+	 */
+	public function __construct($id, $caption, $message, $visible = false)
+	{
+		$this->id      = $id;
+		$this->caption = $caption;
+		$this->message = $message;
+		$this->visible = $visible;
+		$this->_tpl    = new XoopsTpl();
+	}
 
-    /**
-     * @param  bool $outputNow
-     * @return mixed|string|void
-     */
-    public function render($outputNow = true)
-    {
-        $aTip = [
-            'id'      => $this->id,
-            'caption' => $this->caption,
-            'message' => $this->message,
-            'visible' => $this->visible ? 'block' : 'none'
-        ];
-        $this->_tpl->assign('tip', $aTip);
-        if ($outputNow) {
-            $this->_tpl->display('db:smartobject_tip.tpl');
-        } else {
-            return $this->_tpl->fetch('db:smartobject_tip.tpl');
-        }
-    }
+	/**
+	 * @param  bool $outputNow
+	 * @return mixed|string|void
+	 */
+	public function render($outputNow = true)
+	{
+		$aTip = [
+			'id'      => $this->id,
+			'caption' => $this->caption,
+			'message' => $this->message,
+			'visible' => $this->visible ? 'block' : 'none'
+		];
+		$this->_tpl->assign('tip', $aTip);
+		if ($outputNow) {
+			$this->_tpl->display('db:smartobject_tip.tpl');
+		} else {
+			return $this->_tpl->fetch('db:smartobject_tip.tpl');
+		}
+	}
 }

class/smarthighlighter.php

Indentation +84 added lines, -84 removed lines

@@ -19,96 +19,96 @@
  */
 class SmartHighlighter
 {
-    /**
-     * @access private
-     */
-    public $preg_keywords = '';
-    /**
-     * @access private
-     */
-    public $keywords = '';
-    /**
-     * @access private
-     */
-    public $singlewords = false;
-    /**
-     * @access private
-     */
-    public $replace_callback = null;
+	/**
+	 * @access private
+	 */
+	public $preg_keywords = '';
+	/**
+	 * @access private
+	 */
+	public $keywords = '';
+	/**
+	 * @access private
+	 */
+	public $singlewords = false;
+	/**
+	 * @access private
+	 */
+	public $replace_callback = null;
 
-    public $content;
+	public $content;
 
-    /**
-     * Main constructor
-     *
-     * This is the main constructor of keyhighlighter class. <br>
-     * It's the only public method of the class.
-     * @param string   $keywords         the keywords you want to highlight
-     * @param boolean  $singlewords      specify if it has to highlight also the single words.
-     * @param callback $replace_callback a custom callback for keyword highlight.
-     *                                   <code>
-     *                                   <?php
-     *                                   require ('keyhighlighter.class.php');
-     *
-     * function my_highlighter ($matches) {
-     *  return '<span style="font-weight: bolder; color: #FF0000;">' . $matches[0] . '</span>';
-     * }
-     *
-     * new keyhighlighter ('W3C', false, 'my_highlighter');
-     * readfile ('http://www.w3c.org/');
-     * ?>
-     * </code>
-     */
-    // public function __construct ()
-    public function __construct($keywords, $singlewords = false, $replace_callback = null)
-    {
-        $this->keywords         = $keywords;
-        $this->singlewords      = $singlewords;
-        $this->replace_callback = $replace_callback;
-    }
+	/**
+	 * Main constructor
+	 *
+	 * This is the main constructor of keyhighlighter class. <br>
+	 * It's the only public method of the class.
+	 * @param string   $keywords         the keywords you want to highlight
+	 * @param boolean  $singlewords      specify if it has to highlight also the single words.
+	 * @param callback $replace_callback a custom callback for keyword highlight.
+	 *                                   <code>
+	 *                                   <?php
+	 *                                   require ('keyhighlighter.class.php');
+	 *
+	 * function my_highlighter ($matches) {
+	 *  return '<span style="font-weight: bolder; color: #FF0000;">' . $matches[0] . '</span>';
+	 * }
+	 *
+	 * new keyhighlighter ('W3C', false, 'my_highlighter');
+	 * readfile ('http://www.w3c.org/');
+	 * ?>
+	 * </code>
+	 */
+	// public function __construct ()
+	public function __construct($keywords, $singlewords = false, $replace_callback = null)
+	{
+		$this->keywords         = $keywords;
+		$this->singlewords      = $singlewords;
+		$this->replace_callback = $replace_callback;
+	}
 
-    /**
-     * @access private
-     * @param $replace_matches
-     * @return mixed
-     */
-    public function replace($replace_matches)
-    {
-        $patterns = [];
-        if ($this->singlewords) {
-            $keywords = explode(' ', $this->preg_keywords);
-            foreach ($keywords as $keyword) {
-                $patterns[] = '/(?' . '>' . $keyword . '+)/si';
-            }
-        } else {
-            $patterns[] = '/(?' . '>' . $this->preg_keywords . '+)/si';
-        }
+	/**
+	 * @access private
+	 * @param $replace_matches
+	 * @return mixed
+	 */
+	public function replace($replace_matches)
+	{
+		$patterns = [];
+		if ($this->singlewords) {
+			$keywords = explode(' ', $this->preg_keywords);
+			foreach ($keywords as $keyword) {
+				$patterns[] = '/(?' . '>' . $keyword . '+)/si';
+			}
+		} else {
+			$patterns[] = '/(?' . '>' . $this->preg_keywords . '+)/si';
+		}
 
-        $result = $replace_matches[0];
+		$result = $replace_matches[0];
 
-        foreach ($patterns as $pattern) {
-            if (null !== $this->replace_callback) {
-                $result = preg_replace_callback($pattern, $this->replace_callback, $result);
-            } else {
-                $result = preg_replace($pattern, '<span class="highlightedkey">\\0</span>', $result);
-            }
-        }
+		foreach ($patterns as $pattern) {
+			if (null !== $this->replace_callback) {
+				$result = preg_replace_callback($pattern, $this->replace_callback, $result);
+			} else {
+				$result = preg_replace($pattern, '<span class="highlightedkey">\\0</span>', $result);
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * @access private
-     * @param $buffer
-     * @return mixed|string
-     */
-    public function highlight($buffer)
-    {
-        $buffer              = '>' . $buffer . '<';
-        $this->preg_keywords = preg_replace('/[^\w ]/si', '', $this->keywords);
-        $buffer              = preg_replace_callback("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", [&$this, 'replace'], $buffer);
-        $buffer              = substr($buffer, 1, -1);
+	/**
+	 * @access private
+	 * @param $buffer
+	 * @return mixed|string
+	 */
+	public function highlight($buffer)
+	{
+		$buffer              = '>' . $buffer . '<';
+		$this->preg_keywords = preg_replace('/[^\w ]/si', '', $this->keywords);
+		$buffer              = preg_replace_callback("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", [&$this, 'replace'], $buffer);
+		$buffer              = substr($buffer, 1, -1);
 
-        return $buffer;
-    }
+		return $buffer;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -78,10 +78,10 @@ 
         if ($this->singlewords) {
             $keywords = explode(' ', $this->preg_keywords);
             foreach ($keywords as $keyword) {
-                $patterns[] = '/(?' . '>' . $keyword . '+)/si';
+                $patterns[] = '/(?'.'>'.$keyword.'+)/si';
             }
         } else {
-            $patterns[] = '/(?' . '>' . $this->preg_keywords . '+)/si';
+            $patterns[] = '/(?'.'>'.$this->preg_keywords.'+)/si';
         }
 
         $result = $replace_matches[0];
@@ -104,9 +104,9 @@ 
      */
     public function highlight($buffer)
     {
-        $buffer              = '>' . $buffer . '<';
+        $buffer              = '>'.$buffer.'<';
         $this->preg_keywords = preg_replace('/[^\w ]/si', '', $this->keywords);
-        $buffer              = preg_replace_callback("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", [&$this, 'replace'], $buffer);
+        $buffer              = preg_replace_callback("/(\>(((?".">[^><]+)|(?R))*)\<)/is", [&$this, 'replace'], $buffer);
         $buffer              = substr($buffer, 1, -1);
 
         return $buffer;

class/rating.php

Indentation +208 added lines, -208 removed lines

@@ -37,125 +37,125 @@ 
  */
 class SmartobjectRating extends SmartObject
 {
-    public $_modulePlugin = false;
-
-    /**
-     * SmartobjectRating constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
-        $this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
-        $this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
-        $this->quickInitVar('uid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_UID);
-        $this->quickInitVar('date', XOBJ_DTYPE_LTIME, true, _CO_SOBJECT_RATING_DATE);
-        $this->quickInitVar('rate', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_RATE);
-
-        $this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
-
-        $this->setControl('dirname', [
-            'handler'  => 'rating',
-            'method'   => 'getModuleList',
-            'onSelect' => 'submit'
-        ]);
-
-        $this->setControl('item', [
-            'object' => &$this,
-            'method' => 'getItemList'
-        ]);
-
-        $this->setControl('uid', 'user');
-
-        $this->setControl('rate', [
-            'handler' => 'rating',
-            'method'  => 'getRateList'
-        ]);
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, ['name', 'dirname'])) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        $ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, []);
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function dirname()
-    {
-        global $smartobjectRatingHandler;
-        $moduleArray = $smartobjectRatingHandler->getModuleList();
-
-        return $moduleArray[$this->getVar('dirname', 'n')];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getItemList()
-    {
-        $plugin = $this->getModulePlugin();
-
-        return $plugin->getItemList();
-    }
-
-    /**
-     * @return string
-     */
-    public function getItemValue()
-    {
-        $moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
-        $plugin         = $this->getModulePlugin();
-        $pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
-        if (!$pluginItemInfo) {
-            return '';
-        }
-        $itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
-        $ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getRateValue()
-    {
-        return $this->getVar('rate');
-    }
-
-    /**
-     * @return bool
-     */
-    public function getModulePlugin()
-    {
-        if (!$this->_modulePlugin) {
-            global $smartobjectRatingHandler;
-            $this->_modulePlugin = $smartobjectRatingHandler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
-        }
-
-        return $this->_modulePlugin;
-    }
+	public $_modulePlugin = false;
+
+	/**
+	 * SmartobjectRating constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
+		$this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
+		$this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
+		$this->quickInitVar('uid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_UID);
+		$this->quickInitVar('date', XOBJ_DTYPE_LTIME, true, _CO_SOBJECT_RATING_DATE);
+		$this->quickInitVar('rate', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_RATE);
+
+		$this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
+
+		$this->setControl('dirname', [
+			'handler'  => 'rating',
+			'method'   => 'getModuleList',
+			'onSelect' => 'submit'
+		]);
+
+		$this->setControl('item', [
+			'object' => &$this,
+			'method' => 'getItemList'
+		]);
+
+		$this->setControl('uid', 'user');
+
+		$this->setControl('rate', [
+			'handler' => 'rating',
+			'method'  => 'getRateList'
+		]);
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, ['name', 'dirname'])) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		$ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, []);
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function dirname()
+	{
+		global $smartobjectRatingHandler;
+		$moduleArray = $smartobjectRatingHandler->getModuleList();
+
+		return $moduleArray[$this->getVar('dirname', 'n')];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getItemList()
+	{
+		$plugin = $this->getModulePlugin();
+
+		return $plugin->getItemList();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getItemValue()
+	{
+		$moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
+		$plugin         = $this->getModulePlugin();
+		$pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
+		if (!$pluginItemInfo) {
+			return '';
+		}
+		$itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
+		$ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getRateValue()
+	{
+		return $this->getVar('rate');
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getModulePlugin()
+	{
+		if (!$this->_modulePlugin) {
+			global $smartobjectRatingHandler;
+			$this->_modulePlugin = $smartobjectRatingHandler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
+		}
+
+		return $this->_modulePlugin;
+	}
 }
 
 /**
@@ -163,93 +163,93 @@ 
  */
 class SmartobjectRatingHandler extends SmartPersistableObjectHandler
 {
-    public $_rateOptions = [];
-    public $_moduleList  = false;
-    public $pluginsObject;
-
-    /**
-     * SmartobjectRatingHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
-        $this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
-
-        $this->_rateOptions[1] = 1;
-        $this->_rateOptions[2] = 2;
-        $this->_rateOptions[3] = 3;
-        $this->_rateOptions[4] = 4;
-        $this->_rateOptions[5] = 5;
-
-        $this->pluginsObject = new SmartPluginHandler();
-    }
-
-    /**
-     * @return bool
-     */
-    public function getModuleList()
-    {
-        if (!$this->_moduleList) {
-            $moduleArray          = $this->pluginsObject->getPluginsArray();
-            $this->_moduleList[0] = _CO_SOBJECT_MAKE_SELECTION;
-            foreach ($moduleArray as $k => $v) {
-                $this->_moduleList[$k] = $v;
-            }
-        }
-
-        return $this->_moduleList;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRateList()
-    {
-        return $this->_rateOptions;
-    }
-
-    /**
-     * @param $itemid
-     * @param $dirname
-     * @param $item
-     * @return int
-     */
-    public function getRatingAverageByItemId($itemid, $dirname, $item)
-    {
-        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM ' . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        list($average, $sum) = $this->db->fetchRow($result);
-        $ret['average'] = isset($average) ? $average : 0;
-        $ret['sum']     = isset($sum) ? $sum : 0;
-
-        return $ret;
-    }
-
-    /**
-     * @param $item
-     * @param $itemid
-     * @param $dirname
-     * @param $uid
-     * @return bool
-     */
-    public function already_rated($item, $itemid, $dirname, $uid)
-    {
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('item', $item));
-        $criteria->add(new Criteria('itemid', $itemid));
-        $criteria->add(new Criteria('dirname', $dirname));
-        $criteria->add(new Criteria('user.uid', $uid));
-
-        $ret = $this->getObjects($criteria);
-
-        if (!$ret) {
-            return false;
-        } else {
-            return $ret[0];
-        }
-    }
+	public $_rateOptions = [];
+	public $_moduleList  = false;
+	public $pluginsObject;
+
+	/**
+	 * SmartobjectRatingHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
+		$this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
+
+		$this->_rateOptions[1] = 1;
+		$this->_rateOptions[2] = 2;
+		$this->_rateOptions[3] = 3;
+		$this->_rateOptions[4] = 4;
+		$this->_rateOptions[5] = 5;
+
+		$this->pluginsObject = new SmartPluginHandler();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getModuleList()
+	{
+		if (!$this->_moduleList) {
+			$moduleArray          = $this->pluginsObject->getPluginsArray();
+			$this->_moduleList[0] = _CO_SOBJECT_MAKE_SELECTION;
+			foreach ($moduleArray as $k => $v) {
+				$this->_moduleList[$k] = $v;
+			}
+		}
+
+		return $this->_moduleList;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getRateList()
+	{
+		return $this->_rateOptions;
+	}
+
+	/**
+	 * @param $itemid
+	 * @param $dirname
+	 * @param $item
+	 * @return int
+	 */
+	public function getRatingAverageByItemId($itemid, $dirname, $item)
+	{
+		$sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM ' . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		list($average, $sum) = $this->db->fetchRow($result);
+		$ret['average'] = isset($average) ? $average : 0;
+		$ret['sum']     = isset($sum) ? $sum : 0;
+
+		return $ret;
+	}
+
+	/**
+	 * @param $item
+	 * @param $itemid
+	 * @param $dirname
+	 * @param $uid
+	 * @return bool
+	 */
+	public function already_rated($item, $itemid, $dirname, $uid)
+	{
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('item', $item));
+		$criteria->add(new Criteria('itemid', $itemid));
+		$criteria->add(new Criteria('dirname', $dirname));
+		$criteria->add(new Criteria('user.uid', $uid));
+
+		$ret = $this->getObjects($criteria);
+
+		if (!$ret) {
+			return false;
+		} else {
+			return $ret[0];
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -29,8 +29,8 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartplugins.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartplugins.php';
 
 /**
  * Class SmartobjectRating
@@ -124,14 +124,14 @@ 
      */
     public function getItemValue()
     {
-        $moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
+        $moduleUrl      = XOOPS_URL.'/modules/'.$this->getVar('dirname', 'n').'/';
         $plugin         = $this->getModulePlugin();
         $pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
         if (!$pluginItemInfo) {
             return '';
         }
         $itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
-        $ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
+        $ret      = '<a href="'.$moduleUrl.$itemPath.'">'.$pluginItemInfo['caption'].'</a>';
 
         return $ret;
     }
@@ -174,7 +174,7 @@ 
     public function __construct(XoopsDatabase $db)
     {
         parent::__construct($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
-        $this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
+        $this->generalSQL = 'SELECT * FROM '.$this->table.' AS '.$this->_itemname.' INNER JOIN '.$this->db->prefix('users').' AS user ON '.$this->_itemname.'.uid=user.uid';
 
         $this->_rateOptions[1] = 1;
         $this->_rateOptions[2] = 2;
@@ -217,7 +217,7 @@ 
      */
     public function getRatingAverageByItemId($itemid, $dirname, $item)
     {
-        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM ' . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
+        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM '.$this->table." WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;

class/form/elements/smartformuserelement.php

Indentation +27 added lines, -27 removed lines

@@ -11,36 +11,36 @@
  */
 class SmartFormUserElement extends XoopsFormSelect
 {
-    public $multiple = false;
+	public $multiple = false;
 
-    /**
-     * SmartFormUserElement constructor.
-     * @param string $object
-     * @param string $key
-     */
-    public function __construct($object, $key)
-    {
-        $var  = $object->vars[$key];
-        $size = isset($var['size']) ? $var['size'] : ($this->multiple ? 5 : 1);
+	/**
+	 * SmartFormUserElement constructor.
+	 * @param string $object
+	 * @param string $key
+	 */
+	public function __construct($object, $key)
+	{
+		$var  = $object->vars[$key];
+		$size = isset($var['size']) ? $var['size'] : ($this->multiple ? 5 : 1);
 
-        parent::__construct($var['form_caption'], $key, $object->getVar($key, 'e'), $size, $this->multiple);
+		parent::__construct($var['form_caption'], $key, $object->getVar($key, 'e'), $size, $this->multiple);
 
-        // Adding the options inside this SelectBox
-        // If the custom method is not from a module, than it's from the core
-        $control = $object->getControl($key);
+		// Adding the options inside this SelectBox
+		// If the custom method is not from a module, than it's from the core
+		$control = $object->getControl($key);
 
-        global $xoopsDB;
-        $ret   = [];
-        $limit = $start = 0;
-        $sql   = 'SELECT uid, uname FROM ' . $xoopsDB->prefix('users');
-        $sql   .= ' ORDER BY uname ASC';
+		global $xoopsDB;
+		$ret   = [];
+		$limit = $start = 0;
+		$sql   = 'SELECT uid, uname FROM ' . $xoopsDB->prefix('users');
+		$sql   .= ' ORDER BY uname ASC';
 
-        $result = $xoopsDB->query($sql);
-        if ($result) {
-            while ($myrow = $xoopsDB->fetchArray($result)) {
-                $uArray[$myrow['uid']] = $myrow['uname'];
-            }
-        }
-        $this->addOptionArray($uArray);
-    }
+		$result = $xoopsDB->query($sql);
+		if ($result) {
+			while ($myrow = $xoopsDB->fetchArray($result)) {
+				$uArray[$myrow['uid']] = $myrow['uname'];
+			}
+		}
+		$this->addOptionArray($uArray);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         global $xoopsDB;
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT uid, uname FROM ' . $xoopsDB->prefix('users');
+        $sql   = 'SELECT uid, uname FROM '.$xoopsDB->prefix('users');
         $sql   .= ' ORDER BY uname ASC';
 
         $result = $xoopsDB->query($sql);

class/smartobjectcategory.php

Indentation +204 added lines, -204 removed lines

@@ -18,123 +18,123 @@ 
  */
 class SmartobjectCategory extends SmartSeoObject
 {
-    public $_categoryPath;
-
-    /**
-     * SmartobjectCategory constructor.
-     */
-    public function __construct()
-    {
-        $this->initVar('categoryid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('parentid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_CATEGORY_PARENTID, _CO_SOBJECT_CATEGORY_PARENTID_DSC);
-        $this->initVar('name', XOBJ_DTYPE_TXTBOX, '', false, null, '', false, _CO_SOBJECT_CATEGORY_NAME, _CO_SOBJECT_CATEGORY_NAME_DSC);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, '', false, null, '', false, _CO_SOBJECT_CATEGORY_DESCRIPTION, _CO_SOBJECT_CATEGORY_DESCRIPTION_DSC);
-        $this->initVar('image', XOBJ_DTYPE_TXTBOX, '', false, null, '', false, _CO_SOBJECT_CATEGORY_IMAGE, _CO_SOBJECT_CATEGORY_IMAGE_DSC);
-
-        $this->initCommonVar('doxcode');
-
-        $this->setControl('image', ['name' => 'image']);
-        $this->setControl('parentid', ['name' => 'parentcategory']);
-        $this->setControl('description', [
-            'name'        => 'textarea',
-            'itemHandler' => false,
-            'method'      => false,
-            'module'      => false,
-            'form_editor' => 'default'
-        ]);
-
-        // call parent constructor to get SEO fields initiated
-        parent::__construct();
-    }
-
-    /**
-     * returns a specific variable for the object in a proper format
-     *
-     * @access public
-     * @param  string $key    key of the object's variable to be returned
-     * @param  string $format format to use for the output
-     * @return mixed  formatted value of the variable
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, ['description', 'image'])) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return string
-     */
-    public function description()
-    {
-        return $this->getValueFor('description', false);
-    }
-
-    /**
-     * @return bool|mixed
-     */
-    public function image()
-    {
-        $ret = $this->getVar('image', 'e');
-        if ($ret == '-1') {
-            return false;
-        } else {
-            return $ret;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        $this->setVar('doxcode', true);
-        global $myts;
-        $objectArray = parent::toArray();
-        if ($objectArray['image']) {
-            $objectArray['image'] = $this->getImageDir() . $objectArray['image'];
-        }
-
-        return $objectArray;
-    }
-
-    /**
-     * Create the complete path of a category
-     *
-     * @todo this could be improved as it uses multiple queries
-     * @param  bool $withAllLink make all name clickable
-     * @param  bool $currentCategory
-     * @return string complete path (breadcrumb)
-     */
-    public function getCategoryPath($withAllLink = true, $currentCategory = false)
-    {
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($this->handler);
-
-        if (!$this->_categoryPath) {
-            if ($withAllLink && !$currentCategory) {
-                $ret = $controller->getItemLink($this);
-            } else {
-                $currentCategory = false;
-                $ret             = $this->getVar('name');
-            }
-            $parentid = $this->getVar('parentid');
-            if ($parentid != 0) {
-                $parentObj = $this->handler->get($parentid);
-                if ($parentObj->isNew()) {
-                    exit;
-                }
-                $parentid = $parentObj->getVar('parentid');
-                $ret      = $parentObj->getCategoryPath($withAllLink, $currentCategory) . ' > ' . $ret;
-            }
-            $this->_categoryPath = $ret;
-        }
-
-        return $this->_categoryPath;
-    }
+	public $_categoryPath;
+
+	/**
+	 * SmartobjectCategory constructor.
+	 */
+	public function __construct()
+	{
+		$this->initVar('categoryid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('parentid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_CATEGORY_PARENTID, _CO_SOBJECT_CATEGORY_PARENTID_DSC);
+		$this->initVar('name', XOBJ_DTYPE_TXTBOX, '', false, null, '', false, _CO_SOBJECT_CATEGORY_NAME, _CO_SOBJECT_CATEGORY_NAME_DSC);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, '', false, null, '', false, _CO_SOBJECT_CATEGORY_DESCRIPTION, _CO_SOBJECT_CATEGORY_DESCRIPTION_DSC);
+		$this->initVar('image', XOBJ_DTYPE_TXTBOX, '', false, null, '', false, _CO_SOBJECT_CATEGORY_IMAGE, _CO_SOBJECT_CATEGORY_IMAGE_DSC);
+
+		$this->initCommonVar('doxcode');
+
+		$this->setControl('image', ['name' => 'image']);
+		$this->setControl('parentid', ['name' => 'parentcategory']);
+		$this->setControl('description', [
+			'name'        => 'textarea',
+			'itemHandler' => false,
+			'method'      => false,
+			'module'      => false,
+			'form_editor' => 'default'
+		]);
+
+		// call parent constructor to get SEO fields initiated
+		parent::__construct();
+	}
+
+	/**
+	 * returns a specific variable for the object in a proper format
+	 *
+	 * @access public
+	 * @param  string $key    key of the object's variable to be returned
+	 * @param  string $format format to use for the output
+	 * @return mixed  formatted value of the variable
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, ['description', 'image'])) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function description()
+	{
+		return $this->getValueFor('description', false);
+	}
+
+	/**
+	 * @return bool|mixed
+	 */
+	public function image()
+	{
+		$ret = $this->getVar('image', 'e');
+		if ($ret == '-1') {
+			return false;
+		} else {
+			return $ret;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$this->setVar('doxcode', true);
+		global $myts;
+		$objectArray = parent::toArray();
+		if ($objectArray['image']) {
+			$objectArray['image'] = $this->getImageDir() . $objectArray['image'];
+		}
+
+		return $objectArray;
+	}
+
+	/**
+	 * Create the complete path of a category
+	 *
+	 * @todo this could be improved as it uses multiple queries
+	 * @param  bool $withAllLink make all name clickable
+	 * @param  bool $currentCategory
+	 * @return string complete path (breadcrumb)
+	 */
+	public function getCategoryPath($withAllLink = true, $currentCategory = false)
+	{
+		require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($this->handler);
+
+		if (!$this->_categoryPath) {
+			if ($withAllLink && !$currentCategory) {
+				$ret = $controller->getItemLink($this);
+			} else {
+				$currentCategory = false;
+				$ret             = $this->getVar('name');
+			}
+			$parentid = $this->getVar('parentid');
+			if ($parentid != 0) {
+				$parentObj = $this->handler->get($parentid);
+				if ($parentObj->isNew()) {
+					exit;
+				}
+				$parentid = $parentObj->getVar('parentid');
+				$ret      = $parentObj->getCategoryPath($withAllLink, $currentCategory) . ' > ' . $ret;
+			}
+			$this->_categoryPath = $ret;
+		}
+
+		return $this->_categoryPath;
+	}
 }
 
 /**
@@ -142,91 +142,91 @@ 
  */
 class SmartobjectCategoryHandler extends SmartPersistableObjectHandler
 {
-    public $allCategoriesObj = false;
-    public $_allCategoriesId = false;
-
-    /**
-     * SmartobjectCategoryHandler constructor.
-     * @param XoopsDatabase        $db
-     * @param                      $modulename
-     */
-    public function __construct(XoopsDatabase $db, $modulename)
-    {
-        parent::__construct($db, 'category', 'categoryid', 'name', 'description', $modulename);
-    }
-
-    /**
-     * @param  int    $parentid
-     * @param  bool   $perm_name
-     * @param  string $sort
-     * @param  string $order
-     * @return array|bool
-     */
-    public function getAllCategoriesArray($parentid = 0, $perm_name = false, $sort = 'parentid', $order = 'ASC')
-    {
-        if (!$this->allCategoriesObj) {
-            $criteria = new CriteriaCompo();
-            $criteria->setSort($sort);
-            $criteria->setOrder($order);
-            global $xoopsUser;
-            $userIsAdmin = is_object($xoopsUser) && $xoopsUser->isAdmin();
-
-            if ($perm_name && !$userIsAdmin) {
-                if (!$this->setGrantedObjectsCriteria($criteria, $perm_name)) {
-                    return false;
-                }
-            }
-
-            $this->allCategoriesObj = $this->getObjects($criteria, 'parentid');
-        }
-
-        $ret = [];
-        if (isset($this->allCategoriesObj[$parentid])) {
-            foreach ($this->allCategoriesObj[$parentid] as $categoryid => $categoryObj) {
-                $ret[$categoryid]['self'] = $categoryObj->toArray();
-                if (isset($this->allCategoriesObj[$categoryid])) {
-                    $ret[$categoryid]['sub']          = $this->getAllCategoriesArray($categoryid);
-                    $ret[$categoryid]['subcatscount'] = count($ret[$categoryid]['sub']);
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param               $parentid
-     * @param  bool         $asString
-     * @return array|string
-     */
-    public function getParentIds($parentid, $asString = true)
-    {
-        if (!$this->allCategoriesId) {
-            $ret = [];
-            $sql = 'SELECT categoryid, parentid FROM ' . $this->table . ' AS ' . $this->_itemname . ' ORDER BY parentid';
-
-            $result = $this->db->query($sql);
-
-            if (!$result) {
-                return $ret;
-            }
-
-            while ($myrow = $this->db->fetchArray($result)) {
-                $this->allCategoriesId[$myrow['categoryid']] = $myrow['parentid'];
-            }
-        }
-
-        $retArray = [$parentid];
-        while ($parentid != 0) {
-            $parentid = $this->allCategoriesId[$parentid];
-            if ($parentid != 0) {
-                $retArray[] = $parentid;
-            }
-        }
-        if ($asString) {
-            return implode(', ', $retArray);
-        } else {
-            return $retArray;
-        }
-    }
+	public $allCategoriesObj = false;
+	public $_allCategoriesId = false;
+
+	/**
+	 * SmartobjectCategoryHandler constructor.
+	 * @param XoopsDatabase        $db
+	 * @param                      $modulename
+	 */
+	public function __construct(XoopsDatabase $db, $modulename)
+	{
+		parent::__construct($db, 'category', 'categoryid', 'name', 'description', $modulename);
+	}
+
+	/**
+	 * @param  int    $parentid
+	 * @param  bool   $perm_name
+	 * @param  string $sort
+	 * @param  string $order
+	 * @return array|bool
+	 */
+	public function getAllCategoriesArray($parentid = 0, $perm_name = false, $sort = 'parentid', $order = 'ASC')
+	{
+		if (!$this->allCategoriesObj) {
+			$criteria = new CriteriaCompo();
+			$criteria->setSort($sort);
+			$criteria->setOrder($order);
+			global $xoopsUser;
+			$userIsAdmin = is_object($xoopsUser) && $xoopsUser->isAdmin();
+
+			if ($perm_name && !$userIsAdmin) {
+				if (!$this->setGrantedObjectsCriteria($criteria, $perm_name)) {
+					return false;
+				}
+			}
+
+			$this->allCategoriesObj = $this->getObjects($criteria, 'parentid');
+		}
+
+		$ret = [];
+		if (isset($this->allCategoriesObj[$parentid])) {
+			foreach ($this->allCategoriesObj[$parentid] as $categoryid => $categoryObj) {
+				$ret[$categoryid]['self'] = $categoryObj->toArray();
+				if (isset($this->allCategoriesObj[$categoryid])) {
+					$ret[$categoryid]['sub']          = $this->getAllCategoriesArray($categoryid);
+					$ret[$categoryid]['subcatscount'] = count($ret[$categoryid]['sub']);
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param               $parentid
+	 * @param  bool         $asString
+	 * @return array|string
+	 */
+	public function getParentIds($parentid, $asString = true)
+	{
+		if (!$this->allCategoriesId) {
+			$ret = [];
+			$sql = 'SELECT categoryid, parentid FROM ' . $this->table . ' AS ' . $this->_itemname . ' ORDER BY parentid';
+
+			$result = $this->db->query($sql);
+
+			if (!$result) {
+				return $ret;
+			}
+
+			while ($myrow = $this->db->fetchArray($result)) {
+				$this->allCategoriesId[$myrow['categoryid']] = $myrow['parentid'];
+			}
+		}
+
+		$retArray = [$parentid];
+		while ($parentid != 0) {
+			$parentid = $this->allCategoriesId[$parentid];
+			if ($parentid != 0) {
+				$retArray[] = $parentid;
+			}
+		}
+		if ($asString) {
+			return implode(', ', $retArray);
+		} else {
+			return $retArray;
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartseoobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartseoobject.php';
 
 /**
  * Class SmartobjectCategory
@@ -95,7 +95,7 @@ 
         global $myts;
         $objectArray = parent::toArray();
         if ($objectArray['image']) {
-            $objectArray['image'] = $this->getImageDir() . $objectArray['image'];
+            $objectArray['image'] = $this->getImageDir().$objectArray['image'];
         }
 
         return $objectArray;
@@ -111,7 +111,7 @@ 
      */
     public function getCategoryPath($withAllLink = true, $currentCategory = false)
     {
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
         $controller = new SmartObjectController($this->handler);
 
         if (!$this->_categoryPath) {
@@ -128,7 +128,7 @@ 
                     exit;
                 }
                 $parentid = $parentObj->getVar('parentid');
-                $ret      = $parentObj->getCategoryPath($withAllLink, $currentCategory) . ' > ' . $ret;
+                $ret      = $parentObj->getCategoryPath($withAllLink, $currentCategory).' > '.$ret;
             }
             $this->_categoryPath = $ret;
         }
@@ -203,7 +203,7 @@ 
     {
         if (!$this->allCategoriesId) {
             $ret = [];
-            $sql = 'SELECT categoryid, parentid FROM ' . $this->table . ' AS ' . $this->_itemname . ' ORDER BY parentid';
+            $sql = 'SELECT categoryid, parentid FROM '.$this->table.' AS '.$this->_itemname.' ORDER BY parentid';
 
             $result = $this->db->query($sql);
 

class/smartmlobject.php

Indentation +132 added lines, -132 removed lines

@@ -24,82 +24,82 @@ 
  */
 class SmartMlObject extends SmartObject
 {
-    /**
-     * SmartMlObject constructor.
-     */
-    public function __construct()
-    {
-        $this->initVar('language', XOBJ_DTYPE_TXTBOX, 'english', false, null, '', true, _CO_SOBJECT_LANGUAGE_CAPTION, _CO_SOBJECT_LANGUAGE_DSC, true, true);
-        $this->setControl('language', 'language');
-    }
-
-    /**
-     * If object is not new, change the control of the not-multilanguage fields
-     *
-     * We need to intercept this function from SmartObject because if the object is not new...
-     */
-    // function getForm() {
-
-    //}
-
-    /**
-     * Strip Multilanguage Fields
-     *
-     * Get rid of all the multilanguage fields to have an object with only global fields.
-     * This will be usefull when creating the ML object for the first time. Then we will be able
-     * to create translations.
-     */
-    public function stripMultilanguageFields()
-    {
-        $objectVars    =& $this->getVars();
-        $newObjectVars = [];
-        foreach ($objectVars as $key => $var) {
-            if (!$var['multilingual']) {
-                $newObjectVars[$key] = $var;
-            }
-        }
-        $this->vars = $newObjectVars;
-    }
-
-    public function stripNonMultilanguageFields()
-    {
-        $objectVars    =& $this->getVars();
-        $newObjectVars = [];
-        foreach ($objectVars as $key => $var) {
-            if ($var['multilingual'] || $key == $this->handler->keyName) {
-                $newObjectVars[$key] = $var;
-            }
-        }
-        $this->vars = $newObjectVars;
-    }
-
-    /**
-     * Make non multilanguage fields read only
-     *
-     * This is used when we are creating/editing a translation.
-     * We only want to edit the multilanguag fields, not the global one.
-     */
-    public function makeNonMLFieldReadOnly()
-    {
-        foreach ($this->getVars() as $key => $var) {
-            //if (($key == 'language') || (!$var['multilingual'] && $key <> $this->handler->keyName)) {
-            if (!$var['multilingual'] && $key != $this->handler->keyName) {
-                $this->setControl($key, 'label');
-            }
-        }
-    }
-
-    /**
-     * @param  bool $onlyUrl
-     * @param  bool $withimage
-     * @return string
-     */
-    public function getEditLanguageLink($onlyUrl = false, $withimage = true)
-    {
-        $controller = new SmartObjectController($this->handler);
-
-        return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
-    }
+	/**
+	 * SmartMlObject constructor.
+	 */
+	public function __construct()
+	{
+		$this->initVar('language', XOBJ_DTYPE_TXTBOX, 'english', false, null, '', true, _CO_SOBJECT_LANGUAGE_CAPTION, _CO_SOBJECT_LANGUAGE_DSC, true, true);
+		$this->setControl('language', 'language');
+	}
+
+	/**
+	 * If object is not new, change the control of the not-multilanguage fields
+	 *
+	 * We need to intercept this function from SmartObject because if the object is not new...
+	 */
+	// function getForm() {
+
+	//}
+
+	/**
+	 * Strip Multilanguage Fields
+	 *
+	 * Get rid of all the multilanguage fields to have an object with only global fields.
+	 * This will be usefull when creating the ML object for the first time. Then we will be able
+	 * to create translations.
+	 */
+	public function stripMultilanguageFields()
+	{
+		$objectVars    =& $this->getVars();
+		$newObjectVars = [];
+		foreach ($objectVars as $key => $var) {
+			if (!$var['multilingual']) {
+				$newObjectVars[$key] = $var;
+			}
+		}
+		$this->vars = $newObjectVars;
+	}
+
+	public function stripNonMultilanguageFields()
+	{
+		$objectVars    =& $this->getVars();
+		$newObjectVars = [];
+		foreach ($objectVars as $key => $var) {
+			if ($var['multilingual'] || $key == $this->handler->keyName) {
+				$newObjectVars[$key] = $var;
+			}
+		}
+		$this->vars = $newObjectVars;
+	}
+
+	/**
+	 * Make non multilanguage fields read only
+	 *
+	 * This is used when we are creating/editing a translation.
+	 * We only want to edit the multilanguag fields, not the global one.
+	 */
+	public function makeNonMLFieldReadOnly()
+	{
+		foreach ($this->getVars() as $key => $var) {
+			//if (($key == 'language') || (!$var['multilingual'] && $key <> $this->handler->keyName)) {
+			if (!$var['multilingual'] && $key != $this->handler->keyName) {
+				$this->setControl($key, 'label');
+			}
+		}
+	}
+
+	/**
+	 * @param  bool $onlyUrl
+	 * @param  bool $withimage
+	 * @return string
+	 */
+	public function getEditLanguageLink($onlyUrl = false, $withimage = true)
+	{
+		$controller = new SmartObjectController($this->handler);
+
+		return $controller->getEditLanguageLink($this, $onlyUrl, $withimage);
+	}
 }
 
 /**
@@ -107,60 +107,60 @@ 
  */
 class SmartPersistableMlObjectHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * @param  null $criteria
-     * @param  bool $id_as_key
-     * @param  bool $as_object
-     * @param  bool $debug
-     * @param  bool $language
-     * @return array
-     */
-    public function getObjects(
-        $criteria = null,
-        $id_as_key = false,
-        $as_object = true,
-        $debug = false,
-        $language = false
-    ) {
-        // Create the first part of the SQL query to join the "_text" table
-        $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
-
-        if ($language) {
-            // If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
-
-            // if no criteria was previously created, let's create it
-            if (!$criteria) {
-                $criteria = new CriteriaCompo();
-            }
-            $criteria->add(new Criteria('language', $language));
-
-            return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-        }
-
-        return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-    }
-
-    /**
-     * @param  mixed $id
-     * @param  bool  $language
-     * @param  bool  $as_object
-     * @param  bool  $debug
-     * @return mixed
-     */
-    public function &get($id, $language = false, $as_object = true, $debug = false)
-    {
-        if (!$language) {
-            return parent::get($id, $as_object, $debug);
-        } else {
-            $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria('language', $language));
-
-            return parent::get($id, $as_object, $debug, $criteria);
-        }
-    }
-
-    public function changeTableNameForML()
-    {
-        $this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
-    }
+	/**
+	 * @param  null $criteria
+	 * @param  bool $id_as_key
+	 * @param  bool $as_object
+	 * @param  bool $debug
+	 * @param  bool $language
+	 * @return array
+	 */
+	public function getObjects(
+		$criteria = null,
+		$id_as_key = false,
+		$as_object = true,
+		$debug = false,
+		$language = false
+	) {
+		// Create the first part of the SQL query to join the "_text" table
+		$sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
+
+		if ($language) {
+			// If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
+
+			// if no criteria was previously created, let's create it
+			if (!$criteria) {
+				$criteria = new CriteriaCompo();
+			}
+			$criteria->add(new Criteria('language', $language));
+
+			return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+		}
+
+		return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+	}
+
+	/**
+	 * @param  mixed $id
+	 * @param  bool  $language
+	 * @param  bool  $as_object
+	 * @param  bool  $debug
+	 * @return mixed
+	 */
+	public function &get($id, $language = false, $as_object = true, $debug = false)
+	{
+		if (!$language) {
+			return parent::get($id, $as_object, $debug);
+		} else {
+			$criteria = new CriteriaCompo();
+			$criteria->add(new Criteria('language', $language));
+
+			return parent::get($id, $as_object, $debug, $criteria);
+		}
+	}
+
+	public function changeTableNameForML()
+	{
+		$this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * SmartObject base Multilanguage-enabled class
@@ -51,7 +51,7 @@ 
      */
     public function stripMultilanguageFields()
     {
-        $objectVars    =& $this->getVars();
+        $objectVars    = & $this->getVars();
         $newObjectVars = [];
         foreach ($objectVars as $key => $var) {
             if (!$var['multilingual']) {
@@ -63,7 +63,7 @@ 
 
     public function stripNonMultilanguageFields()
     {
-        $objectVars    =& $this->getVars();
+        $objectVars    = & $this->getVars();
         $newObjectVars = [];
         foreach ($objectVars as $key => $var) {
             if ($var['multilingual'] || $key == $this->handler->keyName) {
@@ -123,7 +123,7 @@ 
         $language = false
     ) {
         // Create the first part of the SQL query to join the "_text" table
-        $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
+        $sql = 'SELECT * FROM '.$this->table.' AS '.$this->_itemname.' INNER JOIN '.$this->table.'_text AS '.$this->_itemname.'_text ON '.$this->_itemname.'.'.$this->keyName.'='.$this->_itemname.'_text.'.$this->keyName;
 
         if ($language) {
             // If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
@@ -161,6 +161,6 @@ 
 
     public function changeTableNameForML()
     {
-        $this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
+        $this->table = $this->db->prefix($this->_moduleName.'_'.$this->_itemname.'_text');
     }
 }