mambax7 / smartobject

class/smartaddto.php

Indentation +51 added lines, -51 removed lines

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

Spacing +6 added lines, -6 removed lines

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

class/smarttip.php

Indentation +39 added lines, -39 removed lines

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

class/basedurl.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectBasedUrl

class/smartobjecttable.php

Indentation +879 added lines, -879 removed lines

@@ -21,84 +21,84 @@ 
  */
 class SmartObjectColumn
 {
-    public $_keyname;
-    public $_align;
-    public $_width;
-    public $_customMethodForValue;
-    public $_extraParams;
-    public $_sortable;
-    public $_customCaption;
-
-    /**
-     * SmartObjectColumn constructor.
-     * @param        $keyname
-     * @param string $align
-     * @param bool   $width
-     * @param bool   $customMethodForValue
-     * @param bool   $param
-     * @param bool   $customCaption
-     * @param bool   $sortable
-     */
-    public function __construct(
-        $keyname,
-        $align = 'left',
-        $width = false,
-        $customMethodForValue = false,
-        $param = false,
-        $customCaption = false,
-        $sortable = true
-    ) {
-        $this->_keyname              = $keyname;
-        $this->_align                = $align;
-        $this->_width                = $width;
-        $this->_customMethodForValue = $customMethodForValue;
-        $this->_sortable             = $sortable;
-        $this->_param                = $param;
-        $this->_customCaption        = $customCaption;
-    }
-
-    public function getKeyName()
-    {
-        return $this->_keyname;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAlign()
-    {
-        return $this->_align;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isSortable()
-    {
-        return $this->_sortable;
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getWidth()
-    {
-        if ($this->_width) {
-            $ret = $this->_width;
-        } else {
-            $ret = '';
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getCustomCaption()
-    {
-        return $this->_customCaption;
-    }
+	public $_keyname;
+	public $_align;
+	public $_width;
+	public $_customMethodForValue;
+	public $_extraParams;
+	public $_sortable;
+	public $_customCaption;
+
+	/**
+	 * SmartObjectColumn constructor.
+	 * @param        $keyname
+	 * @param string $align
+	 * @param bool   $width
+	 * @param bool   $customMethodForValue
+	 * @param bool   $param
+	 * @param bool   $customCaption
+	 * @param bool   $sortable
+	 */
+	public function __construct(
+		$keyname,
+		$align = 'left',
+		$width = false,
+		$customMethodForValue = false,
+		$param = false,
+		$customCaption = false,
+		$sortable = true
+	) {
+		$this->_keyname              = $keyname;
+		$this->_align                = $align;
+		$this->_width                = $width;
+		$this->_customMethodForValue = $customMethodForValue;
+		$this->_sortable             = $sortable;
+		$this->_param                = $param;
+		$this->_customCaption        = $customCaption;
+	}
+
+	public function getKeyName()
+	{
+		return $this->_keyname;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAlign()
+	{
+		return $this->_align;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isSortable()
+	{
+		return $this->_sortable;
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getWidth()
+	{
+		if ($this->_width) {
+			$ret = $this->_width;
+		} else {
+			$ret = '';
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getCustomCaption()
+	{
+		return $this->_customCaption;
+	}
 }
 
 /**
@@ -112,805 +112,805 @@ 
  */
 class SmartObjectTable
 {
-    public $_id;
-    public $_objectHandler;
-    public $_columns;
-    public $_criteria;
-    public $_actions;
-    public $_objects = false;
-    public $_aObjects;
-    public $_custom_actions;
-    public $_sortsel;
-    public $_ordersel;
-    public $_limitsel;
-    public $_filtersel;
-    public $_filterseloptions;
-    public $_filtersel2;
-    public $_filtersel2options;
-    public $_filtersel2optionsDefault;
-
-    public $_tempObject;
-    public $_tpl;
-    public $_introButtons;
-    public $_quickSearch            = false;
-    public $_actionButtons          = false;
-    public $_head_css_class         = 'bg3';
-    public $_hasActions             = false;
-    public $_userSide               = false;
-    public $_printerFriendlyPage    = false;
-    public $_tableHeader            = false;
-    public $_tableFooter            = false;
-    public $_showActionsColumnTitle = true;
-    public $_isTree                 = false;
-    public $_showFilterAndLimit     = true;
-    public $_enableColumnsSorting   = true;
-    public $_customTemplate         = false;
-    public $_withSelectedActions    = [];
-
-    /**
-     * Constructor
-     *
-     * @param SmartPersistableObjectHandler $objectHandler {@link SmartPersistableObjectHandler}
-     * @param CriteriaElement               $criteria
-     * @param array                         $actions       array representing the actions to offer
-     *
-     * @param bool                          $userSide
-     */
-    public function __construct(
-        SmartPersistableObjectHandler $objectHandler,
-        CriteriaElement $criteria = null,
-        $actions = ['edit', 'delete'],
-        $userSide = false
-    ) {
-        $this->_id            = $objectHandler->className;
-        $this->_objectHandler = $objectHandler;
-
-        if (!$criteria) {
-            $criteria = new CriteriaCompo();
-        }
-        $this->_criteria       = $criteria;
-        $this->_actions        = $actions;
-        $this->_custom_actions = [];
-        $this->_userSide       = $userSide;
-        if ($userSide) {
-            $this->_head_css_class = 'head';
-        }
-    }
-
-    /**
-     * @param      $op
-     * @param bool $caption
-     * @param bool $text
-     */
-    public function addActionButton($op, $caption = false, $text = false)
-    {
-        $action                 = [
-            'op'      => $op,
-            'caption' => $caption,
-            'text'    => $text
-        ];
-        $this->_actionButtons[] = $action;
-    }
-
-    /**
-     * @param $columnObj
-     */
-    public function addColumn($columnObj)
-    {
-        $this->_columns[] = $columnObj;
-    }
-
-    /**
-     * @param $name
-     * @param $location
-     * @param $value
-     */
-    public function addIntroButton($name, $location, $value)
-    {
-        $introButton             = [];
-        $introButton['name']     = $name;
-        $introButton['location'] = $location;
-        $introButton['value']    = $value;
-        $this->_introButtons[]   = $introButton;
-        unset($introButton);
-    }
-
-    public function addPrinterFriendlyLink()
-    {
-        $current_urls               = smart_getCurrentUrls();
-        $current_url                = $current_urls['full'];
-        $this->_printerFriendlyPage = $current_url . '&print';
-    }
-
-    /**
-     * @param        $fields
-     * @param string $caption
-     */
-    public function addQuickSearch($fields, $caption = _CO_SOBJECT_QUICK_SEARCH)
-    {
-        $this->_quickSearch = ['fields' => $fields, 'caption' => $caption];
-    }
-
-    /**
-     * @param $content
-     */
-    public function addHeader($content)
-    {
-        $this->_tableHeader = $content;
-    }
-
-    /**
-     * @param $content
-     */
-    public function addFooter($content)
-    {
-        $this->_tableFooter = $content;
-    }
-
-    /**
-     * @param $caption
-     */
-    public function addDefaultIntroButton($caption)
-    {
-        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
-    }
-
-    /**
-     * @param $method
-     */
-    public function addCustomAction($method)
-    {
-        $this->_custom_actions[] = $method;
-    }
-
-    /**
-     * @param $default_sort
-     */
-    public function setDefaultSort($default_sort)
-    {
-        $this->_sortsel = $default_sort;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultSort()
-    {
-        if ($this->_sortsel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
-        }
-    }
-
-    /**
-     * @param $default_order
-     */
-    public function setDefaultOrder($default_order)
-    {
-        $this->_ordersel = $default_order;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultOrder()
-    {
-        if ($this->_ordersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
-        }
-    }
-
-    /**
-     * @param array $actions
-     */
-    public function addWithSelectedActions($actions = [])
-    {
-        $this->addColumn(new SmartObjectColumn('checked', 'center', 20, false, false, ' '));
-        $this->_withSelectedActions = $actions;
-    }
-
-    /**
-     * Adding a filter in the table
-     *
-     * @param string $key    key to the field that will be used for sorting
-     * @param string $method method of the handler that will be called to populate the options when this filter is selected
-     * @param bool   $default
-     */
-    public function addFilter($key, $method, $default = false)
-    {
-        $this->_filterseloptions[$key]   = $method;
-        $this->_filtersel2optionsDefault = $default;
-    }
-
-    /**
-     * @param $default_filter
-     */
-    public function setDefaultFilter($default_filter)
-    {
-        $this->_filtersel = $default_filter;
-    }
-
-    public function isForUserSide()
-    {
-        $this->_userSide = true;
-    }
-
-    /**
-     * @param $template
-     */
-    public function setCustomTemplate($template)
-    {
-        $this->_customTemplate = $template;
-    }
-
-    public function setSortOrder()
-    {
-        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
-        //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
-        $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
-
-        if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
-            && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
-            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
-        } else {
-            $this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
-        }
-
-        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
-        //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
-        $ordersArray = $this->getOrdersArray();
-        $this->_criteria->setOrder($this->_ordersel);
-    }
-
-    /**
-     * @param $id
-     */
-    public function setTableId($id)
-    {
-        $this->_id = $id;
-    }
-
-    /**
-     * @param $objects
-     */
-    public function setObjects($objects)
-    {
-        $this->_objects = $objects;
-    }
-
-    public function createTableRows()
-    {
-        $this->_aObjects = [];
-
-        $doWeHaveActions = false;
-
-        $objectclass = 'odd';
-        if (count($this->_objects) > 0) {
-            foreach ($this->_objects as $object) {
-                $aObject = [];
-
-                $i = 0;
-
-                $aColumns = [];
-
-                foreach ($this->_columns as $column) {
-                    $aColumn = [];
-
-                    if ($i == 0) {
-                        $class = 'head';
-                    } elseif ($i % 2 == 0) {
-                        $class = 'even';
-                    } else {
-                        $class = 'odd';
-                    }
-                    if (method_exists($object, 'initiateCustomFields')) {
-                        //$object->initiateCustomFields();
-                    }
-                    if ($column->_keyname === 'checked') {
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
-                    } elseif ($column->_customMethodForValue
-                              && method_exists($object, $column->_customMethodForValue)) {
-                        $method = $column->_customMethodForValue;
-                        if ($column->_param) {
-                            $value = $object->$method($column->_param);
-                        } else {
-                            $value = $object->$method();
-                        }
-                    } else {
-                        /**
-                         * If the column is the identifier, then put a link on it
-                         */
-                        if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                            $value = $object->getItemLink();
-                        } else {
-                            $value = $object->getVar($column->getKeyName());
-                        }
-                    }
-
-                    $aColumn['value'] = $value;
-                    $aColumn['class'] = $class;
-                    $aColumn['width'] = $column->getWidth();
-                    $aColumn['align'] = $column->getAlign();
-
-                    $aColumns[] = $aColumn;
-                    ++$i;
-                }
-
-                $aObject['columns'] = $aColumns;
-                $aObject['id']      = $object->id();
-
-                $objectclass = ($objectclass === 'even') ? 'odd' : 'even';
-
-                $aObject['class'] = $objectclass;
-
-                $actions = [];
-
-                // Adding the custom actions if any
-                foreach ($this->_custom_actions as $action) {
-                    if (method_exists($object, $action)) {
-                        $actions[] = $object->$action();
-                    }
-                }
-
-                require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
-                $controller = new SmartObjectController($this->_objectHandler);
-
-                if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
-                    $actions[] = $controller->getEditItemLink($object, false, true, $this->_userSide);
-                }
-                if ((!is_array($this->_actions)) || in_array('delete', $this->_actions)) {
-                    $actions[] = $controller->getDeleteItemLink($object, false, true, $this->_userSide);
-                }
-                $aObject['actions'] = $actions;
-
-                $this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
-
-                $doWeHaveActions = $doWeHaveActions ? true : count($actions) > 0;
-
-                $this->_aObjects[] = $aObject;
-            }
-            $this->_tpl->assign('smartobject_objects', $this->_aObjects);
-        } else {
-            $colspan = count($this->_columns) + 1;
-            $this->_tpl->assign('smartobject_colspan', $colspan);
-        }
-        $this->_hasActions = $doWeHaveActions;
-    }
-
-    /**
-     * @param  bool $debug
-     * @return mixed
-     */
-    public function fetchObjects($debug = false)
-    {
-        return $this->_objectHandler->getObjects($this->_criteria, true, true, false, $debug);
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultFilter()
-    {
-        if ($this->_filtersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
-        }
-    }
-
-    /**
-     * @return array|bool
-     */
-    public function getFiltersArray()
-    {
-        $ret               = [];
-        $field             = [];
-        $field['caption']  = _CO_OBJ_NONE;
-        $field['selected'] = '';
-        $ret['default']    = $field;
-        unset($field);
-
-        if ($this->_filterseloptions) {
-            foreach ($this->_filterseloptions as $key => $value) {
-                $field = [];
-                if (is_array($value)) {
-                    $field['caption']  = $key;
-                    $field['selected'] = $this->_filtersel == $key ? 'selected' : '';
-                } else {
-                    $field['caption']  = $this->_tempObject->vars[$key]['form_caption'];
-                    $field['selected'] = $this->_filtersel == $key ? 'selected' : '';
-                }
-                $ret[$key] = $field;
-                unset($field);
-            }
-        } else {
-            $ret = false;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $default_filter2
-     */
-    public function setDefaultFilter2($default_filter2)
-    {
-        $this->_filtersel2 = $default_filter2;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultFilter2()
-    {
-        if ($this->_filtersel2) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getFilters2Array()
-    {
-        $ret = [];
-
-        foreach ($this->_filtersel2options as $key => $value) {
-            $field             = [];
-            $field['caption']  = $value;
-            $field['selected'] = $this->_filtersel2 == $key ? 'selected' : '';
-            $ret[$key]         = $field;
-            unset($field);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $limitsArray
-     * @param $params_of_the_options_sel
-     */
-    public function renderOptionSelection($limitsArray, $params_of_the_options_sel)
-    {
-        // Rendering the form to select options on the table
-        $current_urls = smart_getCurrentUrls();
-        $current_url  = $current_urls['full'];
-
-        /**
-         * What was $params_of_the_options_sel doing again ?
-         */
-        //$this->_tpl->assign('smartobject_optionssel_action', $_SERVER['PHP_SELF'] . "?" . implode('&', $params_of_the_options_sel));
-        $this->_tpl->assign('smartobject_optionssel_action', $current_url);
-        $this->_tpl->assign('smartobject_optionssel_limitsArray', $limitsArray);
-    }
-
-    /**
-     * @return array
-     */
-    public function getLimitsArray()
-    {
-        $ret                    = [];
-        $ret['all']['caption']  = _CO_SOBJECT_LIMIT_ALL;
-        $ret['all']['selected'] = ('all' === $this->_limitsel) ? 'selected' : '';
-
-        $ret['5']['caption']  = '5';
-        $ret['5']['selected'] = ('5' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['10']['caption']  = '10';
-        $ret['10']['selected'] = ('10' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['15']['caption']  = '15';
-        $ret['15']['selected'] = ('15' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['20']['caption']  = '20';
-        $ret['20']['selected'] = ('20' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['25']['caption']  = '25';
-        $ret['25']['selected'] = ('25' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['30']['caption']  = '30';
-        $ret['30']['selected'] = ('30' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['35']['caption']  = '35';
-        $ret['35']['selected'] = ('35' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['40']['caption']  = '40';
-        $ret['40']['selected'] = ('40' == $this->_limitsel) ? 'selected' : '';
-
-        return $ret;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getObjects()
-    {
-        return $this->_objects;
-    }
-
-    public function hideActionColumnTitle()
-    {
-        $this->_showActionsColumnTitle = false;
-    }
-
-    public function hideFilterAndLimit()
-    {
-        $this->_showFilterAndLimit = false;
-    }
-
-    /**
-     * @return array
-     */
-    public function getOrdersArray()
-    {
-        $ret                    = [];
-        $ret['ASC']['caption']  = _CO_SOBJECT_SORT_ASC;
-        $ret['ASC']['selected'] = ('ASC' === $this->_ordersel) ? 'selected' : '';
-
-        $ret['DESC']['caption']  = _CO_SOBJECT_SORT_DESC;
-        $ret['DESC']['selected'] = ('DESC' === $this->_ordersel) ? 'selected' : '';
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed|string|void
-     */
-    public function renderD()
-    {
-        return $this->render(false, true);
-    }
-
-    public function renderForPrint()
-    {
-    }
-
-    /**
-     * @param  bool $fetchOnly
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function render($fetchOnly = false, $debug = false)
-    {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
-
-        $this->_tpl = new XoopsTpl();
-
-        /**
-         * We need access to the vars of the SmartObject for a few things in the table creation.
-         * Since we may not have a SmartObject to look into now, let's create one for this purpose
-         * and we will free it after
-         */
-        $this->_tempObject = $this->_objectHandler->create();
-
-        $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
-
-        $this->setSortOrder();
-
-        if (!$this->_isTree) {
-            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
-        } else {
-            $this->_limitsel = 'all';
-        }
-
-        $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
-        $limitsArray = $this->getLimitsArray();
-        $this->_criteria->setLimit($this->_limitsel);
-
-        $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
-        $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
-        $filtersArray = $this->getFiltersArray();
-
-        if ($filtersArray) {
-            $this->_tpl->assign('smartobject_optionssel_filtersArray', $filtersArray);
-        }
-
-        // Check if the selected filter is defined and if so, create the selfilter2
-        if (isset($this->_filterseloptions[$this->_filtersel])) {
-            // check if method associate with this filter exists in the handler
-            if (is_array($this->_filterseloptions[$this->_filtersel])) {
-                $filter = $this->_filterseloptions[$this->_filtersel];
-                $this->_criteria->add($filter['criteria']);
-            } else {
-                if (method_exists($this->_objectHandler, $this->_filterseloptions[$this->_filtersel])) {
-
-                    // then we will create the selfilter2 options by calling this method
-                    $method                   = $this->_filterseloptions[$this->_filtersel];
-                    $this->_filtersel2options = $this->_objectHandler->$method();
-
-                    $this->_filtersel2 = isset($_GET['filtersel2']) ? $_GET['filtersel2'] : $this->getDefaultFilter2();
-                    $this->_filtersel2 = isset($_POST['filtersel2']) ? $_POST['filtersel2'] : $this->_filtersel2;
-
-                    $filters2Array = $this->getFilters2Array();
-                    $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
-
-                    smart_setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
-                    if ($this->_filtersel2 !== 'default') {
-                        $this->_criteria->add(new Criteria($this->_filtersel, $this->_filtersel2));
-                    }
-                }
-            }
-        }
-        // Check if we have a quicksearch
-
-        if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
-            $quicksearch_criteria = new CriteriaCompo();
-            if (is_array($this->_quickSearch['fields'])) {
-                foreach ($this->_quickSearch['fields'] as $v) {
-                    $quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
-                }
-            } else {
-                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
-            }
-            $this->_criteria->add($quicksearch_criteria);
-        }
-
-        $this->_objects = $this->fetchObjects($debug);
-
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-        if ($this->_criteria->getLimit() > 0) {
-
-            /**
-             * Geeting rid of the old params
-             * $new_get_array is an array containing the new GET parameters
-             */
-            $new_get_array = [];
-
-            /**
-             * $params_of_the_options_sel is an array with all the parameters of the page
-             * but without the pagenave parameters. This array will be used in the
-             * OptionsSelection
-             */
-            $params_of_the_options_sel = [];
-
-            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName];
-            foreach ($_GET as $k => $v) {
-                if (!in_array($k, $not_needed_params)) {
-                    $new_get_array[]             = "$k=$v";
-                    $params_of_the_options_sel[] = "$k=$v";
-                }
-            }
-
-            /**
-             * Adding the new params of the pagenav
-             */
-            $new_get_array[] = 'sortsel=' . $this->_sortsel;
-            $new_get_array[] = 'ordersel=' . $this->_ordersel;
-            $new_get_array[] = 'limitsel=' . $this->_limitsel;
-            $otherParams     = implode('&', $new_get_array);
-
-            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
-            $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
-        }
-        $this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
-
-        // retreive the current url and the query string
-        $current_urls = smart_getCurrentUrls();
-        $current_url  = $current_urls['full_phpself'];
-        $query_string = $current_urls['querystring'];
-        if ($query_string) {
-            $query_string = str_replace('?', '', $query_string);
-        }
-        $query_stringArray     = explode('&', $query_string);
-        $new_query_stringArray = [];
-        foreach ($query_stringArray as $query_string) {
-            if (strpos($query_string, 'sortsel') === false && strpos($query_string, 'ordersel') === false) {
-                $new_query_stringArray[] = $query_string;
-            }
-        }
-        $new_query_string = implode('&', $new_query_stringArray);
-
-        $orderArray                     = [];
-        $orderArray['ASC']['image']     = 'desc.png';
-        $orderArray['ASC']['neworder']  = 'DESC';
-        $orderArray['DESC']['image']    = 'asc.png';
-        $orderArray['DESC']['neworder'] = 'ASC';
-
-        $aColumns = [];
-
-        foreach ($this->_columns as $column) {
-            $qs_param         = '';
-            $aColumn          = [];
-            $aColumn['width'] = $column->getWidth();
-            $aColumn['align'] = $column->getAlign();
-            $aColumn['key']   = $column->getKeyName();
-            if ($column->_keyname === 'checked') {
-                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
-            } elseif ($column->getCustomCaption()) {
-                $aColumn['caption'] = $column->getCustomCaption();
-            } else {
-                $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
-            }
-            // Are we doing a GET sort on this column ?
-            $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
-                        && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
-                       || ($this->_sortsel == $column->getKeyName());
-            $order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
-
-            if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
-                $qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
-            }
-            if (!$this->_enableColumnsSorting || $column->_keyname === 'checked' || !$column->isSortable()) {
-                $aColumn['caption'] = $aColumn['caption'];
-            } elseif ($getSort) {
-                $aColumn['caption'] = '<a href="'
-                                      . $current_url
-                                      . '?'
-                                      . $this->_objectHandler->_itemname
-                                      . '_'
-                                      . 'sortsel='
-                                      . $column->getKeyName()
-                                      . '&'
-                                      . $this->_objectHandler->_itemname
-                                      . '_'
-                                      . 'ordersel='
-                                      . $orderArray[$order]['neworder']
-                                      . $qs_param
-                                      . '&'
-                                      . $new_query_string
-                                      . '">'
-                                      . $aColumn['caption']
-                                      . ' <img src="'
-                                      . SMARTOBJECT_IMAGES_ACTIONS_URL
-                                      . $orderArray[$order]['image']
-                                      . '" alt="ASC"></a>';
-            } else {
-                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
-            }
-            $aColumns[] = $aColumn;
-        }
-        $this->_tpl->assign('smartobject_columns', $aColumns);
-
-        if ($this->_quickSearch) {
-            $this->_tpl->assign('smartobject_quicksearch', $this->_quickSearch['caption']);
-        }
-
-        $this->createTableRows();
-
-        $this->_tpl->assign('smartobject_showFilterAndLimit', $this->_showFilterAndLimit);
-        $this->_tpl->assign('smartobject_isTree', $this->_isTree);
-        $this->_tpl->assign('smartobject_show_action_column_title', $this->_showActionsColumnTitle);
-        $this->_tpl->assign('smartobject_table_header', $this->_tableHeader);
-        $this->_tpl->assign('smartobject_table_footer', $this->_tableFooter);
-        $this->_tpl->assign('smartobject_printer_friendly_page', $this->_printerFriendlyPage);
-        $this->_tpl->assign('smartobject_user_side', $this->_userSide);
-        $this->_tpl->assign('smartobject_has_actions', $this->_hasActions);
-        $this->_tpl->assign('smartobject_head_css_class', $this->_head_css_class);
-        $this->_tpl->assign('smartobject_actionButtons', $this->_actionButtons);
-        $this->_tpl->assign('smartobject_introButtons', $this->_introButtons);
-        $this->_tpl->assign('smartobject_id', $this->_id);
-        if (!empty($this->_withSelectedActions)) {
-            $this->_tpl->assign('smartobject_withSelectedActions', $this->_withSelectedActions);
-        }
-
-        $smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
-        if ($fetchOnly) {
-            return $this->_tpl->fetch('db:' . $smartobjectTable_template);
-        } else {
-            $this->_tpl->display('db:' . $smartobjectTable_template);
-        }
-    }
-
-    public function disableColumnsSorting()
-    {
-        $this->_enableColumnsSorting = false;
-    }
-
-    /**
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function fetch($debug = false)
-    {
-        return $this->render(true, $debug);
-    }
+	public $_id;
+	public $_objectHandler;
+	public $_columns;
+	public $_criteria;
+	public $_actions;
+	public $_objects = false;
+	public $_aObjects;
+	public $_custom_actions;
+	public $_sortsel;
+	public $_ordersel;
+	public $_limitsel;
+	public $_filtersel;
+	public $_filterseloptions;
+	public $_filtersel2;
+	public $_filtersel2options;
+	public $_filtersel2optionsDefault;
+
+	public $_tempObject;
+	public $_tpl;
+	public $_introButtons;
+	public $_quickSearch            = false;
+	public $_actionButtons          = false;
+	public $_head_css_class         = 'bg3';
+	public $_hasActions             = false;
+	public $_userSide               = false;
+	public $_printerFriendlyPage    = false;
+	public $_tableHeader            = false;
+	public $_tableFooter            = false;
+	public $_showActionsColumnTitle = true;
+	public $_isTree                 = false;
+	public $_showFilterAndLimit     = true;
+	public $_enableColumnsSorting   = true;
+	public $_customTemplate         = false;
+	public $_withSelectedActions    = [];
+
+	/**
+	 * Constructor
+	 *
+	 * @param SmartPersistableObjectHandler $objectHandler {@link SmartPersistableObjectHandler}
+	 * @param CriteriaElement               $criteria
+	 * @param array                         $actions       array representing the actions to offer
+	 *
+	 * @param bool                          $userSide
+	 */
+	public function __construct(
+		SmartPersistableObjectHandler $objectHandler,
+		CriteriaElement $criteria = null,
+		$actions = ['edit', 'delete'],
+		$userSide = false
+	) {
+		$this->_id            = $objectHandler->className;
+		$this->_objectHandler = $objectHandler;
+
+		if (!$criteria) {
+			$criteria = new CriteriaCompo();
+		}
+		$this->_criteria       = $criteria;
+		$this->_actions        = $actions;
+		$this->_custom_actions = [];
+		$this->_userSide       = $userSide;
+		if ($userSide) {
+			$this->_head_css_class = 'head';
+		}
+	}
+
+	/**
+	 * @param      $op
+	 * @param bool $caption
+	 * @param bool $text
+	 */
+	public function addActionButton($op, $caption = false, $text = false)
+	{
+		$action                 = [
+			'op'      => $op,
+			'caption' => $caption,
+			'text'    => $text
+		];
+		$this->_actionButtons[] = $action;
+	}
+
+	/**
+	 * @param $columnObj
+	 */
+	public function addColumn($columnObj)
+	{
+		$this->_columns[] = $columnObj;
+	}
+
+	/**
+	 * @param $name
+	 * @param $location
+	 * @param $value
+	 */
+	public function addIntroButton($name, $location, $value)
+	{
+		$introButton             = [];
+		$introButton['name']     = $name;
+		$introButton['location'] = $location;
+		$introButton['value']    = $value;
+		$this->_introButtons[]   = $introButton;
+		unset($introButton);
+	}
+
+	public function addPrinterFriendlyLink()
+	{
+		$current_urls               = smart_getCurrentUrls();
+		$current_url                = $current_urls['full'];
+		$this->_printerFriendlyPage = $current_url . '&print';
+	}
+
+	/**
+	 * @param        $fields
+	 * @param string $caption
+	 */
+	public function addQuickSearch($fields, $caption = _CO_SOBJECT_QUICK_SEARCH)
+	{
+		$this->_quickSearch = ['fields' => $fields, 'caption' => $caption];
+	}
+
+	/**
+	 * @param $content
+	 */
+	public function addHeader($content)
+	{
+		$this->_tableHeader = $content;
+	}
+
+	/**
+	 * @param $content
+	 */
+	public function addFooter($content)
+	{
+		$this->_tableFooter = $content;
+	}
+
+	/**
+	 * @param $caption
+	 */
+	public function addDefaultIntroButton($caption)
+	{
+		$this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
+	}
+
+	/**
+	 * @param $method
+	 */
+	public function addCustomAction($method)
+	{
+		$this->_custom_actions[] = $method;
+	}
+
+	/**
+	 * @param $default_sort
+	 */
+	public function setDefaultSort($default_sort)
+	{
+		$this->_sortsel = $default_sort;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultSort()
+	{
+		if ($this->_sortsel) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
+		}
+	}
+
+	/**
+	 * @param $default_order
+	 */
+	public function setDefaultOrder($default_order)
+	{
+		$this->_ordersel = $default_order;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultOrder()
+	{
+		if ($this->_ordersel) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
+		}
+	}
+
+	/**
+	 * @param array $actions
+	 */
+	public function addWithSelectedActions($actions = [])
+	{
+		$this->addColumn(new SmartObjectColumn('checked', 'center', 20, false, false, '&nbsp;'));
+		$this->_withSelectedActions = $actions;
+	}
+
+	/**
+	 * Adding a filter in the table
+	 *
+	 * @param string $key    key to the field that will be used for sorting
+	 * @param string $method method of the handler that will be called to populate the options when this filter is selected
+	 * @param bool   $default
+	 */
+	public function addFilter($key, $method, $default = false)
+	{
+		$this->_filterseloptions[$key]   = $method;
+		$this->_filtersel2optionsDefault = $default;
+	}
+
+	/**
+	 * @param $default_filter
+	 */
+	public function setDefaultFilter($default_filter)
+	{
+		$this->_filtersel = $default_filter;
+	}
+
+	public function isForUserSide()
+	{
+		$this->_userSide = true;
+	}
+
+	/**
+	 * @param $template
+	 */
+	public function setCustomTemplate($template)
+	{
+		$this->_customTemplate = $template;
+	}
+
+	public function setSortOrder()
+	{
+		$this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
+		//$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+		$fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
+
+		if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
+			&& $this->_tempObject->vars[$this->_sortsel]['itemName']) {
+			$this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
+		} else {
+			$this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
+		}
+
+		$this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
+		//$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+		$ordersArray = $this->getOrdersArray();
+		$this->_criteria->setOrder($this->_ordersel);
+	}
+
+	/**
+	 * @param $id
+	 */
+	public function setTableId($id)
+	{
+		$this->_id = $id;
+	}
+
+	/**
+	 * @param $objects
+	 */
+	public function setObjects($objects)
+	{
+		$this->_objects = $objects;
+	}
+
+	public function createTableRows()
+	{
+		$this->_aObjects = [];
+
+		$doWeHaveActions = false;
+
+		$objectclass = 'odd';
+		if (count($this->_objects) > 0) {
+			foreach ($this->_objects as $object) {
+				$aObject = [];
+
+				$i = 0;
+
+				$aColumns = [];
+
+				foreach ($this->_columns as $column) {
+					$aColumn = [];
+
+					if ($i == 0) {
+						$class = 'head';
+					} elseif ($i % 2 == 0) {
+						$class = 'even';
+					} else {
+						$class = 'odd';
+					}
+					if (method_exists($object, 'initiateCustomFields')) {
+						//$object->initiateCustomFields();
+					}
+					if ($column->_keyname === 'checked') {
+						$value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
+					} elseif ($column->_customMethodForValue
+							  && method_exists($object, $column->_customMethodForValue)) {
+						$method = $column->_customMethodForValue;
+						if ($column->_param) {
+							$value = $object->$method($column->_param);
+						} else {
+							$value = $object->$method();
+						}
+					} else {
+						/**
+						 * If the column is the identifier, then put a link on it
+						 */
+						if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+							$value = $object->getItemLink();
+						} else {
+							$value = $object->getVar($column->getKeyName());
+						}
+					}
+
+					$aColumn['value'] = $value;
+					$aColumn['class'] = $class;
+					$aColumn['width'] = $column->getWidth();
+					$aColumn['align'] = $column->getAlign();
+
+					$aColumns[] = $aColumn;
+					++$i;
+				}
+
+				$aObject['columns'] = $aColumns;
+				$aObject['id']      = $object->id();
+
+				$objectclass = ($objectclass === 'even') ? 'odd' : 'even';
+
+				$aObject['class'] = $objectclass;
+
+				$actions = [];
+
+				// Adding the custom actions if any
+				foreach ($this->_custom_actions as $action) {
+					if (method_exists($object, $action)) {
+						$actions[] = $object->$action();
+					}
+				}
+
+				require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+				$controller = new SmartObjectController($this->_objectHandler);
+
+				if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
+					$actions[] = $controller->getEditItemLink($object, false, true, $this->_userSide);
+				}
+				if ((!is_array($this->_actions)) || in_array('delete', $this->_actions)) {
+					$actions[] = $controller->getDeleteItemLink($object, false, true, $this->_userSide);
+				}
+				$aObject['actions'] = $actions;
+
+				$this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
+
+				$doWeHaveActions = $doWeHaveActions ? true : count($actions) > 0;
+
+				$this->_aObjects[] = $aObject;
+			}
+			$this->_tpl->assign('smartobject_objects', $this->_aObjects);
+		} else {
+			$colspan = count($this->_columns) + 1;
+			$this->_tpl->assign('smartobject_colspan', $colspan);
+		}
+		$this->_hasActions = $doWeHaveActions;
+	}
+
+	/**
+	 * @param  bool $debug
+	 * @return mixed
+	 */
+	public function fetchObjects($debug = false)
+	{
+		return $this->_objectHandler->getObjects($this->_criteria, true, true, false, $debug);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultFilter()
+	{
+		if ($this->_filtersel) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
+		}
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public function getFiltersArray()
+	{
+		$ret               = [];
+		$field             = [];
+		$field['caption']  = _CO_OBJ_NONE;
+		$field['selected'] = '';
+		$ret['default']    = $field;
+		unset($field);
+
+		if ($this->_filterseloptions) {
+			foreach ($this->_filterseloptions as $key => $value) {
+				$field = [];
+				if (is_array($value)) {
+					$field['caption']  = $key;
+					$field['selected'] = $this->_filtersel == $key ? 'selected' : '';
+				} else {
+					$field['caption']  = $this->_tempObject->vars[$key]['form_caption'];
+					$field['selected'] = $this->_filtersel == $key ? 'selected' : '';
+				}
+				$ret[$key] = $field;
+				unset($field);
+			}
+		} else {
+			$ret = false;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $default_filter2
+	 */
+	public function setDefaultFilter2($default_filter2)
+	{
+		$this->_filtersel2 = $default_filter2;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultFilter2()
+	{
+		if ($this->_filtersel2) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getFilters2Array()
+	{
+		$ret = [];
+
+		foreach ($this->_filtersel2options as $key => $value) {
+			$field             = [];
+			$field['caption']  = $value;
+			$field['selected'] = $this->_filtersel2 == $key ? 'selected' : '';
+			$ret[$key]         = $field;
+			unset($field);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $limitsArray
+	 * @param $params_of_the_options_sel
+	 */
+	public function renderOptionSelection($limitsArray, $params_of_the_options_sel)
+	{
+		// Rendering the form to select options on the table
+		$current_urls = smart_getCurrentUrls();
+		$current_url  = $current_urls['full'];
+
+		/**
+		 * What was $params_of_the_options_sel doing again ?
+		 */
+		//$this->_tpl->assign('smartobject_optionssel_action', $_SERVER['PHP_SELF'] . "?" . implode('&', $params_of_the_options_sel));
+		$this->_tpl->assign('smartobject_optionssel_action', $current_url);
+		$this->_tpl->assign('smartobject_optionssel_limitsArray', $limitsArray);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLimitsArray()
+	{
+		$ret                    = [];
+		$ret['all']['caption']  = _CO_SOBJECT_LIMIT_ALL;
+		$ret['all']['selected'] = ('all' === $this->_limitsel) ? 'selected' : '';
+
+		$ret['5']['caption']  = '5';
+		$ret['5']['selected'] = ('5' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['10']['caption']  = '10';
+		$ret['10']['selected'] = ('10' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['15']['caption']  = '15';
+		$ret['15']['selected'] = ('15' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['20']['caption']  = '20';
+		$ret['20']['selected'] = ('20' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['25']['caption']  = '25';
+		$ret['25']['selected'] = ('25' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['30']['caption']  = '30';
+		$ret['30']['selected'] = ('30' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['35']['caption']  = '35';
+		$ret['35']['selected'] = ('35' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['40']['caption']  = '40';
+		$ret['40']['selected'] = ('40' == $this->_limitsel) ? 'selected' : '';
+
+		return $ret;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getObjects()
+	{
+		return $this->_objects;
+	}
+
+	public function hideActionColumnTitle()
+	{
+		$this->_showActionsColumnTitle = false;
+	}
+
+	public function hideFilterAndLimit()
+	{
+		$this->_showFilterAndLimit = false;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getOrdersArray()
+	{
+		$ret                    = [];
+		$ret['ASC']['caption']  = _CO_SOBJECT_SORT_ASC;
+		$ret['ASC']['selected'] = ('ASC' === $this->_ordersel) ? 'selected' : '';
+
+		$ret['DESC']['caption']  = _CO_SOBJECT_SORT_DESC;
+		$ret['DESC']['selected'] = ('DESC' === $this->_ordersel) ? 'selected' : '';
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed|string|void
+	 */
+	public function renderD()
+	{
+		return $this->render(false, true);
+	}
+
+	public function renderForPrint()
+	{
+	}
+
+	/**
+	 * @param  bool $fetchOnly
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false, $debug = false)
+	{
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
+
+		$this->_tpl = new XoopsTpl();
+
+		/**
+		 * We need access to the vars of the SmartObject for a few things in the table creation.
+		 * Since we may not have a SmartObject to look into now, let's create one for this purpose
+		 * and we will free it after
+		 */
+		$this->_tempObject = $this->_objectHandler->create();
+
+		$this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
+
+		$this->setSortOrder();
+
+		if (!$this->_isTree) {
+			$this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
+		} else {
+			$this->_limitsel = 'all';
+		}
+
+		$this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
+		$limitsArray = $this->getLimitsArray();
+		$this->_criteria->setLimit($this->_limitsel);
+
+		$this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
+		$this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+		$filtersArray = $this->getFiltersArray();
+
+		if ($filtersArray) {
+			$this->_tpl->assign('smartobject_optionssel_filtersArray', $filtersArray);
+		}
+
+		// Check if the selected filter is defined and if so, create the selfilter2
+		if (isset($this->_filterseloptions[$this->_filtersel])) {
+			// check if method associate with this filter exists in the handler
+			if (is_array($this->_filterseloptions[$this->_filtersel])) {
+				$filter = $this->_filterseloptions[$this->_filtersel];
+				$this->_criteria->add($filter['criteria']);
+			} else {
+				if (method_exists($this->_objectHandler, $this->_filterseloptions[$this->_filtersel])) {
+
+					// then we will create the selfilter2 options by calling this method
+					$method                   = $this->_filterseloptions[$this->_filtersel];
+					$this->_filtersel2options = $this->_objectHandler->$method();
+
+					$this->_filtersel2 = isset($_GET['filtersel2']) ? $_GET['filtersel2'] : $this->getDefaultFilter2();
+					$this->_filtersel2 = isset($_POST['filtersel2']) ? $_POST['filtersel2'] : $this->_filtersel2;
+
+					$filters2Array = $this->getFilters2Array();
+					$this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
+
+					smart_setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+					if ($this->_filtersel2 !== 'default') {
+						$this->_criteria->add(new Criteria($this->_filtersel, $this->_filtersel2));
+					}
+				}
+			}
+		}
+		// Check if we have a quicksearch
+
+		if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
+			$quicksearch_criteria = new CriteriaCompo();
+			if (is_array($this->_quickSearch['fields'])) {
+				foreach ($this->_quickSearch['fields'] as $v) {
+					$quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
+				}
+			} else {
+				$quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
+			}
+			$this->_criteria->add($quicksearch_criteria);
+		}
+
+		$this->_objects = $this->fetchObjects($debug);
+
+		require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+		if ($this->_criteria->getLimit() > 0) {
+
+			/**
+			 * Geeting rid of the old params
+			 * $new_get_array is an array containing the new GET parameters
+			 */
+			$new_get_array = [];
+
+			/**
+			 * $params_of_the_options_sel is an array with all the parameters of the page
+			 * but without the pagenave parameters. This array will be used in the
+			 * OptionsSelection
+			 */
+			$params_of_the_options_sel = [];
+
+			$not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName];
+			foreach ($_GET as $k => $v) {
+				if (!in_array($k, $not_needed_params)) {
+					$new_get_array[]             = "$k=$v";
+					$params_of_the_options_sel[] = "$k=$v";
+				}
+			}
+
+			/**
+			 * Adding the new params of the pagenav
+			 */
+			$new_get_array[] = 'sortsel=' . $this->_sortsel;
+			$new_get_array[] = 'ordersel=' . $this->_ordersel;
+			$new_get_array[] = 'limitsel=' . $this->_limitsel;
+			$otherParams     = implode('&', $new_get_array);
+
+			$pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
+			$this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
+		}
+		$this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
+
+		// retreive the current url and the query string
+		$current_urls = smart_getCurrentUrls();
+		$current_url  = $current_urls['full_phpself'];
+		$query_string = $current_urls['querystring'];
+		if ($query_string) {
+			$query_string = str_replace('?', '', $query_string);
+		}
+		$query_stringArray     = explode('&', $query_string);
+		$new_query_stringArray = [];
+		foreach ($query_stringArray as $query_string) {
+			if (strpos($query_string, 'sortsel') === false && strpos($query_string, 'ordersel') === false) {
+				$new_query_stringArray[] = $query_string;
+			}
+		}
+		$new_query_string = implode('&', $new_query_stringArray);
+
+		$orderArray                     = [];
+		$orderArray['ASC']['image']     = 'desc.png';
+		$orderArray['ASC']['neworder']  = 'DESC';
+		$orderArray['DESC']['image']    = 'asc.png';
+		$orderArray['DESC']['neworder'] = 'ASC';
+
+		$aColumns = [];
+
+		foreach ($this->_columns as $column) {
+			$qs_param         = '';
+			$aColumn          = [];
+			$aColumn['width'] = $column->getWidth();
+			$aColumn['align'] = $column->getAlign();
+			$aColumn['key']   = $column->getKeyName();
+			if ($column->_keyname === 'checked') {
+				$aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
+			} elseif ($column->getCustomCaption()) {
+				$aColumn['caption'] = $column->getCustomCaption();
+			} else {
+				$aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
+			}
+			// Are we doing a GET sort on this column ?
+			$getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
+						&& $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
+					   || ($this->_sortsel == $column->getKeyName());
+			$order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
+
+			if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
+				$qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
+			}
+			if (!$this->_enableColumnsSorting || $column->_keyname === 'checked' || !$column->isSortable()) {
+				$aColumn['caption'] = $aColumn['caption'];
+			} elseif ($getSort) {
+				$aColumn['caption'] = '<a href="'
+									  . $current_url
+									  . '?'
+									  . $this->_objectHandler->_itemname
+									  . '_'
+									  . 'sortsel='
+									  . $column->getKeyName()
+									  . '&'
+									  . $this->_objectHandler->_itemname
+									  . '_'
+									  . 'ordersel='
+									  . $orderArray[$order]['neworder']
+									  . $qs_param
+									  . '&'
+									  . $new_query_string
+									  . '">'
+									  . $aColumn['caption']
+									  . ' <img src="'
+									  . SMARTOBJECT_IMAGES_ACTIONS_URL
+									  . $orderArray[$order]['image']
+									  . '" alt="ASC"></a>';
+			} else {
+				$aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+			}
+			$aColumns[] = $aColumn;
+		}
+		$this->_tpl->assign('smartobject_columns', $aColumns);
+
+		if ($this->_quickSearch) {
+			$this->_tpl->assign('smartobject_quicksearch', $this->_quickSearch['caption']);
+		}
+
+		$this->createTableRows();
+
+		$this->_tpl->assign('smartobject_showFilterAndLimit', $this->_showFilterAndLimit);
+		$this->_tpl->assign('smartobject_isTree', $this->_isTree);
+		$this->_tpl->assign('smartobject_show_action_column_title', $this->_showActionsColumnTitle);
+		$this->_tpl->assign('smartobject_table_header', $this->_tableHeader);
+		$this->_tpl->assign('smartobject_table_footer', $this->_tableFooter);
+		$this->_tpl->assign('smartobject_printer_friendly_page', $this->_printerFriendlyPage);
+		$this->_tpl->assign('smartobject_user_side', $this->_userSide);
+		$this->_tpl->assign('smartobject_has_actions', $this->_hasActions);
+		$this->_tpl->assign('smartobject_head_css_class', $this->_head_css_class);
+		$this->_tpl->assign('smartobject_actionButtons', $this->_actionButtons);
+		$this->_tpl->assign('smartobject_introButtons', $this->_introButtons);
+		$this->_tpl->assign('smartobject_id', $this->_id);
+		if (!empty($this->_withSelectedActions)) {
+			$this->_tpl->assign('smartobject_withSelectedActions', $this->_withSelectedActions);
+		}
+
+		$smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
+		if ($fetchOnly) {
+			return $this->_tpl->fetch('db:' . $smartobjectTable_template);
+		} else {
+			$this->_tpl->display('db:' . $smartobjectTable_template);
+		}
+	}
+
+	public function disableColumnsSorting()
+	{
+		$this->_enableColumnsSorting = false;
+	}
+
+	/**
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function fetch($debug = false)
+	{
+		return $this->render(true, $debug);
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -184,7 +184,7 @@ 
      */
     public function addActionButton($op, $caption = false, $text = false)
     {
-        $action                 = [
+        $action = [
             'op'      => $op,
             'caption' => $caption,
             'text'    => $text
@@ -219,7 +219,7 @@ 
     {
         $current_urls               = smart_getCurrentUrls();
         $current_url                = $current_urls['full'];
-        $this->_printerFriendlyPage = $current_url . '&print';
+        $this->_printerFriendlyPage = $current_url.'&print';
     }
 
     /**
@@ -252,7 +252,7 @@ 
      */
     public function addDefaultIntroButton($caption)
     {
-        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
+        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page.'?op=mod', $caption);
     }
 
     /**
@@ -277,9 +277,9 @@ 
     public function getDefaultSort()
     {
         if ($this->_sortsel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_objectHandler->identifierName);
         }
     }
 
@@ -297,9 +297,9 @@ 
     public function getDefaultOrder()
     {
         if ($this->_ordersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', 'ASC');
         }
     }
 
@@ -348,21 +348,21 @@ 
 
     public function setSortOrder()
     {
-        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
+        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] : $this->getDefaultSort();
         //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
 
         if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
             && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
-            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'].'.'.$this->_sortsel);
         } else {
-            $this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_objectHandler->_itemname.'.'.$this->_sortsel);
         }
 
-        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
+        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : $this->getDefaultOrder();
         //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         $ordersArray = $this->getOrdersArray();
         $this->_criteria->setOrder($this->_ordersel);
     }
@@ -412,7 +412,7 @@ 
                         //$object->initiateCustomFields();
                     }
                     if ($column->_keyname === 'checked') {
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
+                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'">';
                     } elseif ($column->_customMethodForValue
                               && method_exists($object, $column->_customMethodForValue)) {
                         $method = $column->_customMethodForValue;
@@ -457,7 +457,7 @@ 
                     }
                 }
 
-                require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+                require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
                 $controller = new SmartObjectController($this->_objectHandler);
 
                 if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
@@ -497,9 +497,9 @@ 
     public function getDefaultFilter()
     {
         if ($this->_filtersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', 'default');
         }
     }
 
@@ -549,9 +549,9 @@ 
     public function getDefaultFilter2()
     {
         if ($this->_filtersel2) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', 'default');
         }
     }
 
@@ -679,7 +679,7 @@ 
      */
     public function render($fetchOnly = false, $debug = false)
     {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         $this->_tpl = new XoopsTpl();
 
@@ -690,24 +690,24 @@ 
          */
         $this->_tempObject = $this->_objectHandler->create();
 
-        $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
+        $this->_criteria->setStart(isset($_GET['start'.$this->_objectHandler->keyName]) ? (int) $_GET['start'.$this->_objectHandler->keyName] : 0);
 
         $this->setSortOrder();
 
         if (!$this->_isTree) {
-            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
+            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'].'_limitsel', '15');
         } else {
             $this->_limitsel = 'all';
         }
 
         $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_limitsel', $this->_limitsel);
         $limitsArray = $this->getLimitsArray();
         $this->_criteria->setLimit($this->_limitsel);
 
         $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
         $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         $filtersArray = $this->getFiltersArray();
 
         if ($filtersArray) {
@@ -733,7 +733,7 @@ 
                     $filters2Array = $this->getFilters2Array();
                     $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
 
-                    smart_setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+                    smart_setCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
                     if ($this->_filtersel2 !== 'default') {
                         $this->_criteria->add(new Criteria($this->_filtersel, $this->_filtersel2));
                     }
@@ -742,21 +742,21 @@ 
         }
         // Check if we have a quicksearch
 
-        if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
+        if (isset($_POST['quicksearch_'.$this->_id]) && $_POST['quicksearch_'.$this->_id] != '') {
             $quicksearch_criteria = new CriteriaCompo();
             if (is_array($this->_quickSearch['fields'])) {
                 foreach ($this->_quickSearch['fields'] as $v) {
-                    $quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
+                    $quicksearch_criteria->add(new Criteria($v, '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'), 'OR');
                 }
             } else {
-                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
+                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'));
             }
             $this->_criteria->add($quicksearch_criteria);
         }
 
         $this->_objects = $this->fetchObjects($debug);
 
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         if ($this->_criteria->getLimit() > 0) {
 
             /**
@@ -772,7 +772,7 @@ 
              */
             $params_of_the_options_sel = [];
 
-            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName];
+            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start'.$this->_objectHandler->keyName];
             foreach ($_GET as $k => $v) {
                 if (!in_array($k, $not_needed_params)) {
                     $new_get_array[]             = "$k=$v";
@@ -783,12 +783,12 @@ 
             /**
              * Adding the new params of the pagenav
              */
-            $new_get_array[] = 'sortsel=' . $this->_sortsel;
-            $new_get_array[] = 'ordersel=' . $this->_ordersel;
-            $new_get_array[] = 'limitsel=' . $this->_limitsel;
+            $new_get_array[] = 'sortsel='.$this->_sortsel;
+            $new_get_array[] = 'ordersel='.$this->_ordersel;
+            $new_get_array[] = 'limitsel='.$this->_limitsel;
             $otherParams     = implode('&', $new_get_array);
 
-            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
+            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start'.$this->_objectHandler->keyName, $otherParams);
             $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
         }
         $this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
@@ -824,20 +824,20 @@ 
             $aColumn['align'] = $column->getAlign();
             $aColumn['key']   = $column->getKeyName();
             if ($column->_keyname === 'checked') {
-                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
+                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"'.' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');">';
             } elseif ($column->getCustomCaption()) {
                 $aColumn['caption'] = $column->getCustomCaption();
             } else {
                 $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
             }
             // Are we doing a GET sort on this column ?
-            $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
-                        && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
+            $getSort = (isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel'])
+                        && $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] == $column->getKeyName())
                        || ($this->_sortsel == $column->getKeyName());
-            $order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
+            $order   = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : 'DESC';
 
-            if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
-                $qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
+            if (isset($_REQUEST['quicksearch_'.$this->_id]) && $_REQUEST['quicksearch_'.$this->_id] != '') {
+                $qs_param = '&quicksearch_'.$this->_id.'='.$_REQUEST['quicksearch_'.$this->_id];
             }
             if (!$this->_enableColumnsSorting || $column->_keyname === 'checked' || !$column->isSortable()) {
                 $aColumn['caption'] = $aColumn['caption'];
@@ -864,7 +864,7 @@ 
                                       . $orderArray[$order]['image']
                                       . '" alt="ASC"></a>';
             } else {
-                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+                $aColumn['caption'] = '<a href="'.$current_url.'?'.$this->_objectHandler->_itemname.'_'.'sortsel='.$column->getKeyName().'&'.$this->_objectHandler->_itemname.'_'.'ordersel=ASC'.$qs_param.'&'.$new_query_string.'">'.$aColumn['caption'].'</a>';
             }
             $aColumns[] = $aColumn;
         }
@@ -894,9 +894,9 @@ 
 
         $smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
         if ($fetchOnly) {
-            return $this->_tpl->fetch('db:' . $smartobjectTable_template);
+            return $this->_tpl->fetch('db:'.$smartobjectTable_template);
         } else {
-            $this->_tpl->display('db:' . $smartobjectTable_template);
+            $this->_tpl->display('db:'.$smartobjectTable_template);
         }
     }
 

class/smarthighlighter.php

Indentation +84 added lines, -84 removed lines

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

Spacing +4 added lines, -4 removed lines

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

class/smartobjectpermission.php

Indentation +199 added lines, -199 removed lines

@@ -12,18 +12,18 @@ 
 
 class SmartobjectPermissionHandler extends XoopsObjectHandler
 {
-    public $handler;
-
-    /**
-     * SmartobjectPermissionHandler constructor.
-     * @param XoopsDatabase $handler
-     */
-    public function __construct($handler)
-    {
-        $this->handler = $handler;
-    }
-
-    /*
+	public $handler;
+
+	/**
+	 * SmartobjectPermissionHandler constructor.
+	 * @param XoopsDatabase $handler
+	 */
+	public function __construct($handler)
+	{
+		$this->handler = $handler;
+	}
+
+	/*
      * Returns permissions for a certain type
      *
      * @param string $type "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
@@ -31,74 +31,74 @@ 
      *
      * @return array
      */
-    /**
-     * @param        $gperm_name
-     * @param  null  $id
-     * @return array
-     */
-    public function getGrantedGroups($gperm_name, $id = null)
-    {
-        static $groups;
-
-        if (!isset($groups[$gperm_name]) || ($id !== null && !isset($groups[$gperm_name][$id]))) {
-            $smartModule = $this->handler->getModuleInfo();
-            //Get group permissions handler
-            $gpermHandler = xoops_getHandler('groupperm');
-
-            //Get groups allowed for an item id
-            $allowedgroups            = $gpermHandler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
-            $groups[$gperm_name][$id] = $allowedgroups;
-        }
-
-        //Return the permission array
-        return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : [];
-    }
-
-    /**
-     * @param        $item_ids_array
-     * @param  bool  $gperm_name
-     * @return array
-     */
-    public function getGrantedGroupsForIds($item_ids_array, $gperm_name = false)
-    {
-        static $groups;
-
-        if ($gperm_name) {
-            if (isset($groups[$gperm_name])) {
-                return $groups[$gperm_name];
-            }
-        } else {
-            // if !$gperm_name then we will fetch all permissions in the module so we don't need them again
-            return $groups;
-        }
-
-        $smartModule = $this->handler->getModuleInfo();
-
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
-
-        if ($gperm_name) {
-            $criteria->add(new Criteria('gperm_name', $gperm_name));
-        }
-
-        //Get group permissions handler
-        $gpermHandler = xoops_getHandler('groupperm');
-
-        $permissionsObj = $gpermHandler->getObjects($criteria);
-
-        foreach ($permissionsObj as $permissionObj) {
-            $groups[$permissionObj->getVar('gperm_name')][$permissionObj->getVar('gperm_itemid')][] = $permissionObj->getVar('gperm_groupid');
-        }
-
-        //Return the permission array
-        if ($gperm_name) {
-            return isset($groups[$gperm_name]) ? $groups[$gperm_name] : [];
-        } else {
-            return isset($groups) ? $groups : [];
-        }
-    }
-
-    /*
+	/**
+	 * @param        $gperm_name
+	 * @param  null  $id
+	 * @return array
+	 */
+	public function getGrantedGroups($gperm_name, $id = null)
+	{
+		static $groups;
+
+		if (!isset($groups[$gperm_name]) || ($id !== null && !isset($groups[$gperm_name][$id]))) {
+			$smartModule = $this->handler->getModuleInfo();
+			//Get group permissions handler
+			$gpermHandler = xoops_getHandler('groupperm');
+
+			//Get groups allowed for an item id
+			$allowedgroups            = $gpermHandler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
+			$groups[$gperm_name][$id] = $allowedgroups;
+		}
+
+		//Return the permission array
+		return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : [];
+	}
+
+	/**
+	 * @param        $item_ids_array
+	 * @param  bool  $gperm_name
+	 * @return array
+	 */
+	public function getGrantedGroupsForIds($item_ids_array, $gperm_name = false)
+	{
+		static $groups;
+
+		if ($gperm_name) {
+			if (isset($groups[$gperm_name])) {
+				return $groups[$gperm_name];
+			}
+		} else {
+			// if !$gperm_name then we will fetch all permissions in the module so we don't need them again
+			return $groups;
+		}
+
+		$smartModule = $this->handler->getModuleInfo();
+
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
+
+		if ($gperm_name) {
+			$criteria->add(new Criteria('gperm_name', $gperm_name));
+		}
+
+		//Get group permissions handler
+		$gpermHandler = xoops_getHandler('groupperm');
+
+		$permissionsObj = $gpermHandler->getObjects($criteria);
+
+		foreach ($permissionsObj as $permissionObj) {
+			$groups[$permissionObj->getVar('gperm_name')][$permissionObj->getVar('gperm_itemid')][] = $permissionObj->getVar('gperm_groupid');
+		}
+
+		//Return the permission array
+		if ($gperm_name) {
+			return isset($groups[$gperm_name]) ? $groups[$gperm_name] : [];
+		} else {
+			return isset($groups) ? $groups : [];
+		}
+	}
+
+	/*
      * Returns permissions for a certain type
      *
      * @param string $type "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
@@ -106,123 +106,123 @@ 
      *
      * @return array
      */
-    /**
-     * @param        $gperm_name
-     * @param  null  $id
-     * @return array
-     */
-    public function getGrantedItems($gperm_name, $id = null)
-    {
-        global $xoopsUser;
-        static $permissions;
-
-        if (!isset($permissions[$gperm_name]) || ($id !== null && !isset($permissions[$gperm_name][$id]))) {
-            $smartModule = $this->handler->getModuleInfo();
-
-            if (is_object($smartModule)) {
-
-                //Get group permissions handler
-                $gpermHandler = xoops_getHandler('groupperm');
-
-                //Get user's groups
-                $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : [XOOPS_GROUP_ANONYMOUS];
-
-                //Get all allowed item ids in this module and for this user's groups
-                $userpermissions          = $gpermHandler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
-                $permissions[$gperm_name] = $userpermissions;
-            }
-        }
-
-        //Return the permission array
-        return isset($permissions[$gperm_name]) ? $permissions[$gperm_name] : [];
-    }
-
-    /**
-     * @param $id
-     */
-    public function storeAllPermissionsForId($id)
-    {
-        foreach ($this->handler->getPermissions() as $permission) {
-            $this->saveItem_Permissions($_POST[$permission['perm_name']], $id, $permission['perm_name']);
-        }
-    }
-
-    /**
-     * Saves permissions for the selected item
-     *
-     *  saveItem_Permissions()
-     *
-     * @param  array  $groups    : group with granted permission
-     * @param  int    $itemid    categoryID on which we are setting permissions for Categories and Forums
-     * @param  string $perm_name : name of the permission
-     * @return bool   : TRUE if the no errors occured
-     */
-
-    public function saveItem_Permissions($groups, $itemid, $perm_name)
-    {
-        $smartModule = $this->handler->getModuleInfo();
-
-        $result       = true;
-        $module_id    = $smartModule->getVar('mid');
-        $gpermHandler = xoops_getHandler('groupperm');
-
-        // First, if the permissions are already there, delete them
-        $gpermHandler->deleteByModule($module_id, $perm_name, $itemid);
-        //echo "itemid: $itemid - perm: $perm_name - modid: $module_id";
-        //exit;
-        // Save the new permissions
-
-        if (count($groups) > 0) {
-            foreach ($groups as $group_id) {
-                $gpermHandler->addRight($perm_name, $itemid, $group_id, $module_id);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Delete all permission for a specific item
-     *
-     *  deletePermissions()
-     *
-     * @param  integer $itemid : id of the item for which to delete the permissions
-     * @param          $gperm_name
-     * @return bool:   TRUE if the no errors occured
-     */
-    public function deletePermissions($itemid, $gperm_name)
-    {
-        global $xoopsModule;
-
-        $smartModule =& smartsection_getModuleInfo();
-
-        $result       = true;
-        $module_id    = $smartModule->getVar('mid');
-        $gpermHandler = xoops_getHandler('groupperm');
-
-        $gpermHandler->deleteByModule($module_id, $gperm_name, $itemid);
-
-        return $result;
-    }
-
-    /**
-     * Checks if the user has access to a specific permission on a given object
-     *
-     * @param  string $gperm_name   name of the permission to test
-     * @param  int    $gperm_itemid id of the object to check
-     * @return boolean: TRUE if user has access, FALSE if not
-     **/
-    public function accessGranted($gperm_name, $gperm_itemid)
-    {
-        global $xoopsUser;
-
-        $gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : [XOOPS_GROUP_ANONYMOUS];
-        $smartModule   = $this->handler->getModuleInfo();
-        $gperm_modid   = $smartModule->getVar('mid');
-
-        //Get group permissions handler
-        $gpermHandler = xoops_getHandler('groupperm');
-
-        return $gpermHandler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
-    }
+	/**
+	 * @param        $gperm_name
+	 * @param  null  $id
+	 * @return array
+	 */
+	public function getGrantedItems($gperm_name, $id = null)
+	{
+		global $xoopsUser;
+		static $permissions;
+
+		if (!isset($permissions[$gperm_name]) || ($id !== null && !isset($permissions[$gperm_name][$id]))) {
+			$smartModule = $this->handler->getModuleInfo();
+
+			if (is_object($smartModule)) {
+
+				//Get group permissions handler
+				$gpermHandler = xoops_getHandler('groupperm');
+
+				//Get user's groups
+				$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : [XOOPS_GROUP_ANONYMOUS];
+
+				//Get all allowed item ids in this module and for this user's groups
+				$userpermissions          = $gpermHandler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
+				$permissions[$gperm_name] = $userpermissions;
+			}
+		}
+
+		//Return the permission array
+		return isset($permissions[$gperm_name]) ? $permissions[$gperm_name] : [];
+	}
+
+	/**
+	 * @param $id
+	 */
+	public function storeAllPermissionsForId($id)
+	{
+		foreach ($this->handler->getPermissions() as $permission) {
+			$this->saveItem_Permissions($_POST[$permission['perm_name']], $id, $permission['perm_name']);
+		}
+	}
+
+	/**
+	 * Saves permissions for the selected item
+	 *
+	 *  saveItem_Permissions()
+	 *
+	 * @param  array  $groups    : group with granted permission
+	 * @param  int    $itemid    categoryID on which we are setting permissions for Categories and Forums
+	 * @param  string $perm_name : name of the permission
+	 * @return bool   : TRUE if the no errors occured
+	 */
+
+	public function saveItem_Permissions($groups, $itemid, $perm_name)
+	{
+		$smartModule = $this->handler->getModuleInfo();
+
+		$result       = true;
+		$module_id    = $smartModule->getVar('mid');
+		$gpermHandler = xoops_getHandler('groupperm');
+
+		// First, if the permissions are already there, delete them
+		$gpermHandler->deleteByModule($module_id, $perm_name, $itemid);
+		//echo "itemid: $itemid - perm: $perm_name - modid: $module_id";
+		//exit;
+		// Save the new permissions
+
+		if (count($groups) > 0) {
+			foreach ($groups as $group_id) {
+				$gpermHandler->addRight($perm_name, $itemid, $group_id, $module_id);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Delete all permission for a specific item
+	 *
+	 *  deletePermissions()
+	 *
+	 * @param  integer $itemid : id of the item for which to delete the permissions
+	 * @param          $gperm_name
+	 * @return bool:   TRUE if the no errors occured
+	 */
+	public function deletePermissions($itemid, $gperm_name)
+	{
+		global $xoopsModule;
+
+		$smartModule =& smartsection_getModuleInfo();
+
+		$result       = true;
+		$module_id    = $smartModule->getVar('mid');
+		$gpermHandler = xoops_getHandler('groupperm');
+
+		$gpermHandler->deleteByModule($module_id, $gperm_name, $itemid);
+
+		return $result;
+	}
+
+	/**
+	 * Checks if the user has access to a specific permission on a given object
+	 *
+	 * @param  string $gperm_name   name of the permission to test
+	 * @param  int    $gperm_itemid id of the object to check
+	 * @return boolean: TRUE if user has access, FALSE if not
+	 **/
+	public function accessGranted($gperm_name, $gperm_itemid)
+	{
+		global $xoopsUser;
+
+		$gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : [XOOPS_GROUP_ANONYMOUS];
+		$smartModule   = $this->handler->getModuleInfo();
+		$gperm_modid   = $smartModule->getVar('mid');
+
+		//Get group permissions handler
+		$gpermHandler = xoops_getHandler('groupperm');
+
+		return $gpermHandler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
+	}
 }

class/rating.php

Indentation +208 added lines, -208 removed lines

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

Spacing +6 added lines, -6 removed lines

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

class/smartobjectsingleview.php

Indentation +112 added lines, -112 removed lines

@@ -20,39 +20,39 @@ 
  */
 class SmartObjectRow
 {
-    public $_keyname;
-    public $_align;
-    public $_customMethodForValue;
-    public $_header;
-    public $_class;
+	public $_keyname;
+	public $_align;
+	public $_customMethodForValue;
+	public $_header;
+	public $_class;
 
-    /**
-     * SmartObjectRow constructor.
-     * @param      $keyname
-     * @param bool $customMethodForValue
-     * @param bool $header
-     * @param bool $class
-     */
-    public function __construct($keyname, $customMethodForValue = false, $header = false, $class = false)
-    {
-        $this->_keyname              = $keyname;
-        $this->_customMethodForValue = $customMethodForValue;
-        $this->_header               = $header;
-        $this->_class                = $class;
-    }
+	/**
+	 * SmartObjectRow constructor.
+	 * @param      $keyname
+	 * @param bool $customMethodForValue
+	 * @param bool $header
+	 * @param bool $class
+	 */
+	public function __construct($keyname, $customMethodForValue = false, $header = false, $class = false)
+	{
+		$this->_keyname              = $keyname;
+		$this->_customMethodForValue = $customMethodForValue;
+		$this->_header               = $header;
+		$this->_class                = $class;
+	}
 
-    public function getKeyName()
-    {
-        return $this->_keyname;
-    }
+	public function getKeyName()
+	{
+		return $this->_keyname;
+	}
 
-    /**
-     * @return bool
-     */
-    public function isHeader()
-    {
-        return $this->_header;
-    }
+	/**
+	 * @return bool
+	 */
+	public function isHeader()
+	{
+		return $this->_header;
+	}
 }
 
 /**
@@ -66,94 +66,94 @@ 
  */
 class SmartObjectSingleView
 {
-    public $_object;
-    public $_userSide;
-    public $_tpl;
-    public $_rows;
-    public $_actions;
-    public $_headerAsRow = true;
+	public $_object;
+	public $_userSide;
+	public $_tpl;
+	public $_rows;
+	public $_actions;
+	public $_headerAsRow = true;
 
-    /**
-     * Constructor
-     * @param       $object
-     * @param bool  $userSide
-     * @param array $actions
-     * @param bool  $headerAsRow
-     */
-    public function __construct($object, $userSide = false, $actions = [], $headerAsRow = true)
-    {
-        $this->_object      = $object;
-        $this->_userSide    = $userSide;
-        $this->_actions     = $actions;
-        $this->_headerAsRow = $headerAsRow;
-    }
+	/**
+	 * Constructor
+	 * @param       $object
+	 * @param bool  $userSide
+	 * @param array $actions
+	 * @param bool  $headerAsRow
+	 */
+	public function __construct($object, $userSide = false, $actions = [], $headerAsRow = true)
+	{
+		$this->_object      = $object;
+		$this->_userSide    = $userSide;
+		$this->_actions     = $actions;
+		$this->_headerAsRow = $headerAsRow;
+	}
 
-    /**
-     * @param $rowObj
-     */
-    public function addRow($rowObj)
-    {
-        $this->_rows[] = $rowObj;
-    }
+	/**
+	 * @param $rowObj
+	 */
+	public function addRow($rowObj)
+	{
+		$this->_rows[] = $rowObj;
+	}
 
-    /**
-     * @param  bool $fetchOnly
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function render($fetchOnly = false, $debug = false)
-    {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+	/**
+	 * @param  bool $fetchOnly
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false, $debug = false)
+	{
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        $this->_tpl             = new XoopsTpl();
-        $vars                   = $this->_object->vars;
-        $smartobjectObjectArray = [];
+		$this->_tpl             = new XoopsTpl();
+		$vars                   = $this->_object->vars;
+		$smartobjectObjectArray = [];
 
-        foreach ($this->_rows as $row) {
-            $key = $row->getKeyName();
-            if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
-                $method = $row->_customMethodForValue;
-                $value  = $this->_object->$method();
-            } else {
-                $value = $this->_object->getVar($row->getKeyName());
-            }
-            if ($row->isHeader()) {
-                $this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
-                $this->_tpl->assign('smartobject_single_view_header_value', $value);
-            } else {
-                $smartobjectObjectArray[$key]['value']   = $value;
-                $smartobjectObjectArray[$key]['header']  = $row->isHeader();
-                $smartobjectObjectArray[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
-            }
-        }
-        $action_row = '';
-        if (in_array('edit', $this->_actions)) {
-            $action_row .= $this->_object->getEditItemLink(false, true, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $action_row .= $this->_object->getDeleteItemLink(false, true, true);
-        }
-        if ($action_row) {
-            $smartobjectObjectArray['zaction']['value']   = $action_row;
-            $smartobjectObjectArray['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
-        }
+		foreach ($this->_rows as $row) {
+			$key = $row->getKeyName();
+			if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
+				$method = $row->_customMethodForValue;
+				$value  = $this->_object->$method();
+			} else {
+				$value = $this->_object->getVar($row->getKeyName());
+			}
+			if ($row->isHeader()) {
+				$this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
+				$this->_tpl->assign('smartobject_single_view_header_value', $value);
+			} else {
+				$smartobjectObjectArray[$key]['value']   = $value;
+				$smartobjectObjectArray[$key]['header']  = $row->isHeader();
+				$smartobjectObjectArray[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
+			}
+		}
+		$action_row = '';
+		if (in_array('edit', $this->_actions)) {
+			$action_row .= $this->_object->getEditItemLink(false, true, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$action_row .= $this->_object->getDeleteItemLink(false, true, true);
+		}
+		if ($action_row) {
+			$smartobjectObjectArray['zaction']['value']   = $action_row;
+			$smartobjectObjectArray['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
+		}
 
-        $this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
-        $this->_tpl->assign('smartobject_object_array', $smartobjectObjectArray);
+		$this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
+		$this->_tpl->assign('smartobject_object_array', $smartobjectObjectArray);
 
-        if ($fetchOnly) {
-            return $this->_tpl->fetch('db:smartobject_singleview_display.tpl');
-        } else {
-            $this->_tpl->display('db:smartobject_singleview_display.tpl');
-        }
-    }
+		if ($fetchOnly) {
+			return $this->_tpl->fetch('db:smartobject_singleview_display.tpl');
+		} else {
+			$this->_tpl->display('db:smartobject_singleview_display.tpl');
+		}
+	}
 
-    /**
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function fetch($debug = false)
-    {
-        return $this->render(true, $debug);
-    }
+	/**
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function fetch($debug = false)
+	{
+		return $this->render(true, $debug);
+	}
 }

class/form/smartobjectform.php

Indentation +810 added lines, -810 removed lines

@@ -30,803 +30,803 @@ 
  */
 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, 'post', true);
-        $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()
-    {
-        require_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    = [
-            '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, 'post', true);
+		$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()
+	{
+		require_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    = [
+			'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, [
-                                '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, [
-                                '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, [
-                                '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':
-                require_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, [
+								'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, [
+								'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, [
+								'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':
+				require_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':
-                require_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':
-                require_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':
-                require_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')) {
-                        require_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)) {
-                            require_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 = [
-                '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          = [];
-        $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)) {
-            require_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')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php';
-                            $editor = new XoopsFormTinyTextArea([
-                                                                    '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')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php';
-                            $editor = new XoopsFormFckeditor([
-                                                                 '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')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php';
-                            $editor = new XoopsFormInbetweenTextArea([
-                                                                         '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')) {
-                            require_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')) {
-                            require_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')) {
-                            require_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 = [];
-        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':
+				require_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':
+				require_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':
+				require_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')) {
+						require_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)) {
+							require_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 = [
+				'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          = [];
+		$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)) {
+			require_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')) {
+							require_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php';
+							$editor = new XoopsFormTinyTextArea([
+																	'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')) {
+							require_once XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php';
+							$editor = new XoopsFormFckeditor([
+																 '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')) {
+							require_once XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php';
+							$editor = new XoopsFormInbetweenTextArea([
+																		 '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')) {
+							require_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')) {
+							require_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')) {
+							require_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 = [];
+		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() . ">
             <table width='100%' class='outer' cellspacing='1'>
             <tr><th colspan='2'>" . $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 = [];
-        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, [
-            '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 = [];
+		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, [
+			'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;
                     }
@@ -834,12 +834,12 @@ 
                 }
                 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;
                         }
@@ -847,8 +847,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;
                         }
@@ -856,25 +856,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 +52 added lines, -52 removed lines

@@ -15,9 +15,9 @@ 
 /**
  * Including the XoopsFormLoader classes
  */
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsectionclose.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsection.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/form/elements/smartformsectionclose.php';
 
 /**
  * SmartForm base class
@@ -60,7 +60,7 @@ 
         $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;
@@ -88,7 +88,7 @@ 
 
     public function addCaptcha()
     {
-        require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php';
+        require_once SMARTOBJECT_ROOT_PATH.'include/captcha/formcaptcha.php';
         $this->addElement(new XoopsFormCaptcha(), true);
     }
 
@@ -99,7 +99,7 @@ 
      */
     public function addCustomButton($name, $caption, $onclick = false)
     {
-        $custom_button_array    = [
+        $custom_button_array = [
             'name'    => $name,
             'caption' => $caption,
             'onclick' => $onclick
@@ -120,7 +120,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);
@@ -131,7 +131,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']);
@@ -298,8 +298,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']);
@@ -331,7 +331,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
@@ -339,7 +339,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);
@@ -349,7 +349,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)"');
         }
@@ -367,7 +367,7 @@ 
     {
         switch ($controlName) {
             case 'check':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php';
+                require_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']);
@@ -434,38 +434,38 @@ 
                 break;
 
             case 'urllink':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformurllinkelement.php';
+                require_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':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformrichfileelement.php';
+                require_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':
-                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php';
+                require_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')) {
-                        require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php';
+                    if (file_exists(SMARTOBJECT_ROOT_PATH.'class/form/elements/'.strtolower($classname).'.php')) {
+                        require_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)) {
-                            require_once $moduleFormElementsPath . $classFileName;
+                        if (file_exists($moduleFormElementsPath.$classFileName)) {
+                            require_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
                         }
@@ -534,7 +534,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)) {
             require_once $xoopseditorclass;
@@ -544,8 +544,8 @@ 
 
                 case 'tiny':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinytextarea.php';
                             $editor = new XoopsFormTinyTextArea([
                                                                     'caption' => $caption,
                                                                     'name'    => $name,
@@ -575,8 +575,8 @@ 
 
                 case 'fckeditor':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/fckeditor/formfckeditor.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/fckeditor/formfckeditor.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/xoopseditor/fckeditor/formfckeditor.php';
                             $editor = new XoopsFormFckeditor([
                                                                  'caption' => $caption,
                                                                  'name'    => $name,
@@ -598,8 +598,8 @@ 
 
                 case 'inbetween':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/inbetween/forminbetweentextarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/inbetween/forminbetweentextarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/xoopseditor/inbetween/forminbetweentextarea.php';
                             $editor = new XoopsFormInbetweenTextArea([
                                                                          'caption' => $caption,
                                                                          'name'    => $name,
@@ -621,8 +621,8 @@ 
 
                 case 'koivi':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php';
                             $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, '100%', '400px');
                         } else {
                             if ($dhtml) {
@@ -638,8 +638,8 @@ 
 
                 case 'spaw':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/spaw/formspaw.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/spaw/formspaw.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/spaw/formspaw.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/spaw/formspaw.php';
                             $editor = new XoopsFormSpaw($caption, $name, $value);
                         }
                     } else {
@@ -649,8 +649,8 @@ 
 
                 case 'htmlarea':
                     if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php';
+                        if (is_readable(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php')) {
+                            require_once XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php';
                             $editor = new XoopsFormHtmlarea($caption, $name, $value);
                         }
                     } else {
@@ -686,10 +686,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 = [];
         while (false !== ($file = readdir($handle))) {
-            if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file)
+            if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/", $file)
                 && strtolower($file) !== 'cvs') {
                 $dirlist[$file] = $file;
             }
@@ -711,7 +711,7 @@ 
     {
         foreach ($this->_elements as $eleObj) {
             if ($eleObj->getName() == $keyname) {
-                $ret =& $eleObj;
+                $ret = & $eleObj;
                 break;
             }
         }
@@ -728,9 +728,9 @@ 
     {
         $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() . ">
+            <form name='" . $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>
+            <tr><th colspan='2'>" . $this->getTitle().'</th></tr>
         ';
         $hidden   = '';
         $class    = 'even';
@@ -739,11 +739,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();
             }
@@ -789,7 +789,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
         ]);
@@ -807,7 +807,7 @@ 
         }
         $myts     = MyTextSanitizer::getInstance();
         $formname = $this->getName();
-        $js       .= "function xoopsFormValidate_{$formname}(myform) {";
+        $js .= "function xoopsFormValidate_{$formname}(myform) {";
         // First, output code to check required elements
         $elements = $this->getRequired();
         foreach ($elements as $elt) {
@@ -858,15 +858,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";
                 }
             }
         }