mambax7 / smartobject

class/adsense.php

Doc Comments +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
     /**
      * @param  string $key
      * @param  string $format
-     * @return mixed
+     * @return string
      */
     public function getVar($key, $format = 's')
     {
@@ -157,7 +157,7 @@ 
     }
 
     /**
-     * @return mixed|string
+     * @return string
      */
     public function generateTag()
     {

Indentation +307 added lines, -307 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,120 +134,120 @@ 
 </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
-        $pattern = array(
-            '/%09/', // Tab
-            '/%20/', // Space
-            '/%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 .= 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
+		$pattern = array(
+			'/%09/', // Tab
+			'/%20/', // Space
+			'/%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 .= 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;
+	}
 }
 
 /**
@@ -255,116 +255,116 @@ 
  */
 class SmartobjectAdsenseHandler extends SmartPersistableObjectHandler
 {
-    public $adFormats;
-    public $adFormatsList;
-    public $objects = false;
-
-    /**
-     * SmartobjectAdsenseHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $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 XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $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;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -29,7 +29,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectAdsense
@@ -111,23 +111,23 @@ 
     {
         global $smartobjectAdsenseHandler;
         if ($this->getVar('style', 'n') !== '') {
-            $ret = '<div style="' . $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'] . ';
-google_ad_format = "' . $this->getVar('format', 'n') . '";
+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'].';
+google_ad_format = "' . $this->getVar('format', 'n').'";
 google_ad_type = "text";
 google_ad_channel ="";
-google_color_border = "' . $this->getVar('border_color', 'n') . '";
-google_color_bg = "' . $this->getVar('background_color', 'n') . '";
-google_color_link = "' . $this->getVar('link_color', 'n') . '";
-google_color_url = "' . $this->getVar('url_color', 'n') . '";
-google_color_text = "' . $this->getVar('text_color', 'n') . '";
+google_color_border = "' . $this->getVar('border_color', 'n').'";
+google_color_bg = "' . $this->getVar('background_color', 'n').'";
+google_color_link = "' . $this->getVar('link_color', 'n').'";
+google_color_url = "' . $this->getVar('url_color', 'n').'";
+google_color_text = "' . $this->getVar('text_color', 'n').'";
 //--></script>
 <script type="text/javascript"
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
@@ -142,7 +142,7 @@ 
      */
     public function getXoopsCode()
     {
-        $ret = '[adsense]' . $this->getVar('tag', 'n') . '[/adsense]';
+        $ret = '[adsense]'.$this->getVar('tag', 'n').'[/adsense]';
 
         return $ret;
     }
@@ -234,16 +234,16 @@ 
      */
     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 .
+        $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;

class/customtag.php

Doc Comments +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
     }
 
     /**
-     * @return mixed|string
+     * @return string
      */
     public function generateTag()
     {

Indentation +246 added lines, -246 removed lines

@@ -36,208 +36,208 @@ 
  */
 class SmartobjectCustomtag extends SmartObject
 {
-    public $content = false;
-
-    /**
-     * SmartobjectCustomtag constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('customtagid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_NAME, _CO_SOBJECT_CUSTOMTAG_NAME_DSC);
-        $this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION_DSC);
-        $this->quickInitVar('content', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_CUSTOMTAG_CONTENT, _CO_SOBJECT_CUSTOMTAG_CONTENT_DSC);
-        $this->quickInitVar('language', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_LANGUAGE, _CO_SOBJECT_CUSTOMTAG_LANGUAGE_DSC);
-
-        $this->initNonPersistableVar('dohtml', XOBJ_DTYPE_INT, 'class', 'dohtml', '', true);
-        $this->initNonPersistableVar('doimage', XOBJ_DTYPE_INT, 'class', 'doimage', '', true);
-        $this->initNonPersistableVar('doxcode', XOBJ_DTYPE_INT, 'class', 'doxcode', '', true);
-        $this->initNonPersistableVar('dosmiley', XOBJ_DTYPE_INT, 'class', 'dosmiley', '', true);
-
-        $this->setControl('content', array(
-            'name'        => 'textarea',
-            'form_editor' => 'textarea',
-            'form_rows'   => 25
-        ));
-        $this->setControl('language', array(
-            'name' => 'language',
-            'all'  => true
-        ));
-    }
-
-    /**
-     * @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 bool|mixed
-     */
-    public function render()
-    {
-        if (!$this->content) {
-            $ret           = $this->getVar('content');
-            $this->content = $ret;
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * @return bool|mixed|string
-     */
-    public function renderWithPhp()
-    {
-        if (!$this->content) {
-            $ret           = $this->getVar('content');
-            $this->content = $ret;
-        } else {
-            $ret = $this->content;
-        }
-
-        // check for PHP if we are not on admin side
-        if (!defined('XOOPS_CPFUNC_LOADED') && !(strpos($ret, '[php]') === false)) {
-            $ret = str_replace('[php]', '', $ret);
-            // we have PHP code, let's evaluate
-            eval($ret);
-
-            return '';
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXoopsCode()
-    {
-        $ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCloneLink()
-    {
-        $ret = '<a href="' .
-               SMARTOBJECT_URL .
-               'admin/customtag.php?op=clone&customtagid=' .
-               $this->id() .
-               '"><img src="' .
-               SMARTOBJECT_IMAGES_ACTIONS_URL .
-               'editcopy.png" style="vertical-align: middle;" alt="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
-               '" title="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
-               '" /></a>';
-
-        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
-        $pattern = array(
-            '/%09/', // Tab
-            '/%20/', // Space
-            '/%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 .= time();
-        $title = md5($title);
-
-        return $title;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCustomtagName()
-    {
-        $ret = $this->getVar('name');
-
-        return $ret;
-    }
+	public $content = false;
+
+	/**
+	 * SmartobjectCustomtag constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('customtagid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('name', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_NAME, _CO_SOBJECT_CUSTOMTAG_NAME_DSC);
+		$this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION, _CO_SOBJECT_CUSTOMTAG_DESCRIPTION_DSC);
+		$this->quickInitVar('content', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_CUSTOMTAG_CONTENT, _CO_SOBJECT_CUSTOMTAG_CONTENT_DSC);
+		$this->quickInitVar('language', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_CUSTOMTAG_LANGUAGE, _CO_SOBJECT_CUSTOMTAG_LANGUAGE_DSC);
+
+		$this->initNonPersistableVar('dohtml', XOBJ_DTYPE_INT, 'class', 'dohtml', '', true);
+		$this->initNonPersistableVar('doimage', XOBJ_DTYPE_INT, 'class', 'doimage', '', true);
+		$this->initNonPersistableVar('doxcode', XOBJ_DTYPE_INT, 'class', 'doxcode', '', true);
+		$this->initNonPersistableVar('dosmiley', XOBJ_DTYPE_INT, 'class', 'dosmiley', '', true);
+
+		$this->setControl('content', array(
+			'name'        => 'textarea',
+			'form_editor' => 'textarea',
+			'form_rows'   => 25
+		));
+		$this->setControl('language', array(
+			'name' => 'language',
+			'all'  => true
+		));
+	}
+
+	/**
+	 * @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 bool|mixed
+	 */
+	public function render()
+	{
+		if (!$this->content) {
+			$ret           = $this->getVar('content');
+			$this->content = $ret;
+		}
+
+		return $this->content;
+	}
+
+	/**
+	 * @return bool|mixed|string
+	 */
+	public function renderWithPhp()
+	{
+		if (!$this->content) {
+			$ret           = $this->getVar('content');
+			$this->content = $ret;
+		} else {
+			$ret = $this->content;
+		}
+
+		// check for PHP if we are not on admin side
+		if (!defined('XOOPS_CPFUNC_LOADED') && !(strpos($ret, '[php]') === false)) {
+			$ret = str_replace('[php]', '', $ret);
+			// we have PHP code, let's evaluate
+			eval($ret);
+
+			return '';
+		}
+
+		return $this->content;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXoopsCode()
+	{
+		$ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCloneLink()
+	{
+		$ret = '<a href="' .
+			   SMARTOBJECT_URL .
+			   'admin/customtag.php?op=clone&customtagid=' .
+			   $this->id() .
+			   '"><img src="' .
+			   SMARTOBJECT_IMAGES_ACTIONS_URL .
+			   'editcopy.png" style="vertical-align: middle;" alt="' .
+			   _CO_SOBJECT_CUSTOMTAG_CLONE .
+			   '" title="' .
+			   _CO_SOBJECT_CUSTOMTAG_CLONE .
+			   '" /></a>';
+
+		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
+		$pattern = array(
+			'/%09/', // Tab
+			'/%20/', // Space
+			'/%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 .= time();
+		$title = md5($title);
+
+		return $title;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getCustomtagName()
+	{
+		$ret = $this->getVar('name');
+
+		return $ret;
+	}
 }
 
 /**
@@ -245,48 +245,48 @@ 
  */
 class SmartobjectCustomtagHandler extends SmartPersistableObjectHandler
 {
-    public $objects = false;
-
-    /**
-     * SmartobjectCustomtagHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'customtag', 'customtagid', 'name', 'description', 'smartobject');
-        $this->addPermission('view', _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW, _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW_DSC);
-    }
-
-    /**
-     * @return array|bool
-     */
-    public function getCustomtagsByName()
-    {
-        if (!$this->objects) {
-            global $xoopsConfig;
-
-            $ret = array();
-
-            $criteria = new CriteriaCompo();
-
-            $criteria_language = new CriteriaCompo();
-            $criteria_language->add(new Criteria('language', $xoopsConfig['language']));
-            $criteria_language->add(new Criteria('language', 'all'), 'OR');
-            $criteria->add($criteria_language);
-
-            $smartobjectPermissionsHandler = new SmartObjectPermissionHandler($this);
-            $granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
-
-            if ($granted_ids && count($granted_ids) > 0) {
-                $criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
-                $customtagsObj = $this->getObjects($criteria, true);
-                foreach ($customtagsObj as $customtagObj) {
-                    $ret[$customtagObj->getVar('name')] = $customtagObj;
-                }
-            }
-            $this->objects = $ret;
-        }
-
-        return $this->objects;
-    }
+	public $objects = false;
+
+	/**
+	 * SmartobjectCustomtagHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'customtag', 'customtagid', 'name', 'description', 'smartobject');
+		$this->addPermission('view', _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW, _CO_SOBJECT_CUSTOMTAG_PERMISSION_VIEW_DSC);
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public function getCustomtagsByName()
+	{
+		if (!$this->objects) {
+			global $xoopsConfig;
+
+			$ret = array();
+
+			$criteria = new CriteriaCompo();
+
+			$criteria_language = new CriteriaCompo();
+			$criteria_language->add(new Criteria('language', $xoopsConfig['language']));
+			$criteria_language->add(new Criteria('language', 'all'), 'OR');
+			$criteria->add($criteria_language);
+
+			$smartobjectPermissionsHandler = new SmartObjectPermissionHandler($this);
+			$granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
+
+			if ($granted_ids && count($granted_ids) > 0) {
+				$criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
+				$customtagsObj = $this->getObjects($criteria, true);
+				foreach ($customtagsObj as $customtagObj) {
+					$ret[$customtagObj->getVar('name')] = $customtagObj;
+				}
+			}
+			$this->objects = $ret;
+		}
+
+		return $this->objects;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectCustomtag
@@ -122,7 +122,7 @@ 
      */
     public function getXoopsCode()
     {
-        $ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
+        $ret = '[customtag]'.$this->getVar('tag', 'n').'[/customtag]';
 
         return $ret;
     }
@@ -132,16 +132,16 @@ 
      */
     public function getCloneLink()
     {
-        $ret = '<a href="' .
-               SMARTOBJECT_URL .
-               'admin/customtag.php?op=clone&customtagid=' .
-               $this->id() .
-               '"><img src="' .
-               SMARTOBJECT_IMAGES_ACTIONS_URL .
-               'editcopy.png" style="vertical-align: middle;" alt="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
-               '" title="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
+        $ret = '<a href="'.
+               SMARTOBJECT_URL.
+               'admin/customtag.php?op=clone&customtagid='.
+               $this->id().
+               '"><img src="'.
+               SMARTOBJECT_IMAGES_ACTIONS_URL.
+               'editcopy.png" style="vertical-align: middle;" alt="'.
+               _CO_SOBJECT_CUSTOMTAG_CLONE.
+               '" title="'.
+               _CO_SOBJECT_CUSTOMTAG_CLONE.
                '" /></a>';
 
         return $ret;
@@ -278,7 +278,7 @@ 
             $granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
 
             if ($granted_ids && count($granted_ids) > 0) {
-                $criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
+                $criteria->add(new Criteria('customtagid', '('.implode(', ', $granted_ids).')', 'IN'));
                 $customtagsObj = $this->getObjects($criteria, true);
                 foreach ($customtagsObj as $customtagObj) {
                     $ret[$customtagObj->getVar('name')] = $customtagObj;

class/form/elements/smartformuploadelement.php

Doc Comments +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 class SmartFormUploadElement extends XoopsFormFile
 {
     /**
-     * @param $object
-     * @param $key
+     * @param string $object
+     * @param string $key
      */
     public function SmartFormFileElement($object, $key)
     {

Indentation +18 added lines, -18 removed lines

@@ -11,25 +11,25 @@
  */
 class SmartFormUploadElement extends XoopsFormFile
 {
-    /**
-     * @param $object
-     * @param $key
-     */
-    public function SmartFormFileElement($object, $key)
-    {
-        parent::__construct(_CO_SOBJECT_UPLOAD, $key, isset($object->vars[$key]['form_maxfilesize']) ? $object->vars[$key]['form_maxfilesize'] : 0);
-        $this->setExtra(' size=50');
-    }
+	/**
+	 * @param $object
+	 * @param $key
+	 */
+	public function SmartFormFileElement($object, $key)
+	{
+		parent::__construct(_CO_SOBJECT_UPLOAD, $key, isset($object->vars[$key]['form_maxfilesize']) ? $object->vars[$key]['form_maxfilesize'] : 0);
+		$this->setExtra(' size=50');
+	}
 
-    /**
-     * prepare HTML for output
-     *
-     * @return string HTML
-     */
-    public function render()
-    {
-        return "<input type='hidden' name='MAX_FILE_SIZE' value='" . $this->getMaxFileSize() . "' />
+	/**
+	 * prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	public function render()
+	{
+		return "<input type='hidden' name='MAX_FILE_SIZE' value='" . $this->getMaxFileSize() . "' />
                 <input type='file' name='" . $this->getName() . "' id='" . $this->getName() . "'" . $this->getExtra() . " />
                 <input type='hidden' name='smart_upload_file[]' id='smart_upload_file[]' value='" . $this->getName() . "' />";
-    }
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -28,8 +28,8 @@
      */
     public function render()
     {
-        return "<input type='hidden' name='MAX_FILE_SIZE' value='" . $this->getMaxFileSize() . "' />
-                <input type='file' name='" . $this->getName() . "' id='" . $this->getName() . "'" . $this->getExtra() . " />
-                <input type='hidden' name='smart_upload_file[]' id='smart_upload_file[]' value='" . $this->getName() . "' />";
+        return "<input type='hidden' name='MAX_FILE_SIZE' value='".$this->getMaxFileSize()."' />
+                <input type='file' name='" . $this->getName()."' id='".$this->getName()."'".$this->getExtra()." />
+                <input type='hidden' name='smart_upload_file[]' id='smart_upload_file[]' value='" . $this->getName()."' />";
     }
 }

class/form/smartobjectform.php

Doc Comments +2 added lines, -2 removed lines

@@ -306,8 +306,8 @@
     }
 
     /**
-     * @param      $form_name
-     * @param      $form_caption
+     * @param      string $form_name
+     * @param      string $form_caption
      * @param bool $submit_button_caption
      */
     public function createButtons($form_name, $form_caption, $submit_button_caption = false)

Indentation +796 added lines, -796 removed lines

@@ -30,790 +30,790 @@ 
  */
 class SmartObjectForm extends XoopsThemeForm
 {
-    public $targetObject           = null;
-    public $form_fields            = null;
-    public $_cancel_js_action      = false;
-    public $_custom_button         = false;
-    public $_captcha               = false;
-    public $_form_name             = false;
-    public $_form_caption          = false;
-    public $_submit_button_caption = false;
-
-    /**
-     * SmartobjectForm constructor.
-     * @param string $target
-     * @param string $form_name
-     * @param string $form_caption
-     * @param string $form_action
-     * @param null   $form_fields
-     * @param bool   $submit_button_caption
-     * @param bool   $cancel_js_action
-     * @param bool   $captcha
-     */
-    public function __construct(&$target, $form_name, $form_caption, $form_action, $form_fields = null, $submit_button_caption = false, $cancel_js_action = false, $captcha = false)
-    {
-        $this->targetObject           =& $target;
-        $this->form_fields            = $form_fields;
-        $this->_cancel_js_action      = $cancel_js_action;
-        $this->_captcha               = $captcha;
-        $this->_form_name             = $form_name;
-        $this->_form_caption          = $form_caption;
-        $this->_submit_button_caption = $submit_button_caption;
-
-        if (!isset($form_action)) {
-            $form_action = xoops_getenv('PHP_SELF');
-        }
-
-        parent::__construct($form_caption, $form_name, $form_action);
-        $this->setExtra('enctype="multipart/form-data"');
-
-        $this->createElements();
-
-        if ($captcha) {
-            $this->addCaptcha();
-        }
-
-        $this->createPermissionControls();
-
-        $this->createButtons($form_name, $form_caption, $submit_button_caption);
-    }
-
-    public function addCaptcha()
-    {
-        include_once(SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php');
-        $this->addElement(new XoopsFormCaptcha(), true);
-    }
-
-    /**
-     * @param      $name
-     * @param      $caption
-     * @param bool $onclick
-     */
-    public function addCustomButton($name, $caption, $onclick = false)
-    {
-        $custom_button_array    = array(
-            'name'    => $name,
-            'caption' => $caption,
-            'onclick' => $onclick
-        );
-        $this->_custom_button[] = $custom_button_array;
-    }
-
-    /**
-     * Add an element to the form
-     *
-     * @param string|XoopsFormElement      &$formElement reference to a {@link XoopsFormElement}
-     * @param bool        $key
-     * @param bool        $var
-     * @param bool|string $required     is this a "required" element?
-     */
-    public function addElement($formElement, $key = false, $var = false, $required = 'notset')
-    {
-        if ($key) {
-            if ($this->targetObject->vars[$key]['readonly']) {
-                $formElement->setExtra('disabled="disabled"');
-                $formElement->setName($key . '-readonly');
-                // Since this element is disable, we still want to pass it's value in the form
-                $hidden = new XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
-                $this->addElement($hidden);
-            }
-            $formElement->setDescription($var['form_dsc']);
-            if (isset($this->targetObject->controls[$key]['onSelect'])) {
-                $hidden = new XoopsFormHidden('changedField', false);
-                $this->addElement($hidden);
-                $otherExtra      = isset($var['form_extra']) ? $var['form_extra'] : '';
-                $onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
-                $formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
-            } else {
-                if (isset($var['form_extra'])) {
-                    $formElement->setExtra($var['form_extra']);
-                }
-            }
-            $controls = $this->targetObject->controls;
-            if (isset($controls[$key]['js'])) {
-                $formElement->customValidationCode[] = $controls[$key]['js'];
-            }
-            parent::addElement($formElement, $required === 'notset' ? $var['required'] : $required);
-        } else {
-            parent::addElement($formElement, $required === 'notset' ? false : true);
-        }
-        unset($formElement);
-    }
-
-    public function createElements()
-    {
-        $controls = $this->targetObject->controls;
-        $vars     = $this->targetObject->vars;
-        foreach ($vars as $key => $var) {
-
-            // If $displayOnForm is false OR this is the primary key, it doesn't
-            // need to be displayed, then we only create an hidden field
-            if ($key == $this->targetObject->handler->keyName || !$var['displayOnForm']) {
-                $elementToAdd = new XoopsFormHidden($key, $var['value']);
-                $this->addElement($elementToAdd, $key, $var, false);
-                unset($elementToAdd);
-                // If not, the we need to create the proper form control for this fields
-            } else {
-                // If this field has a specific control, we will use it
-
-                if ($key === 'parentid') {
-                    /**
-                     * Why this ?
-                     */
-                }
-                if (isset($controls[$key])) {
-                    /* If the control has name, it's because it's an object already present in the script
+	public $targetObject           = null;
+	public $form_fields            = null;
+	public $_cancel_js_action      = false;
+	public $_custom_button         = false;
+	public $_captcha               = false;
+	public $_form_name             = false;
+	public $_form_caption          = false;
+	public $_submit_button_caption = false;
+
+	/**
+	 * SmartobjectForm constructor.
+	 * @param string $target
+	 * @param string $form_name
+	 * @param string $form_caption
+	 * @param string $form_action
+	 * @param null   $form_fields
+	 * @param bool   $submit_button_caption
+	 * @param bool   $cancel_js_action
+	 * @param bool   $captcha
+	 */
+	public function __construct(&$target, $form_name, $form_caption, $form_action, $form_fields = null, $submit_button_caption = false, $cancel_js_action = false, $captcha = false)
+	{
+		$this->targetObject           =& $target;
+		$this->form_fields            = $form_fields;
+		$this->_cancel_js_action      = $cancel_js_action;
+		$this->_captcha               = $captcha;
+		$this->_form_name             = $form_name;
+		$this->_form_caption          = $form_caption;
+		$this->_submit_button_caption = $submit_button_caption;
+
+		if (!isset($form_action)) {
+			$form_action = xoops_getenv('PHP_SELF');
+		}
+
+		parent::__construct($form_caption, $form_name, $form_action);
+		$this->setExtra('enctype="multipart/form-data"');
+
+		$this->createElements();
+
+		if ($captcha) {
+			$this->addCaptcha();
+		}
+
+		$this->createPermissionControls();
+
+		$this->createButtons($form_name, $form_caption, $submit_button_caption);
+	}
+
+	public function addCaptcha()
+	{
+		include_once(SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php');
+		$this->addElement(new XoopsFormCaptcha(), true);
+	}
+
+	/**
+	 * @param      $name
+	 * @param      $caption
+	 * @param bool $onclick
+	 */
+	public function addCustomButton($name, $caption, $onclick = false)
+	{
+		$custom_button_array    = array(
+			'name'    => $name,
+			'caption' => $caption,
+			'onclick' => $onclick
+		);
+		$this->_custom_button[] = $custom_button_array;
+	}
+
+	/**
+	 * Add an element to the form
+	 *
+	 * @param string|XoopsFormElement      &$formElement reference to a {@link XoopsFormElement}
+	 * @param bool        $key
+	 * @param bool        $var
+	 * @param bool|string $required     is this a "required" element?
+	 */
+	public function addElement($formElement, $key = false, $var = false, $required = 'notset')
+	{
+		if ($key) {
+			if ($this->targetObject->vars[$key]['readonly']) {
+				$formElement->setExtra('disabled="disabled"');
+				$formElement->setName($key . '-readonly');
+				// Since this element is disable, we still want to pass it's value in the form
+				$hidden = new XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
+				$this->addElement($hidden);
+			}
+			$formElement->setDescription($var['form_dsc']);
+			if (isset($this->targetObject->controls[$key]['onSelect'])) {
+				$hidden = new XoopsFormHidden('changedField', false);
+				$this->addElement($hidden);
+				$otherExtra      = isset($var['form_extra']) ? $var['form_extra'] : '';
+				$onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
+				$formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
+			} else {
+				if (isset($var['form_extra'])) {
+					$formElement->setExtra($var['form_extra']);
+				}
+			}
+			$controls = $this->targetObject->controls;
+			if (isset($controls[$key]['js'])) {
+				$formElement->customValidationCode[] = $controls[$key]['js'];
+			}
+			parent::addElement($formElement, $required === 'notset' ? $var['required'] : $required);
+		} else {
+			parent::addElement($formElement, $required === 'notset' ? false : true);
+		}
+		unset($formElement);
+	}
+
+	public function createElements()
+	{
+		$controls = $this->targetObject->controls;
+		$vars     = $this->targetObject->vars;
+		foreach ($vars as $key => $var) {
+
+			// If $displayOnForm is false OR this is the primary key, it doesn't
+			// need to be displayed, then we only create an hidden field
+			if ($key == $this->targetObject->handler->keyName || !$var['displayOnForm']) {
+				$elementToAdd = new XoopsFormHidden($key, $var['value']);
+				$this->addElement($elementToAdd, $key, $var, false);
+				unset($elementToAdd);
+				// If not, the we need to create the proper form control for this fields
+			} else {
+				// If this field has a specific control, we will use it
+
+				if ($key === 'parentid') {
+					/**
+					 * Why this ?
+					 */
+				}
+				if (isset($controls[$key])) {
+					/* If the control has name, it's because it's an object already present in the script
                      * for example, "user"
                      * If the field does not have a name, than we will use a "select" (ie XoopsFormSelect)
                      */
-                    if (!isset($controls[$key]['name']) || !$controls[$key]['name']) {
-                        $controls[$key]['name'] = 'select';
-                    }
-
-                    $form_select = $this->getControl($controls[$key]['name'], $key);
-
-                    // Adding on the form, the control for this field
-                    $this->addElement($form_select, $key, $var);
-                    unset($form_select);
-
-                    // If this field don't have a specific control, we will use the standard one, depending on its data type
-                } else {
-                    switch ($var['data_type']) {
-
-                        case XOBJ_DTYPE_TXTBOX:
-
-                            $form_text = $this->getControl('text', $key);
-                            $this->addElement($form_text, $key, $var);
-                            unset($form_text);
-                            break;
-
-                        case XOBJ_DTYPE_INT:
-                            $this->targetObject->setControl($key, array(
-                                'name' => 'text',
-                                'size' => '5'
-                            ));
-                            $form_text = $this->getControl('text', $key);
-                            $this->addElement($form_text, $key, $var);
-                            unset($form_text);
-                            break;
-
-                        case XOBJ_DTYPE_FLOAT:
-                            $this->targetObject->setControl($key, array(
-                                'name' => 'text',
-                                'size' => '5'
-                            ));
-                            $form_text = $this->getControl('text', $key);
-                            $this->addElement($form_text, $key, $var);
-                            unset($form_text);
-                            break;
-
-                        case XOBJ_DTYPE_LTIME:
-                            $form_date_time = $this->getControl('date_time', $key);
-                            $this->addElement($form_date_time, $key, $var);
-                            unset($form_date_time);
-                            break;
-
-                        case XOBJ_DTYPE_STIME:
-                            $form_date_time = $this->getControl('date', $key);
-                            $this->addElement($form_date_time, $key, $var);
-                            unset($form_date_time);
-                            break;
-
-                        case XOBJ_DTYPE_TIME_ONLY:
-                            $form_time = $this->getControl('time', $key);
-                            $this->addElement($form_time, $key, $var);
-                            unset($form_time);
-                            break;
-
-                        case XOBJ_DTYPE_CURRENCY:
-                            $this->targetObject->setControl($key, array(
-                                'name' => 'text',
-                                'size' => '15'
-                            ));
-                            $form_currency = $this->getControl('text', $key);
-                            $this->addElement($form_currency, $key, $var);
-                            unset($form_currency);
-                            break;
-
-                        case XOBJ_DTYPE_URLLINK:
-                            $form_urllink = $this->getControl('urllink', $key);
-                            $this->addElement($form_urllink, $key, $var);
-                            unset($form_urllink);
-                            break;
-
-                        case XOBJ_DTYPE_FILE:
-                            $form_file = $this->getControl('richfile', $key);
-                            $this->addElement($form_file, $key, $var);
-                            unset($form_file);
-                            break;
-
-                        case XOBJ_DTYPE_TXTAREA:
-
-                            $form_text_area = $this->getTextArea($key, $var);
-                            $this->addElement($form_text_area, $key, $var);
-                            unset($form_text_area);
-                            break;
-
-                        case XOBJ_DTYPE_ARRAY:
-                            // TODO: To come...
-                            break;
-                        case XOBJ_DTYPE_SOURCE:
-                            // TODO: To come...
-                            break;
-                        case XOBJ_DTYPE_FORM_SECTION:
-                            $section_control = new SmartFormSection($key, $var['value']);
-                            $this->addElement($section_control, $key, $var);
-                            unset($section_control);
-                            break;
-                        case XOBJ_DTYPE_FORM_SECTION_CLOSE:
-                            $section_control = new SmartFormSectionClose($key, $var['value']);
-                            $this->addElement($section_control, $key, $var);
-                            unset($section_control);
-                            break;
-                    }
-                }
-            }
-        }
-        // Add an hidden field to store the URL of the page before this form
-        $this->addElement(new XoopsFormHidden('smart_page_before_form', smart_get_page_before_form()));
-    }
-
-    public function createPermissionControls()
-    {
-        $smartModuleConfig = $this->targetObject->handler->getModuleConfig();
-
-        $permissions = $this->targetObject->handler->getPermissions();
-
-        if ($permissions) {
-            $memberHandler = xoops_getHandler('member');
-            $group_list    = $memberHandler->getGroupList();
-            asort($group_list);
-            foreach ($permissions as $permission) {
-                if ($this->targetObject->isNew()) {
-                    if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
-                        $groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
-                    }
-                } else {
-                    $groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
-                }
-                $groups_select = new XoopsFormSelect($permission['caption'], $permission['perm_name'], $groups_value, 4, true);
-                $groups_select->setDescription($permission['description']);
-                $groups_select->addOptionArray($group_list);
-                $this->addElement($groups_select);
-                unset($groups_select);
-            }
-        }
-    }
-
-    /**
-     * @param      $form_name
-     * @param      $form_caption
-     * @param bool $submit_button_caption
-     */
-    public function createButtons($form_name, $form_caption, $submit_button_caption = false)
-    {
-        $button_tray = new XoopsFormElementTray('', '');
-        $button_tray->addElement(new XoopsFormHidden('op', $form_name));
-        if (!$submit_button_caption) {
-            if ($this->targetObject->isNew()) {
-                $butt_create = new XoopsFormButton('', 'create_button', _CO_SOBJECT_CREATE, 'submit');
-            } else {
-                $butt_create = new XoopsFormButton('', 'modify_button', _CO_SOBJECT_MODIFY, 'submit');
-            }
-        } else {
-            $butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption, 'submit');
-        }
-        $butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
-        $button_tray->addElement($butt_create);
-
-        //creating custom buttons
-        if ($this->_custom_button) {
-            foreach ($this->_custom_button as $custom_button) {
-                $butt_custom = new XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
-                if ($custom_button['onclick']) {
-                    $butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
-                }
-                $button_tray->addElement($butt_custom);
-                unset($butt_custom);
-            }
-        }
-
-        // creating the "cancel" button
-        $butt_cancel = new XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
-        if ($this->_cancel_js_action) {
-            $butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
-        } else {
-            $butt_cancel->setExtra('onclick="history.go(-1)"');
-        }
-        $button_tray->addElement($butt_cancel);
-
-        $this->addElement($button_tray);
-    }
-
-    /**
-     * @param $controlName
-     * @param $key
-     * @return XoopsFormLabel
-     */
-    public function getControl($controlName, $key)
-    {
-        switch ($controlName) {
-            case 'check':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php');
-                $control    = $this->targetObject->getControl($key);
-                $controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                $controlObj->addOptionArray($control['options']);
-
-                return $controlObj;
-                break;
-
-            case 'color':
-                $control    = $this->targetObject->getControl($key);
-                $controlObj = new XoopsFormColorPicker($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-
-                return $controlObj;
-                break;
-
-            case 'radio':
-                $control = $this->targetObject->getControl($key);
-
-                $controlObj = new XoopsFormRadio($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                $controlObj->addOptionArray($control['options']);
-
-                return $controlObj;
-                break;
-
-            case 'label':
-                return new XoopsFormLabel($this->targetObject->vars[$key]['form_caption'], $this->targetObject->getVar($key));
-                break;
-
-            case 'textarea':
-                return $this->getTextArea($key);
-
-            case 'theme':
-                return $this->getThemeSelect($key, $this->targetObject->vars[$key]);
-
-            case 'theme_multi':
-                return $this->getThemeSelect($key, $this->targetObject->vars[$key], true);
-                break;
-
-            case 'timezone':
-                return new XoopsFormSelectTimezone($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                break;
-
-            case 'group':
-                return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
-                break;
-
-            case 'group_multi':
-                return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
-                break;
-
-            /*case 'user':
+					if (!isset($controls[$key]['name']) || !$controls[$key]['name']) {
+						$controls[$key]['name'] = 'select';
+					}
+
+					$form_select = $this->getControl($controls[$key]['name'], $key);
+
+					// Adding on the form, the control for this field
+					$this->addElement($form_select, $key, $var);
+					unset($form_select);
+
+					// If this field don't have a specific control, we will use the standard one, depending on its data type
+				} else {
+					switch ($var['data_type']) {
+
+						case XOBJ_DTYPE_TXTBOX:
+
+							$form_text = $this->getControl('text', $key);
+							$this->addElement($form_text, $key, $var);
+							unset($form_text);
+							break;
+
+						case XOBJ_DTYPE_INT:
+							$this->targetObject->setControl($key, array(
+								'name' => 'text',
+								'size' => '5'
+							));
+							$form_text = $this->getControl('text', $key);
+							$this->addElement($form_text, $key, $var);
+							unset($form_text);
+							break;
+
+						case XOBJ_DTYPE_FLOAT:
+							$this->targetObject->setControl($key, array(
+								'name' => 'text',
+								'size' => '5'
+							));
+							$form_text = $this->getControl('text', $key);
+							$this->addElement($form_text, $key, $var);
+							unset($form_text);
+							break;
+
+						case XOBJ_DTYPE_LTIME:
+							$form_date_time = $this->getControl('date_time', $key);
+							$this->addElement($form_date_time, $key, $var);
+							unset($form_date_time);
+							break;
+
+						case XOBJ_DTYPE_STIME:
+							$form_date_time = $this->getControl('date', $key);
+							$this->addElement($form_date_time, $key, $var);
+							unset($form_date_time);
+							break;
+
+						case XOBJ_DTYPE_TIME_ONLY:
+							$form_time = $this->getControl('time', $key);
+							$this->addElement($form_time, $key, $var);
+							unset($form_time);
+							break;
+
+						case XOBJ_DTYPE_CURRENCY:
+							$this->targetObject->setControl($key, array(
+								'name' => 'text',
+								'size' => '15'
+							));
+							$form_currency = $this->getControl('text', $key);
+							$this->addElement($form_currency, $key, $var);
+							unset($form_currency);
+							break;
+
+						case XOBJ_DTYPE_URLLINK:
+							$form_urllink = $this->getControl('urllink', $key);
+							$this->addElement($form_urllink, $key, $var);
+							unset($form_urllink);
+							break;
+
+						case XOBJ_DTYPE_FILE:
+							$form_file = $this->getControl('richfile', $key);
+							$this->addElement($form_file, $key, $var);
+							unset($form_file);
+							break;
+
+						case XOBJ_DTYPE_TXTAREA:
+
+							$form_text_area = $this->getTextArea($key, $var);
+							$this->addElement($form_text_area, $key, $var);
+							unset($form_text_area);
+							break;
+
+						case XOBJ_DTYPE_ARRAY:
+							// TODO: To come...
+							break;
+						case XOBJ_DTYPE_SOURCE:
+							// TODO: To come...
+							break;
+						case XOBJ_DTYPE_FORM_SECTION:
+							$section_control = new SmartFormSection($key, $var['value']);
+							$this->addElement($section_control, $key, $var);
+							unset($section_control);
+							break;
+						case XOBJ_DTYPE_FORM_SECTION_CLOSE:
+							$section_control = new SmartFormSectionClose($key, $var['value']);
+							$this->addElement($section_control, $key, $var);
+							unset($section_control);
+							break;
+					}
+				}
+			}
+		}
+		// Add an hidden field to store the URL of the page before this form
+		$this->addElement(new XoopsFormHidden('smart_page_before_form', smart_get_page_before_form()));
+	}
+
+	public function createPermissionControls()
+	{
+		$smartModuleConfig = $this->targetObject->handler->getModuleConfig();
+
+		$permissions = $this->targetObject->handler->getPermissions();
+
+		if ($permissions) {
+			$memberHandler = xoops_getHandler('member');
+			$group_list    = $memberHandler->getGroupList();
+			asort($group_list);
+			foreach ($permissions as $permission) {
+				if ($this->targetObject->isNew()) {
+					if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
+						$groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
+					}
+				} else {
+					$groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
+				}
+				$groups_select = new XoopsFormSelect($permission['caption'], $permission['perm_name'], $groups_value, 4, true);
+				$groups_select->setDescription($permission['description']);
+				$groups_select->addOptionArray($group_list);
+				$this->addElement($groups_select);
+				unset($groups_select);
+			}
+		}
+	}
+
+	/**
+	 * @param      $form_name
+	 * @param      $form_caption
+	 * @param bool $submit_button_caption
+	 */
+	public function createButtons($form_name, $form_caption, $submit_button_caption = false)
+	{
+		$button_tray = new XoopsFormElementTray('', '');
+		$button_tray->addElement(new XoopsFormHidden('op', $form_name));
+		if (!$submit_button_caption) {
+			if ($this->targetObject->isNew()) {
+				$butt_create = new XoopsFormButton('', 'create_button', _CO_SOBJECT_CREATE, 'submit');
+			} else {
+				$butt_create = new XoopsFormButton('', 'modify_button', _CO_SOBJECT_MODIFY, 'submit');
+			}
+		} else {
+			$butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption, 'submit');
+		}
+		$butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
+		$button_tray->addElement($butt_create);
+
+		//creating custom buttons
+		if ($this->_custom_button) {
+			foreach ($this->_custom_button as $custom_button) {
+				$butt_custom = new XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
+				if ($custom_button['onclick']) {
+					$butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
+				}
+				$button_tray->addElement($butt_custom);
+				unset($butt_custom);
+			}
+		}
+
+		// creating the "cancel" button
+		$butt_cancel = new XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
+		if ($this->_cancel_js_action) {
+			$butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
+		} else {
+			$butt_cancel->setExtra('onclick="history.go(-1)"');
+		}
+		$button_tray->addElement($butt_cancel);
+
+		$this->addElement($button_tray);
+	}
+
+	/**
+	 * @param $controlName
+	 * @param $key
+	 * @return XoopsFormLabel
+	 */
+	public function getControl($controlName, $key)
+	{
+		switch ($controlName) {
+			case 'check':
+				include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php');
+				$control    = $this->targetObject->getControl($key);
+				$controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				$controlObj->addOptionArray($control['options']);
+
+				return $controlObj;
+				break;
+
+			case 'color':
+				$control    = $this->targetObject->getControl($key);
+				$controlObj = new XoopsFormColorPicker($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+
+				return $controlObj;
+				break;
+
+			case 'radio':
+				$control = $this->targetObject->getControl($key);
+
+				$controlObj = new XoopsFormRadio($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				$controlObj->addOptionArray($control['options']);
+
+				return $controlObj;
+				break;
+
+			case 'label':
+				return new XoopsFormLabel($this->targetObject->vars[$key]['form_caption'], $this->targetObject->getVar($key));
+				break;
+
+			case 'textarea':
+				return $this->getTextArea($key);
+
+			case 'theme':
+				return $this->getThemeSelect($key, $this->targetObject->vars[$key]);
+
+			case 'theme_multi':
+				return $this->getThemeSelect($key, $this->targetObject->vars[$key], true);
+				break;
+
+			case 'timezone':
+				return new XoopsFormSelectTimezone($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				break;
+
+			case 'group':
+				return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
+				break;
+
+			case 'group_multi':
+				return new XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
+				break;
+
+			/*case 'user':
              return new XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
              break;*/
 
-            case 'user_multi':
-                return new XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
-                break;
-
-            case 'password':
-                return new XoopsFormPassword($this->targetObject->vars[$key]['form_caption'], $key, 50, 255, $this->targetObject->getVar($key, 'e'));
-                break;
-
-            case 'country':
-                return new XoopsFormSelectCountry($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key, 'e'));
-                break;
-
-            case 'urllink':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformurllinkelement.php');
-
-                return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
-                break;
-
-            case 'richfile':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformrichfileelement.php');
-
-                return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
-                break;
-            case 'section':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php');
-
-                return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
-                break;
-
-            default:
-                $classname = 'SmartForm' . ucfirst($controlName) . 'Element';
-                if (!class_exists($classname)) {
-                    if (file_exists(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php')) {
-                        include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php');
-                    } else {
-                        // perhaps this is a control created by the module
-                        $moduleName             = $this->targetObject->handler->_moduleName;
-                        $moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
-                        $classname              = ucfirst($moduleName) . ucfirst($controlName) . 'Element';
-                        $classFileName          = strtolower($classname) . '.php';
-
-                        if (file_exists($moduleFormElementsPath . $classFileName)) {
-                            include_once($moduleFormElementsPath . $classFileName);
-                        } else {
-                            trigger_error($classname . ' Not found', E_USER_WARNING);
-
-                            return new XoopsFormLabel(); //Empty object
-                        }
-                    }
-                }
-
-                return new $classname($this->targetObject, $key);
-                break;
-        }
-    }
-
-    /**
-     * @param $key
-     * @return XoopsFormDhtmlTextArea|XoopsFormEditor|XoopsFormFckeditor|XoopsFormTextArea|XoopsFormTinyTextArea
-     */
-    public function getTextArea($key)
-    {
-        $var = $this->targetObject->vars[$key];
-
-        // if no control has been created, let's create a default one
-        if (!isset($this->targetObject->controls[$key])) {
-            $control = array(
-                'name'        => 'textarea',
-                'itemHandler' => false,
-                'method'      => false,
-                'module'      => false,
-                'form_editor' => 'default'
-            );
-        } else {
-            $control = $this->targetObject->controls[$key];
-        }
-        $xoops22 = smart_isXoops22();
-
-        $form_editor = isset($control['form_editor']) ? $control['form_editor'] : 'textarea';
-        /**
-         * If the editor is 'default', retreive the default editor of this module
-         */
-        if ($form_editor === 'default') {
-            global $xoopsModuleConfig;
-            $form_editor = isset($xoopsModuleConfig['default_editor']) ? $xoopsModuleConfig['default_editor'] : 'textarea';
-        }
-
-        $caption = $var['form_caption'];
-        $name    = $key;
-
-        $value = $this->targetObject->getVar($key);
-
-        $value = $this->targetObject->getValueFor($key, true);
-
-        $editor_configs          = array();
-        $editor_configs['name']  = $name;
-        $editor_configs['value'] = $value;
-        if ($form_editor !== 'textarea') {
-            $editor_configs['rows'] = 35;
-            $editor_configs['cols'] = 60;
-        }
-
-        if (isset($control['rows'])) {
-            $editor_configs['rows'] = $control['rows'];
-        }
-        if (isset($control['cols'])) {
-            $editor_configs['cols'] = $control['cols'];
-        }
-
-        $editor_configs['width']  = '100%';
-        $editor_configs['height'] = '400px';
-
-        $dhtml            = true;
-        $xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
-
-        if (file_exists($xoopseditorclass)) {
-            include_once($xoopseditorclass);
-            $editor = new XoopsFormEditor($caption, $form_editor, $editor_configs, $nohtml = false, $onfailure = 'textarea');
-        } else {
-            switch ($form_editor) {
-
-                case 'tiny':
-                    if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php');
-                            $editor = new XoopsFormTinyTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, 'tinyeditor', $editor_configs);
-                    }
-                    break;
-
-                case 'dhtmltextarea':
-                case 'dhtmltext':
-                    $editor = new XoopsFormDhtmlTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), 20, 60);
-                    if ($var['form_dsc']) {
-                        $editor->setDescription($var['form_dsc']);
-                    }
-                    break;
-
-                case 'fckeditor':
-                    if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php');
-                            $editor = new XoopsFormFckeditor(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, 'fckeditor', $editor_configs);
-                    }
-                    break;
-
-                case 'inbetween':
-                    if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php');
-                            $editor = new XoopsFormInbetweenTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, 'inbetween', $editor_configs);
-                    }
-                    break;
-
-                case 'koivi':
-                    if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php');
-                            $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
-                        } else {
-                            if ($dhtml) {
-                                $editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, 'koivi', $editor_configs);
-                    }
-                    break;
-
-                case 'spaw':
-                    if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php');
-                            $editor = new XoopsFormSpaw($caption, $name, $value);
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, 'spaw', $editor_configs);
-                    }
-                    break;
-
-                case 'htmlarea':
-                    if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php');
-                            $editor = new XoopsFormHtmlarea($caption, $name, $value);
-                        }
-                    } else {
-                        $editor = new XoopsFormEditor($caption, 'htmlarea', $editor_configs);
-                    }
-                    break;
-
-                default:
-                case 'textarea':
-                    $form_rows = isset($control['rows']) ? $control['rows'] : 5;
-                    $form_cols = isset($control['cols']) ? $control['cols'] : 60;
-
-                    $editor = new XoopsFormTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), $form_rows, $form_cols);
-                    if ($var['form_dsc']) {
-                        $editor->setDescription($var['form_dsc']);
-                    }
-                    break;
-
-            }
-        }
-
-        return $editor;
-    }
-
-    /**
-     * @param                  $key
-     * @param                  $var
-     * @param  bool            $multiple
-     * @return XoopsFormSelect
-     */
-    public function getThemeSelect($key, $var, $multiple = false)
-    {
-        $size         = $multiple ? 5 : 1;
-        $theme_select = new XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
-
-        $handle  = opendir(XOOPS_THEME_PATH . '/');
-        $dirlist = array();
-        while (false !== ($file = readdir($handle))) {
-            if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) !== 'cvs') {
-                $dirlist[$file] = $file;
-            }
-        }
-        closedir($handle);
-        if (!empty($dirlist)) {
-            asort($dirlist);
-            $theme_select->addOptionArray($dirlist);
-        }
-
-        return $theme_select;
-    }
-
-    /**
-     * @param $keyname
-     * @return bool
-     */
-    public function &getElementById($keyname)
-    {
-        foreach ($this->_elements as $eleObj) {
-            if ($eleObj->getName() == $keyname) {
-                $ret =& $eleObj;
-                break;
-            }
-        }
-
-        return isset($ret) ? $ret : false;
-    }
-
-    /**
-     * create HTML to output the form as a theme-enabled table with validation.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $required = $this->getRequired();
-        $ret      = "
+			case 'user_multi':
+				return new XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
+				break;
+
+			case 'password':
+				return new XoopsFormPassword($this->targetObject->vars[$key]['form_caption'], $key, 50, 255, $this->targetObject->getVar($key, 'e'));
+				break;
+
+			case 'country':
+				return new XoopsFormSelectCountry($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key, 'e'));
+				break;
+
+			case 'urllink':
+				include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformurllinkelement.php');
+
+				return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
+				break;
+
+			case 'richfile':
+				include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformrichfileelement.php');
+
+				return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
+				break;
+			case 'section':
+				include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php');
+
+				return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
+				break;
+
+			default:
+				$classname = 'SmartForm' . ucfirst($controlName) . 'Element';
+				if (!class_exists($classname)) {
+					if (file_exists(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php')) {
+						include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php');
+					} else {
+						// perhaps this is a control created by the module
+						$moduleName             = $this->targetObject->handler->_moduleName;
+						$moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
+						$classname              = ucfirst($moduleName) . ucfirst($controlName) . 'Element';
+						$classFileName          = strtolower($classname) . '.php';
+
+						if (file_exists($moduleFormElementsPath . $classFileName)) {
+							include_once($moduleFormElementsPath . $classFileName);
+						} else {
+							trigger_error($classname . ' Not found', E_USER_WARNING);
+
+							return new XoopsFormLabel(); //Empty object
+						}
+					}
+				}
+
+				return new $classname($this->targetObject, $key);
+				break;
+		}
+	}
+
+	/**
+	 * @param $key
+	 * @return XoopsFormDhtmlTextArea|XoopsFormEditor|XoopsFormFckeditor|XoopsFormTextArea|XoopsFormTinyTextArea
+	 */
+	public function getTextArea($key)
+	{
+		$var = $this->targetObject->vars[$key];
+
+		// if no control has been created, let's create a default one
+		if (!isset($this->targetObject->controls[$key])) {
+			$control = array(
+				'name'        => 'textarea',
+				'itemHandler' => false,
+				'method'      => false,
+				'module'      => false,
+				'form_editor' => 'default'
+			);
+		} else {
+			$control = $this->targetObject->controls[$key];
+		}
+		$xoops22 = smart_isXoops22();
+
+		$form_editor = isset($control['form_editor']) ? $control['form_editor'] : 'textarea';
+		/**
+		 * If the editor is 'default', retreive the default editor of this module
+		 */
+		if ($form_editor === 'default') {
+			global $xoopsModuleConfig;
+			$form_editor = isset($xoopsModuleConfig['default_editor']) ? $xoopsModuleConfig['default_editor'] : 'textarea';
+		}
+
+		$caption = $var['form_caption'];
+		$name    = $key;
+
+		$value = $this->targetObject->getVar($key);
+
+		$value = $this->targetObject->getValueFor($key, true);
+
+		$editor_configs          = array();
+		$editor_configs['name']  = $name;
+		$editor_configs['value'] = $value;
+		if ($form_editor !== 'textarea') {
+			$editor_configs['rows'] = 35;
+			$editor_configs['cols'] = 60;
+		}
+
+		if (isset($control['rows'])) {
+			$editor_configs['rows'] = $control['rows'];
+		}
+		if (isset($control['cols'])) {
+			$editor_configs['cols'] = $control['cols'];
+		}
+
+		$editor_configs['width']  = '100%';
+		$editor_configs['height'] = '400px';
+
+		$dhtml            = true;
+		$xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
+
+		if (file_exists($xoopseditorclass)) {
+			include_once($xoopseditorclass);
+			$editor = new XoopsFormEditor($caption, $form_editor, $editor_configs, $nohtml = false, $onfailure = 'textarea');
+		} else {
+			switch ($form_editor) {
+
+				case 'tiny':
+					if (!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
+							include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php');
+							$editor = new XoopsFormTinyTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, 'tinyeditor', $editor_configs);
+					}
+					break;
+
+				case 'dhtmltextarea':
+				case 'dhtmltext':
+					$editor = new XoopsFormDhtmlTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), 20, 60);
+					if ($var['form_dsc']) {
+						$editor->setDescription($var['form_dsc']);
+					}
+					break;
+
+				case 'fckeditor':
+					if (!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php')) {
+							include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php');
+							$editor = new XoopsFormFckeditor(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, 'fckeditor', $editor_configs);
+					}
+					break;
+
+				case 'inbetween':
+					if (!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
+							include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php');
+							$editor = new XoopsFormInbetweenTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, 'inbetween', $editor_configs);
+					}
+					break;
+
+				case 'koivi':
+					if (!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
+							include_once(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php');
+							$editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
+						} else {
+							if ($dhtml) {
+								$editor = new XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, 'koivi', $editor_configs);
+					}
+					break;
+
+				case 'spaw':
+					if (!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
+							include_once(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php');
+							$editor = new XoopsFormSpaw($caption, $name, $value);
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, 'spaw', $editor_configs);
+					}
+					break;
+
+				case 'htmlarea':
+					if (!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
+							include_once(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php');
+							$editor = new XoopsFormHtmlarea($caption, $name, $value);
+						}
+					} else {
+						$editor = new XoopsFormEditor($caption, 'htmlarea', $editor_configs);
+					}
+					break;
+
+				default:
+				case 'textarea':
+					$form_rows = isset($control['rows']) ? $control['rows'] : 5;
+					$form_cols = isset($control['cols']) ? $control['cols'] : 60;
+
+					$editor = new XoopsFormTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), $form_rows, $form_cols);
+					if ($var['form_dsc']) {
+						$editor->setDescription($var['form_dsc']);
+					}
+					break;
+
+			}
+		}
+
+		return $editor;
+	}
+
+	/**
+	 * @param                  $key
+	 * @param                  $var
+	 * @param  bool            $multiple
+	 * @return XoopsFormSelect
+	 */
+	public function getThemeSelect($key, $var, $multiple = false)
+	{
+		$size         = $multiple ? 5 : 1;
+		$theme_select = new XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
+
+		$handle  = opendir(XOOPS_THEME_PATH . '/');
+		$dirlist = array();
+		while (false !== ($file = readdir($handle))) {
+			if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) !== 'cvs') {
+				$dirlist[$file] = $file;
+			}
+		}
+		closedir($handle);
+		if (!empty($dirlist)) {
+			asort($dirlist);
+			$theme_select->addOptionArray($dirlist);
+		}
+
+		return $theme_select;
+	}
+
+	/**
+	 * @param $keyname
+	 * @return bool
+	 */
+	public function &getElementById($keyname)
+	{
+		foreach ($this->_elements as $eleObj) {
+			if ($eleObj->getName() == $keyname) {
+				$ret =& $eleObj;
+				break;
+			}
+		}
+
+		return isset($ret) ? $ret : false;
+	}
+
+	/**
+	 * create HTML to output the form as a theme-enabled table with validation.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$required = $this->getRequired();
+		$ret      = "
             <form name='" .
-                    $this->getName() .
-                    "' id='" .
-                    $this->getName() .
-                    "' action='" .
-                    $this->getAction() .
-                    "' method='" .
-                    $this->getMethod() .
-                    "' onsubmit='return xoopsFormValidate_" .
-                    $this->getName() .
-                    "(this);'" .
-                    $this->getExtra() .
-                    ">
+					$this->getName() .
+					"' id='" .
+					$this->getName() .
+					"' action='" .
+					$this->getAction() .
+					"' method='" .
+					$this->getMethod() .
+					"' onsubmit='return xoopsFormValidate_" .
+					$this->getName() .
+					"(this);'" .
+					$this->getExtra() .
+					">
             <table width='100%' class='outer' cellspacing='1'>
             <tr><th colspan='2'>" .
-                    $this->getTitle() .
-                    '</th></tr>
+					$this->getTitle() .
+					'</th></tr>
         ';
-        $hidden   = '';
-        $class    = 'even';
-        foreach ($this->getElements() as $ele) {
-            if (!is_object($ele)) {
-                $ret .= $ele;
-            } elseif (!$ele->isHidden()) {
-                //$class = ( $class == 'even' ) ? 'odd': 'even';
-                $ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>" . $ele->getCaption();
-                if ($ele->getDescription() !== '') {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $ele->getDescription() . '</span>';
-                }
-                $ret .= "</td><td class='$class'>" . $ele->render() . "</td></tr>\n";
-            } else {
-                $hidden .= $ele->render();
-            }
-        }
-        $ret .= "</table>\n$hidden\n</form>\n";
-        $ret .= $this->renderValidationJS(true);
-
-        return $ret;
-    }
-
-    /**
-     * assign to smarty form template instead of displaying directly
-     *
-     * @param XoopsTpl &$tpl       reference to a {@link Smarty} object
-     * @param bool   $smartyName
-     * @see     Smarty
-     */
-    public function assign(XoopsTpl $tpl, $smartyName = false)
-    {
-        $i        = 0;
-        $elements = array();
-        foreach ($this->getElements() as $ele) {
-            $n                             = ($ele->getName() !== '') ? $ele->getName() : $i;
-            $elements[$n]['name']          = $ele->getName();
-            $elements[$n]['caption']       = $ele->getCaption();
-            $elements[$n]['body']          = $ele->render();
-            $elements[$n]['hidden']        = $ele->isHidden();
-            $elements[$n]['section']       = strtolower(get_class($ele)) == strtolower('SmartFormSection');
-            $elements[$n]['section_close'] = get_class($ele) === 'SmartFormSectionClose';
-            $elements[$n]['hide']          = isset($this->targetObject->vars[$n]['hide']) ? $this->targetObject->vars[$n]['hide'] : false;
-            if ($ele->getDescription() !== '') {
-                $elements[$n]['description'] = $ele->getDescription();
-            }
-            ++$i;
-        }
-        $js = $this->renderValidationJS();
-        if (!$smartyName) {
-            $smartyName = $this->getName();
-        }
-
-        $tpl->assign($smartyName, array(
-            'title'      => $this->getTitle(),
-            'name'       => $this->getName(),
-            'action'     => $this->getAction(),
-            'method'     => $this->getMethod(),
-            'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '(this);"' . $this->getExtra(),
-            'javascript' => $js,
-            'elements'   => $elements
-        ));
-    }
-
-    /**
-     * @param  bool   $withtags
-     * @return string
-     */
-    public function renderValidationJS($withtags = true)
-    {
-        $js = '';
-        if ($withtags) {
-            $js .= "\n<!-- Start Form Validation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
-        }
-        $myts     = MyTextSanitizer::getInstance();
-        $formname = $this->getName();
-        $js .= "function xoopsFormValidate_{$formname}(myform) {";
-        // First, output code to check required elements
-        $elements = $this->getRequired();
-        foreach ($elements as $elt) {
-            $eltname    = $elt->getName();
-            $eltcaption = trim($elt->getCaption());
-            $eltmsg     = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg     = str_replace('"', '\"', stripslashes($eltmsg));
-            if (strtolower(get_class($elt)) === 'xoopsformradio') {
-                $js .= 'var myOption = -1;';
-                $js .= "for (i=myform.{$eltname}.length-1; i > -1; i--) {
+		$hidden   = '';
+		$class    = 'even';
+		foreach ($this->getElements() as $ele) {
+			if (!is_object($ele)) {
+				$ret .= $ele;
+			} elseif (!$ele->isHidden()) {
+				//$class = ( $class == 'even' ) ? 'odd': 'even';
+				$ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>" . $ele->getCaption();
+				if ($ele->getDescription() !== '') {
+					$ret .= '<br><br><span style="font-weight: normal;">' . $ele->getDescription() . '</span>';
+				}
+				$ret .= "</td><td class='$class'>" . $ele->render() . "</td></tr>\n";
+			} else {
+				$hidden .= $ele->render();
+			}
+		}
+		$ret .= "</table>\n$hidden\n</form>\n";
+		$ret .= $this->renderValidationJS(true);
+
+		return $ret;
+	}
+
+	/**
+	 * assign to smarty form template instead of displaying directly
+	 *
+	 * @param XoopsTpl &$tpl       reference to a {@link Smarty} object
+	 * @param bool   $smartyName
+	 * @see     Smarty
+	 */
+	public function assign(XoopsTpl $tpl, $smartyName = false)
+	{
+		$i        = 0;
+		$elements = array();
+		foreach ($this->getElements() as $ele) {
+			$n                             = ($ele->getName() !== '') ? $ele->getName() : $i;
+			$elements[$n]['name']          = $ele->getName();
+			$elements[$n]['caption']       = $ele->getCaption();
+			$elements[$n]['body']          = $ele->render();
+			$elements[$n]['hidden']        = $ele->isHidden();
+			$elements[$n]['section']       = strtolower(get_class($ele)) == strtolower('SmartFormSection');
+			$elements[$n]['section_close'] = get_class($ele) === 'SmartFormSectionClose';
+			$elements[$n]['hide']          = isset($this->targetObject->vars[$n]['hide']) ? $this->targetObject->vars[$n]['hide'] : false;
+			if ($ele->getDescription() !== '') {
+				$elements[$n]['description'] = $ele->getDescription();
+			}
+			++$i;
+		}
+		$js = $this->renderValidationJS();
+		if (!$smartyName) {
+			$smartyName = $this->getName();
+		}
+
+		$tpl->assign($smartyName, array(
+			'title'      => $this->getTitle(),
+			'name'       => $this->getName(),
+			'action'     => $this->getAction(),
+			'method'     => $this->getMethod(),
+			'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '(this);"' . $this->getExtra(),
+			'javascript' => $js,
+			'elements'   => $elements
+		));
+	}
+
+	/**
+	 * @param  bool   $withtags
+	 * @return string
+	 */
+	public function renderValidationJS($withtags = true)
+	{
+		$js = '';
+		if ($withtags) {
+			$js .= "\n<!-- Start Form Validation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
+		}
+		$myts     = MyTextSanitizer::getInstance();
+		$formname = $this->getName();
+		$js .= "function xoopsFormValidate_{$formname}(myform) {";
+		// First, output code to check required elements
+		$elements = $this->getRequired();
+		foreach ($elements as $elt) {
+			$eltname    = $elt->getName();
+			$eltcaption = trim($elt->getCaption());
+			$eltmsg     = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg     = str_replace('"', '\"', stripslashes($eltmsg));
+			if (strtolower(get_class($elt)) === 'xoopsformradio') {
+				$js .= 'var myOption = -1;';
+				$js .= "for (i=myform.{$eltname}.length-1; i > -1; i--) {
                     if (myform.{$eltname}[i].checked) {
                         myOption = i; i = -1;
                     }
                 }
                 if (myOption == -1) {
                     window.alert(\"{$eltmsg}\"); myform.{$eltname}[0].focus(); return false; }\n";
-            } elseif (strtolower(get_class($elt)) === 'smartformselect_multielement') {
-                $js .= 'var hasSelections = false;';
-                $js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
+			} elseif (strtolower(get_class($elt)) === 'smartformselect_multielement') {
+				$js .= 'var hasSelections = false;';
+				$js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
                     if (myform['{$eltname}[]'].options[i].selected) {
                         hasSelections = true;
                     }
@@ -821,11 +821,11 @@ 
                 }
                 if (hasSelections == false) {
                     window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'].options[0].focus(); return false; }\n";
-            } elseif (strtolower(get_class($elt)) === 'xoopsformcheckbox' || strtolower(get_class($elt)) === 'smartformcheckelement') {
-                $js .= 'var hasSelections = false;';
-                //sometimes, there is an implicit '[]', sometimes not
-                if (strpos($eltname, '[') === false) {
-                    $js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
+			} elseif (strtolower(get_class($elt)) === 'xoopsformcheckbox' || strtolower(get_class($elt)) === 'smartformcheckelement') {
+				$js .= 'var hasSelections = false;';
+				//sometimes, there is an implicit '[]', sometimes not
+				if (strpos($eltname, '[') === false) {
+					$js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
                         if (myform['{$eltname}[]'][i].checked) {
                             hasSelections = true;
                         }
@@ -833,8 +833,8 @@ 
                     }
                     if (hasSelections == false) {
                         window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
-                } else {
-                    $js .= "for (var i = 0; i < myform['{$eltname}'].length; i++) {
+				} else {
+					$js .= "for (var i = 0; i < myform['{$eltname}'].length; i++) {
                         if (myform['{$eltname}'][i].checked) {
                             hasSelections = true;
                         }
@@ -842,25 +842,25 @@ 
                     }
                     if (hasSelections == false) {
                         window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
-                }
-            } else {
-                $js .= "if ( myform.{$eltname}.value == \"\" ) " . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
-            }
-        }
-        // Now, handle custom validation code
-        $elements =& $this->getElements(true);
-        foreach ($elements as $elt) {
-            if (method_exists($elt, 'renderValidationJS') && strtolower(get_class($elt)) !== 'xoopsformcheckbox') {
-                if ($eltjs = $elt->renderValidationJS()) {
-                    $js .= $eltjs . "\n";
-                }
-            }
-        }
-        $js .= "return true;\n}\n";
-        if ($withtags) {
-            $js .= "//--></script>\n<!-- 'End Form Validation JavaScript' //-->\n";
-        }
-
-        return $js;
-    }
+				}
+			} else {
+				$js .= "if ( myform.{$eltname}.value == \"\" ) " . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
+			}
+		}
+		// Now, handle custom validation code
+		$elements =& $this->getElements(true);
+		foreach ($elements as $elt) {
+			if (method_exists($elt, 'renderValidationJS') && strtolower(get_class($elt)) !== 'xoopsformcheckbox') {
+				if ($eltjs = $elt->renderValidationJS()) {
+					$js .= $eltjs . "\n";
+				}
+			}
+		}
+		$js .= "return true;\n}\n";
+		if ($withtags) {
+			$js .= "//--></script>\n<!-- 'End Form Validation JavaScript' //-->\n";
+		}
+
+		return $js;
+	}
 }

Spacing +61 added lines, -61 removed lines

@@ -15,9 +15,9 @@ 
 /**
  * Including the XoopsFormLoader classes
  */
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php';
-include_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsectionclose.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsection.php';
+include_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsectionclose.php';
 
 /**
  * SmartForm base class
@@ -52,7 +52,7 @@ 
      */
     public function __construct(&$target, $form_name, $form_caption, $form_action, $form_fields = null, $submit_button_caption = false, $cancel_js_action = false, $captcha = false)
     {
-        $this->targetObject           =& $target;
+        $this->targetObject           = & $target;
         $this->form_fields            = $form_fields;
         $this->_cancel_js_action      = $cancel_js_action;
         $this->_captcha               = $captcha;
@@ -80,7 +80,7 @@ 
 
     public function addCaptcha()
     {
-        include_once(SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php');
+        include_once(SMARTOBJECT_ROOT_PATH.'include/captcha/formcaptcha.php');
         $this->addElement(new XoopsFormCaptcha(), true);
     }
 
@@ -91,7 +91,7 @@ 
      */
     public function addCustomButton($name, $caption, $onclick = false)
     {
-        $custom_button_array    = array(
+        $custom_button_array = array(
             'name'    => $name,
             'caption' => $caption,
             'onclick' => $onclick
@@ -112,7 +112,7 @@ 
         if ($key) {
             if ($this->targetObject->vars[$key]['readonly']) {
                 $formElement->setExtra('disabled="disabled"');
-                $formElement->setName($key . '-readonly');
+                $formElement->setName($key.'-readonly');
                 // Since this element is disable, we still want to pass it's value in the form
                 $hidden = new XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
                 $this->addElement($hidden);
@@ -123,7 +123,7 @@ 
                 $this->addElement($hidden);
                 $otherExtra      = isset($var['form_extra']) ? $var['form_extra'] : '';
                 $onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
-                $formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
+                $formElement->setExtra('onchange="'.$onchangedString.'"'.' '.$otherExtra);
             } else {
                 if (isset($var['form_extra'])) {
                     $formElement->setExtra($var['form_extra']);
@@ -290,8 +290,8 @@ 
             asort($group_list);
             foreach ($permissions as $permission) {
                 if ($this->targetObject->isNew()) {
-                    if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
-                        $groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
+                    if (isset($smartModuleConfig['def_perm_'.$permission['perm_name']])) {
+                        $groups_value = $smartModuleConfig['def_perm_'.$permission['perm_name']];
                     }
                 } else {
                     $groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
@@ -323,7 +323,7 @@ 
         } else {
             $butt_create = new XoopsFormButton('', 'modify_button', $submit_button_caption, 'submit');
         }
-        $butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
+        $butt_create->setExtra('onclick="this.form.elements.op.value=\''.$form_name.'\'"');
         $button_tray->addElement($butt_create);
 
         //creating custom buttons
@@ -331,7 +331,7 @@ 
             foreach ($this->_custom_button as $custom_button) {
                 $butt_custom = new XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
                 if ($custom_button['onclick']) {
-                    $butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
+                    $butt_custom->setExtra('onclick="'.$custom_button['onclick'].'"');
                 }
                 $button_tray->addElement($butt_custom);
                 unset($butt_custom);
@@ -341,7 +341,7 @@ 
         // creating the "cancel" button
         $butt_cancel = new XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
         if ($this->_cancel_js_action) {
-            $butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
+            $butt_cancel->setExtra('onclick="'.$this->_cancel_js_action.'"');
         } else {
             $butt_cancel->setExtra('onclick="history.go(-1)"');
         }
@@ -359,7 +359,7 @@ 
     {
         switch ($controlName) {
             case 'check':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php');
+                include_once(SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformcheckelement.php');
                 $control    = $this->targetObject->getControl($key);
                 $controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
                 $controlObj->addOptionArray($control['options']);
@@ -426,38 +426,38 @@ 
                 break;
 
             case 'urllink':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformurllinkelement.php');
+                include_once(SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformurllinkelement.php');
 
                 return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
                 break;
 
             case 'richfile':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformrichfileelement.php');
+                include_once(SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformrichfileelement.php');
 
                 return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
                 break;
             case 'section':
-                include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php');
+                include_once(SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsection.php');
 
                 return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
                 break;
 
             default:
-                $classname = 'SmartForm' . ucfirst($controlName) . 'Element';
+                $classname = 'SmartForm'.ucfirst($controlName).'Element';
                 if (!class_exists($classname)) {
-                    if (file_exists(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php')) {
-                        include_once(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php');
+                    if (file_exists(SMARTOBJECT_ROOT_PATH.'class/form/elements/'.strtolower($classname).'.php')) {
+                        include_once(SMARTOBJECT_ROOT_PATH.'class/form/elements/'.strtolower($classname).'.php');
                     } else {
                         // perhaps this is a control created by the module
                         $moduleName             = $this->targetObject->handler->_moduleName;
-                        $moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
-                        $classname              = ucfirst($moduleName) . ucfirst($controlName) . 'Element';
-                        $classFileName          = strtolower($classname) . '.php';
+                        $moduleFormElementsPath = $this->targetObject->handler->_modulePath.'class/form/elements/';
+                        $classname              = ucfirst($moduleName).ucfirst($controlName).'Element';
+                        $classFileName          = strtolower($classname).'.php';
 
-                        if (file_exists($moduleFormElementsPath . $classFileName)) {
-                            include_once($moduleFormElementsPath . $classFileName);
+                        if (file_exists($moduleFormElementsPath.$classFileName)) {
+                            include_once($moduleFormElementsPath.$classFileName);
                         } else {
-                            trigger_error($classname . ' Not found', E_USER_WARNING);
+                            trigger_error($classname.' Not found', E_USER_WARNING);
 
                             return new XoopsFormLabel(); //Empty object
                         }
@@ -526,7 +526,7 @@ 
         $editor_configs['height'] = '400px';
 
         $dhtml            = true;
-        $xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
+        $xoopseditorclass = XOOPS_ROOT_PATH.'/class/xoopsform/formeditor.php';
 
         if (file_exists($xoopseditorclass)) {
             include_once($xoopseditorclass);
@@ -536,8 +536,8 @@ 
 
                 case 'tiny':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php');
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
+                            include_once(XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinytextarea.php');
                             $editor = new XoopsFormTinyTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
                         } else {
                             if ($dhtml) {
@@ -561,8 +561,8 @@ 
 
                 case 'fckeditor':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php');
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/fckeditor/formfckeditor.php')) {
+                            include_once(XOOPS_ROOT_PATH.'/class/xoopseditor/fckeditor/formfckeditor.php');
                             $editor = new XoopsFormFckeditor(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
                         } else {
                             if ($dhtml) {
@@ -578,8 +578,8 @@ 
 
                 case 'inbetween':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php');
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
+                            include_once(XOOPS_ROOT_PATH.'/class/xoopseditor/inbetween/forminbetweentextarea.php');
                             $editor = new XoopsFormInbetweenTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '300px'), true);
                         } else {
                             if ($dhtml) {
@@ -595,8 +595,8 @@ 
 
                 case 'koivi':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php');
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php')) {
+                            include_once(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php');
                             $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
                         } else {
                             if ($dhtml) {
@@ -612,8 +612,8 @@ 
 
                 case 'spaw':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php');
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/spaw/formspaw.php')) {
+                            include_once(XOOPS_ROOT_PATH.'/class/spaw/formspaw.php');
                             $editor = new XoopsFormSpaw($caption, $name, $value);
                         }
                     } else {
@@ -623,8 +623,8 @@ 
 
                 case 'htmlarea':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
-                            include_once(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php');
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php')) {
+                            include_once(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php');
                             $editor = new XoopsFormHtmlarea($caption, $name, $value);
                         }
                     } else {
@@ -660,10 +660,10 @@ 
         $size         = $multiple ? 5 : 1;
         $theme_select = new XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
 
-        $handle  = opendir(XOOPS_THEME_PATH . '/');
+        $handle  = opendir(XOOPS_THEME_PATH.'/');
         $dirlist = array();
         while (false !== ($file = readdir($handle))) {
-            if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) !== 'cvs') {
+            if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) !== 'cvs') {
                 $dirlist[$file] = $file;
             }
         }
@@ -684,7 +684,7 @@ 
     {
         foreach ($this->_elements as $eleObj) {
             if ($eleObj->getName() == $keyname) {
-                $ret =& $eleObj;
+                $ret = & $eleObj;
                 break;
             }
         }
@@ -702,21 +702,21 @@ 
         $required = $this->getRequired();
         $ret      = "
             <form name='" .
-                    $this->getName() .
-                    "' id='" .
-                    $this->getName() .
-                    "' action='" .
-                    $this->getAction() .
-                    "' method='" .
-                    $this->getMethod() .
-                    "' onsubmit='return xoopsFormValidate_" .
-                    $this->getName() .
-                    "(this);'" .
-                    $this->getExtra() .
+                    $this->getName().
+                    "' id='".
+                    $this->getName().
+                    "' action='".
+                    $this->getAction().
+                    "' method='".
+                    $this->getMethod().
+                    "' onsubmit='return xoopsFormValidate_".
+                    $this->getName().
+                    "(this);'".
+                    $this->getExtra().
                     ">
             <table width='100%' class='outer' cellspacing='1'>
             <tr><th colspan='2'>" .
-                    $this->getTitle() .
+                    $this->getTitle().
                     '</th></tr>
         ';
         $hidden   = '';
@@ -726,11 +726,11 @@ 
                 $ret .= $ele;
             } elseif (!$ele->isHidden()) {
                 //$class = ( $class == 'even' ) ? 'odd': 'even';
-                $ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>" . $ele->getCaption();
+                $ret .= "<tr id='".$ele->getName()."' valign='top' align='left'><td class='head'>".$ele->getCaption();
                 if ($ele->getDescription() !== '') {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $ele->getDescription() . '</span>';
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$ele->getDescription().'</span>';
                 }
-                $ret .= "</td><td class='$class'>" . $ele->render() . "</td></tr>\n";
+                $ret .= "</td><td class='$class'>".$ele->render()."</td></tr>\n";
             } else {
                 $hidden .= $ele->render();
             }
@@ -776,7 +776,7 @@ 
             'name'       => $this->getName(),
             'action'     => $this->getAction(),
             'method'     => $this->getMethod(),
-            'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '(this);"' . $this->getExtra(),
+            'extra'      => 'onsubmit="return xoopsFormValidate_'.$this->getName().'(this);"'.$this->getExtra(),
             'javascript' => $js,
             'elements'   => $elements
         ));
@@ -844,15 +844,15 @@ 
                         window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
                 }
             } else {
-                $js .= "if ( myform.{$eltname}.value == \"\" ) " . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
+                $js .= "if ( myform.{$eltname}.value == \"\" ) "."{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
             }
         }
         // Now, handle custom validation code
-        $elements =& $this->getElements(true);
+        $elements = & $this->getElements(true);
         foreach ($elements as $elt) {
             if (method_exists($elt, 'renderValidationJS') && strtolower(get_class($elt)) !== 'xoopsformcheckbox') {
                 if ($eltjs = $elt->renderValidationJS()) {
-                    $js .= $eltjs . "\n";
+                    $js .= $eltjs."\n";
                 }
             }
         }

class/member.php

Doc Comments +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
      * Creates a random number with a specified number of $digits
      *
      * @param  int $digits number of digits
-     * @return return int random number
+     * @return string int random number
      * @author xHelp Team
      *
      * @access public

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

Spacing +10 added lines, -10 removed lines

@@ -30,9 +30,9 @@ 
 // ------------------------------------------------------------------------- //
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
-require_once XOOPS_ROOT_PATH . '/kernel/user.php';
-require_once XOOPS_ROOT_PATH . '/kernel/group.php';
-require_once XOOPS_ROOT_PATH . '/kernel/member.php';
+require_once XOOPS_ROOT_PATH.'/kernel/user.php';
+require_once XOOPS_ROOT_PATH.'/kernel/group.php';
+require_once XOOPS_ROOT_PATH.'/kernel/member.php';
 
 /**
  * XOOPS member handler class.
@@ -151,14 +151,14 @@ 
 
         if ($notifyUser) {
             // send some notifications
-            $xoopsMailer =& getMailer();
+            $xoopsMailer = & getMailer();
             $xoopsMailer->useMail();
-            $xoopsMailer->setTemplateDir(SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/mail_template');
+            $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('SITEURL', XOOPS_URL.'/');
             $xoopsMailer->assign('NAME', $userObj->getVar('name'));
             $xoopsMailer->assign('UNAME', $userObj->getVar('uname'));
             $xoopsMailer->setToUsers($userObj);
@@ -204,7 +204,7 @@ 
         if (strlen($name) > 0) {
             $name = explode(' ', trim($name));
             if (count($name) > 1) {
-                $basename = strtolower(substr($name[0], 0, 1) . $name[count($name) - 1]);
+                $basename = strtolower(substr($name[0], 0, 1).$name[count($name) - 1]);
             } else {
                 $basename = strtolower($name[0]);
             }
@@ -221,9 +221,9 @@ 
         while ($i < $count) {
             $num = $this->genRandNumber();
             if ($onbasename < 0 && $hasbasename) {
-                $names[] = xoops_substr($basename, 0, 58, '') . $num;
+                $names[] = xoops_substr($basename, 0, 58, '').$num;
             } else {
-                $names[] = xoops_substr($emailname, 0, 58, '') . $num;
+                $names[] = xoops_substr($emailname, 0, 58, '').$num;
             }
             $i          = count($names);
             $onbasename = ~$onbasename;
@@ -265,7 +265,7 @@ 
     {
         static $randCalled = false;
         if (!$randCalled) {
-            mt_srand((double)microtime() * 1000000);
+            mt_srand((double) microtime() * 1000000);
             $randCalled = true;
         }
     }

class/smartdbupdater.php

Doc Comments +3 added lines, -3 removed lines

@@ -141,7 +141,7 @@ 
     }
 
     /**
-     * @param $field
+     * @param string $field
      * @return bool
      */
     public function fieldExists($field)
@@ -623,7 +623,7 @@ 
     /**
      * Use to update a table
      *
-     * @param object $table {@link SmartDbTable} that will be updated
+     * @param SmartDbTable $table {@link SmartDbTable} that will be updated
      *
      * @see SmartDbTable
      *
@@ -725,7 +725,7 @@ 
     /**
      * @param $module
      * @param $item
-     * @return bool
+     * @return false|null
      */
     public function upgradeObjectItem($module, $item)
     {

Indentation +814 added lines, -814 removed lines

@@ -18,7 +18,7 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+	include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
@@ -26,7 +26,7 @@ 
 global $xoopsConfig;
 $common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+	$common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
 }
 include($common_file);
 
@@ -35,500 +35,500 @@ 
  */
 class SmartDbTable
 {
-    /**
-     * @var string $_name name of the table
-     */
-    public $_name;
-    /**
-     * @var string $_structure structure of the table
-     */
-    public $_structure;
-
-    /**
-     * @var array $_data containing valued of each records to be added
-     */
-    public $_data;
-
-    /**
-     * @var array $_alteredFields containing fields to be altered
-     */
-    public $_alteredFields;
-
-    /**
-     * @var array $_newFields containing new fields to be added
-     */
-    public $_newFields;
-
-    /**
-     * @var array $_droppedFields containing fields to be dropped
-     */
-    public $_droppedFields;
-
-    /**
-     * @var array $_flagForDrop flag table to drop it
-     */
-    public $_flagForDrop = false;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */
-    public $_updatedFields;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */ //felix
-    public $_updatedWhere;
-
-    public $_existingFieldsArray = false;
-
-    /**
-     * Constructor
-     *
-     * @param string $name name of the table
-     *
-     */
-    public function __construct($name)
-    {
-        $this->_name = $name;
-        $this->_data = array();
-    }
-
-    /**
-     * Return the table name, prefixed with site table prefix
-     *
-     * @return string table name
-     *
-     */
-    public function name()
-    {
-        global $xoopsDB;
-
-        return $xoopsDB->prefix($this->_name);
-    }
-
-    /**
-     * Checks if the table already exists in the database
-     *
-     * @return bool TRUE if it exists, FALSE if not
-     *
-     */
-    public function exists()
-    {
-        return smart_TableExists($this->_name);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getExistingFieldsArray()
-    {
-        global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
-        while ($existing_field = $xoopsDB->fetchArray($result)) {
-            $fields[$existing_field['Field']] = $existing_field['Type'];
-            if ($existing_field['Null'] !== 'YES') {
-                $fields[$existing_field['Field']] .= ' NOT NULL';
-            }
-            if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
-            }
-            if (!($existing_field['Default'] === null) && ($existing_field['Default'] || $existing_field['Default'] === '' || $existing_field['Default'] == 0)) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * @param $field
-     * @return bool
-     */
-    public function fieldExists($field)
-    {
-        $existingFields = $this->getExistingFieldsArray();
-
-        return isset($existingFields[$field]);
-    }
-
-    /**
-     * Set the table structure
-     *
-     * Example:
-     *
-     *      $table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
-     *                `date` int(11) NOT NULL default '0',
-     *                `status` int(1) NOT NULL default '-1',
-     *                `itemid` int(11) NOT NULL default '0',
-     *                `uid` int(11) NOT NULL default '0',
-     *                `price` float NOT NULL default '0',
-     *                `currency` varchar(100) NOT NULL default '',
-     *                PRIMARY KEY  (`transactionid`)");
-     *
-     * @param string $structure table structure
-     *
-     */
-    public function setStructure($structure)
-    {
-        $this->_structure = $structure;
-    }
-
-    /**
-     * Return the table structure
-     *
-     * @return string table structure
-     *
-     */
-    public function getStructure()
-    {
-        return sprintf($this->_structure, $this->name());
-    }
-
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $data values of a record
-     *
-     */
-    public function setData($data)
-    {
-        $this->_data[] = $data;
-    }
-
-    /**
-     * Get the data array
-     *
-     * @return array containing the records values to be added
-     *
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Use to insert data in a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function addData()
-    {
-        global $xoopsDB;
-        foreach ($this->getData() as $data) {
-            $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
-            $ret   = $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Add a field to be added
-     *
-     * @param string $name       name of the field
-     * @param string $properties properties of the field
-     * @param bool   $newname
-     * @param bool   $showerror
-     */
-    public function addAlteredField($name, $properties, $newname = false, $showerror = true)
-    {
-        $field['name']          = $name;
-        $field['properties']    = $properties;
-        $field['showerror']     = $showerror;
-        $field['newname']       = $newname;
-        $this->_alteredFields[] = $field;
-    }
-    /**
-     * Invert values 0 to 1 and 1 to 0
-     *
-     * @param string $name     name of the field
-     * @param        $newValue
-     * @param        $oldValue
-     * @internal param string $old old propertie
-     * @internal param string $new new propertie
-     */ //felix
-    public function addUpdatedWhere($name, $newValue, $oldValue)
-    {
-        $field['name']         = $name;
-        $field['value']        = $newValue;
-        $field['where']        = $oldValue;
-        $this->_updatedWhere[] = $field;
-    }
-
-    /**
-     * Add new field of a record to be added
-     *
-     * @param string $name       name of the field
-     * @param string $properties properties of the field
-     *
-     */
-    public function addNewField($name, $properties)
-    {
-        $field['name']       = $name;
-        $field['properties'] = $properties;
-        $this->_newFields[]  = $field;
-    }
-
-    /**
-     * Get fields that need to be altered
-     *
-     * @return array fields that need to be altered
-     *
-     */
-    public function getAlteredFields()
-    {
-        return $this->_alteredFields;
-    }
-
-    /**
-     * Add field for which the value will be updated
-     *
-     * @param string $name  name of the field
-     * @param string $value value to be set
-     *
-     */
-    public function addUpdatedField($name, $value)
-    {
-        $field['name']          = $name;
-        $field['value']         = $value;
-        $this->_updatedFields[] = $field;
-    }
-
-    /**
-     * Get new fields to be added
-     *
-     * @return array fields to be added
-     *
-     */
-    public function getNewFields()
-    {
-        return $this->_newFields;
-    }
-
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */
-    public function getUpdatedFields()
-    {
-        return $this->_updatedFields;
-    }
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */ //felix
-    public function getUpdatedWhere()
-    {
-        return $this->_updatedWhere;
-    }
-
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $name name of the field
-     *
-     */
-    public function addDroppedField($name)
-    {
-        $this->_droppedFields[] = $name;
-    }
-
-    /**
-     * Get fields that need to be dropped
-     *
-     * @return array fields that need to be dropped
-     *
-     */
-    public function getDroppedFields()
-    {
-        return $this->_droppedFields;
-    }
-
-    /**
-     * Set the flag to drop the table
-     *
-     */
-    public function setFlagForDrop()
-    {
-        $this->_flagForDrop = true;
-    }
-
-    /**
-     * Use to create a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function createTable()
-    {
-        global $xoopsDB;
-        $query = $this->getStructure();
-        $query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
-        //xoops_debug($query);
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to drop a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function dropTable()
-    {
-        global $xoopsDB;
-        $query = sprintf('DROP TABLE %s', $this->name());
-        $ret   = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-
-            return false;
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to alter a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function alterTable()
-    {
-        global $xoopsDB;
-        $ret = true;
-
-        foreach ($this->getAlteredFields() as $alteredField) {
-            if (!$alteredField['newname']) {
-                $alteredField['newname'] = $alteredField['name'];
-            }
-
-            $query = sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s', $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
-            $ret   = $ret && $xoopsDB->query($query);
-            if ($alteredField['showerror']) {
-                if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-                } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to add new fileds in the table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function addNewFields()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getNewFields() as $newField) {
-            $query = sprintf('ALTER TABLE `%s` ADD `%s` %s', $this->name(), $newField['name'], $newField['properties']);
-            //echo $query;
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function updateFieldsValues()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedFields() as $updatedField) {
-            $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
-            $ret   = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */ //felix
-    public function updateWhereValues()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedWhere() as $updatedWhere) {
-            $query = sprintf('UPDATE %s SET %s = %s WHERE %s  %s', $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
-            //echo $query."<br>";
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to drop fields
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function dropFields()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getDroppedFields() as $droppedField) {
-            $query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
-            $ret   = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
+	/**
+	 * @var string $_name name of the table
+	 */
+	public $_name;
+	/**
+	 * @var string $_structure structure of the table
+	 */
+	public $_structure;
+
+	/**
+	 * @var array $_data containing valued of each records to be added
+	 */
+	public $_data;
+
+	/**
+	 * @var array $_alteredFields containing fields to be altered
+	 */
+	public $_alteredFields;
+
+	/**
+	 * @var array $_newFields containing new fields to be added
+	 */
+	public $_newFields;
+
+	/**
+	 * @var array $_droppedFields containing fields to be dropped
+	 */
+	public $_droppedFields;
+
+	/**
+	 * @var array $_flagForDrop flag table to drop it
+	 */
+	public $_flagForDrop = false;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */
+	public $_updatedFields;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */ //felix
+	public $_updatedWhere;
+
+	public $_existingFieldsArray = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $name name of the table
+	 *
+	 */
+	public function __construct($name)
+	{
+		$this->_name = $name;
+		$this->_data = array();
+	}
+
+	/**
+	 * Return the table name, prefixed with site table prefix
+	 *
+	 * @return string table name
+	 *
+	 */
+	public function name()
+	{
+		global $xoopsDB;
+
+		return $xoopsDB->prefix($this->_name);
+	}
+
+	/**
+	 * Checks if the table already exists in the database
+	 *
+	 * @return bool TRUE if it exists, FALSE if not
+	 *
+	 */
+	public function exists()
+	{
+		return smart_TableExists($this->_name);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getExistingFieldsArray()
+	{
+		global $xoopsDB;
+		$result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+		while ($existing_field = $xoopsDB->fetchArray($result)) {
+			$fields[$existing_field['Field']] = $existing_field['Type'];
+			if ($existing_field['Null'] !== 'YES') {
+				$fields[$existing_field['Field']] .= ' NOT NULL';
+			}
+			if ($existing_field['Extra']) {
+				$fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+			}
+			if (!($existing_field['Default'] === null) && ($existing_field['Default'] || $existing_field['Default'] === '' || $existing_field['Default'] == 0)) {
+				$fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * @param $field
+	 * @return bool
+	 */
+	public function fieldExists($field)
+	{
+		$existingFields = $this->getExistingFieldsArray();
+
+		return isset($existingFields[$field]);
+	}
+
+	/**
+	 * Set the table structure
+	 *
+	 * Example:
+	 *
+	 *      $table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
+	 *                `date` int(11) NOT NULL default '0',
+	 *                `status` int(1) NOT NULL default '-1',
+	 *                `itemid` int(11) NOT NULL default '0',
+	 *                `uid` int(11) NOT NULL default '0',
+	 *                `price` float NOT NULL default '0',
+	 *                `currency` varchar(100) NOT NULL default '',
+	 *                PRIMARY KEY  (`transactionid`)");
+	 *
+	 * @param string $structure table structure
+	 *
+	 */
+	public function setStructure($structure)
+	{
+		$this->_structure = $structure;
+	}
+
+	/**
+	 * Return the table structure
+	 *
+	 * @return string table structure
+	 *
+	 */
+	public function getStructure()
+	{
+		return sprintf($this->_structure, $this->name());
+	}
+
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $data values of a record
+	 *
+	 */
+	public function setData($data)
+	{
+		$this->_data[] = $data;
+	}
+
+	/**
+	 * Get the data array
+	 *
+	 * @return array containing the records values to be added
+	 *
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * Use to insert data in a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function addData()
+	{
+		global $xoopsDB;
+		foreach ($this->getData() as $data) {
+			$query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
+			$ret   = $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Add a field to be added
+	 *
+	 * @param string $name       name of the field
+	 * @param string $properties properties of the field
+	 * @param bool   $newname
+	 * @param bool   $showerror
+	 */
+	public function addAlteredField($name, $properties, $newname = false, $showerror = true)
+	{
+		$field['name']          = $name;
+		$field['properties']    = $properties;
+		$field['showerror']     = $showerror;
+		$field['newname']       = $newname;
+		$this->_alteredFields[] = $field;
+	}
+	/**
+	 * Invert values 0 to 1 and 1 to 0
+	 *
+	 * @param string $name     name of the field
+	 * @param        $newValue
+	 * @param        $oldValue
+	 * @internal param string $old old propertie
+	 * @internal param string $new new propertie
+	 */ //felix
+	public function addUpdatedWhere($name, $newValue, $oldValue)
+	{
+		$field['name']         = $name;
+		$field['value']        = $newValue;
+		$field['where']        = $oldValue;
+		$this->_updatedWhere[] = $field;
+	}
+
+	/**
+	 * Add new field of a record to be added
+	 *
+	 * @param string $name       name of the field
+	 * @param string $properties properties of the field
+	 *
+	 */
+	public function addNewField($name, $properties)
+	{
+		$field['name']       = $name;
+		$field['properties'] = $properties;
+		$this->_newFields[]  = $field;
+	}
+
+	/**
+	 * Get fields that need to be altered
+	 *
+	 * @return array fields that need to be altered
+	 *
+	 */
+	public function getAlteredFields()
+	{
+		return $this->_alteredFields;
+	}
+
+	/**
+	 * Add field for which the value will be updated
+	 *
+	 * @param string $name  name of the field
+	 * @param string $value value to be set
+	 *
+	 */
+	public function addUpdatedField($name, $value)
+	{
+		$field['name']          = $name;
+		$field['value']         = $value;
+		$this->_updatedFields[] = $field;
+	}
+
+	/**
+	 * Get new fields to be added
+	 *
+	 * @return array fields to be added
+	 *
+	 */
+	public function getNewFields()
+	{
+		return $this->_newFields;
+	}
+
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */
+	public function getUpdatedFields()
+	{
+		return $this->_updatedFields;
+	}
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */ //felix
+	public function getUpdatedWhere()
+	{
+		return $this->_updatedWhere;
+	}
+
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $name name of the field
+	 *
+	 */
+	public function addDroppedField($name)
+	{
+		$this->_droppedFields[] = $name;
+	}
+
+	/**
+	 * Get fields that need to be dropped
+	 *
+	 * @return array fields that need to be dropped
+	 *
+	 */
+	public function getDroppedFields()
+	{
+		return $this->_droppedFields;
+	}
+
+	/**
+	 * Set the flag to drop the table
+	 *
+	 */
+	public function setFlagForDrop()
+	{
+		$this->_flagForDrop = true;
+	}
+
+	/**
+	 * Use to create a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function createTable()
+	{
+		global $xoopsDB;
+		$query = $this->getStructure();
+		$query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+		//xoops_debug($query);
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to drop a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function dropTable()
+	{
+		global $xoopsDB;
+		$query = sprintf('DROP TABLE %s', $this->name());
+		$ret   = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+
+			return false;
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to alter a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function alterTable()
+	{
+		global $xoopsDB;
+		$ret = true;
+
+		foreach ($this->getAlteredFields() as $alteredField) {
+			if (!$alteredField['newname']) {
+				$alteredField['newname'] = $alteredField['name'];
+			}
+
+			$query = sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s', $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
+			$ret   = $ret && $xoopsDB->query($query);
+			if ($alteredField['showerror']) {
+				if (!$ret) {
+					echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+				} else {
+					echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to add new fileds in the table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function addNewFields()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getNewFields() as $newField) {
+			$query = sprintf('ALTER TABLE `%s` ADD `%s` %s', $this->name(), $newField['name'], $newField['properties']);
+			//echo $query;
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function updateFieldsValues()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedFields() as $updatedField) {
+			$query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
+			$ret   = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */ //felix
+	public function updateWhereValues()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedWhere() as $updatedWhere) {
+			$query = sprintf('UPDATE %s SET %s = %s WHERE %s  %s', $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
+			//echo $query."<br>";
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to drop fields
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function dropFields()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getDroppedFields() as $droppedField) {
+			$query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
+			$ret   = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
 }
 
 /**
@@ -542,328 +542,328 @@ 
  */
 class SmartobjectDbupdater
 {
-    public $_dbTypesArray;
-
-    /**
-     * SmartobjectDbupdater constructor.
-     */
-    public function __construct()
-    {
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTBOX]       = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTAREA]      = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_INT]          = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URL]          = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_EMAIL]        = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_ARRAY]        = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_OTHER]        = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_SOURCE]       = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_STIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_MTIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_LTIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_CURRENCY]     = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_FLOAT]        = 'float';
-        $this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY]    = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URLLINK]      = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_FILE]         = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_IMAGE]        = 'varchar(255)';
-    }
-
-    /**
-     * Use to execute a general query
-     *
-     * @param string $query   query that will be executed
-     * @param string $goodmsg message displayed on success
-     * @param string $badmsg  message displayed on error
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function runQuery($query, $goodmsg, $badmsg)
-    {
-        global $xoopsDB;
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo "&nbsp;&nbsp;$badmsg<br>";
-
-            return false;
-        } else {
-            echo "&nbsp;&nbsp;$goodmsg<br>";
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to rename a table
-     *
-     * @param string $from name of the table to rename
-     * @param string $to   new name of the renamed table
-     *
-     * @return bool true if success, false if an error occured
-     */
-    public function renameTable($from, $to)
-    {
-        global $xoopsDB;
-        $from  = $xoopsDB->prefix($from);
-        $to    = $xoopsDB->prefix($to);
-        $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
-        $ret   = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
-
-            return false;
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to update a table
-     *
-     * @param object $table {@link SmartDbTable} that will be updated
-     *
-     * @see SmartDbTable
-     *
-     * @return bool true if success, false if an error occured
-     */
-    public function updateTable($table)
-    {
-        global $xoopsDB;
-        $ret = true;
-        // If table has a structure, create the table
-        if ($table->getStructure()) {
-            $ret = $table->createTable() && $ret;
-        }
-        // If table is flag for drop, drop it
-        if ($table->_flagForDrop) {
-            $ret = $table->dropTable() && $ret;
-        }
-        // If table has data, insert it
-        if ($table->getData()) {
-            $ret = $table->addData() && $ret;
-        }
-        // If table has new fields to be added, add them
-        if ($table->getNewFields()) {
-            $ret = $table->addNewFields() && $ret;
-        }
-        // If table has altered field, alter the table
-        if ($table->getAlteredFields()) {
-            $ret = $table->alterTable() && $ret;
-        }
-        // If table has updated field values, update the table
-        if ($table->getUpdatedFields()) {
-            $ret = $table->updateFieldsValues($table) && $ret;
-        }
-        // If table has dropped field, alter the table
-        if ($table->getDroppedFields()) {
-            $ret = $table->dropFields($table) && $ret;
-        }
-        //felix
-        // If table has updated field values, update the table
-        if ($table->getUpdatedWhere()) {
-            $ret = $table->UpdateWhereValues($table) && $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $module
-     * @param $item
-     */
-    public function automaticUpgrade($module, $item)
-    {
-        if (is_array($item)) {
-            foreach ($item as $v) {
-                $this->upgradeObjectItem($module, $v);
-            }
-        } else {
-            $this->upgradeObjectItem($module, $item);
-        }
-    }
-
-    /**
-     * @param $var
-     * @return string
-     */
-    public function getFieldTypeFromVar($var)
-    {
-        $ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
-
-        return $ret;
-    }
-
-    /**
-     * @param         $var
-     * @param  bool   $key
-     * @return string
-     */
-    public function getFieldDefaultFromVar($var, $key = false)
-    {
-        if ($var['value']) {
-            return $var['value'];
-        } else {
-            if (in_array($var['data_type'], array(
-                XOBJ_DTYPE_INT,
-                XOBJ_DTYPE_STIME,
-                XOBJ_DTYPE_MTIME,
-                XOBJ_DTYPE_LTIME,
-                XOBJ_DTYPE_TIME_ONLY,
-                XOBJ_DTYPE_URLLINK,
-                XOBJ_DTYPE_FILE
-            ))) {
-                return '0';
-            } else {
-                return '';
-            }
-        }
-    }
-
-    /**
-     * @param $module
-     * @param $item
-     * @return bool
-     */
-    public function upgradeObjectItem($module, $item)
-    {
-        $moduleHandler = xoops_getModuleHandler($item, $module);
-        if (!$moduleHandler) {
-            return false;
-        }
-
-        $table      = new SmartDbTable($module . '_' . $item);
-        $object     = $moduleHandler->create();
-        $objectVars = $object->getVars();
-
-        if (!$table->exists()) {
-            // table was never created, let's do it
-            $structure = '';
-            foreach ($objectVars as $key => $var) {
-                if ($var['persistent']) {
-                    $type = $this->getFieldTypeFromVar($var);
-                    if ($key == $moduleHandler->keyName) {
-                        $extra = 'auto_increment';
-                    } else {
-                        $default = $this->getFieldDefaultFromVar($var);
-                        $extra   = "default '$default'
+	public $_dbTypesArray;
+
+	/**
+	 * SmartobjectDbupdater constructor.
+	 */
+	public function __construct()
+	{
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTBOX]       = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTAREA]      = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_INT]          = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URL]          = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_EMAIL]        = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_ARRAY]        = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_OTHER]        = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_SOURCE]       = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_STIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_MTIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_LTIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_CURRENCY]     = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_FLOAT]        = 'float';
+		$this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY]    = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URLLINK]      = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_FILE]         = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_IMAGE]        = 'varchar(255)';
+	}
+
+	/**
+	 * Use to execute a general query
+	 *
+	 * @param string $query   query that will be executed
+	 * @param string $goodmsg message displayed on success
+	 * @param string $badmsg  message displayed on error
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function runQuery($query, $goodmsg, $badmsg)
+	{
+		global $xoopsDB;
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo "&nbsp;&nbsp;$badmsg<br>";
+
+			return false;
+		} else {
+			echo "&nbsp;&nbsp;$goodmsg<br>";
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to rename a table
+	 *
+	 * @param string $from name of the table to rename
+	 * @param string $to   new name of the renamed table
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	public function renameTable($from, $to)
+	{
+		global $xoopsDB;
+		$from  = $xoopsDB->prefix($from);
+		$to    = $xoopsDB->prefix($to);
+		$query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
+		$ret   = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+
+			return false;
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to update a table
+	 *
+	 * @param object $table {@link SmartDbTable} that will be updated
+	 *
+	 * @see SmartDbTable
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	public function updateTable($table)
+	{
+		global $xoopsDB;
+		$ret = true;
+		// If table has a structure, create the table
+		if ($table->getStructure()) {
+			$ret = $table->createTable() && $ret;
+		}
+		// If table is flag for drop, drop it
+		if ($table->_flagForDrop) {
+			$ret = $table->dropTable() && $ret;
+		}
+		// If table has data, insert it
+		if ($table->getData()) {
+			$ret = $table->addData() && $ret;
+		}
+		// If table has new fields to be added, add them
+		if ($table->getNewFields()) {
+			$ret = $table->addNewFields() && $ret;
+		}
+		// If table has altered field, alter the table
+		if ($table->getAlteredFields()) {
+			$ret = $table->alterTable() && $ret;
+		}
+		// If table has updated field values, update the table
+		if ($table->getUpdatedFields()) {
+			$ret = $table->updateFieldsValues($table) && $ret;
+		}
+		// If table has dropped field, alter the table
+		if ($table->getDroppedFields()) {
+			$ret = $table->dropFields($table) && $ret;
+		}
+		//felix
+		// If table has updated field values, update the table
+		if ($table->getUpdatedWhere()) {
+			$ret = $table->UpdateWhereValues($table) && $ret;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $module
+	 * @param $item
+	 */
+	public function automaticUpgrade($module, $item)
+	{
+		if (is_array($item)) {
+			foreach ($item as $v) {
+				$this->upgradeObjectItem($module, $v);
+			}
+		} else {
+			$this->upgradeObjectItem($module, $item);
+		}
+	}
+
+	/**
+	 * @param $var
+	 * @return string
+	 */
+	public function getFieldTypeFromVar($var)
+	{
+		$ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
+
+		return $ret;
+	}
+
+	/**
+	 * @param         $var
+	 * @param  bool   $key
+	 * @return string
+	 */
+	public function getFieldDefaultFromVar($var, $key = false)
+	{
+		if ($var['value']) {
+			return $var['value'];
+		} else {
+			if (in_array($var['data_type'], array(
+				XOBJ_DTYPE_INT,
+				XOBJ_DTYPE_STIME,
+				XOBJ_DTYPE_MTIME,
+				XOBJ_DTYPE_LTIME,
+				XOBJ_DTYPE_TIME_ONLY,
+				XOBJ_DTYPE_URLLINK,
+				XOBJ_DTYPE_FILE
+			))) {
+				return '0';
+			} else {
+				return '';
+			}
+		}
+	}
+
+	/**
+	 * @param $module
+	 * @param $item
+	 * @return bool
+	 */
+	public function upgradeObjectItem($module, $item)
+	{
+		$moduleHandler = xoops_getModuleHandler($item, $module);
+		if (!$moduleHandler) {
+			return false;
+		}
+
+		$table      = new SmartDbTable($module . '_' . $item);
+		$object     = $moduleHandler->create();
+		$objectVars = $object->getVars();
+
+		if (!$table->exists()) {
+			// table was never created, let's do it
+			$structure = '';
+			foreach ($objectVars as $key => $var) {
+				if ($var['persistent']) {
+					$type = $this->getFieldTypeFromVar($var);
+					if ($key == $moduleHandler->keyName) {
+						$extra = 'auto_increment';
+					} else {
+						$default = $this->getFieldDefaultFromVar($var);
+						$extra   = "default '$default'
 ";
-                    }
-                    $structure .= "`$key` $type not null $extra,
+					}
+					$structure .= "`$key` $type not null $extra,
 ";
-                }
-            }
-            $structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
+				}
+			}
+			$structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
 ';
-            $table->setStructure($structure);
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        } else {
-            $existingFieldsArray = $table->getExistingFieldsArray();
-            foreach ($objectVars as $key => $var) {
-                if ($var['persistent']) {
-                    if (!isset($existingFieldsArray[$key])) {
-                        // the fiels does not exist, let's create it
-                        $type    = $this->getFieldTypeFromVar($var);
-                        $default = $this->getFieldDefaultFromVar($var);
-                        $table->addNewField($key, "$type not null default '$default'");
-                    } else {
-                        // if field already exists, let's check if the definition is correct
-                        $definition = strtolower($existingFieldsArray[$key]);
-                        $type       = $this->getFieldTypeFromVar($var);
-                        if ($key == $moduleHandler->keyName) {
-                            $extra = 'auto_increment';
-                        } else {
-                            $default = $this->getFieldDefaultFromVar($var, $key);
-                            $extra   = "default '$default'";
-                        }
-                        $actual_definition = "$type not null $extra";
-                        if ($definition != $actual_definition) {
-                            $table->addAlteredField($key, $actual_definition);
-                        }
-                    }
-                }
-            }
-
-            // check to see if there are some unused fields left in the table
-            foreach ($existingFieldsArray as $key => $v) {
-                if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
-                    $table->addDroppedField($key);
-                }
-            }
-
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-    }
-
-    /**
-     * @param $module
-     * @return bool
-     */
-    public function moduleUpgrade(&$module)
-    {
-        $dirname = $module->getVar('dirname');
-
-        ob_start();
-
-        $table = new SmartDbTable($dirname . '_meta');
-        if (!$table->exists()) {
-            $table->setStructure("
+			$table->setStructure($structure);
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		} else {
+			$existingFieldsArray = $table->getExistingFieldsArray();
+			foreach ($objectVars as $key => $var) {
+				if ($var['persistent']) {
+					if (!isset($existingFieldsArray[$key])) {
+						// the fiels does not exist, let's create it
+						$type    = $this->getFieldTypeFromVar($var);
+						$default = $this->getFieldDefaultFromVar($var);
+						$table->addNewField($key, "$type not null default '$default'");
+					} else {
+						// if field already exists, let's check if the definition is correct
+						$definition = strtolower($existingFieldsArray[$key]);
+						$type       = $this->getFieldTypeFromVar($var);
+						if ($key == $moduleHandler->keyName) {
+							$extra = 'auto_increment';
+						} else {
+							$default = $this->getFieldDefaultFromVar($var, $key);
+							$extra   = "default '$default'";
+						}
+						$actual_definition = "$type not null $extra";
+						if ($definition != $actual_definition) {
+							$table->addAlteredField($key, $actual_definition);
+						}
+					}
+				}
+			}
+
+			// check to see if there are some unused fields left in the table
+			foreach ($existingFieldsArray as $key => $v) {
+				if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
+					$table->addDroppedField($key);
+				}
+			}
+
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+	}
+
+	/**
+	 * @param $module
+	 * @return bool
+	 */
+	public function moduleUpgrade(&$module)
+	{
+		$dirname = $module->getVar('dirname');
+
+		ob_start();
+
+		$table = new SmartDbTable($dirname . '_meta');
+		if (!$table->exists()) {
+			$table->setStructure("
               `metakey` varchar(50) NOT NULL default '',
               `metavalue` varchar(255) NOT NULL default '',
               PRIMARY KEY (`metakey`)");
-            $table->setData("'version',0");
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        $dbVersion = smart_GetMeta('version', $dirname);
-        if (!$dbVersion) {
-            $dbVersion = 0;
-        }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
-        echo 'Database version: ' . $dbVersion . '<br>';
-        echo 'New database version: ' . $newDbVersion . '<br>';
-
-        if ($newDbVersion > $dbVersion) {
-            for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
-                if (function_exists($upgrade_function)) {
-                    $upgrade_function();
-                }
-            }
-        }
-
-        echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
-
-        // if there is a function to execute for this DB version, let's do it
-        //$function_
-
-        $module_info = smart_getModuleInfo($dirname);
-        $this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
-
-        echo '</code>';
-
-        $feedback = ob_get_clean();
-        if (method_exists($module, 'setMessage')) {
-            $module->setMessage($feedback);
-        } else {
-            echo $feedback;
-        }
-        smart_SetMeta('version', $newDbVersion, $dirname); //Set meta version to current
-
-        return true;
-    }
+			$table->setData("'version',0");
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		$dbVersion = smart_GetMeta('version', $dirname);
+		if (!$dbVersion) {
+			$dbVersion = 0;
+		}
+		$newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
+		echo 'Database version: ' . $dbVersion . '<br>';
+		echo 'New database version: ' . $newDbVersion . '<br>';
+
+		if ($newDbVersion > $dbVersion) {
+			for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
+				$upgrade_function = $dirname . '_db_upgrade_' . $i;
+				if (function_exists($upgrade_function)) {
+					$upgrade_function();
+				}
+			}
+		}
+
+		echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+
+		// if there is a function to execute for this DB version, let's do it
+		//$function_
+
+		$module_info = smart_getModuleInfo($dirname);
+		$this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
+
+		echo '</code>';
+
+		$feedback = ob_get_clean();
+		if (method_exists($module, 'setMessage')) {
+			$module->setMessage($feedback);
+		} else {
+			echo $feedback;
+		}
+		smart_SetMeta('version', $newDbVersion, $dirname); //Set meta version to current
+
+		return true;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -18,15 +18,15 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
  */
 global $xoopsConfig;
-$common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
+$common_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+    $common_file = SMARTOBJECT_ROOT_PATH.'language/english/smartdbupdater.php';
 }
 include($common_file);
 
@@ -123,17 +123,17 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->query('SHOW COLUMNS FROM '.$this->name());
         while ($existing_field = $xoopsDB->fetchArray($result)) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ($existing_field['Null'] !== 'YES') {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
             if (!($existing_field['Default'] === null) && ($existing_field['Default'] || $existing_field['Default'] === '' || $existing_field['Default'] == 0)) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+                $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
             }
         }
 
@@ -219,9 +219,9 @@ 
             $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
             $ret   = $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
             }
         }
 
@@ -373,13 +373,13 @@ 
     {
         global $xoopsDB;
         $query = $this->getStructure();
-        $query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+        $query = 'CREATE TABLE `'.$this->name().'` ('.$query.") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
         //xoops_debug($query);
         $ret = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
         }
 
         return $ret;
@@ -397,11 +397,11 @@ 
         $query = sprintf('DROP TABLE %s', $this->name());
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
 
             return true;
         }
@@ -427,9 +427,9 @@ 
             $ret   = $ret && $xoopsDB->query($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).' ('.$xoopsDB->error().')<br>';
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
                 }
             }
         }
@@ -452,9 +452,9 @@ 
             //echo $query;
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
             }
         }
 
@@ -475,9 +475,9 @@ 
             $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -498,9 +498,9 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -521,9 +521,9 @@ 
             $query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
             }
         }
 
@@ -610,11 +610,11 @@ 
         $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }
@@ -734,7 +734,7 @@ 
             return false;
         }
 
