mambax7 / smartobject

class/smarthighlighter.php

Indentation +88 added lines, -88 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * This file contains the keyhighlighter class that highlight the chosen keyword in the current output buffer.
- *
- * @package keyhighlighter
- */
+	 * This file contains the keyhighlighter class that highlight the chosen keyword in the current output buffer.
+	 *
+	 * @package keyhighlighter
+	 */
 
 /**
  * keyhighlighter class
@@ -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 = array();
-        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 = array();
+		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", array(&$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", array(&$this, 'replace'), $buffer);
+		$buffer              = substr($buffer, 1, -1);
 
-        return $buffer;
-    }
+		return $buffer;
+	}
 }

class/smartobjecttag.php

Indentation +33 added lines, -33 removed lines

@@ -35,19 +35,19 @@ 
  */
 class SmartobjectTag extends SmartMlObject
 {
-    /**
-     * SmartobjectTag constructor.
-     */
-    public function __construct()
-    {
-        $this->initVar('tagid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_TAG_TAGID_CAPTION, _CO_SOBJECT_TAG_TAGID_DSC, true);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_TAG_DESCRIPTION_CAPTION, _CO_SOBJECT_TAG_DESCRIPTION_DSC);
-        $this->initVar('value', XOBJ_DTYPE_TXTAREA, '', true, null, '', true, _CO_SOBJECT_TAG_VALUE_CAPTION, _CO_SOBJECT_TAG_VALUE_DSC);
+	/**
+	 * SmartobjectTag constructor.
+	 */
+	public function __construct()
+	{
+		$this->initVar('tagid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_TAG_TAGID_CAPTION, _CO_SOBJECT_TAG_TAGID_DSC, true);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_TAG_DESCRIPTION_CAPTION, _CO_SOBJECT_TAG_DESCRIPTION_DSC);
+		$this->initVar('value', XOBJ_DTYPE_TXTAREA, '', true, null, '', true, _CO_SOBJECT_TAG_VALUE_CAPTION, _CO_SOBJECT_TAG_VALUE_DSC);
 
-        // call parent constructor to get Multilanguage field initiated
-        $this->SmartMlObject();
-    }
+		// call parent constructor to get Multilanguage field initiated
+		$this->SmartMlObject();
+	}
 }
 
 /**
@@ -55,27 +55,27 @@ 
  */
 class SmartobjectTagHandler extends SmartPersistableMlObjectHandler
 {
-    /**
-     * SmartobjectTagHandler constructor.
-     * @param object|XoopsDatabase $db
-     */
-    public function __construct($db)
-    {
-        parent::__construct($db, 'tag', 'tagid', 'name', 'description', 'smartobject');
-    }
+	/**
+	 * SmartobjectTagHandler constructor.
+	 * @param object|XoopsDatabase $db
+	 */
+	public function __construct($db)
+	{
+		parent::__construct($db, 'tag', 'tagid', 'name', 'description', 'smartobject');
+	}
 
-    /**
-     * @return mixed
-     */
-    public function getLanguages()
-    {
-        include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $aLanguages     = XoopsLists::getLangList();
-        $ret['default'] = _CO_SOBJECT_ALL;
-        foreach ($aLanguages as $lang) {
-            $ret[$lang] = $lang;
-        }
+	/**
+	 * @return mixed
+	 */
+	public function getLanguages()
+	{
+		include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+		$aLanguages     = XoopsLists::getLangList();
+		$ret['default'] = _CO_SOBJECT_ALL;
+		foreach ($aLanguages as $lang) {
+			$ret[$lang] = $lang;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

class/adsense.php

Indentation +253 added lines, -253 removed lines

@@ -36,87 +36,87 @@ 
  */
 class SmartobjectAdsense extends SmartObject
 {
-    /**
-     * SmartobjectAdsense constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('adsenseid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_ADSENSE_DESCRIPTION, _CO_SOBJECT_ADSENSE_DESCRIPTION_DSC);
-        $this->quickInitVar('client_id', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_CLIENT_ID, _CO_SOBJECT_ADSENSE_CLIENT_ID_DSC);
-        $this->quickInitVar('tag', XOBJ_DTYPE_TXTBOX, false, _CO_SOBJECT_ADSENSE_TAG, _CO_SOBJECT_ADSENSE_TAG_DSC);
-        $this->quickInitVar('format', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_FORMAT, _CO_SOBJECT_ADSENSE_FORMAT_DSC);
-        $this->quickInitVar('border_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BORDER_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
-        $this->quickInitVar('background_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BACKGROUND_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
-        $this->quickInitVar('link_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_LINK_COLOR, _CO_SOBJECT_ADSENSE_LINK_COLOR_DSC);
-        $this->quickInitVar('url_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_URL_COLOR, _CO_SOBJECT_ADSENSE_URL_COLOR_DSC);
-        $this->quickInitVar('text_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_TEXT_COLOR, _CO_SOBJECT_ADSENSE_TEXT_COLOR_DSC);
-        $this->quickInitVar('style', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_ADSENSE_STYLE, _CO_SOBJECT_ADSENSE_STYLE_DSC);
-
-        $this->setControl('format', array(
-            'handler' => 'adsense',
-            'method'  => 'getFormats'
-        ));
-
-        $this->setControl('border_color', array(
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ));
-
-        $this->setControl('background_color', array(
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ));
-
-        $this->setControl('link_color', array(
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ));
-
-        $this->setControl('url_color', array(
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ));
-
-        $this->setControl('text_color', array(
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ));
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, array())) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        global $smartobjectAdsenseHandler;
-        if ($this->getVar('style', 'n') != '') {
-            $ret = '<div style="' . $this->getVar('style', 'n') . '">';
-        } else {
-            $ret = '<div>';
-        }
-
-        $ret .= '<script type="text/javascript"><!--
+	/**
+	 * SmartobjectAdsense constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('adsenseid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_ADSENSE_DESCRIPTION, _CO_SOBJECT_ADSENSE_DESCRIPTION_DSC);
+		$this->quickInitVar('client_id', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_CLIENT_ID, _CO_SOBJECT_ADSENSE_CLIENT_ID_DSC);
+		$this->quickInitVar('tag', XOBJ_DTYPE_TXTBOX, false, _CO_SOBJECT_ADSENSE_TAG, _CO_SOBJECT_ADSENSE_TAG_DSC);
+		$this->quickInitVar('format', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_FORMAT, _CO_SOBJECT_ADSENSE_FORMAT_DSC);
+		$this->quickInitVar('border_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BORDER_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
+		$this->quickInitVar('background_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BACKGROUND_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
+		$this->quickInitVar('link_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_LINK_COLOR, _CO_SOBJECT_ADSENSE_LINK_COLOR_DSC);
+		$this->quickInitVar('url_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_URL_COLOR, _CO_SOBJECT_ADSENSE_URL_COLOR_DSC);
+		$this->quickInitVar('text_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_TEXT_COLOR, _CO_SOBJECT_ADSENSE_TEXT_COLOR_DSC);
+		$this->quickInitVar('style', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_ADSENSE_STYLE, _CO_SOBJECT_ADSENSE_STYLE_DSC);
+
+		$this->setControl('format', array(
+			'handler' => 'adsense',
+			'method'  => 'getFormats'
+		));
+
+		$this->setControl('border_color', array(
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		));
+
+		$this->setControl('background_color', array(
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		));
+
+		$this->setControl('link_color', array(
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		));
+
+		$this->setControl('url_color', array(
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		));
+
+		$this->setControl('text_color', array(
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		));
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, array())) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		global $smartobjectAdsenseHandler;
+		if ($this->getVar('style', 'n') != '') {
+			$ret = '<div style="' . $this->getVar('style', 'n') . '">';
+		} else {
+			$ret = '<div>';
+		}
+
+		$ret .= '<script type="text/javascript"><!--
 google_ad_client = "' . $this->getVar('client_id', 'n') . '";
 google_ad_width = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['width'] . ';
 google_ad_height = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['height'] . ';
@@ -134,66 +134,66 @@ 
 </script>
 </div>';
 
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXoopsCode()
-    {
-        $ret = '[adsense]' . $this->getVar('tag', 'n') . '[/adsense]';
-
-        return $ret;
-    }
-
-    /**
-     * @param $var
-     * @return bool
-     */
-    public function emptyString($var)
-    {
-        return (strlen($var) > 0);
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function generateTag()
-    {
-        $title = rawurlencode(strtolower($this->getVar('description', 'e')));
-        $title = xoops_substr($title, 0, 10, '');
-        // Transformation des ponctuations
-        //                 Tab     Space      !        "        #        %        &        '        (        )        ,        /       :        ;        <        =        >        ?        @        [        \        ]        ^        {        |        }        ~       .
-        $pattern = array('/%09/', '/%20/', '/%21/', '/%22/', '/%23/', '/%25/', '/%26/', '/%27/', '/%28/', '/%29/', '/%2C/', '/%2F/', '/%3A/', '/%3B/', '/%3C/', '/%3D/', '/%3E/', '/%3F/', '/%40/', '/%5B/', '/%5C/', '/%5D/', '/%5E/', '/%7B/', '/%7C/', '/%7D/', '/%7E/', "/\./");
-        $rep_pat = array('-', '-', '-', '-', '-', '-100', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-at-', '-', '-', '-', '-', '-', '-', '-', '-', '-');
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        // Transformation des caract�res accentu�s
-        //                  °        è        é        ê        ë        ç        à        â        ä        î        ï        ù        ü        û        ô        ö
-        $pattern = array('/%B0/', '/%E8/', '/%E9/', '/%EA/', '/%EB/', '/%E7/', '/%E0/', '/%E2/', '/%E4/', '/%EE/', '/%EF/', '/%F9/', '/%FC/', '/%FB/', '/%F4/', '/%F6/');
-        $rep_pat = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
-        $title   = preg_replace($pattern, $rep_pat, $title);
-
-        $tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
-        $tableau = array_filter($tableau, array($this, 'emptyString')); // Supprime les chaines vides du tableau
-        $title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
-
-        $title = $title . time();
-        $title = md5($title);
-
-        return $title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCloneLink()
-    {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/adsense.php?op=clone&adsenseid=' . $this->getVar('adsenseid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" alt="' . _CO_SOBJECT_ADSENSE_CLONE . '" title="' . _CO_SOBJECT_ADSENSE_CLONE . '" /></a>';
-
-        return $ret;
-    }
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXoopsCode()
+	{
+		$ret = '[adsense]' . $this->getVar('tag', 'n') . '[/adsense]';
+
+		return $ret;
+	}
+
+	/**
+	 * @param $var
+	 * @return bool
+	 */
+	public function emptyString($var)
+	{
+		return (strlen($var) > 0);
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function generateTag()
+	{
+		$title = rawurlencode(strtolower($this->getVar('description', 'e')));
+		$title = xoops_substr($title, 0, 10, '');
+		// Transformation des ponctuations
+		//                 Tab     Space      !        "        #        %        &        '        (        )        ,        /       :        ;        <        =        >        ?        @        [        \        ]        ^        {        |        }        ~       .
+		$pattern = array('/%09/', '/%20/', '/%21/', '/%22/', '/%23/', '/%25/', '/%26/', '/%27/', '/%28/', '/%29/', '/%2C/', '/%2F/', '/%3A/', '/%3B/', '/%3C/', '/%3D/', '/%3E/', '/%3F/', '/%40/', '/%5B/', '/%5C/', '/%5D/', '/%5E/', '/%7B/', '/%7C/', '/%7D/', '/%7E/', "/\./");
+		$rep_pat = array('-', '-', '-', '-', '-', '-100', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-', '-at-', '-', '-', '-', '-', '-', '-', '-', '-', '-');
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		// Transformation des caract�res accentu�s
+		//                  °        è        é        ê        ë        ç        à        â        ä        î        ï        ù        ü        û        ô        ö
+		$pattern = array('/%B0/', '/%E8/', '/%E9/', '/%EA/', '/%EB/', '/%E7/', '/%E0/', '/%E2/', '/%E4/', '/%EE/', '/%EF/', '/%F9/', '/%FC/', '/%FB/', '/%F4/', '/%F6/');
+		$rep_pat = array('-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o');
+		$title   = preg_replace($pattern, $rep_pat, $title);
+
+		$tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
+		$tableau = array_filter($tableau, array($this, 'emptyString')); // Supprime les chaines vides du tableau
+		$title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
+
+		$title = $title . time();
+		$title = md5($title);
+
+		return $title;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCloneLink()
+	{
+		$ret = '<a href="' . SMARTOBJECT_URL . 'admin/adsense.php?op=clone&adsenseid=' . $this->getVar('adsenseid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" alt="' . _CO_SOBJECT_ADSENSE_CLONE . '" title="' . _CO_SOBJECT_ADSENSE_CLONE . '" /></a>';
+
+		return $ret;
+	}
 }
 
 /**
@@ -201,116 +201,116 @@ 
  */
 class SmartobjectAdsenseHandler extends SmartPersistableObjectHandler
 {
-    public $adFormats;
-    public $adFormatsList;
-    public $objects = false;
-
-    /**
-     * SmartobjectAdsenseHandler constructor.
-     * @param object|XoopsDatabase $db
-     */
-    public function __construct($db)
-    {
-        parent::__construct($db, 'adsense', 'adsenseid', 'description', '', 'smartobject');
-        $this->adFormats     = array();
-        $this->adFormatsList = array();
-
-        $this->adFormats['728x90_as']['caption'] = '728 X 90 Leaderboard';
-        $this->adFormats['728x90_as']['width']   = 728;
-        $this->adFormats['728x90_as']['height']  = 90;
-        $this->adFormatsList['728x90_as']        = $this->adFormats['728x90_as']['caption'];
-
-        $this->adFormats['468x60_as']['caption'] = '468 X 60 Banner';
-        $this->adFormats['468x60_as']['width']   = 468;
-        $this->adFormats['468x60_as']['height']  = 60;
-        $this->adFormatsList['468x60_as']        = $this->adFormats['468x60_as']['caption'];
-
-        $this->adFormats['234x60_as']['caption'] = '234 X 60 Half Banner';
-        $this->adFormats['234x60_as']['width']   = 234;
-        $this->adFormats['234x60_as']['height']  = 60;
-        $this->adFormatsList['234x60_as']        = $this->adFormats['234x60_as']['caption'];
-
-        $this->adFormats['120x600_as']['caption'] = '120 X 600 Skyscraper';
-        $this->adFormats['120x600_as']['width']   = 120;
-        $this->adFormats['120x600_as']['height']  = 600;
-        $this->adFormatsList['120x600_as']        = $this->adFormats['120x600_as']['caption'];
-
-        $this->adFormats['160x600_as']['caption'] = '160 X 600 Wide Skyscraper';
-        $this->adFormats['160x600_as']['width']   = 160;
-        $this->adFormats['160x600_as']['height']  = 600;
-        $this->adFormatsList['160x600_as']        = $this->adFormats['160x600_as']['caption'];
-
-        $this->adFormats['120x240_as']['caption'] = '120 X 240 Vertical Banner';
-        $this->adFormats['120x240_as']['width']   = 120;
-        $this->adFormats['120x240_as']['height']  = 240;
-        $this->adFormatsList['120x240_as']        = $this->adFormats['120x240_as']['caption'];
-
-        $this->adFormats['336x280_as']['caption'] = '336 X 280 Large Rectangle';
-        $this->adFormats['336x280_as']['width']   = 136;
-        $this->adFormats['336x280_as']['height']  = 280;
-        $this->adFormatsList['336x280_as']        = $this->adFormats['336x280_as']['caption'];
-
-        $this->adFormats['300x250_as']['caption'] = '300 X 250 Medium Rectangle';
-        $this->adFormats['300x250_as']['width']   = 300;
-        $this->adFormats['300x250_as']['height']  = 250;
-        $this->adFormatsList['300x250_as']        = $this->adFormats['300x250_as']['caption'];
-
-        $this->adFormats['250x250_as']['caption'] = '250 X 250 Square';
-        $this->adFormats['250x250_as']['width']   = 250;
-        $this->adFormats['250x250_as']['height']  = 250;
-        $this->adFormatsList['250x250_as']        = $this->adFormats['250x250_as']['caption'];
-
-        $this->adFormats['200x200_as']['caption'] = '200 X 200 Small Square';
-        $this->adFormats['200x200_as']['width']   = 200;
-        $this->adFormats['200x200_as']['height']  = 200;
-        $this->adFormatsList['200x200_as']        = $this->adFormats['200x200_as']['caption'];
-
-        $this->adFormats['180x150_as']['caption'] = '180 X 150 Small Rectangle';
-        $this->adFormats['180x150_as']['width']   = 180;
-        $this->adFormats['180x150_as']['height']  = 150;
-        $this->adFormatsList['180x150_as']        = $this->adFormats['180x150_as']['caption'];
-
-        $this->adFormats['125x125_as']['caption'] = '125 X 125 Button';
-        $this->adFormats['125x125_as']['width']   = 125;
-        $this->adFormats['125x125_as']['height']  = 125;
-        $this->adFormatsList['125x125_as']        = $this->adFormats['125x125_as']['caption'];
-    }
-
-    /**
-     * @return array
-     */
-    public function getFormats()
-    {
-        return $this->adFormatsList;
-    }
-
-    /**
-     * @param $obj
-     * @return bool
-     */
-    public function beforeSave(&$obj)
-    {
-        if ($obj->getVar('tag') == '') {
-            $obj->setVar('tag', $title = $obj->generateTag());
-        }
-
-        return true;
-    }
-
-    /**
-     * @return array|bool
-     */
-    public function getAdsensesByTag()
-    {
-        if (!$this->objects) {
-            $adsensesObj = $this->getObjects(null, true);
-            $ret         = array();
-            foreach ($adsensesObj as $adsenseObj) {
-                $ret[$adsenseObj->getVar('tag')] = $adsenseObj;
-            }
-            $this->objects = $ret;
-        }
-
-        return $this->objects;
-    }
+	public $adFormats;
+	public $adFormatsList;
+	public $objects = false;
+
+	/**
+	 * SmartobjectAdsenseHandler constructor.
+	 * @param object|XoopsDatabase $db
+	 */
+	public function __construct($db)
+	{
+		parent::__construct($db, 'adsense', 'adsenseid', 'description', '', 'smartobject');
+		$this->adFormats     = array();
+		$this->adFormatsList = array();
+
+		$this->adFormats['728x90_as']['caption'] = '728 X 90 Leaderboard';
+		$this->adFormats['728x90_as']['width']   = 728;
+		$this->adFormats['728x90_as']['height']  = 90;
+		$this->adFormatsList['728x90_as']        = $this->adFormats['728x90_as']['caption'];
+
+		$this->adFormats['468x60_as']['caption'] = '468 X 60 Banner';
+		$this->adFormats['468x60_as']['width']   = 468;
+		$this->adFormats['468x60_as']['height']  = 60;
+		$this->adFormatsList['468x60_as']        = $this->adFormats['468x60_as']['caption'];
+
+		$this->adFormats['234x60_as']['caption'] = '234 X 60 Half Banner';
+		$this->adFormats['234x60_as']['width']   = 234;
+		$this->adFormats['234x60_as']['height']  = 60;
+		$this->adFormatsList['234x60_as']        = $this->adFormats['234x60_as']['caption'];
+
+		$this->adFormats['120x600_as']['caption'] = '120 X 600 Skyscraper';
+		$this->adFormats['120x600_as']['width']   = 120;
+		$this->adFormats['120x600_as']['height']  = 600;
+		$this->adFormatsList['120x600_as']        = $this->adFormats['120x600_as']['caption'];
+
+		$this->adFormats['160x600_as']['caption'] = '160 X 600 Wide Skyscraper';
+		$this->adFormats['160x600_as']['width']   = 160;
+		$this->adFormats['160x600_as']['height']  = 600;
+		$this->adFormatsList['160x600_as']        = $this->adFormats['160x600_as']['caption'];
+
+		$this->adFormats['120x240_as']['caption'] = '120 X 240 Vertical Banner';
+		$this->adFormats['120x240_as']['width']   = 120;
+		$this->adFormats['120x240_as']['height']  = 240;
+		$this->adFormatsList['120x240_as']        = $this->adFormats['120x240_as']['caption'];
+
+		$this->adFormats['336x280_as']['caption'] = '336 X 280 Large Rectangle';
+		$this->adFormats['336x280_as']['width']   = 136;
+		$this->adFormats['336x280_as']['height']  = 280;
+		$this->adFormatsList['336x280_as']        = $this->adFormats['336x280_as']['caption'];
+
+		$this->adFormats['300x250_as']['caption'] = '300 X 250 Medium Rectangle';
+		$this->adFormats['300x250_as']['width']   = 300;
+		$this->adFormats['300x250_as']['height']  = 250;
+		$this->adFormatsList['300x250_as']        = $this->adFormats['300x250_as']['caption'];
+
+		$this->adFormats['250x250_as']['caption'] = '250 X 250 Square';
+		$this->adFormats['250x250_as']['width']   = 250;
+		$this->adFormats['250x250_as']['height']  = 250;
+		$this->adFormatsList['250x250_as']        = $this->adFormats['250x250_as']['caption'];
+
+		$this->adFormats['200x200_as']['caption'] = '200 X 200 Small Square';
+		$this->adFormats['200x200_as']['width']   = 200;
+		$this->adFormats['200x200_as']['height']  = 200;
+		$this->adFormatsList['200x200_as']        = $this->adFormats['200x200_as']['caption'];
+
+		$this->adFormats['180x150_as']['caption'] = '180 X 150 Small Rectangle';
+		$this->adFormats['180x150_as']['width']   = 180;
+		$this->adFormats['180x150_as']['height']  = 150;
+		$this->adFormatsList['180x150_as']        = $this->adFormats['180x150_as']['caption'];
+
+		$this->adFormats['125x125_as']['caption'] = '125 X 125 Button';
+		$this->adFormats['125x125_as']['width']   = 125;
+		$this->adFormats['125x125_as']['height']  = 125;
+		$this->adFormatsList['125x125_as']        = $this->adFormats['125x125_as']['caption'];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getFormats()
+	{
+		return $this->adFormatsList;
+	}
+
+	/**
+	 * @param $obj
+	 * @return bool
+	 */
+	public function beforeSave(&$obj)
+	{
+		if ($obj->getVar('tag') == '') {
+			$obj->setVar('tag', $title = $obj->generateTag());
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public function getAdsensesByTag()
+	{
+		if (!$this->objects) {
+			$adsensesObj = $this->getObjects(null, true);
+			$ret         = array();
+			foreach ($adsensesObj as $adsenseObj) {
+				$ret[$adsenseObj->getVar('tag')] = $adsenseObj;
+			}
+			$this->objects = $ret;
+		}
+
+		return $this->objects;
+	}
 }

class/member.php

Indentation +200 added lines, -200 removed lines

@@ -46,227 +46,227 @@
  */
 class SmartobjectMemberHandler extends XoopsMemberHandler
 {
-    /**
-     * constructor
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db);
-        $this->_uHandler = xoops_getModuleHandler('user', 'smartobject');
-    }
+	/**
+	 * constructor
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db);
+		$this->_uHandler = xoops_getModuleHandler('user', 'smartobject');
+	}
 
-    /**
-     * @param       $userObj
-     * @param  bool $groups
-     * @param  bool $notifyUser
-     * @param  bool $password
-     * @return bool
-     */
-    public function addAndActivateUser(&$userObj, $groups = false, $notifyUser = true, &$password = false)
-    {
-        $email = $userObj->getVar('email');
-        if (!$userObj->getVar('email') || $email == '') {
-            $userObj->setErrors(_CO_SOBJECT_USER_NEED_EMAIL);
+	/**
+	 * @param       $userObj
+	 * @param  bool $groups
+	 * @param  bool $notifyUser
+	 * @param  bool $password
+	 * @return bool
+	 */
+	public function addAndActivateUser(&$userObj, $groups = false, $notifyUser = true, &$password = false)
+	{
+		$email = $userObj->getVar('email');
+		if (!$userObj->getVar('email') || $email == '') {
+			$userObj->setErrors(_CO_SOBJECT_USER_NEED_EMAIL);
 
-            return false;
-        }
+			return false;
+		}
 
-        $password = $userObj->getVar('pass');
-        // randomly generating the password if not already set
-        if ('' === $password) {
-            $password = substr(md5(uniqid(mt_rand(), 1)), 0, 6);
-        }
-        $userObj->setVar('pass', md5($password));
+		$password = $userObj->getVar('pass');
+		// randomly generating the password if not already set
+		if ('' === $password) {
+			$password = substr(md5(uniqid(mt_rand(), 1)), 0, 6);
+		}
+		$userObj->setVar('pass', md5($password));
 
-        // if no username is set, let's generate one
-        $unamecount = 20;
-        $uname      = $userObj->getVar('uname');
-        if (!$uname || $uname == '') {
-            $usernames = $this->genUserNames($email, $unamecount);
-            $newuser   = false;
-            $i         = 0;
-            while ($newuser == false) {
-                $crit  = new Criteria('uname', $usernames[$i]);
-                $count = $this->getUserCount($crit);
-                if ($count == 0) {
-                    $newuser = true;
-                } else {
-                    //Move to next username
-                    ++$i;
-                    if ($i == $unamecount) {
-                        //Get next batch of usernames to try, reset counter
-                        $usernames = $this->genUserNames($email, $unamecount);
-                        $i         = 0;
-                    }
-                }
-            }
-        }
+		// if no username is set, let's generate one
+		$unamecount = 20;
+		$uname      = $userObj->getVar('uname');
+		if (!$uname || $uname == '') {
+			$usernames = $this->genUserNames($email, $unamecount);
+			$newuser   = false;
+			$i         = 0;
+			while ($newuser == false) {
+				$crit  = new Criteria('uname', $usernames[$i]);
+				$count = $this->getUserCount($crit);
+				if ($count == 0) {
+					$newuser = true;
+				} else {
+					//Move to next username
+					++$i;
+					if ($i == $unamecount) {
+						//Get next batch of usernames to try, reset counter
+						$usernames = $this->genUserNames($email, $unamecount);
+						$i         = 0;
+					}
+				}
+			}
+		}
 
-        global $xoopsConfig;
+		global $xoopsConfig;
 
-        $configHandler  = xoops_getHandler('config');
-        $xoopsConfigUser = $configHandler->getConfigsByCat(XOOPS_CONF_USER);
-        switch ($xoopsConfigUser['activation_type']) {
-            case 0:
-                $level           = 0;
-                $mailtemplate    = 'smartmail_activate_user.tpl';
-                $aInfoMessages[] = sprintf(_NL_MA_NEW_USER_NEED_ACT, $user_email);
-                break;
-            case 1:
-                $level           = 1;
-                $mailtemplate    = 'smartmail_auto_activate_user.tpl';
-                $aInfoMessages[] = sprintf(_NL_MA_NEW_USER_AUTO_ACT, $user_email);
-                break;
-            case 2:
-            default:
-                $level           = 0;
-                $mailtemplate    = 'smartmail_admin_activate_user.tpl';
-                $aInfoMessages[] = sprintf(_NL_MA_NEW_USER_ADMIN_ACT, $user_email);
-        }
+		$configHandler  = xoops_getHandler('config');
+		$xoopsConfigUser = $configHandler->getConfigsByCat(XOOPS_CONF_USER);
+		switch ($xoopsConfigUser['activation_type']) {
+			case 0:
+				$level           = 0;
+				$mailtemplate    = 'smartmail_activate_user.tpl';
+				$aInfoMessages[] = sprintf(_NL_MA_NEW_USER_NEED_ACT, $user_email);
+				break;
+			case 1:
+				$level           = 1;
+				$mailtemplate    = 'smartmail_auto_activate_user.tpl';
+				$aInfoMessages[] = sprintf(_NL_MA_NEW_USER_AUTO_ACT, $user_email);
+				break;
+			case 2:
+			default:
+				$level           = 0;
+				$mailtemplate    = 'smartmail_admin_activate_user.tpl';
+				$aInfoMessages[] = sprintf(_NL_MA_NEW_USER_ADMIN_ACT, $user_email);
+		}
 
-        $userObj->setVar('uname', $usernames[$i]);
-        $userObj->setVar('user_avatar', 'blank.gif');
-        $userObj->setVar('user_regdate', time());
-        $userObj->setVar('timezone_offset', $xoopsConfig['default_TZ']);
-        $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
-        $userObj->setVar('actkey', $actkey);
-        $userObj->setVar('email', $email);
-        $userObj->setVar('notify_method', 2);
-        $userObj->setVar('level', $userObj);
+		$userObj->setVar('uname', $usernames[$i]);
+		$userObj->setVar('user_avatar', 'blank.gif');
+		$userObj->setVar('user_regdate', time());
+		$userObj->setVar('timezone_offset', $xoopsConfig['default_TZ']);
+		$actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
+		$userObj->setVar('actkey', $actkey);
+		$userObj->setVar('email', $email);
+		$userObj->setVar('notify_method', 2);
+		$userObj->setVar('level', $userObj);
 
-        if ($this->insertUser($userObj)) {
+		if ($this->insertUser($userObj)) {
 
-            // if $groups=false, Add the user to Registered Users group
-            if (!$groups) {
-                $this->addUserToGroup(XOOPS_GROUP_USERS, $userObj->getVar('uid'));
-            } else {
-                foreach ($groups as $groupid) {
-                    $this->addUserToGroup($groupid, $userObj->getVar('uid'));
-                }
-            }
-        } else {
-            return false;
-        }
+			// if $groups=false, Add the user to Registered Users group
+			if (!$groups) {
+				$this->addUserToGroup(XOOPS_GROUP_USERS, $userObj->getVar('uid'));
+			} else {
+				foreach ($groups as $groupid) {
+					$this->addUserToGroup($groupid, $userObj->getVar('uid'));
+				}
+			}
+		} else {
+			return false;
+		}
 
-        if ($notifyUser) {
-            // send some notifications
-            $xoopsMailer =& getMailer();
-            $xoopsMailer->useMail();
-            $xoopsMailer->setTemplateDir(SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/mail_template');
-            $xoopsMailer->setTemplate('smartobject_notify_user_added_by_admin.tpl');
-            $xoopsMailer->assign('XOOPS_USER_PASSWORD', $password);
-            $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
-            $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-            $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
-            $xoopsMailer->assign('NAME', $userObj->getVar('name'));
-            $xoopsMailer->assign('UNAME', $userObj->getVar('uname'));
-            $xoopsMailer->setToUsers($userObj);
-            $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
-            $xoopsMailer->setFromName($xoopsConfig['sitename']);
-            $xoopsMailer->setSubject(sprintf(_CO_SOBJECT_NEW_USER_NOTIFICATION_SUBJECT, $xoopsConfig['sitename']));
+		if ($notifyUser) {
+			// send some notifications
+			$xoopsMailer =& getMailer();
+			$xoopsMailer->useMail();
+			$xoopsMailer->setTemplateDir(SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/mail_template');
+			$xoopsMailer->setTemplate('smartobject_notify_user_added_by_admin.tpl');
+			$xoopsMailer->assign('XOOPS_USER_PASSWORD', $password);
+			$xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
+			$xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+			$xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+			$xoopsMailer->assign('NAME', $userObj->getVar('name'));
+			$xoopsMailer->assign('UNAME', $userObj->getVar('uname'));
+			$xoopsMailer->setToUsers($userObj);
+			$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+			$xoopsMailer->setFromName($xoopsConfig['sitename']);
+			$xoopsMailer->setSubject(sprintf(_CO_SOBJECT_NEW_USER_NOTIFICATION_SUBJECT, $xoopsConfig['sitename']));
 
-            if (!$xoopsMailer->send(true)) {
-                /**
-                 * @todo trap error if email was not sent
-                 */
-                $xoopsMailer->getErrors(true);
-            }
-        }
+			if (!$xoopsMailer->send(true)) {
+				/**
+				 * @todo trap error if email was not sent
+				 */
+				$xoopsMailer->getErrors(true);
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Generates an array of usernames
-     *
-     * @param  string $email email of user
-     * @param  int    $count number of names to generate
-     * @return array  $names
-     * @internal param string $name name of user
-     * @author   xHelp Team
-     *
-     * @access   public
-     */
-    public function genUserNames($email, $count = 20)
-    {
-        $name = substr($email, 0, strpos($email, '@')); //Take the email adress without domain as username
+	/**
+	 * Generates an array of usernames
+	 *
+	 * @param  string $email email of user
+	 * @param  int    $count number of names to generate
+	 * @return array  $names
+	 * @internal param string $name name of user
+	 * @author   xHelp Team
+	 *
+	 * @access   public
+	 */
+	public function genUserNames($email, $count = 20)
+	{
+		$name = substr($email, 0, strpos($email, '@')); //Take the email adress without domain as username
 
-        $names  = array();
-        $userid = explode('@', $email);
+		$names  = array();
+		$userid = explode('@', $email);
 
-        $basename    = '';
-        $hasbasename = false;
-        $emailname   = $userid[0];
+		$basename    = '';
+		$hasbasename = false;
+		$emailname   = $userid[0];
 
-        $names[] = $emailname;
+		$names[] = $emailname;
 
-        if (strlen($name) > 0) {
-            $name = explode(' ', trim($name));
-            if (count($name) > 1) {
-                $basename = strtolower(substr($name[0], 0, 1) . $name[count($name) - 1]);
-            } else {
-                $basename = strtolower($name[0]);
-            }
-            $basename = xoops_substr($basename, 0, 60, '');
-            //Prevent Duplication of Email Username and Name
-            if (!in_array($basename, $names)) {
-                $names[]     = $basename;
-                $hasbasename = true;
-            }
-        }
+		if (strlen($name) > 0) {
+			$name = explode(' ', trim($name));
+			if (count($name) > 1) {
+				$basename = strtolower(substr($name[0], 0, 1) . $name[count($name) - 1]);
+			} else {
+				$basename = strtolower($name[0]);
+			}
+			$basename = xoops_substr($basename, 0, 60, '');
+			//Prevent Duplication of Email Username and Name
+			if (!in_array($basename, $names)) {
+				$names[]     = $basename;
+				$hasbasename = true;
+			}
+		}
 
-        $i          = count($names);
-        $onbasename = 1;
-        while ($i < $count) {
-            $num = $this->genRandNumber();
-            if ($onbasename < 0 && $hasbasename) {
-                $names[] = xoops_substr($basename, 0, 58, '') . $num;
-            } else {
-                $names[] = xoops_substr($emailname, 0, 58, '') . $num;
-            }
-            $i          = count($names);
-            $onbasename = ~$onbasename;
-            $num        = '';
-        }
+		$i          = count($names);
+		$onbasename = 1;
+		while ($i < $count) {
+			$num = $this->genRandNumber();
+			if ($onbasename < 0 && $hasbasename) {
+				$names[] = xoops_substr($basename, 0, 58, '') . $num;
+			} else {
+				$names[] = xoops_substr($emailname, 0, 58, '') . $num;
+			}
+			$i          = count($names);
+			$onbasename = ~$onbasename;
+			$num        = '';
+		}
 
-        return $names;
-    }
+		return $names;
+	}
 
-    /**
-     * Creates a random number with a specified number of $digits
-     *
-     * @param  int $digits number of digits
-     * @return return int random number
-     * @author xHelp Team
-     *
-     * @access public
-     */
-    public function genRandNumber($digits = 2)
-    {
-        $this->initRand();
-        $tmp = array();
+	/**
+	 * Creates a random number with a specified number of $digits
+	 *
+	 * @param  int $digits number of digits
+	 * @return return int random number
+	 * @author xHelp Team
+	 *
+	 * @access public
+	 */
+	public function genRandNumber($digits = 2)
+	{
+		$this->initRand();
+		$tmp = array();
 
-        for ($i = 0; $i < $digits; ++$i) {
-            $tmp[$i] = (mt_rand() % 9);
-        }
+		for ($i = 0; $i < $digits; ++$i) {
+			$tmp[$i] = (mt_rand() % 9);
+		}
 
-        return implode('', $tmp);
-    }
+		return implode('', $tmp);
+	}
 
-    /**
-     * Gives the random number generator a seed to start from
-     *
-     * @return void
-     *
-     * @access public
-     */
-    public function initRand()
-    {
-        static $randCalled = false;
-        if (!$randCalled) {
-            mt_srand((double)microtime() * 1000000);
-            $randCalled = true;
-        }
-    }
+	/**
+	 * Gives the random number generator a seed to start from
+	 *
+	 * @return void
+	 *
+	 * @access public
+	 */
+	public function initRand()
+	{
+		static $randCalled = false;
+		if (!$randCalled) {
+			mt_srand((double)microtime() * 1000000);
+			$randCalled = true;
+		}
+	}
 }

class/smartseoobject.php

Indentation +37 added lines, -37 removed lines

@@ -24,44 +24,44 @@
  */
 class SmartSeoObject extends SmartObject
 {
-    /**
-     * SmartSeoObject constructor.
-     */
-    public function __construct()
-    {
-        $this->initCommonVar('meta_keywords');
-        $this->initCommonVar('meta_description');
-        $this->initCommonVar('short_url');
-        $this->seoEnabled = true;
-    }
+	/**
+	 * SmartSeoObject constructor.
+	 */
+	public function __construct()
+	{
+		$this->initCommonVar('meta_keywords');
+		$this->initCommonVar('meta_description');
+		$this->initCommonVar('short_url');
+		$this->seoEnabled = true;
+	}
 
-    /**
-     * Return the value of the short_url field of this object
-     *
-     * @return string
-     */
-    public function short_url()
-    {
-        return $this->getVar('short_url');
-    }
+	/**
+	 * Return the value of the short_url field of this object
+	 *
+	 * @return string
+	 */
+	public function short_url()
+	{
+		return $this->getVar('short_url');
+	}
 
-    /**
-     * Return the value of the meta_keywords field of this object
-     *
-     * @return string
-     */
-    public function meta_keywords()
-    {
-        return $this->getVar('meta_keywords');
-    }
+	/**
+	 * Return the value of the meta_keywords field of this object
+	 *
+	 * @return string
+	 */
+	public function meta_keywords()
+	{
+		return $this->getVar('meta_keywords');
+	}
 
-    /**
-     * Return the value of the meta_description field of this object
-     *
-     * @return string
-     */
-    public function meta_description()
-    {
-        return $this->getVar('meta_description');
-    }
+	/**
+	 * Return the value of the meta_description field of this object
+	 *
+	 * @return string
+	 */
+	public function meta_description()
+	{
+		return $this->getVar('meta_description');
+	}
 }

class/smartjax.php

Indentation +6 added lines, -6 removed lines

@@ -36,10 +36,10 @@
  */
 class SmartJax extends Projax
 {
-    public function initiateFromUserside()
-    {
-        global $xoTheme;
-        $xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/prototype.js');
-        $xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/scriptaculous.js');
-    }
+	public function initiateFromUserside()
+	{
+		global $xoTheme;
+		$xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/prototype.js');
+		$xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/scriptaculous.js');
+	}
 }

class/smartmlobject.php

Indentation +127 added lines, -127 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 = array();
-        foreach ($objectVars as $key => $var) {
-            if (!$var['multilingual']) {
-                $newObjectVars[$key] = $var;
-            }
-        }
-        $this->vars = $newObjectVars;
-    }
-
-    public function stripNonMultilanguageFields()
-    {
-        $objectVars    =& $this->getVars();
-        $newObjectVars = array();
-        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 = array();
+		foreach ($objectVars as $key => $var) {
+			if (!$var['multilingual']) {
+				$newObjectVars[$key] = $var;
+			}
+		}
+		$this->vars = $newObjectVars;
+	}
+
+	public function stripNonMultilanguageFields()
+	{
+		$objectVars    =& $this->getVars();
+		$newObjectVars = array();
+		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,55 +107,55 @@ 
  */
 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');
+	}
 }

class/form/elements/smartformurllinkelement.php

Indentation +22 added lines, -22 removed lines

@@ -11,31 +11,31 @@
  */
 class SmartFormUrlLinkElement extends XoopsFormElementTray
 {
-    /**
-     * SmartFormUrlLinkElement constructor.
-     * @param string $form_caption
-     * @param string $key
-     * @param string $object
-     */
-    public function __construct($form_caption, $key, $object)
-    {
-        parent::__construct($form_caption, ' ');
+	/**
+	 * SmartFormUrlLinkElement constructor.
+	 * @param string $form_caption
+	 * @param string $key
+	 * @param string $object
+	 */
+	public function __construct($form_caption, $key, $object)
+	{
+		parent::__construct($form_caption, ' ');
 
-        $this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_URLLINK_URL));
-        $this->addElement(new SmartFormTextElement($object, 'url_' . $key));
+		$this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_URLLINK_URL));
+		$this->addElement(new SmartFormTextElement($object, 'url_' . $key));
 
-        $this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_CAPTION));
-        $this->addElement(new SmartFormTextElement($object, 'caption_' . $key));
+		$this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_CAPTION));
+		$this->addElement(new SmartFormTextElement($object, 'caption_' . $key));
 
-        $this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_DESC . '<br/>'));
-        $this->addElement(new XoopsFormTextArea('', 'desc_' . $key, $object->getVar('description')));
+		$this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_DESC . '<br/>'));
+		$this->addElement(new XoopsFormTextArea('', 'desc_' . $key, $object->getVar('description')));
 
-        $this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_URLLINK_TARGET));
-        $targ_val    = $object->getVar('target');
-        $targetRadio = new XoopsFormRadio('', 'target_' . $key, $targ_val != '' ? $targ_val : '_blank');
-        $control     = $object->getControl('target');
-        $targetRadio->addOptionArray($control['options']);
+		$this->addElement(new XoopsFormLabel('', '<br/>' . _CO_SOBJECT_URLLINK_TARGET));
+		$targ_val    = $object->getVar('target');
+		$targetRadio = new XoopsFormRadio('', 'target_' . $key, $targ_val != '' ? $targ_val : '_blank');
+		$control     = $object->getControl('target');
+		$targetRadio->addOptionArray($control['options']);
 
-        $this->addElement($targetRadio);
-    }
+		$this->addElement($targetRadio);
+	}
 }

class/form/elements/smartformtextelement.php

Indentation +18 added lines, -18 removed lines

@@ -11,24 +11,24 @@
  */
 class SmartFormTextElement extends XoopsFormText
 {
-    /**
-     * SmartFormTextElement constructor.
-     * @param string $object
-     * @param string $key
-     */
-    public function __construct($object, $key)
-    {
-        $var = $object->vars[$key];
+	/**
+	 * SmartFormTextElement constructor.
+	 * @param string $object
+	 * @param string $key
+	 */
+	public function __construct($object, $key)
+	{
+		$var = $object->vars[$key];
 
-        if (isset($object->controls[$key])) {
-            $control        = $object->controls[$key];
-            $form_maxlength = isset($control['maxlength']) ? $control['maxlength'] : (isset($var['maxlength']) ? $var['maxlength'] : 255);
-            $form_size      = isset($control['size']) ? $control['size'] : 50;
-        } else {
-            $form_maxlength = 255;
-            $form_size      = 50;
-        }
+		if (isset($object->controls[$key])) {
+			$control        = $object->controls[$key];
+			$form_maxlength = isset($control['maxlength']) ? $control['maxlength'] : (isset($var['maxlength']) ? $var['maxlength'] : 255);
+			$form_size      = isset($control['size']) ? $control['size'] : 50;
+		} else {
+			$form_maxlength = 255;
+			$form_size      = 50;
+		}
 
-        parent::__construct($var['form_caption'], $key, $form_size, $form_maxlength, $object->getVar($key, 'e'));
-    }
+		parent::__construct($var['form_caption'], $key, $form_size, $form_maxlength, $object->getVar($key, 'e'));
+	}
 }