-        $table      = new SmartDbTable($module . '_' . $item);
+        $table      = new SmartDbTable($module.'_'.$item);
         $object     = $moduleHandler->create();
         $objectVars = $object->getVars();
 
@@ -755,7 +755,7 @@ 
 ";
                 }
             }
-            $structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
+            $structure .= 'PRIMARY KEY  (`'.$moduleHandler->keyName.'`)
 ';
             $table->setStructure($structure);
             if (!$this->updateTable($table)) {
@@ -815,7 +815,7 @@ 
 
         ob_start();
 
-        $table = new SmartDbTable($dirname . '_meta');
+        $table = new SmartDbTable($dirname.'_meta');
         if (!$table->exists()) {
             $table->setStructure("
               `metakey` varchar(50) NOT NULL default '',
@@ -833,20 +833,20 @@ 
         if (!$dbVersion) {
             $dbVersion = 0;
         }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
-        echo 'Database version: ' . $dbVersion . '<br>';
-        echo 'New database version: ' . $newDbVersion . '<br>';
+        $newDbVersion = constant(strtoupper($dirname.'_db_version')) ?: 0;
+        echo 'Database version: '.$dbVersion.'<br>';
+        echo 'New database version: '.$newDbVersion.'<br>';
 
         if ($newDbVersion > $dbVersion) {
             for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
+                $upgrade_function = $dirname.'_db_upgrade_'.$i;
                 if (function_exists($upgrade_function)) {
                     $upgrade_function();
                 }
             }
         }
 
-        echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+        echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
 
         // if there is a function to execute for this DB version, let's do it
         //$function_

class/smartexport.php

Doc Comments +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
     /**
      * @param $val
      * @param $separator
-     * @param $trimFunction
+     * @param false|string $trimFunction
      * @return mixed|string
      */
     public function valToCsvHelper($val, $separator, $trimFunction)
@@ -248,7 +248,7 @@ 
     }
 
     /**
-     * @param $content
+     * @param string $content
      */
     public function saveExportFile($content)
     {

Indentation +258 added lines, -258 removed lines

@@ -19,110 +19,110 @@ 
  */
 class SmartObjectExport
 {
-    public $handler;
-    public $criteria;
-    public $fields;
-    public $format;
-    public $filename;
-    public $filepath;
-    public $options;
-    public $outputMethods = false;
-    public $notDisplayFields;
+	public $handler;
+	public $criteria;
+	public $fields;
+	public $format;
+	public $filename;
+	public $filepath;
+	public $options;
+	public $outputMethods = false;
+	public $notDisplayFields;
 
-    /**
-     * Constructor
-     *
-     * @param SmartPersistableObjectHandler $objectHandler SmartObjectHandler handling the data we want to export
-     * @param CriteriaElement      $criteria      containing the criteria of the query fetching the objects to be exported
-     * @param array|bool  $fields        fields to be exported. If FALSE then all fields will be exported
-     * @param bool|string $filename      name of the file to be created
-     * @param bool|string $filepath      path where the file will be saved
-     * @param string      $format        format of the ouputed export. Currently only supports CSV
-     * @param array|bool  $options       options of the format to be exported in
-     */
-    public function __construct(SmartPersistableObjectHandler $objectHandler, CriteriaElement $criteria = null, $fields = false, $filename = false, $filepath = false, $format = 'csv', $options = false)
-    {
-        $this->handler          = $objectHandler;
-        $this->criteria         = $criteria;
-        $this->fields           = $fields;
-        $this->filename         = $filename;
-        $this->format           = $format;
-        $this->options          = $options;
-        $this->notDisplayFields = false;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param SmartPersistableObjectHandler $objectHandler SmartObjectHandler handling the data we want to export
+	 * @param CriteriaElement      $criteria      containing the criteria of the query fetching the objects to be exported
+	 * @param array|bool  $fields        fields to be exported. If FALSE then all fields will be exported
+	 * @param bool|string $filename      name of the file to be created
+	 * @param bool|string $filepath      path where the file will be saved
+	 * @param string      $format        format of the ouputed export. Currently only supports CSV
+	 * @param array|bool  $options       options of the format to be exported in
+	 */
+	public function __construct(SmartPersistableObjectHandler $objectHandler, CriteriaElement $criteria = null, $fields = false, $filename = false, $filepath = false, $format = 'csv', $options = false)
+	{
+		$this->handler          = $objectHandler;
+		$this->criteria         = $criteria;
+		$this->fields           = $fields;
+		$this->filename         = $filename;
+		$this->format           = $format;
+		$this->options          = $options;
+		$this->notDisplayFields = false;
+	}
 
-    /**
-     * Renders the export
-     * @param $filename
-     */
-    public function render($filename)
-    {
-        $this->filename = $filename;
+	/**
+	 * Renders the export
+	 * @param $filename
+	 */
+	public function render($filename)
+	{
+		$this->filename = $filename;
 
-        $objects        = $this->handler->getObjects($this->criteria);
-        $rows           = array();
-        $columnsHeaders = array();
-        $firstObject    = true;
-        foreach ($objects as $object) {
-            $row = array();
-            foreach ($object->vars as $key => $var) {
-                if ((!$this->fields || in_array($key, $this->fields)) && !in_array($key, $this->notDisplayFields)) {
-                    if ($this->outputMethods && isset($this->outputMethods[$key]) && method_exists($object, $this->outputMethods[$key])) {
-                        $method    = $this->outputMethods[$key];
-                        $row[$key] = $object->$method();
-                    } else {
-                        $row[$key] = $object->getVar($key);
-                    }
-                    if ($firstObject) {
-                        // then set the columnsHeaders array as well
-                        $columnsHeaders[$key] = $var['form_caption'];
-                    }
-                }
-            }
-            $firstObject = false;
-            $rows[]      = $row;
-            unset($row);
-        }
-        $data                   = array();
-        $data['rows']           = $rows;
-        $data['columnsHeaders'] = $columnsHeaders;
-        $smartExportRenderer    = new SmartExportRenderer($data, $this->filename, $this->filepath, $this->format, $this->options);
-        $smartExportRenderer->execute();
-    }
+		$objects        = $this->handler->getObjects($this->criteria);
+		$rows           = array();
+		$columnsHeaders = array();
+		$firstObject    = true;
+		foreach ($objects as $object) {
+			$row = array();
+			foreach ($object->vars as $key => $var) {
+				if ((!$this->fields || in_array($key, $this->fields)) && !in_array($key, $this->notDisplayFields)) {
+					if ($this->outputMethods && isset($this->outputMethods[$key]) && method_exists($object, $this->outputMethods[$key])) {
+						$method    = $this->outputMethods[$key];
+						$row[$key] = $object->$method();
+					} else {
+						$row[$key] = $object->getVar($key);
+					}
+					if ($firstObject) {
+						// then set the columnsHeaders array as well
+						$columnsHeaders[$key] = $var['form_caption'];
+					}
+				}
+			}
+			$firstObject = false;
+			$rows[]      = $row;
+			unset($row);
+		}
+		$data                   = array();
+		$data['rows']           = $rows;
+		$data['columnsHeaders'] = $columnsHeaders;
+		$smartExportRenderer    = new SmartExportRenderer($data, $this->filename, $this->filepath, $this->format, $this->options);
+		$smartExportRenderer->execute();
+	}
 
-    /**
-     * Set an array contaning the alternate methods to use instead of the default getVar()
-     *
-     * $outputMethods array example: 'uid' => 'getUserName'...
-     * @param $outputMethods
-     */
-    public function setOuptutMethods($outputMethods)
-    {
-        $this->outputMethods = $outputMethods;
-    }
+	/**
+	 * Set an array contaning the alternate methods to use instead of the default getVar()
+	 *
+	 * $outputMethods array example: 'uid' => 'getUserName'...
+	 * @param $outputMethods
+	 */
+	public function setOuptutMethods($outputMethods)
+	{
+		$this->outputMethods = $outputMethods;
+	}
 
-    /*
+	/*
      * Set an array of fields that we don't want in export
      */
-    /**
-     * @param $fields
-     */
-    public function setNotDisplayFields($fields)
-    {
-        if (!$this->notDisplayFields) {
-            if (is_array($fields)) {
-                $this->notDisplayFields = $fields;
-            } else {
-                $this->notDisplayFields = array($fields);
-            }
-        } else {
-            if (is_array($fields)) {
-                $this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
-            } else {
-                $this->notDisplayFields[] = $fields;
-            }
-        }
-    }
+	/**
+	 * @param $fields
+	 */
+	public function setNotDisplayFields($fields)
+	{
+		if (!$this->notDisplayFields) {
+			if (is_array($fields)) {
+				$this->notDisplayFields = $fields;
+			} else {
+				$this->notDisplayFields = array($fields);
+			}
+		} else {
+			if (is_array($fields)) {
+				$this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
+			} else {
+				$this->notDisplayFields[] = $fields;
+			}
+		}
+	}
 }
 
 /**
@@ -136,181 +136,181 @@ 
  */
 class SmartExportRenderer
 {
-    public $data;
-    public $format;
-    public $filename;
-    public $filepath;
-    public $options;
+	public $data;
+	public $format;
+	public $filename;
+	public $filepath;
+	public $options;
 
-    /**
-     * Constructor
-     *
-     * @param array       $data     contains the data to be exported
-     * @param bool|string $filename name of the file in which the exported data will be saved
-     * @param bool|string $filepath path where the file will be saved
-     * @param string      $format   format of the ouputed export. Currently only supports CSV
-     * @param array       $options  options of the format to be exported in
-     */
-    public function __construct($data, $filename = false, $filepath = false, $format = 'csv', $options = array('separator' => ';'))
-    {
-        $this->data     = $data;
-        $this->format   = $format;
-        $this->filename = $filename;
-        $this->filepath = $filepath;
-        $this->options  = $options;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param array       $data     contains the data to be exported
+	 * @param bool|string $filename name of the file in which the exported data will be saved
+	 * @param bool|string $filepath path where the file will be saved
+	 * @param string      $format   format of the ouputed export. Currently only supports CSV
+	 * @param array       $options  options of the format to be exported in
+	 */
+	public function __construct($data, $filename = false, $filepath = false, $format = 'csv', $options = array('separator' => ';'))
+	{
+		$this->data     = $data;
+		$this->format   = $format;
+		$this->filename = $filename;
+		$this->filepath = $filepath;
+		$this->options  = $options;
+	}
 
-    /**
-     * @param         $dataArray
-     * @param         $separator
-     * @param  string $trim
-     * @param  bool   $removeEmptyLines
-     * @return string
-     */
-    public function arrayToCsvString($dataArray, $separator, $trim = 'both', $removeEmptyLines = true)
-    {
-        if (!is_array($dataArray) || empty($dataArray)) {
-            return '';
-        }
-        switch ($trim) {
-            case 'none':
-                $trimFunction = false;
-                break;
-            case 'left':
-                $trimFunction = 'ltrim';
-                break;
-            case 'right':
-                $trimFunction = 'rtrim';
-                break;
-            default: //'both':
-                $trimFunction = 'trim';
-                break;
-        }
-        $ret = array();
-        foreach ($dataArray as $key => $field) {
-            $ret[$key] = $this->valToCsvHelper($field, $separator, $trimFunction);
-        }
+	/**
+	 * @param         $dataArray
+	 * @param         $separator
+	 * @param  string $trim
+	 * @param  bool   $removeEmptyLines
+	 * @return string
+	 */
+	public function arrayToCsvString($dataArray, $separator, $trim = 'both', $removeEmptyLines = true)
+	{
+		if (!is_array($dataArray) || empty($dataArray)) {
+			return '';
+		}
+		switch ($trim) {
+			case 'none':
+				$trimFunction = false;
+				break;
+			case 'left':
+				$trimFunction = 'ltrim';
+				break;
+			case 'right':
+				$trimFunction = 'rtrim';
+				break;
+			default: //'both':
+				$trimFunction = 'trim';
+				break;
+		}
+		$ret = array();
+		foreach ($dataArray as $key => $field) {
+			$ret[$key] = $this->valToCsvHelper($field, $separator, $trimFunction);
+		}
 
-        return implode($separator, $ret);
-    }
+		return implode($separator, $ret);
+	}
 
-    /**
-     * @param $val
-     * @param $separator
-     * @param $trimFunction
-     * @return mixed|string
-     */
-    public function valToCsvHelper($val, $separator, $trimFunction)
-    {
-        if ($trimFunction) {
-            $val = $trimFunction ($val);
-        }
-        //If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
-        $needQuote = false;
-        do {
-            if (strpos($val, '"') !== false) {
-                $val       = str_replace('"', '""', $val);
-                $needQuote = true;
-                break;
-            }
-            if (strpos($val, $separator) !== false) {
-                $needQuote = true;
-                break;
-            }
-            if ((strpos($val, "\n") !== false) || (strpos($val, "\r") !== false)) { // \r is for mac
-                $needQuote = true;
-                break;
-            }
-        } while (false);
-        if ($needQuote) {
-            $val = '"' . $val . '"';
-        }
+	/**
+	 * @param $val
+	 * @param $separator
+	 * @param $trimFunction
+	 * @return mixed|string
+	 */
+	public function valToCsvHelper($val, $separator, $trimFunction)
+	{
+		if ($trimFunction) {
+			$val = $trimFunction ($val);
+		}
+		//If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
+		$needQuote = false;
+		do {
+			if (strpos($val, '"') !== false) {
+				$val       = str_replace('"', '""', $val);
+				$needQuote = true;
+				break;
+			}
+			if (strpos($val, $separator) !== false) {
+				$needQuote = true;
+				break;
+			}
+			if ((strpos($val, "\n") !== false) || (strpos($val, "\r") !== false)) { // \r is for mac
+				$needQuote = true;
+				break;
+			}
+		} while (false);
+		if ($needQuote) {
+			$val = '"' . $val . '"';
+		}
 
-        return $val;
-    }
+		return $val;
+	}
 
-    public function execute()
-    {
-        $exportFileData = '';
+	public function execute()
+	{
+		$exportFileData = '';
 
-        switch ($this->format) {
-            case 'csv':
-                $separator = isset($this->options['separator']) ? $this->options['separator'] : ';';
-                $firstRow  = implode($separator, $this->data['columnsHeaders']);
-                $exportFileData .= $firstRow . "\r\n";
+		switch ($this->format) {
+			case 'csv':
+				$separator = isset($this->options['separator']) ? $this->options['separator'] : ';';
+				$firstRow  = implode($separator, $this->data['columnsHeaders']);
+				$exportFileData .= $firstRow . "\r\n";
 
-                foreach ($this->data['rows'] as $cols) {
-                    $exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
-                }
-                break;
-        }
-        $this->saveExportFile($exportFileData);
-    }
+				foreach ($this->data['rows'] as $cols) {
+					$exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
+				}
+				break;
+		}
+		$this->saveExportFile($exportFileData);
+	}
 
-    /**
-     * @param $content
-     */
-    public function saveExportFile($content)
-    {
-        switch ($this->format) {
-            case 'csv':
-                $this->saveCsv($content);
-                break;
-        }
-    }
+	/**
+	 * @param $content
+	 */
+	public function saveExportFile($content)
+	{
+		switch ($this->format) {
+			case 'csv':
+				$this->saveCsv($content);
+				break;
+		}
+	}
 
-    /**
-     * @param $content
-     */
-    public function saveCsv($content)
-    {
-        if (!$this->filepath) {
-            $this->filepath = XOOPS_UPLOAD_PATH . '/';
-        }
-        if (!$this->filename) {
-            $this->filename .= time();
-            $this->filename .= '.csv';
-        }
+	/**
+	 * @param $content
+	 */
+	public function saveCsv($content)
+	{
+		if (!$this->filepath) {
+			$this->filepath = XOOPS_UPLOAD_PATH . '/';
+		}
+		if (!$this->filename) {
+			$this->filename .= time();
+			$this->filename .= '.csv';
+		}
 
-        $fullFileName = $this->filepath . $this->filename;
+		$fullFileName = $this->filepath . $this->filename;
 
-        if (!$handle = fopen($fullFileName, 'a+')) {
-            trigger_error('Unable to open ' . $fullFileName, E_USER_WARNING);
-        } elseif (fwrite($handle, $content) === false) {
-            trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
-        } else {
-            $mimeType  = 'text/csv';
-            $file      = strrev($this->filename);
-            $temp_name = strtolower(strrev(substr($file, 0, strpos($file, '--'))));
-            if ($temp_name === '') {
-                $file_name = $this->filename;
-            } else {
-                $file_name = $temp_name;
-            }
-            $fullFileName = $this->filepath . stripslashes(trim($this->filename));
+		if (!$handle = fopen($fullFileName, 'a+')) {
+			trigger_error('Unable to open ' . $fullFileName, E_USER_WARNING);
+		} elseif (fwrite($handle, $content) === false) {
+			trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
+		} else {
+			$mimeType  = 'text/csv';
+			$file      = strrev($this->filename);
+			$temp_name = strtolower(strrev(substr($file, 0, strpos($file, '--'))));
+			if ($temp_name === '') {
+				$file_name = $this->filename;
+			} else {
+				$file_name = $temp_name;
+			}
+			$fullFileName = $this->filepath . stripslashes(trim($this->filename));
 
-            if (ini_get('zlib.output_compression')) {
-                ini_set('zlib.output_compression', 'Off');
-            }
+			if (ini_get('zlib.output_compression')) {
+				ini_set('zlib.output_compression', 'Off');
+			}
 
-            header('Pragma: public');
-            header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-            header('Cache-Control: private', false);
-            header('Content-Transfer-Encoding: binary');
-            if (isset($mimeType)) {
-                header('Content-Type: ' . $mimeType);
-            }
+			header('Pragma: public');
+			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+			header('Cache-Control: private', false);
+			header('Content-Transfer-Encoding: binary');
+			if (isset($mimeType)) {
+				header('Content-Type: ' . $mimeType);
+			}
 
-            header('Content-Disposition: attachment; filename=' . $file_name);
+			header('Content-Disposition: attachment; filename=' . $file_name);
 
-            if (isset($mimeType) && false !== strpos($mimeType, 'text/')) {
-                $fp = fopen($fullFileName, 'r');
-            } else {
-                $fp = fopen($fullFileName, 'rb');
-            }
-            fpassthru($fp);
-            exit();
-        }
-        fclose($handle);
-    }
+			if (isset($mimeType) && false !== strpos($mimeType, 'text/')) {
+				$fp = fopen($fullFileName, 'r');
+			} else {
+				$fp = fopen($fullFileName, 'rb');
+			}
+			fpassthru($fp);
+			exit();
+		}
+		fclose($handle);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -203,7 +203,7 @@ 
     public function valToCsvHelper($val, $separator, $trimFunction)
     {
         if ($trimFunction) {
-            $val = $trimFunction ($val);
+            $val = $trimFunction($val);
         }
         //If there is a separator (;) or a quote (") or a linebreak in the string, we need to quote it.
         $needQuote = false;
@@ -223,7 +223,7 @@ 
             }
         } while (false);
         if ($needQuote) {
-            $val = '"' . $val . '"';
+            $val = '"'.$val.'"';
         }
 
         return $val;
@@ -237,10 +237,10 @@ 
             case 'csv':
                 $separator = isset($this->options['separator']) ? $this->options['separator'] : ';';
                 $firstRow  = implode($separator, $this->data['columnsHeaders']);
-                $exportFileData .= $firstRow . "\r\n";
+                $exportFileData .= $firstRow."\r\n";
 
                 foreach ($this->data['rows'] as $cols) {
-                    $exportFileData .= $this->arrayToCsvString($cols, $separator) . "\r\n";
+                    $exportFileData .= $this->arrayToCsvString($cols, $separator)."\r\n";
                 }
                 break;
         }
@@ -265,19 +265,19 @@ 
     public function saveCsv($content)
     {
         if (!$this->filepath) {
-            $this->filepath = XOOPS_UPLOAD_PATH . '/';
+            $this->filepath = XOOPS_UPLOAD_PATH.'/';
         }
         if (!$this->filename) {
             $this->filename .= time();
             $this->filename .= '.csv';
         }
 
-        $fullFileName = $this->filepath . $this->filename;
+        $fullFileName = $this->filepath.$this->filename;
 
         if (!$handle = fopen($fullFileName, 'a+')) {
-            trigger_error('Unable to open ' . $fullFileName, E_USER_WARNING);
+            trigger_error('Unable to open '.$fullFileName, E_USER_WARNING);
         } elseif (fwrite($handle, $content) === false) {
-            trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
+            trigger_error('Unable to write in '.$fullFileName, E_USER_WARNING);
         } else {
             $mimeType  = 'text/csv';
             $file      = strrev($this->filename);
@@ -287,7 +287,7 @@ 
             } else {
                 $file_name = $temp_name;
             }
-            $fullFileName = $this->filepath . stripslashes(trim($this->filename));
+            $fullFileName = $this->filepath.stripslashes(trim($this->filename));
 
             if (ini_get('zlib.output_compression')) {
                 ini_set('zlib.output_compression', 'Off');
@@ -298,10 +298,10 @@ 
             header('Cache-Control: private', false);
             header('Content-Transfer-Encoding: binary');
             if (isset($mimeType)) {
-                header('Content-Type: ' . $mimeType);
+                header('Content-Type: '.$mimeType);
             }
 
-            header('Content-Disposition: attachment; filename=' . $file_name);
+            header('Content-Disposition: attachment; filename='.$file_name);
 
             if (isset($mimeType) && false !== strpos($mimeType, 'text/')) {
                 $fp = fopen($fullFileName, 'r');

class/smartmetagen.php

Doc Comments +5 added lines, -5 removed lines

@@ -165,7 +165,7 @@ 
     }
 
     /**
-     * @param $keywords
+     * @param string|boolean $keywords
      */
     public function setKeywords($keywords)
     {
@@ -173,7 +173,7 @@ 
     }
 
     /**
-     * @param $categoryPath
+     * @param boolean $categoryPath
      */
     public function setCategoryPath($categoryPath)
     {
@@ -182,7 +182,7 @@ 
     }
 
     /**
-     * @param $description
+     * @param boolean $description
      */
     public function setDescription($description)
     {
@@ -242,8 +242,8 @@ 
     }
 
     /**
-     * @param $text
-     * @param $minChar
+     * @param string $text
+     * @param integer $minChar
      * @return array
      */
     public function findMetaKeywords($text, $minChar)

Indentation +348 added lines, -348 removed lines

@@ -18,320 +18,320 @@ 
  */
 class SmartMetaGen
 {
-    public $_myts;
-
-    public $_title;
-    public $_original_title;
-    public $_keywords;
-    public $_meta_description;
-    public $_categoryPath;
-    public $_description;
-    public $_minChar = 4;
-
-    /**
-     * SmartMetaGen constructor.
-     * @param      $title
-     * @param bool $keywords
-     * @param bool $description
-     * @param bool $categoryPath
-     */
-    public function __construct($title, $keywords = false, $description = false, $categoryPath = false)
-    {
-        $this->_myts = MyTextSanitizer::getInstance();
-        $this->setCategoryPath($categoryPath);
-        $this->setTitle($title);
-        $this->setDescription($description);
-
-        if (!$keywords) {
-            $keywords = $this->createMetaKeywords();
-        }
-
-        /*      $myts = MyTextSanitizer::getInstance();
+	public $_myts;
+
+	public $_title;
+	public $_original_title;
+	public $_keywords;
+	public $_meta_description;
+	public $_categoryPath;
+	public $_description;
+	public $_minChar = 4;
+
+	/**
+	 * SmartMetaGen constructor.
+	 * @param      $title
+	 * @param bool $keywords
+	 * @param bool $description
+	 * @param bool $categoryPath
+	 */
+	public function __construct($title, $keywords = false, $description = false, $categoryPath = false)
+	{
+		$this->_myts = MyTextSanitizer::getInstance();
+		$this->setCategoryPath($categoryPath);
+		$this->setTitle($title);
+		$this->setDescription($description);
+
+		if (!$keywords) {
+			$keywords = $this->createMetaKeywords();
+		}
+
+		/*      $myts = MyTextSanitizer::getInstance();
          if (method_exists($myts, 'formatForML')) {
          $keywords = $myts->formatForML($keywords);
          $description = $myts->formatForML($description);
          }
          */
-        $this->setKeywords($keywords);
-    }
-
-    /**
-     * Return true if the string is length > 0
-     *
-     * @credit psylove
-     *
-     * @var    string  $string Chaine de caract�re
-     * @return boolean
-     */
-    public function emptyString($var)
-    {
-        return (strlen($var) > 0);
-    }
-
-    /**
-     * Create a title for the short_url field of an article
-     *
-     * @credit psylove
-     *
-     * @var    string      $title title of the article
-     * @param  bool|string $withExt
-     * @return string      sort_url for the article
-     */
-    public function generateSeoTitle($title = '', $withExt = true)
-    {
-        // Transformation de la chaine en minuscule
-        // Codage de la chaine afin d'�viter les erreurs 500 en cas de caract�res impr�vus
-        $title = rawurlencode(strtolower($title));
-
-        // Transformation des ponctuations
-        $pattern = array(
-            '/%09/', // Tab
-            '/%20/', // Space
-            '/%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
-
-        if (count($title) > 0) {
-            if ($withExt) {
-                $title .= '.html';
-            }
-
-            return $title;
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * @param $document
-     * @return mixed
-     */
-    public function html2text($document)
-    {
-        return smart_html2text($document);
-    }
-
-    /**
-     * @param $title
-     */
-    public function setTitle($title)
-    {
-        global $xoopsModule, $xoopsModuleConfig;
-        $this->_title          = $this->html2text($title);
-        $this->_title          = $this->purifyText($this->_title);
-        $this->_original_title = $this->_title;
-
-        $moduleName = $xoopsModule->getVar('name');
-
-        $titleTag = array();
-
-        $show_mod_name_breadcrumb = isset($xoopsModuleConfig['show_mod_name_breadcrumb']) ? $xoopsModuleConfig['show_mod_name_breadcrumb'] : true;
-
-        if ($moduleName && $show_mod_name_breadcrumb) {
-            $titleTag['module'] = $moduleName;
-        }
-
-        if (isset($this->_title) && ($this->_title !== '') && (strtoupper($this->_title) != strtoupper($moduleName))) {
-            $titleTag['title'] = $this->_title;
-        }
-
-        if (isset($this->_categoryPath) && ($this->_categoryPath !== '')) {
-            $titleTag['category'] = $this->_categoryPath;
-        }
-
-        $ret = isset($titleTag['title']) ? $titleTag['title'] : '';
-
-        if (isset($titleTag['category']) && $titleTag['category'] !== '') {
-            if ($ret !== '') {
-                $ret .= ' - ';
-            }
-            $ret .= $titleTag['category'];
-        }
-        if (isset($titleTag['module']) && $titleTag['module'] !== '') {
-            if ($ret !== '') {
-                $ret .= ' - ';
-            }
-            $ret .= $titleTag['module'];
-        }
-        $this->_title = $ret;
-    }
-
-    /**
-     * @param $keywords
-     */
-    public function setKeywords($keywords)
-    {
-        $this->_keywords = $keywords;
-    }
-
-    /**
-     * @param $categoryPath
-     */
-    public function setCategoryPath($categoryPath)
-    {
-        $categoryPath        = $this->html2text($categoryPath);
-        $this->_categoryPath = $categoryPath;
-    }
-
-    /**
-     * @param $description
-     */
-    public function setDescription($description)
-    {
-        if (!$description) {
-            global $xoopsModuleConfig;
-            if (isset($xoopsModuleConfig['module_meta_description'])) {
-                $description = $xoopsModuleConfig['module_meta_description'];
-            }
-        }
-
-        $description = $this->html2text($description);
-        $description = $this->purifyText($description);
-
-        $description = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $description);
-        $description = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $description);
-        $description = preg_replace('/[ ]* [ ]*/', ' ', $description);
-        $description = stripslashes($description);
-
-        $this->_description      = $description;
-        $this->_meta_description = $this->createMetaDescription();
-    }
-
-    public function createTitleTag()
-    {
-    }
-
-    /**
-     * @param               $text
-     * @param  bool         $keyword
-     * @return mixed|string
-     */
-    public function purifyText($text, $keyword = false)
-    {
-        return smart_purifyText($text, $keyword);
-    }
-
-    /**
-     * @param  int    $maxWords
-     * @return string
-     */
-    public function createMetaDescription($maxWords = 100)
-    {
-        $words = array();
-        $words = explode(' ', $this->_description);
-
-        // Only keep $maxWords words
-        $newWords = array();
-        $i        = 0;
-
-        while ($i < $maxWords - 1 && $i < count($words)) {
-            $newWords[] = $words[$i];
-            ++$i;
-        }
-        $ret = implode(' ', $newWords);
-
-        return $ret;
-    }
-
-    /**
-     * @param $text
-     * @param $minChar
-     * @return array
-     */
-    public function findMetaKeywords($text, $minChar)
-    {
-        $keywords = array();
-
-        $text = $this->purifyText($text);
-        $text = $this->html2text($text);
-
-        $text = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $text);
-        $text = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $text);
-        $text = preg_replace('/[ ]* [ ]*/', ' ', $text);
-        $text = stripslashes($text);
-        $text =
-
-        $originalKeywords = preg_split('/[^a-zA-Z\'"-]+/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-        foreach ($originalKeywords as $originalKeyword) {
-            $secondRoundKeywords = explode("'", $originalKeyword);
-            foreach ($secondRoundKeywords as $secondRoundKeyword) {
-                if (strlen($secondRoundKeyword) >= $minChar) {
-                    if (!in_array($secondRoundKeyword, $keywords)) {
-                        $keywords[] = trim($secondRoundKeyword);
-                    }
-                }
-            }
-        }
-
-        return $keywords;
-    }
-
-    /**
-     * @return string
-     */
-    public function createMetaKeywords()
-    {
-        global $xoopsModuleConfig;
-        $keywords = $this->findMetaKeywords($this->_original_title . ' ' . $this->_description, $this->_minChar);
-        if (isset($xoopsModuleConfig) && isset($xoopsModuleConfig['moduleMetaKeywords']) && $xoopsModuleConfig['moduleMetaKeywords'] !== '') {
-            $moduleKeywords = explode(',', $xoopsModuleConfig['moduleMetaKeywords']);
-            $keywords       = array_merge($keywords, $moduleKeywords);
-        }
-
-        /* Commenting this out as it may cause problem on XOOPS ML websites
+		$this->setKeywords($keywords);
+	}
+
+	/**
+	 * Return true if the string is length > 0
+	 *
+	 * @credit psylove
+	 *
+	 * @var    string  $string Chaine de caract�re
+	 * @return boolean
+	 */
+	public function emptyString($var)
+	{
+		return (strlen($var) > 0);
+	}
+
+	/**
+	 * Create a title for the short_url field of an article
+	 *
+	 * @credit psylove
+	 *
+	 * @var    string      $title title of the article
+	 * @param  bool|string $withExt
+	 * @return string      sort_url for the article
+	 */
+	public function generateSeoTitle($title = '', $withExt = true)
+	{
+		// Transformation de la chaine en minuscule
+		// Codage de la chaine afin d'�viter les erreurs 500 en cas de caract�res impr�vus
+		$title = rawurlencode(strtolower($title));
+
+		// Transformation des ponctuations
+		$pattern = array(
+			'/%09/', // Tab
+			'/%20/', // Space
+			'/%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
+
+		if (count($title) > 0) {
+			if ($withExt) {
+				$title .= '.html';
+			}
+
+			return $title;
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * @param $document
+	 * @return mixed
+	 */
+	public function html2text($document)
+	{
+		return smart_html2text($document);
+	}
+
+	/**
+	 * @param $title
+	 */
+	public function setTitle($title)
+	{
+		global $xoopsModule, $xoopsModuleConfig;
+		$this->_title          = $this->html2text($title);
+		$this->_title          = $this->purifyText($this->_title);
+		$this->_original_title = $this->_title;
+
+		$moduleName = $xoopsModule->getVar('name');
+
+		$titleTag = array();
+
+		$show_mod_name_breadcrumb = isset($xoopsModuleConfig['show_mod_name_breadcrumb']) ? $xoopsModuleConfig['show_mod_name_breadcrumb'] : true;
+
+		if ($moduleName && $show_mod_name_breadcrumb) {
+			$titleTag['module'] = $moduleName;
+		}
+
+		if (isset($this->_title) && ($this->_title !== '') && (strtoupper($this->_title) != strtoupper($moduleName))) {
+			$titleTag['title'] = $this->_title;
+		}
+
+		if (isset($this->_categoryPath) && ($this->_categoryPath !== '')) {
+			$titleTag['category'] = $this->_categoryPath;
+		}
+
+		$ret = isset($titleTag['title']) ? $titleTag['title'] : '';
+
+		if (isset($titleTag['category']) && $titleTag['category'] !== '') {
+			if ($ret !== '') {
+				$ret .= ' - ';
+			}
+			$ret .= $titleTag['category'];
+		}
+		if (isset($titleTag['module']) && $titleTag['module'] !== '') {
+			if ($ret !== '') {
+				$ret .= ' - ';
+			}
+			$ret .= $titleTag['module'];
+		}
+		$this->_title = $ret;
+	}
+
+	/**
+	 * @param $keywords
+	 */
+	public function setKeywords($keywords)
+	{
+		$this->_keywords = $keywords;
+	}
+
+	/**
+	 * @param $categoryPath
+	 */
+	public function setCategoryPath($categoryPath)
+	{
+		$categoryPath        = $this->html2text($categoryPath);
+		$this->_categoryPath = $categoryPath;
+	}
+
+	/**
+	 * @param $description
+	 */
+	public function setDescription($description)
+	{
+		if (!$description) {
+			global $xoopsModuleConfig;
+			if (isset($xoopsModuleConfig['module_meta_description'])) {
+				$description = $xoopsModuleConfig['module_meta_description'];
+			}
+		}
+
+		$description = $this->html2text($description);
+		$description = $this->purifyText($description);
+
+		$description = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $description);
+		$description = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $description);
+		$description = preg_replace('/[ ]* [ ]*/', ' ', $description);
+		$description = stripslashes($description);
+
+		$this->_description      = $description;
+		$this->_meta_description = $this->createMetaDescription();
+	}
+
+	public function createTitleTag()
+	{
+	}
+
+	/**
+	 * @param               $text
+	 * @param  bool         $keyword
+	 * @return mixed|string
+	 */
+	public function purifyText($text, $keyword = false)
+	{
+		return smart_purifyText($text, $keyword);
+	}
+
+	/**
+	 * @param  int    $maxWords
+	 * @return string
+	 */
+	public function createMetaDescription($maxWords = 100)
+	{
+		$words = array();
+		$words = explode(' ', $this->_description);
+
+		// Only keep $maxWords words
+		$newWords = array();
+		$i        = 0;
+
+		while ($i < $maxWords - 1 && $i < count($words)) {
+			$newWords[] = $words[$i];
+			++$i;
+		}
+		$ret = implode(' ', $newWords);
+
+		return $ret;
+	}
+
+	/**
+	 * @param $text
+	 * @param $minChar
+	 * @return array
+	 */
+	public function findMetaKeywords($text, $minChar)
+	{
+		$keywords = array();
+
+		$text = $this->purifyText($text);
+		$text = $this->html2text($text);
+
+		$text = preg_replace("/([^\r\n])\r\n([^\r\n])/", "\\1 \\2", $text);
+		$text = preg_replace("/[\r\n]*\r\n[\r\n]*/", "\r\n\r\n", $text);
+		$text = preg_replace('/[ ]* [ ]*/', ' ', $text);
+		$text = stripslashes($text);
+		$text =
+
+		$originalKeywords = preg_split('/[^a-zA-Z\'"-]+/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		foreach ($originalKeywords as $originalKeyword) {
+			$secondRoundKeywords = explode("'", $originalKeyword);
+			foreach ($secondRoundKeywords as $secondRoundKeyword) {
+				if (strlen($secondRoundKeyword) >= $minChar) {
+					if (!in_array($secondRoundKeyword, $keywords)) {
+						$keywords[] = trim($secondRoundKeyword);
+					}
+				}
+			}
+		}
+
+		return $keywords;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function createMetaKeywords()
+	{
+		global $xoopsModuleConfig;
+		$keywords = $this->findMetaKeywords($this->_original_title . ' ' . $this->_description, $this->_minChar);
+		if (isset($xoopsModuleConfig) && isset($xoopsModuleConfig['moduleMetaKeywords']) && $xoopsModuleConfig['moduleMetaKeywords'] !== '') {
+			$moduleKeywords = explode(',', $xoopsModuleConfig['moduleMetaKeywords']);
+			$keywords       = array_merge($keywords, $moduleKeywords);
+		}
+
+		/* Commenting this out as it may cause problem on XOOPS ML websites
          $return_keywords = array();
 
          // Cleaning for duplicate keywords
@@ -341,43 +341,43 @@ 
          }
          }*/
 
-        // Only take the first 90 keywords
-        $newKeywords = array();
-        $i           = 0;
-        while ($i < 90 - 1 && isset($keywords[$i])) {
-            $newKeywords[] = $keywords[$i];
-            ++$i;
-        }
-        $ret = implode(', ', $newKeywords);
-
-        return $ret;
-    }
-
-    public function autoBuildMeta_keywords()
-    {
-    }
-
-    public function buildAutoMetaTags()
-    {
-        global $xoopsModule, $xoopsModuleConfig;
-
-        $this->_keywords         = $this->createMetaKeywords();
-        $this->_meta_description = $this->createMetaDescription();
-        $this->_title            = $this->createTitleTag();
-    }
-
-    public function createMetaTags()
-    {
-        global $xoopsTpl, $xoTheme;
-
-        if (is_object($xoTheme)) {
-            $xoTheme->addMeta('meta', 'keywords', $this->_keywords);
-            $xoTheme->addMeta('meta', 'description', $this->_description);
-            $xoTheme->addMeta('meta', 'title', $this->_title);
-        } else {
-            $xoopsTpl->assign('xoops_meta_keywords', $this->_keywords);
-            $xoopsTpl->assign('xoops_meta_description', $this->_description);
-        }
-        $xoopsTpl->assign('xoops_pagetitle', $this->_title);
-    }
+		// Only take the first 90 keywords
+		$newKeywords = array();
+		$i           = 0;
+		while ($i < 90 - 1 && isset($keywords[$i])) {
+			$newKeywords[] = $keywords[$i];
+			++$i;
+		}
+		$ret = implode(', ', $newKeywords);
+
+		return $ret;
+	}
+
+	public function autoBuildMeta_keywords()
+	{
+	}
+
+	public function buildAutoMetaTags()
+	{
+		global $xoopsModule, $xoopsModuleConfig;
+
+		$this->_keywords         = $this->createMetaKeywords();
+		$this->_meta_description = $this->createMetaDescription();
+		$this->_title            = $this->createTitleTag();
+	}
+
+	public function createMetaTags()
+	{
+		global $xoopsTpl, $xoTheme;
+
+		if (is_object($xoTheme)) {
+			$xoTheme->addMeta('meta', 'keywords', $this->_keywords);
+			$xoTheme->addMeta('meta', 'description', $this->_description);
+			$xoTheme->addMeta('meta', 'title', $this->_title);
+		} else {
+			$xoopsTpl->assign('xoops_meta_keywords', $this->_keywords);
+			$xoopsTpl->assign('xoops_meta_description', $this->_description);
+		}
+		$xoopsTpl->assign('xoops_pagetitle', $this->_title);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -325,7 +325,7 @@
     public function createMetaKeywords()
     {
         global $xoopsModuleConfig;
-        $keywords = $this->findMetaKeywords($this->_original_title . ' ' . $this->_description, $this->_minChar);
+        $keywords = $this->findMetaKeywords($this->_original_title.' '.$this->_description, $this->_minChar);
         if (isset($xoopsModuleConfig) && isset($xoopsModuleConfig['moduleMetaKeywords']) && $xoopsModuleConfig['moduleMetaKeywords'] !== '') {
             $moduleKeywords = explode(',', $xoopsModuleConfig['moduleMetaKeywords']);
             $keywords       = array_merge($keywords, $moduleKeywords);

class/smartobjectlink.php

Doc Comments +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      * @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
+     * @return integer  formatted value of the variable
      */
     public function getVar($key, $format = 's')
     {

Indentation +166 added lines, -166 removed lines

@@ -35,164 +35,164 @@ 
  */
 class SmartobjectLink extends SmartObject
 {
-    /**
-     * SmartobjectLink constructor.
-     */
-    public function __construct()
-    {
-        $this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null, '', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
-        $this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
-        $this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
-        $this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
-        $this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
-        $this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
-        $this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
-        $this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
-        $this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_SUBJECT, _CO_SOBJECT_LINK_SUBJECT_DSC, true);
-        $this->initVar('body', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_LINK_BODY, _CO_SOBJECT_LINK_BODY_DSC);
-        $this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
-        $this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
-    }
-
-    /**
-     * 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, array('from_uid', 'to_uid', 'date', 'link'))) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return string
-     */
-    public function from_uid()
-    {
-        $ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
-
-        return $ret;
-    }
-
-    /**
-     * @param  bool   $withContact
-     * @return string
-     */
-    public function to_uid($withContact = false)
-    {
-        $ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function date()
-    {
-        $ret = formatTimestamp($this->getVar('date', 'e'));
-
-        return $ret;
-    }
-
-    /**
-     * @param  bool         $full
-     * @return mixed|string
-     */
-    public function link($full = false)
-    {
-        $ret = $this->getVar('link', 'e');
-        if ($full) {
-            $myts = MyTextSanitizer::getInstance();
-            $ret  = $myts->displayTarea($ret);
-
-            return $ret;
-        } else {
-            $ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
-
-            return $ret;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getViewItemLink()
-    {
-        $ret = '<a href="' .
-               SMARTOBJECT_URL .
-               'admin/link.php?op=view&linkid=' .
-               $this->getVar('linkid') .
-               '"><img src="' .
-               SMARTOBJECT_IMAGES_ACTIONS_URL .
-               'mail_find.png" alt="' .
-               _AM_SOBJECT_SENT_LINK_VIEW .
-               '" title="' .
-               _AM_SOBJECT_SENT_LINK_VIEW .
-               '" /></a>';
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFromInfo()
-    {
-        // check if from_uid represent a user
-
-        if ($this->getVar('from_uid')) {
-            $user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
-            if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
-            }
-        } else {
-            $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
-        }
-
-        return $user;
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        $ret             = parent::toArray();
-        $ret['fromInfo'] = $this->getFromInfo();
-        $ret['toInfo']   = $this->getToInfo();
-        $ret['fullLink'] = $this->link(true);
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getToInfo()
-    {
-        // check if from_uid represent a user
-
-        if ($this->getVar('to_uid')) {
-            $user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
-            if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
-            }
-        } else {
-            $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
-        }
-
-        return $user;
-    }
+	/**
+	 * SmartobjectLink constructor.
+	 */
+	public function __construct()
+	{
+		$this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('date', XOBJ_DTYPE_INT, 0, false, null, '', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
+		$this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
+		$this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
+		$this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
+		$this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
+		$this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
+		$this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
+		$this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
+		$this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_SUBJECT, _CO_SOBJECT_LINK_SUBJECT_DSC, true);
+		$this->initVar('body', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_LINK_BODY, _CO_SOBJECT_LINK_BODY_DSC);
+		$this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
+		$this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
+	}
+
+	/**
+	 * 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, array('from_uid', 'to_uid', 'date', 'link'))) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function from_uid()
+	{
+		$ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
+
+		return $ret;
+	}
+
+	/**
+	 * @param  bool   $withContact
+	 * @return string
+	 */
+	public function to_uid($withContact = false)
+	{
+		$ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function date()
+	{
+		$ret = formatTimestamp($this->getVar('date', 'e'));
+
+		return $ret;
+	}
+
+	/**
+	 * @param  bool         $full
+	 * @return mixed|string
+	 */
+	public function link($full = false)
+	{
+		$ret = $this->getVar('link', 'e');
+		if ($full) {
+			$myts = MyTextSanitizer::getInstance();
+			$ret  = $myts->displayTarea($ret);
+
+			return $ret;
+		} else {
+			$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getViewItemLink()
+	{
+		$ret = '<a href="' .
+			   SMARTOBJECT_URL .
+			   'admin/link.php?op=view&linkid=' .
+			   $this->getVar('linkid') .
+			   '"><img src="' .
+			   SMARTOBJECT_IMAGES_ACTIONS_URL .
+			   'mail_find.png" alt="' .
+			   _AM_SOBJECT_SENT_LINK_VIEW .
+			   '" title="' .
+			   _AM_SOBJECT_SENT_LINK_VIEW .
+			   '" /></a>';
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getFromInfo()
+	{
+		// check if from_uid represent a user
+
+		if ($this->getVar('from_uid')) {
+			$user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
+			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
+				$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+			}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+		}
+
+		return $user;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$ret             = parent::toArray();
+		$ret['fromInfo'] = $this->getFromInfo();
+		$ret['toInfo']   = $this->getToInfo();
+		$ret['fullLink'] = $this->link(true);
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getToInfo()
+	{
+		// check if from_uid represent a user
+
+		if ($this->getVar('to_uid')) {
+			$user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
+			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
+				$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+			}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+		}
+
+		return $user;
+	}
 }
 
 /**
@@ -200,12 +200,12 @@ 
  */
 class SmartobjectLinkHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * SmartobjectLinkHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
-    }
+	/**
+	 * SmartobjectLinkHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -28,7 +28,7 @@ 
 // -------------------------------------------------------------------------//
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectLink
@@ -117,7 +117,7 @@ 
 
             return $ret;
         } else {
-            $ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+            $ret = '<a href="'.$ret.'" alt="'.$this->getVar('link', 'e').'" title="'.$this->getVar('link', 'e').'">'._AM_SOBJECT_SENT_LINKS_GOTO.'</a>';
 
             return $ret;
         }
@@ -128,16 +128,16 @@ 
      */
     public function getViewItemLink()
     {
-        $ret = '<a href="' .
-               SMARTOBJECT_URL .
-               'admin/link.php?op=view&linkid=' .
-               $this->getVar('linkid') .
-               '"><img src="' .
-               SMARTOBJECT_IMAGES_ACTIONS_URL .
-               'mail_find.png" alt="' .
-               _AM_SOBJECT_SENT_LINK_VIEW .
-               '" title="' .
-               _AM_SOBJECT_SENT_LINK_VIEW .
+        $ret = '<a href="'.
+               SMARTOBJECT_URL.
+               'admin/link.php?op=view&linkid='.
+               $this->getVar('linkid').
+               '"><img src="'.
+               SMARTOBJECT_IMAGES_ACTIONS_URL.
+               'mail_find.png" alt="'.
+               _AM_SOBJECT_SENT_LINK_VIEW.
+               '" title="'.
+               _AM_SOBJECT_SENT_LINK_VIEW.
                '" /></a>';
 
         return $ret;
@@ -153,10 +153,10 @@ 
         if ($this->getVar('from_uid')) {
             $user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
         }
 
         return $user;
@@ -185,10 +185,10 @@ 
         if ($this->getVar('to_uid')) {
             $user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
         }
 
         return $user;