mambax7 / smartobject

class/smartobjecthandler.php

Doc Comments +4 added lines, -4 removed lines

@@ -132,10 +132,10 @@ 
      *
      * @param object|XoopsDatabase $db           {@link XoopsDatabase}
      *                                           object
-     * @param                      $itemname
+     * @param                      string $itemname
      * @param string               $keyname      Name of the table key that uniquely identify each {@link SmartObject}
      * @param string               $idenfierName Name of the field which properly identify the {@link SmartObject}
-     * @param                      $summaryName
+     * @param                      string $summaryName
      * @param                      $modulename
      * @internal param string $tablename Name of the table use to store this <a href='psi_element://SmartObject'>SmartObject</a>
      * @internal param Name $string of the class derived from <a href='psi_element://SmartObject'>SmartObject</a> and which this handler is handling and which this handler is handling
@@ -191,7 +191,7 @@ 
 
     /**
      * @param $criteria
-     * @param $perm_name
+     * @param boolean $perm_name
      * @return bool
      */
     public function setGrantedObjectsCriteria(&$criteria, $perm_name)
@@ -375,7 +375,7 @@ 
     }
 
     /**
-     * @param       $sql
+     * @param       string $sql
      * @param       $criteria
      * @param  bool $force
      * @param  bool $debug

Indentation +966 added lines, -966 removed lines

@@ -25,970 +25,970 @@
  */
 class SmartPersistableObjectHandler extends XoopsObjectHandler
 {
-    public $_itemname;
-
-    /**
-     * Name of the table use to store this {@link SmartObject}
-     *
-     * Note that the name of the table needs to be free of the database prefix.
-     * For example "smartsection_categories"
-     * @var string
-     */
-    public $table;
-
-    /**
-     * Name of the table key that uniquely identify each {@link SmartObject}
-     *
-     * For example: "categoryid"
-     * @var string
-     */
-    public $keyName;
-
-    /**
-     * Name of the class derived from {@link SmartObject} and which this handler is handling
-     *
-     * Note that this string needs to be lowercase
-     *
-     * For example: "smartsectioncategory"
-     * @var string
-     */
-    public $className;
-
-    /**
-     * Name of the field which properly identify the {@link SmartObject}
-     *
-     * For example: "name" (this will be the category's name)
-     * @var string
-     */
-    public $identifierName;
-
-    /**
-     * Name of the field which will be use as a summary for the object
-     *
-     * For example: "summary"
-     * @var string
-     */
-    public $summaryName;
-
-    /**
-     * Page name use to basically manage and display the {@link SmartObject}
-     *
-     * This page needs to be the same in user side and admin side
-     *
-     * For example category.php - we will deduct smartsection/category.php as well as smartsection/admin/category.php
-     * @todo this could probably be automatically deducted from the class name - for example, the class SmartsectionCategory will have "category.php" as it's managing page
-     * @var string
-     */
-    public $_page;
-
-    /**
-     * Full path of the module using this {@link SmartObject}
-     *
-     * <code>XOOPS_URL . "/modules/smartsection/"</code>
-     * @todo this could probably be automatically deducted from the class name as it is always prefixed with the module name
-     * @var string
-     */
-    public $_modulePath;
-
-    public $_moduleUrl;
-
-    public $_moduleName;
-
-    public $_uploadUrl;
-
-    public $_uploadPath;
-
-    public $_allowedMimeTypes = 0;
-
-    public $_maxFileSize = 1000000;
-
-    public $_maxWidth = 500;
-
-    public $_maxHeight = 500;
-
-    public $highlightFields = array();
-
-    /**
-     * Array containing the events name and functions
-     *
-     * @var array
-     */
-    public $eventArray = array();
-
-    /**
-     * Array containing the permissions that this handler will manage on the objects
-     *
-     * @var array
-     */
-    public $permissionsArray = false;
-
-    public $generalSQL = false;
-
-    public $_eventHooks     = array();
-    public $_disabledEvents = array();
-
-    /**
-     * Constructor - called from child classes
-     *
-     * @param object|XoopsDatabase $db           {@link XoopsDatabase}
-     *                                           object
-     * @param                      $itemname
-     * @param string               $keyname      Name of the table key that uniquely identify each {@link SmartObject}
-     * @param string               $idenfierName Name of the field which properly identify the {@link SmartObject}
-     * @param                      $summaryName
-     * @param                      $modulename
-     * @internal param string $tablename Name of the table use to store this <a href='psi_element://SmartObject'>SmartObject</a>
-     * @internal param Name $string of the class derived from <a href='psi_element://SmartObject'>SmartObject</a> and which this handler is handling and which this handler is handling
-     * @internal param string $page Page name use to basically manage and display the <a href='psi_element://SmartObject'>SmartObject</a>
-     * @internal param string $moduleName name of the module
-     */
-    public function __construct(XoopsDatabase $db, $itemname, $keyname, $idenfierName, $summaryName, $modulename)
-    {
-        parent::__construct($db);
-
-        $this->_itemname      = $itemname;
-        $this->_moduleName    = $modulename;
-        $this->table          = $db->prefix($modulename . '_' . $itemname);
-        $this->keyName        = $keyname;
-        $this->className      = ucfirst($modulename) . ucfirst($itemname);
-        $this->identifierName = $idenfierName;
-        $this->summaryName    = $summaryName;
-        $this->_page          = $itemname . '.php';
-        $this->_modulePath    = XOOPS_ROOT_PATH . '/modules/' . $this->_moduleName . '/';
-        $this->_moduleUrl     = XOOPS_URL . '/modules/' . $this->_moduleName . '/';
-        $this->_uploadPath    = XOOPS_UPLOAD_PATH . '/' . $this->_moduleName . '/';
-        $this->_uploadUrl     = XOOPS_UPLOAD_URL . '/' . $this->_moduleName . '/';
-    }
-
-    /**
-     * @param $event
-     * @param $method
-     */
-    public function addEventHook($event, $method)
-    {
-        $this->_eventHooks[$event] = $method;
-    }
-
-    /**
-     * Add a permission that this handler will manage for its objects
-     *
-     * Example: $this->addPermission('view', _AM_SSHOP_CAT_PERM_READ, _AM_SSHOP_CAT_PERM_READ_DSC);
-     *
-     * @param string      $perm_name   name of the permission
-     * @param string      $caption     caption of the control that will be displayed in the form
-     * @param bool|string $description description of the control that will be displayed in the form
-     */
-    public function addPermission($perm_name, $caption, $description = false)
-    {
-        include_once(SMARTOBJECT_ROOT_PATH . 'class/smartobjectpermission.php');
-
-        $this->permissionsArray[] = array(
-            'perm_name'   => $perm_name,
-            'caption'     => $caption,
-            'description' => $description
-        );
-    }
-
-    /**
-     * @param $criteria
-     * @param $perm_name
-     * @return bool
-     */
-    public function setGrantedObjectsCriteria(&$criteria, $perm_name)
-    {
-        $smartPermissionsHandler = new SmartobjectPermissionHandler($this);
-        $grantedItems             = $smartPermissionsHandler->getGrantedItems($perm_name);
-        if (count($grantedItems) > 0) {
-            $criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param bool $_uploadPath
-     * @param bool $_allowedMimeTypes
-     * @param bool $_maxFileSize
-     * @param bool $_maxWidth
-     * @param bool $_maxHeight
-     */
-    public function setUploaderConfig($_uploadPath = false, $_allowedMimeTypes = false, $_maxFileSize = false, $_maxWidth = false, $_maxHeight = false)
-    {
-        $this->_uploadPath       = $_uploadPath ?: $this->_uploadPath;
-        $this->_allowedMimeTypes = $_allowedMimeTypes ?: $this->_allowedMimeTypes;
-        $this->_maxFileSize      = $_maxFileSize ?: $this->_maxFileSize;
-        $this->_maxWidth         = $_maxWidth ?: $this->_maxWidth;
-        $this->_maxHeight        = $_maxHeight ?: $this->_maxHeight;
-    }
-
-    /**
-     * create a new {@link SmartObject}
-     *
-     * @param bool $isNew Flag the new objects as "new"?
-     *
-     * @return object {@link SmartObject}
-     */
-    public function &create($isNew = true)
-    {
-        $obj = new $this->className($this);
-        $obj->setImageDir($this->getImageUrl(), $this->getImagePath());
-        if (!$obj->handler) {
-            $obj->handler =& $this;
-        }
-
-        if ($isNew === true) {
-            $obj->setNew();
-        }
-
-        return $obj;
-    }
-
-    /**
-     * @return string
-     */
-    public function getImageUrl()
-    {
-        return $this->_uploadUrl . $this->_itemname . '/';
-    }
-
-    /**
-     * @return string
-     */
-    public function getImagePath()
-    {
-        $dir = $this->_uploadPath . $this->_itemname;
-        if (!file_exists($dir)) {
-            smart_admin_mkdir($dir);
-        }
-
-        return $dir . '/';
-    }
-
-    /**
-     * retrieve a {@link SmartObject}
-     *
-     * @param  mixed $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
-     * @param  bool  $as_object whether to return an object or an array
-     * @param  bool  $debug
-     * @param  bool  $criteria
-     * @return mixed reference to the <a href='psi_element://SmartObject'>SmartObject</a>, FALSE if failed
-     *                          FALSE if failed
-     */
-    public function get($id, $as_object = true, $debug = false, $criteria = false)
-    {
-        if (!$criteria) {
-            $criteria = new CriteriaCompo();
-        }
-        if (is_array($this->keyName)) {
-            for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                /**
-                 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
-                 * Is the fact that we removed the (int)() represents a security risk ?
-                 */
-                //$criteria->add(new Criteria($this->keyName[$i], ($id[$i]), '=', $this->_itemname));
-                $criteria->add(new Criteria($this->keyName[$i], $id[$i], '=', $this->_itemname));
-            }
-        } else {
-            //$criteria = new Criteria($this->keyName, (int)($id), '=', $this->_itemname);
-            /**
-             * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
-             * Is the fact that we removed the (int)() represents a security risk ?
-             */
-            $criteria->add(new Criteria($this->keyName, $id, '=', $this->_itemname));
-        }
-        $criteria->setLimit(1);
-        if ($debug) {
-            $obj_array = $this->getObjectsD($criteria, false, $as_object);
-        } else {
-            $obj_array = $this->getObjects($criteria, false, $as_object);
-            //patch: weird bug of indexing by id even if id_as_key = false;
-            if (!isset($obj_array[0]) && is_object($obj_array[$id])) {
-                $obj_array[0] = $obj_array[$id];
-                unset($obj_array[$id]);
-                $obj_array[0]->unsetNew();
-            }
-        }
-
-        if (count($obj_array) != 1) {
-            $obj =& $this->create();
-
-            return $obj;
-        }
-
-        return $obj_array[0];
-    }
-
-    /**
-     * retrieve a {@link SmartObject}
-     *
-     * @param  mixed $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
-     * @param  bool  $as_object whether to return an object or an array
-     * @return mixed reference to the {@link SmartObject}, FALSE if failed
-     */
-    public function &getD($id, $as_object = true)
-    {
-        return $this->get($id, $as_object, true);
-    }
-
-    /**
-     * retrieve objects from the database
-     *
-     * @param object $criteria  {@link CriteriaElement} conditions to be met
-     * @param bool   $id_as_key use the ID as key for the array?
-     * @param bool   $as_object return an array of objects?
-     *
-     * @param  bool  $sql
-     * @param  bool  $debug
-     * @return array
-     */
-    public function getObjects($criteria = null, $id_as_key = false, $as_object = true, $sql = false, $debug = false)
-    {
-        $ret   = array();
-        $limit = $start = 0;
-
-        if ($this->generalSQL) {
-            $sql = $this->generalSQL;
-        } elseif (!$sql) {
-            $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname;
-        }
-
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-
-        return $this->convertResultSet($result, $id_as_key, $as_object);
-    }
-
-    /**
-     * @param       $sql
-     * @param       $criteria
-     * @param  bool $force
-     * @param  bool $debug
-     * @return array
-     */
-    public function query($sql, $criteria, $force = false, $debug = false)
-    {
-        $ret = array();
-
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->groupby) {
-                $sql .= $criteria->getGroupby();
-            }
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-        }
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        if ($force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-
-        if (!$result) {
-            return $ret;
-        }
-
-        while ($myrow = $this->db->fetchArray($result)) {
-            $ret[] = $myrow;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * retrieve objects with debug mode - so will show the query
-     *
-     * @param object $criteria  {@link CriteriaElement} conditions to be met
-     * @param bool   $id_as_key use the ID as key for the array?
-     * @param bool   $as_object return an array of objects?
-     *
-     * @param  bool  $sql
-     * @return array
-     */
-    public function getObjectsD($criteria = null, $id_as_key = false, $as_object = true, $sql = false)
-    {
-        return $this->getObjects($criteria, $id_as_key, $as_object, $sql, true);
-    }
-
-    /**
-     * @param $arrayObjects
-     * @return array|bool
-     */
-    public function getObjectsAsArray($arrayObjects)
-    {
-        $ret = array();
-        foreach ($arrayObjects as $key => $object) {
-            $ret[$key] = $object->toArray();
-        }
-        if (count($ret > 0)) {
-            return $ret;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Convert a database resultset to a returnable array
-     *
-     * @param object $result    database resultset
-     * @param bool   $id_as_key - should NOT be used with joint keys
-     * @param bool   $as_object
-     *
-     * @return array
-     */
-    public function convertResultSet($result, $id_as_key = false, $as_object = true)
-    {
-        $ret = array();
-        while ($myrow = $this->db->fetchArray($result)) {
-            $obj =& $this->create(false);
-            $obj->assignVars($myrow);
-            if (!$id_as_key) {
-                if ($as_object) {
-                    $ret[] =& $obj;
-                } else {
-                    $ret[] = $obj->toArray();
-                }
-            } else {
-                if ($as_object) {
-                    $value =& $obj;
-                } else {
-                    $value = $obj->toArray();
-                }
-                if ($id_as_key === 'parentid') {
-                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] =& $value;
-                } else {
-                    $ret[$obj->getVar($this->keyName)] = $value;
-                }
-            }
-            unset($obj);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param  null $criteria
-     * @param  int  $limit
-     * @param  int  $start
-     * @return array
-     */
-    public function getListD($criteria = null, $limit = 0, $start = 0)
-    {
-        return $this->getList($criteria, $limit, $start, true);
-    }
-
-    /**
-     * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
-     *
-     * @param object $criteria {@link CriteriaElement} conditions to be met
-     * @param int    $limit    Max number of objects to fetch
-     * @param int    $start    Which record to start at
-     *
-     * @param  bool  $debug
-     * @return array
-     */
-    public function getList($criteria = null, $limit = 0, $start = 0, $debug = false)
-    {
-        $ret = array();
-        if ($criteria == null) {
-            $criteria = new CriteriaCompo();
-        }
-
-        if ($criteria->getSort() == '') {
-            $criteria->setSort($this->getIdentifierName());
-        }
-
-        $sql = 'SELECT ' . (is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName);
-        if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->getIdentifierName();
-        }
-        $sql .= ' FROM ' . $this->table . ' AS ' . $this->_itemname;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-
-        $myts = MyTextSanitizer::getInstance();
-        while ($myrow = $this->db->fetchArray($result)) {
-            //identifiers should be textboxes, so sanitize them like that
-            $ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->displayTarea($myrow[$this->identifierName]);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * count objects matching a condition
-     *
-     * @param  object $criteria {@link CriteriaElement} to match
-     * @return int    count of objects
-     */
-    public function getCount($criteria = null)
-    {
-        $field   = '';
-        $groupby = false;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            if ($criteria->groupby != '') {
-                $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
-            }
-        }
-        /**
-         * if we have a generalSQL, lets used this one.
-         * This needs to be improved...
-         */
-        if ($this->generalSQL) {
-            $sql = $this->generalSQL;
-            $sql = str_replace('SELECT *', 'SELECT COUNT(*)', $sql);
-        } else {
-            $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table . ' AS ' . $this->_itemname;
-        }
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->groupby != '') {
-                $sql .= $criteria->getGroupby();
-            }
-        }
-
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        if ($groupby == false) {
-            list($count) = $this->db->fetchRow($result);
-
-            return $count;
-        } else {
-            $ret = array();
-            while (list($id, $count) = $this->db->fetchRow($result)) {
-                $ret[$id] = $count;
-            }
-
-            return $ret;
-        }
-    }
-
-    /**
-     * delete an object from the database
-     *
-     * @param  XoopsObject $obj reference to the object to delete
-     * @param  bool        $force
-     * @return bool        FALSE if failed.
-     */
-    public function delete(XoopsObject $obj, $force = false)
-    {
-        $eventResult = $this->executeEvent('beforeDelete', $obj);
-        if (!$eventResult) {
-            $obj->setErrors('An error occured during the BeforeDelete event');
-
-            return false;
-        }
-
-        if (is_array($this->keyName)) {
-            $clause = array();
-            for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
-            }
-            $whereclause = implode(' AND ', $clause);
-        } else {
-            $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
-        }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-
-        $eventResult = $this->executeEvent('afterDelete', $obj);
-        if (!$eventResult) {
-            $obj->setErrors('An error occured during the AfterDelete event');
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param $event
-     */
-    public function disableEvent($event)
-    {
-        if (is_array($event)) {
-            foreach ($event as $v) {
-                $this->_disabledEvents[] = $v;
-            }
-        } else {
-            $this->_disabledEvents[] = $event;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getPermissions()
-    {
-        return $this->permissionsArray;
-    }
-
-    /**
-     * insert a new object in the database
-     *
-     * @param  XoopsObject $obj         reference to the object
-     * @param  bool        $force       whether to force the query execution despite security settings
-     * @param  bool        $checkObject check if the object is dirty and clean the attributes
-     * @param  bool        $debug
-     * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
-     */
-    public function insert(XoopsObject $obj, $force = false, $checkObject = true, $debug = false)
-    {
-        if ($checkObject != false) {
-            if (!is_object($obj)) {
-                return false;
-            }
-            /**
-             * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
-             */
-            if (!is_a($obj, $this->className)) {
-                $obj->setError(get_class($obj) . ' Differs from ' . $this->className);
-
-                return false;
-            }
-            if (!$obj->isDirty()) {
-                $obj->setErrors('Not dirty'); //will usually not be outputted as errors are not displayed when the method returns true, but it can be helpful when troubleshooting code - Mith
-
-                return true;
-            }
-        }
-
-        if ($obj->seoEnabled) {
-            // Auto create meta tags if empty
-            $smartobjectMetagen = new SmartMetagen($obj->title(), $obj->getVar('meta_keywords'), $obj->summary());
-
-            if (!$obj->getVar('meta_keywords') || !$obj->getVar('meta_description')) {
-                if (!$obj->meta_keywords()) {
-                    $obj->setVar('meta_keywords', $smartobjectMetagen->_keywords);
-                }
-
-                if (!$obj->meta_description()) {
-                    $obj->setVar('meta_description', $smartobjectMetagen->_meta_description);
-                }
-            }
-
-            // Auto create short_url if empty
-            if (!$obj->short_url()) {
-                $obj->setVar('short_url', $smartobjectMetagen->generateSeoTitle($obj->title('n'), false));
-            }
-        }
-
-        $eventResult = $this->executeEvent('beforeSave', $obj);
-        if (!$eventResult) {
-            $obj->setErrors('An error occured during the BeforeSave event');
-
-            return false;
-        }
-
-        if ($obj->isNew()) {
-            $eventResult = $this->executeEvent('beforeInsert', $obj);
-            if (!$eventResult) {
-                $obj->setErrors('An error occured during the BeforeInsert event');
-
-                return false;
-            }
-        } else {
-            $eventResult = $this->executeEvent('beforeUpdate', $obj);
-            if (!$eventResult) {
-                $obj->setErrors('An error occured during the BeforeUpdate event');
-
-                return false;
-            }
-        }
-        if (!$obj->cleanVars()) {
-            $obj->setErrors('Variables were not cleaned properly.');
-
-            return false;
-        }
-        $fieldsToStoreInDB = array();
-        foreach ($obj->cleanVars as $k => $v) {
-            if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
-                $cleanvars[$k] = (int)$v;
-            } elseif (is_array($v)) {
-                $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
-            } else {
-                $cleanvars[$k] = $this->db->quoteString($v);
-            }
-            if ($obj->vars[$k]['persistent']) {
-                $fieldsToStoreInDB[$k] = $cleanvars[$k];
-            }
-        }
-        if ($obj->isNew()) {
-            if (!is_array($this->keyName)) {
-                if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
-                }
-            }
-
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($fieldsToStoreInDB)) . ') VALUES (' . implode(',', array_values($fieldsToStoreInDB)) . ')';
-        } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
-            foreach ($fieldsToStoreInDB as $key => $value) {
-                if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
-                    continue;
-                }
-                if (isset($notfirst)) {
-                    $sql .= ',';
-                }
-                $sql .= ' ' . $key . ' = ' . $value;
-                $notfirst = true;
-            }
-            if (is_array($this->keyName)) {
-                $whereclause = '';
-                for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                    if ($i > 0) {
-                        $whereclause .= ' AND ';
-                    }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
-                }
-            } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
-            }
-            $sql .= ' WHERE ' . $whereclause;
-        }
-
-        if ($debug) {
-            xoops_debug($sql);
-        }
-
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-
-        if (!$result) {
-            $obj->setErrors($this->db->error());
-
-            return false;
-        }
-
-        if ($obj->isNew() && !is_array($this->keyName)) {
-            $obj->assignVar($this->keyName, $this->db->getInsertId());
-        }
-        $eventResult = $this->executeEvent('afterSave', $obj);
-        if (!$eventResult) {
-            $obj->setErrors('An error occured during the AfterSave event');
-
-            return false;
-        }
-
-        if ($obj->isNew()) {
-            $obj->unsetNew();
-            $eventResult = $this->executeEvent('afterInsert', $obj);
-            if (!$eventResult) {
-                $obj->setErrors('An error occured during the AfterInsert event');
-
-                return false;
-            }
-        } else {
-            $eventResult = $this->executeEvent('afterUpdate', $obj);
-            if (!$eventResult) {
-                $obj->setErrors('An error occured during the AfterUpdate event');
-
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @param       $obj
-     * @param  bool $force
-     * @param  bool $checkObject
-     * @param  bool $debug
-     * @return bool
-     */
-    public function insertD(&$obj, $force = false, $checkObject = true, $debug = false)
-    {
-        return $this->insert($obj, $force, $checkObject, true);
-    }
-
-    /**
-     * Change a value for objects with a certain criteria
-     *
-     * @param string $fieldname  Name of the field
-     * @param string $fieldvalue Value to write
-     * @param object $criteria   {@link CriteriaElement}
-     *
-     * @param  bool  $force
-     * @return bool
-     */
-    public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
-    {
-        $set_clause = $fieldname . ' = ';
-        if (is_numeric($fieldvalue)) {
-            $set_clause .= $fieldvalue;
-        } elseif (is_array($fieldvalue)) {
-            $set_clause .= $this->db->quoteString(implode(',', $fieldvalue));
-        } else {
-            $set_clause .= $this->db->quoteString($fieldvalue);
-        }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (false != $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * delete all objects meeting the conditions
-     *
-     * @param  object $criteria {@link CriteriaElement} with conditions to meet
-     * @return bool
-     */
-
-    public function deleteAll($criteria = null)
-    {
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
-            if (!$this->db->query($sql)) {
-                return false;
-            }
-            $rows = $this->db->getAffectedRows();
-
-            return $rows > 0 ? $rows : true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getModuleInfo()
-    {
-        return smart_getModuleInfo($this->_moduleName);
-    }
-
-    /**
-     * @return bool
-     */
-    public function getModuleConfig()
-    {
-        return smart_getModuleConfig($this->_moduleName);
-    }
-
-    /**
-     * @return string
-     */
-    public function getModuleItemString()
-    {
-        $ret = $this->_moduleName . '_' . $this->_itemname;
-
-        return $ret;
-    }
-
-    /**
-     * @param $object
-     */
-    public function updateCounter($object)
-    {
-        if (isset($object->vars['counter'])) {
-            $new_counter = $object->getVar('counter') + 1;
-            $sql         = 'UPDATE ' . $this->table . ' SET counter=' . $new_counter . ' WHERE ' . $this->keyName . '=' . $object->id();
-            $this->query($sql, null, true);
-        }
-    }
-
-    /**
-     * Execute the function associated with an event
-     * This method will check if the function is available
-     *
-     * @param string $event name of the event
-     * @param        $executeEventObj
-     * @return mixed result of the execution of the function or FALSE if the function was not executed
-     * @internal param object $obj $object on which is performed the event
-     */
-    public function executeEvent($event, &$executeEventObj)
-    {
-        if (!in_array($event, $this->_disabledEvents)) {
-            if (method_exists($this, $event)) {
-                $ret = $this->$event($executeEventObj);
-            } else {
-                // check to see if there is a hook for this event
-                if (isset($this->_eventHooks[$event])) {
-                    $method = $this->_eventHooks[$event];
-                    // check to see if the method specified by this hook exists
-                    if (method_exists($this, $method)) {
-                        $ret = $this->$method($executeEventObj);
-                    }
-                }
-                $ret = true;
-            }
-
-            return $ret;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  bool $withprefix
-     * @return string
-     */
-    public function getIdentifierName($withprefix = true)
-    {
-        if ($withprefix) {
-            return $this->_itemname . '.' . $this->identifierName;
-        } else {
-            return $this->identifierName;
-        }
-    }
+	public $_itemname;
+
+	/**
+	 * Name of the table use to store this {@link SmartObject}
+	 *
+	 * Note that the name of the table needs to be free of the database prefix.
+	 * For example "smartsection_categories"
+	 * @var string
+	 */
+	public $table;
+
+	/**
+	 * Name of the table key that uniquely identify each {@link SmartObject}
+	 *
+	 * For example: "categoryid"
+	 * @var string
+	 */
+	public $keyName;
+
+	/**
+	 * Name of the class derived from {@link SmartObject} and which this handler is handling
+	 *
+	 * Note that this string needs to be lowercase
+	 *
+	 * For example: "smartsectioncategory"
+	 * @var string
+	 */
+	public $className;
+
+	/**
+	 * Name of the field which properly identify the {@link SmartObject}
+	 *
+	 * For example: "name" (this will be the category's name)
+	 * @var string
+	 */
+	public $identifierName;
+
+	/**
+	 * Name of the field which will be use as a summary for the object
+	 *
+	 * For example: "summary"
+	 * @var string
+	 */
+	public $summaryName;
+
+	/**
+	 * Page name use to basically manage and display the {@link SmartObject}
+	 *
+	 * This page needs to be the same in user side and admin side
+	 *
+	 * For example category.php - we will deduct smartsection/category.php as well as smartsection/admin/category.php
+	 * @todo this could probably be automatically deducted from the class name - for example, the class SmartsectionCategory will have "category.php" as it's managing page
+	 * @var string
+	 */
+	public $_page;
+
+	/**
+	 * Full path of the module using this {@link SmartObject}
+	 *
+	 * <code>XOOPS_URL . "/modules/smartsection/"</code>
+	 * @todo this could probably be automatically deducted from the class name as it is always prefixed with the module name
+	 * @var string
+	 */
+	public $_modulePath;
+
+	public $_moduleUrl;
+
+	public $_moduleName;
+
+	public $_uploadUrl;
+
+	public $_uploadPath;
+
+	public $_allowedMimeTypes = 0;
+
+	public $_maxFileSize = 1000000;
+
+	public $_maxWidth = 500;
+
+	public $_maxHeight = 500;
+
+	public $highlightFields = array();
+
+	/**
+	 * Array containing the events name and functions
+	 *
+	 * @var array
+	 */
+	public $eventArray = array();
+
+	/**
+	 * Array containing the permissions that this handler will manage on the objects
+	 *
+	 * @var array
+	 */
+	public $permissionsArray = false;
+
+	public $generalSQL = false;
+
+	public $_eventHooks     = array();
+	public $_disabledEvents = array();
+
+	/**
+	 * Constructor - called from child classes
+	 *
+	 * @param object|XoopsDatabase $db           {@link XoopsDatabase}
+	 *                                           object
+	 * @param                      $itemname
+	 * @param string               $keyname      Name of the table key that uniquely identify each {@link SmartObject}
+	 * @param string               $idenfierName Name of the field which properly identify the {@link SmartObject}
+	 * @param                      $summaryName
+	 * @param                      $modulename
+	 * @internal param string $tablename Name of the table use to store this <a href='psi_element://SmartObject'>SmartObject</a>
+	 * @internal param Name $string of the class derived from <a href='psi_element://SmartObject'>SmartObject</a> and which this handler is handling and which this handler is handling
+	 * @internal param string $page Page name use to basically manage and display the <a href='psi_element://SmartObject'>SmartObject</a>
+	 * @internal param string $moduleName name of the module
+	 */
+	public function __construct(XoopsDatabase $db, $itemname, $keyname, $idenfierName, $summaryName, $modulename)
+	{
+		parent::__construct($db);
+
+		$this->_itemname      = $itemname;
+		$this->_moduleName    = $modulename;
+		$this->table          = $db->prefix($modulename . '_' . $itemname);
+		$this->keyName        = $keyname;
+		$this->className      = ucfirst($modulename) . ucfirst($itemname);
+		$this->identifierName = $idenfierName;
+		$this->summaryName    = $summaryName;
+		$this->_page          = $itemname . '.php';
+		$this->_modulePath    = XOOPS_ROOT_PATH . '/modules/' . $this->_moduleName . '/';
+		$this->_moduleUrl     = XOOPS_URL . '/modules/' . $this->_moduleName . '/';
+		$this->_uploadPath    = XOOPS_UPLOAD_PATH . '/' . $this->_moduleName . '/';
+		$this->_uploadUrl     = XOOPS_UPLOAD_URL . '/' . $this->_moduleName . '/';
+	}
+
+	/**
+	 * @param $event
+	 * @param $method
+	 */
+	public function addEventHook($event, $method)
+	{
+		$this->_eventHooks[$event] = $method;
+	}
+
+	/**
+	 * Add a permission that this handler will manage for its objects
+	 *
+	 * Example: $this->addPermission('view', _AM_SSHOP_CAT_PERM_READ, _AM_SSHOP_CAT_PERM_READ_DSC);
+	 *
+	 * @param string      $perm_name   name of the permission
+	 * @param string      $caption     caption of the control that will be displayed in the form
+	 * @param bool|string $description description of the control that will be displayed in the form
+	 */
+	public function addPermission($perm_name, $caption, $description = false)
+	{
+		include_once(SMARTOBJECT_ROOT_PATH . 'class/smartobjectpermission.php');
+
+		$this->permissionsArray[] = array(
+			'perm_name'   => $perm_name,
+			'caption'     => $caption,
+			'description' => $description
+		);
+	}
+
+	/**
+	 * @param $criteria
+	 * @param $perm_name
+	 * @return bool
+	 */
+	public function setGrantedObjectsCriteria(&$criteria, $perm_name)
+	{
+		$smartPermissionsHandler = new SmartobjectPermissionHandler($this);
+		$grantedItems             = $smartPermissionsHandler->getGrantedItems($perm_name);
+		if (count($grantedItems) > 0) {
+			$criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
+
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @param bool $_uploadPath
+	 * @param bool $_allowedMimeTypes
+	 * @param bool $_maxFileSize
+	 * @param bool $_maxWidth
+	 * @param bool $_maxHeight
+	 */
+	public function setUploaderConfig($_uploadPath = false, $_allowedMimeTypes = false, $_maxFileSize = false, $_maxWidth = false, $_maxHeight = false)
+	{
+		$this->_uploadPath       = $_uploadPath ?: $this->_uploadPath;
+		$this->_allowedMimeTypes = $_allowedMimeTypes ?: $this->_allowedMimeTypes;
+		$this->_maxFileSize      = $_maxFileSize ?: $this->_maxFileSize;
+		$this->_maxWidth         = $_maxWidth ?: $this->_maxWidth;
+		$this->_maxHeight        = $_maxHeight ?: $this->_maxHeight;
+	}
+
+	/**
+	 * create a new {@link SmartObject}
+	 *
+	 * @param bool $isNew Flag the new objects as "new"?
+	 *
+	 * @return object {@link SmartObject}
+	 */
+	public function &create($isNew = true)
+	{
+		$obj = new $this->className($this);
+		$obj->setImageDir($this->getImageUrl(), $this->getImagePath());
+		if (!$obj->handler) {
+			$obj->handler =& $this;
+		}
+
+		if ($isNew === true) {
+			$obj->setNew();
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getImageUrl()
+	{
+		return $this->_uploadUrl . $this->_itemname . '/';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getImagePath()
+	{
+		$dir = $this->_uploadPath . $this->_itemname;
+		if (!file_exists($dir)) {
+			smart_admin_mkdir($dir);
+		}
+
+		return $dir . '/';
+	}
+
+	/**
+	 * retrieve a {@link SmartObject}
+	 *
+	 * @param  mixed $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
+	 * @param  bool  $as_object whether to return an object or an array
+	 * @param  bool  $debug
+	 * @param  bool  $criteria
+	 * @return mixed reference to the <a href='psi_element://SmartObject'>SmartObject</a>, FALSE if failed
+	 *                          FALSE if failed
+	 */
+	public function get($id, $as_object = true, $debug = false, $criteria = false)
+	{
+		if (!$criteria) {
+			$criteria = new CriteriaCompo();
+		}
+		if (is_array($this->keyName)) {
+			for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
+				/**
+				 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
+				 * Is the fact that we removed the (int)() represents a security risk ?
+				 */
+				//$criteria->add(new Criteria($this->keyName[$i], ($id[$i]), '=', $this->_itemname));
+				$criteria->add(new Criteria($this->keyName[$i], $id[$i], '=', $this->_itemname));
+			}
+		} else {
+			//$criteria = new Criteria($this->keyName, (int)($id), '=', $this->_itemname);
+			/**
+			 * In some situations, the $id is not an INTEGER. SmartObjectTag is an example.
+			 * Is the fact that we removed the (int)() represents a security risk ?
+			 */
+			$criteria->add(new Criteria($this->keyName, $id, '=', $this->_itemname));
+		}
+		$criteria->setLimit(1);
+		if ($debug) {
+			$obj_array = $this->getObjectsD($criteria, false, $as_object);
+		} else {
+			$obj_array = $this->getObjects($criteria, false, $as_object);
+			//patch: weird bug of indexing by id even if id_as_key = false;
+			if (!isset($obj_array[0]) && is_object($obj_array[$id])) {
+				$obj_array[0] = $obj_array[$id];
+				unset($obj_array[$id]);
+				$obj_array[0]->unsetNew();
+			}
+		}
+
+		if (count($obj_array) != 1) {
+			$obj =& $this->create();
+
+			return $obj;
+		}
+
+		return $obj_array[0];
+	}
+
+	/**
+	 * retrieve a {@link SmartObject}
+	 *
+	 * @param  mixed $id        ID of the object - or array of ids for joint keys. Joint keys MUST be given in the same order as in the constructor
+	 * @param  bool  $as_object whether to return an object or an array
+	 * @return mixed reference to the {@link SmartObject}, FALSE if failed
+	 */
+	public function &getD($id, $as_object = true)
+	{
+		return $this->get($id, $as_object, true);
+	}
+
+	/**
+	 * retrieve objects from the database
+	 *
+	 * @param object $criteria  {@link CriteriaElement} conditions to be met
+	 * @param bool   $id_as_key use the ID as key for the array?
+	 * @param bool   $as_object return an array of objects?
+	 *
+	 * @param  bool  $sql
+	 * @param  bool  $debug
+	 * @return array
+	 */
+	public function getObjects($criteria = null, $id_as_key = false, $as_object = true, $sql = false, $debug = false)
+	{
+		$ret   = array();
+		$limit = $start = 0;
+
+		if ($this->generalSQL) {
+			$sql = $this->generalSQL;
+		} elseif (!$sql) {
+			$sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname;
+		}
+
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+
+		return $this->convertResultSet($result, $id_as_key, $as_object);
+	}
+
+	/**
+	 * @param       $sql
+	 * @param       $criteria
+	 * @param  bool $force
+	 * @param  bool $debug
+	 * @return array
+	 */
+	public function query($sql, $criteria, $force = false, $debug = false)
+	{
+		$ret = array();
+
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->groupby) {
+				$sql .= $criteria->getGroupby();
+			}
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+		}
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		if ($force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+
+		if (!$result) {
+			return $ret;
+		}
+
+		while ($myrow = $this->db->fetchArray($result)) {
+			$ret[] = $myrow;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * retrieve objects with debug mode - so will show the query
+	 *
+	 * @param object $criteria  {@link CriteriaElement} conditions to be met
+	 * @param bool   $id_as_key use the ID as key for the array?
+	 * @param bool   $as_object return an array of objects?
+	 *
+	 * @param  bool  $sql
+	 * @return array
+	 */
+	public function getObjectsD($criteria = null, $id_as_key = false, $as_object = true, $sql = false)
+	{
+		return $this->getObjects($criteria, $id_as_key, $as_object, $sql, true);
+	}
+
+	/**
+	 * @param $arrayObjects
+	 * @return array|bool
+	 */
+	public function getObjectsAsArray($arrayObjects)
+	{
+		$ret = array();
+		foreach ($arrayObjects as $key => $object) {
+			$ret[$key] = $object->toArray();
+		}
+		if (count($ret > 0)) {
+			return $ret;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Convert a database resultset to a returnable array
+	 *
+	 * @param object $result    database resultset
+	 * @param bool   $id_as_key - should NOT be used with joint keys
+	 * @param bool   $as_object
+	 *
+	 * @return array
+	 */
+	public function convertResultSet($result, $id_as_key = false, $as_object = true)
+	{
+		$ret = array();
+		while ($myrow = $this->db->fetchArray($result)) {
+			$obj =& $this->create(false);
+			$obj->assignVars($myrow);
+			if (!$id_as_key) {
+				if ($as_object) {
+					$ret[] =& $obj;
+				} else {
+					$ret[] = $obj->toArray();
+				}
+			} else {
+				if ($as_object) {
+					$value =& $obj;
+				} else {
+					$value = $obj->toArray();
+				}
+				if ($id_as_key === 'parentid') {
+					$ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] =& $value;
+				} else {
+					$ret[$obj->getVar($this->keyName)] = $value;
+				}
+			}
+			unset($obj);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param  null $criteria
+	 * @param  int  $limit
+	 * @param  int  $start
+	 * @return array
+	 */
+	public function getListD($criteria = null, $limit = 0, $start = 0)
+	{
+		return $this->getList($criteria, $limit, $start, true);
+	}
+
+	/**
+	 * Retrieve a list of objects as arrays - DON'T USE WITH JOINT KEYS
+	 *
+	 * @param object $criteria {@link CriteriaElement} conditions to be met
+	 * @param int    $limit    Max number of objects to fetch
+	 * @param int    $start    Which record to start at
+	 *
+	 * @param  bool  $debug
+	 * @return array
+	 */
+	public function getList($criteria = null, $limit = 0, $start = 0, $debug = false)
+	{
+		$ret = array();
+		if ($criteria == null) {
+			$criteria = new CriteriaCompo();
+		}
+
+		if ($criteria->getSort() == '') {
+			$criteria->setSort($this->getIdentifierName());
+		}
+
+		$sql = 'SELECT ' . (is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName);
+		if (!empty($this->identifierName)) {
+			$sql .= ', ' . $this->getIdentifierName();
+		}
+		$sql .= ' FROM ' . $this->table . ' AS ' . $this->_itemname;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->getSort() != '') {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+
+		$myts = MyTextSanitizer::getInstance();
+		while ($myrow = $this->db->fetchArray($result)) {
+			//identifiers should be textboxes, so sanitize them like that
+			$ret[$myrow[$this->keyName]] = empty($this->identifierName) ? 1 : $myts->displayTarea($myrow[$this->identifierName]);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * count objects matching a condition
+	 *
+	 * @param  object $criteria {@link CriteriaElement} to match
+	 * @return int    count of objects
+	 */
+	public function getCount($criteria = null)
+	{
+		$field   = '';
+		$groupby = false;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			if ($criteria->groupby != '') {
+				$groupby = true;
+				$field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+			}
+		}
+		/**
+		 * if we have a generalSQL, lets used this one.
+		 * This needs to be improved...
+		 */
+		if ($this->generalSQL) {
+			$sql = $this->generalSQL;
+			$sql = str_replace('SELECT *', 'SELECT COUNT(*)', $sql);
+		} else {
+			$sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table . ' AS ' . $this->_itemname;
+		}
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->groupby != '') {
+				$sql .= $criteria->getGroupby();
+			}
+		}
+
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		if ($groupby == false) {
+			list($count) = $this->db->fetchRow($result);
+
+			return $count;
+		} else {
+			$ret = array();
+			while (list($id, $count) = $this->db->fetchRow($result)) {
+				$ret[$id] = $count;
+			}
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * delete an object from the database
+	 *
+	 * @param  XoopsObject $obj reference to the object to delete
+	 * @param  bool        $force
+	 * @return bool        FALSE if failed.
+	 */
+	public function delete(XoopsObject $obj, $force = false)
+	{
+		$eventResult = $this->executeEvent('beforeDelete', $obj);
+		if (!$eventResult) {
+			$obj->setErrors('An error occured during the BeforeDelete event');
+
+			return false;
+		}
+
+		if (is_array($this->keyName)) {
+			$clause = array();
+			for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
+				$clause[] = $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+			}
+			$whereclause = implode(' AND ', $clause);
+		} else {
+			$whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+		}
+		$sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+
+		$eventResult = $this->executeEvent('afterDelete', $obj);
+		if (!$eventResult) {
+			$obj->setErrors('An error occured during the AfterDelete event');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $event
+	 */
+	public function disableEvent($event)
+	{
+		if (is_array($event)) {
+			foreach ($event as $v) {
+				$this->_disabledEvents[] = $v;
+			}
+		} else {
+			$this->_disabledEvents[] = $event;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getPermissions()
+	{
+		return $this->permissionsArray;
+	}
+
+	/**
+	 * insert a new object in the database
+	 *
+	 * @param  XoopsObject $obj         reference to the object
+	 * @param  bool        $force       whether to force the query execution despite security settings
+	 * @param  bool        $checkObject check if the object is dirty and clean the attributes
+	 * @param  bool        $debug
+	 * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
+	 */
+	public function insert(XoopsObject $obj, $force = false, $checkObject = true, $debug = false)
+	{
+		if ($checkObject != false) {
+			if (!is_object($obj)) {
+				return false;
+			}
+			/**
+			 * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+			 */
+			if (!is_a($obj, $this->className)) {
+				$obj->setError(get_class($obj) . ' Differs from ' . $this->className);
+
+				return false;
+			}
+			if (!$obj->isDirty()) {
+				$obj->setErrors('Not dirty'); //will usually not be outputted as errors are not displayed when the method returns true, but it can be helpful when troubleshooting code - Mith
+
+				return true;
+			}
+		}
+
+		if ($obj->seoEnabled) {
+			// Auto create meta tags if empty
+			$smartobjectMetagen = new SmartMetagen($obj->title(), $obj->getVar('meta_keywords'), $obj->summary());
+
+			if (!$obj->getVar('meta_keywords') || !$obj->getVar('meta_description')) {
+				if (!$obj->meta_keywords()) {
+					$obj->setVar('meta_keywords', $smartobjectMetagen->_keywords);
+				}
+
+				if (!$obj->meta_description()) {
+					$obj->setVar('meta_description', $smartobjectMetagen->_meta_description);
+				}
+			}
+
+			// Auto create short_url if empty
+			if (!$obj->short_url()) {
+				$obj->setVar('short_url', $smartobjectMetagen->generateSeoTitle($obj->title('n'), false));
+			}
+		}
+
+		$eventResult = $this->executeEvent('beforeSave', $obj);
+		if (!$eventResult) {
+			$obj->setErrors('An error occured during the BeforeSave event');
+
+			return false;
+		}
+
+		if ($obj->isNew()) {
+			$eventResult = $this->executeEvent('beforeInsert', $obj);
+			if (!$eventResult) {
+				$obj->setErrors('An error occured during the BeforeInsert event');
+
+				return false;
+			}
+		} else {
+			$eventResult = $this->executeEvent('beforeUpdate', $obj);
+			if (!$eventResult) {
+				$obj->setErrors('An error occured during the BeforeUpdate event');
+
+				return false;
+			}
+		}
+		if (!$obj->cleanVars()) {
+			$obj->setErrors('Variables were not cleaned properly.');
+
+			return false;
+		}
+		$fieldsToStoreInDB = array();
+		foreach ($obj->cleanVars as $k => $v) {
+			if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
+				$cleanvars[$k] = (int)$v;
+			} elseif (is_array($v)) {
+				$cleanvars[$k] = $this->db->quoteString(implode(',', $v));
+			} else {
+				$cleanvars[$k] = $this->db->quoteString($v);
+			}
+			if ($obj->vars[$k]['persistent']) {
+				$fieldsToStoreInDB[$k] = $cleanvars[$k];
+			}
+		}
+		if ($obj->isNew()) {
+			if (!is_array($this->keyName)) {
+				if ($cleanvars[$this->keyName] < 1) {
+					$cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+				}
+			}
+
+			$sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($fieldsToStoreInDB)) . ') VALUES (' . implode(',', array_values($fieldsToStoreInDB)) . ')';
+		} else {
+			$sql = 'UPDATE ' . $this->table . ' SET';
+			foreach ($fieldsToStoreInDB as $key => $value) {
+				if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
+					continue;
+				}
+				if (isset($notfirst)) {
+					$sql .= ',';
+				}
+				$sql .= ' ' . $key . ' = ' . $value;
+				$notfirst = true;
+			}
+			if (is_array($this->keyName)) {
+				$whereclause = '';
+				for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
+					if ($i > 0) {
+						$whereclause .= ' AND ';
+					}
+					$whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+				}
+			} else {
+				$whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+			}
+			$sql .= ' WHERE ' . $whereclause;
+		}
+
+		if ($debug) {
+			xoops_debug($sql);
+		}
+
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+
+		if (!$result) {
+			$obj->setErrors($this->db->error());
+
+			return false;
+		}
+
+		if ($obj->isNew() && !is_array($this->keyName)) {
+			$obj->assignVar($this->keyName, $this->db->getInsertId());
+		}
+		$eventResult = $this->executeEvent('afterSave', $obj);
+		if (!$eventResult) {
+			$obj->setErrors('An error occured during the AfterSave event');
+
+			return false;
+		}
+
+		if ($obj->isNew()) {
+			$obj->unsetNew();
+			$eventResult = $this->executeEvent('afterInsert', $obj);
+			if (!$eventResult) {
+				$obj->setErrors('An error occured during the AfterInsert event');
+
+				return false;
+			}
+		} else {
+			$eventResult = $this->executeEvent('afterUpdate', $obj);
+			if (!$eventResult) {
+				$obj->setErrors('An error occured during the AfterUpdate event');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param       $obj
+	 * @param  bool $force
+	 * @param  bool $checkObject
+	 * @param  bool $debug
+	 * @return bool
+	 */
+	public function insertD(&$obj, $force = false, $checkObject = true, $debug = false)
+	{
+		return $this->insert($obj, $force, $checkObject, true);
+	}
+
+	/**
+	 * Change a value for objects with a certain criteria
+	 *
+	 * @param string $fieldname  Name of the field
+	 * @param string $fieldvalue Value to write
+	 * @param object $criteria   {@link CriteriaElement}
+	 *
+	 * @param  bool  $force
+	 * @return bool
+	 */
+	public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
+	{
+		$set_clause = $fieldname . ' = ';
+		if (is_numeric($fieldvalue)) {
+			$set_clause .= $fieldvalue;
+		} elseif (is_array($fieldvalue)) {
+			$set_clause .= $this->db->quoteString(implode(',', $fieldvalue));
+		} else {
+			$set_clause .= $this->db->quoteString($fieldvalue);
+		}
+		$sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (false != $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * delete all objects meeting the conditions
+	 *
+	 * @param  object $criteria {@link CriteriaElement} with conditions to meet
+	 * @return bool
+	 */
+
+	public function deleteAll($criteria = null)
+	{
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql = 'DELETE FROM ' . $this->table;
+			$sql .= ' ' . $criteria->renderWhere();
+			if (!$this->db->query($sql)) {
+				return false;
+			}
+			$rows = $this->db->getAffectedRows();
+
+			return $rows > 0 ? $rows : true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getModuleInfo()
+	{
+		return smart_getModuleInfo($this->_moduleName);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getModuleConfig()
+	{
+		return smart_getModuleConfig($this->_moduleName);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getModuleItemString()
+	{
+		$ret = $this->_moduleName . '_' . $this->_itemname;
+
+		return $ret;
+	}
+
+	/**
+	 * @param $object
+	 */
+	public function updateCounter($object)
+	{
+		if (isset($object->vars['counter'])) {
+			$new_counter = $object->getVar('counter') + 1;
+			$sql         = 'UPDATE ' . $this->table . ' SET counter=' . $new_counter . ' WHERE ' . $this->keyName . '=' . $object->id();
+			$this->query($sql, null, true);
+		}
+	}
+
+	/**
+	 * Execute the function associated with an event
+	 * This method will check if the function is available
+	 *
+	 * @param string $event name of the event
+	 * @param        $executeEventObj
+	 * @return mixed result of the execution of the function or FALSE if the function was not executed
+	 * @internal param object $obj $object on which is performed the event
+	 */
+	public function executeEvent($event, &$executeEventObj)
+	{
+		if (!in_array($event, $this->_disabledEvents)) {
+			if (method_exists($this, $event)) {
+				$ret = $this->$event($executeEventObj);
+			} else {
+				// check to see if there is a hook for this event
+				if (isset($this->_eventHooks[$event])) {
+					$method = $this->_eventHooks[$event];
+					// check to see if the method specified by this hook exists
+					if (method_exists($this, $method)) {
+						$ret = $this->$method($executeEventObj);
+					}
+				}
+				$ret = true;
+			}
+
+			return $ret;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param  bool $withprefix
+	 * @return string
+	 */
+	public function getIdentifierName($withprefix = true)
+	{
+		if ($withprefix) {
+			return $this->_itemname . '.' . $this->identifierName;
+		} else {
+			return $this->identifierName;
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -197,7 +197,7 @@ 
     public function setGrantedObjectsCriteria(&$criteria, $perm_name)
     {
         $smartPermissionsHandler = new SmartobjectPermissionHandler($this);
-        $grantedItems             = $smartPermissionsHandler->getGrantedItems($perm_name);
+        $grantedItems = $smartPermissionsHandler->getGrantedItems($perm_name);
         if (count($grantedItems) > 0) {
             $criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
 
@@ -235,7 +235,7 @@ 
         $obj = new $this->className($this);
         $obj->setImageDir($this->getImageUrl(), $this->getImagePath());
         if (!$obj->handler) {
-            $obj->handler =& $this;
+            $obj->handler = & $this;
         }
 
         if ($isNew === true) {
@@ -312,7 +312,7 @@ 
         }
 
         if (count($obj_array) != 1) {
-            $obj =& $this->create();
+            $obj = & $this->create();
 
             return $obj;
         }
@@ -460,22 +460,22 @@ 
     {
         $ret = array();
         while ($myrow = $this->db->fetchArray($result)) {
-            $obj =& $this->create(false);
+            $obj = & $this->create(false);
             $obj->assignVars($myrow);
             if (!$id_as_key) {
                 if ($as_object) {
-                    $ret[] =& $obj;
+                    $ret[] = & $obj;
                 } else {
                     $ret[] = $obj->toArray();
                 }
             } else {
                 if ($as_object) {
-                    $value =& $obj;
+                    $value = & $obj;
                 } else {
                     $value = $obj->toArray();
                 }
                 if ($id_as_key === 'parentid') {
-                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] =& $value;
+                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] = & $value;
                 } else {
                     $ret[$obj->getVar($this->keyName)] = $value;
                 }
@@ -748,7 +748,7 @@ 
         $fieldsToStoreInDB = array();
         foreach ($obj->cleanVars as $k => $v) {
             if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
-                $cleanvars[$k] = (int)$v;
+                $cleanvars[$k] = (int) $v;
             } elseif (is_array($v)) {
                 $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
             } else {

class/smartobjectlink.php

Doc Comments +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      * @access public
      * @param  string $key    key of the object's variable to be returned
      * @param  string $format format to use for the output
-     * @return mixed  formatted value of the variable
+     * @return integer  formatted value of the variable
      */
     public function getVar($key, $format = 's')
     {

Indentation +156 added lines, -156 removed lines

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

class/smartobjectpermission.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     /**
      * @param       $gperm_name
-     * @param  null $id
+     * @param  integer $id
      * @return array
      */
     public function getGrantedGroups($gperm_name, $id = null)

Indentation +198 added lines, -198 removed lines

@@ -11,18 +11,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)
@@ -30,73 +30,73 @@ 
      *
      * @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] : array();
-    }
-
-    /**
-     * @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] : array();
-        } else {
-            return isset($groups) ? $groups : 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] : array();
+	}
+
+	/**
+	 * @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] : array();
+		} else {
+			return isset($groups) ? $groups : array();
+		}
+	}
+
+	/*
      * Returns permissions for a certain type
      *
      * @param string $type "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
@@ -104,123 +104,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() : array(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] : array();
-    }
-
-    /**
-     * @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 category
-     *
-     *  saveCategory_Permissions()
-     *
-     * @param array   $groups    : group with granted permission
-     * @param         $itemid
-     * @param  string $perm_name : name of the permission
-     * @return bool  : TRUE if the no errors occured
-     * @internal param int $categoryID: categoryID on which we are setting permissions for Categories and Forums
-     */
-
-    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() : array(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() : array(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] : array();
+	}
+
+	/**
+	 * @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 category
+	 *
+	 *  saveCategory_Permissions()
+	 *
+	 * @param array   $groups    : group with granted permission
+	 * @param         $itemid
+	 * @param  string $perm_name : name of the permission
+	 * @return bool  : TRUE if the no errors occured
+	 * @internal param int $categoryID: categoryID on which we are setting permissions for Categories and Forums
+	 */
+
+	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() : array(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);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
     {
         global $xoopsModule;
 
-        $smartModule =& smartsection_getModuleInfo();
+        $smartModule = & smartsection_getModuleInfo();
 
         $result        = true;
         $module_id     = $smartModule->getVar('mid');

class/smartobjectsingleview.php

Doc Comments +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 
     /**
      * Constructor
-     * @param       $object
+     * @param       SmartObject $object
      * @param bool  $userSide
      * @param array $actions
      * @param bool  $headerAsRow
@@ -89,7 +89,7 @@ 
     }
 
     /**
-     * @param $rowObj
+     * @param SmartObjectRow $rowObj
      */
     public function addRow($rowObj)
     {

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 = array(), $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 = array(), $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)
-    {
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+	/**
+	 * @param  bool $fetchOnly
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false, $debug = false)
+	{
+		include_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        $this->_tpl               = new XoopsTpl();
-        $vars                     = $this->_object->vars;
-        $smartobjectObjectArray = array();
+		$this->_tpl               = new XoopsTpl();
+		$vars                     = $this->_object->vars;
+		$smartobjectObjectArray = array();
 
-        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/smartobjectsregistry.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**
      * Access the only instance of this class
      *
-     * @return object
+     * @return SmartObjectsRegistry
      *
      * @static
      * @staticvar   object

Indentation +153 added lines, -153 removed lines

@@ -13,169 +13,169 @@
  */
 class SmartObjectsRegistry
 {
-    public $_registryArray;
+	public $_registryArray;
 
-    /**
-     * Access the only instance of this class
-     *
-     * @return object
-     *
-     * @static
-     * @staticvar   object
-     */
-    public function getInstance()
-    {
-        static $instance;
-        if (!isset($instance)) {
-            $instance = new SmartObjectsRegistry();
-        }
+	/**
+	 * Access the only instance of this class
+	 *
+	 * @return object
+	 *
+	 * @static
+	 * @staticvar   object
+	 */
+	public function getInstance()
+	{
+		static $instance;
+		if (!isset($instance)) {
+			$instance = new SmartObjectsRegistry();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * Adding objects to the registry
-     *
-     * @param  SmartPersistableObjectHandler $handler  of the objects to add
-     * @param  bool|CriteriaCompo            $criteria to pass to the getObjects method of the handler (with id_as_key)
-     * @return FALSE                         if an error occured
-     */
-    public function addObjectsFromHandler(&$handler, $criteria = false)
-    {
-        if (method_exists($handler, 'getObjects')) {
-            $objects                                                                     = $handler->getObjects($criteria, true);
-            $this->_registryArray['objects'][$handler->_moduleName][$handler->_itemname] = $objects;
+	/**
+	 * Adding objects to the registry
+	 *
+	 * @param  SmartPersistableObjectHandler $handler  of the objects to add
+	 * @param  bool|CriteriaCompo            $criteria to pass to the getObjects method of the handler (with id_as_key)
+	 * @return FALSE                         if an error occured
+	 */
+	public function addObjectsFromHandler(&$handler, $criteria = false)
+	{
+		if (method_exists($handler, 'getObjects')) {
+			$objects                                                                     = $handler->getObjects($criteria, true);
+			$this->_registryArray['objects'][$handler->_moduleName][$handler->_itemname] = $objects;
 
-            return $objects;
-        } else {
-            return false;
-        }
-    }
+			return $objects;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Adding objects to the registry from an item name
-     * This method will fetch the handler of the item / module and call the addObjectsFromHandler
-     *
-     * @param  string             $item       name of the item
-     * @param  bool|string        $modulename name of the module
-     * @param  bool|CriteriaCompo $criteria   to pass to the getObjects method of the handler (with id_as_key)
-     * @return FALSE              if an error occured
-     */
-    public function addObjectsFromItemName($item, $modulename = false, $criteria = false)
-    {
-        if (!$modulename) {
-            global $xoopsModule;
-            if (!is_object($xoopsModule)) {
-                return false;
-            } else {
-                $modulename = $xoopsModule->dirname();
-            }
-        }
-        $objectHandler = xoops_getModuleHandler($item, $modulename);
+	/**
+	 * Adding objects to the registry from an item name
+	 * This method will fetch the handler of the item / module and call the addObjectsFromHandler
+	 *
+	 * @param  string             $item       name of the item
+	 * @param  bool|string        $modulename name of the module
+	 * @param  bool|CriteriaCompo $criteria   to pass to the getObjects method of the handler (with id_as_key)
+	 * @return FALSE              if an error occured
+	 */
+	public function addObjectsFromItemName($item, $modulename = false, $criteria = false)
+	{
+		if (!$modulename) {
+			global $xoopsModule;
+			if (!is_object($xoopsModule)) {
+				return false;
+			} else {
+				$modulename = $xoopsModule->dirname();
+			}
+		}
+		$objectHandler = xoops_getModuleHandler($item, $modulename);
 
-        if (method_exists($objectHandler, 'getObjects')) {
-            $objects                                                                                   = $objectHandler->getObjects($criteria, true);
-            $this->_registryArray['objects'][$objectHandler->_moduleName][$objectHandler->_itemname] = $objects;
+		if (method_exists($objectHandler, 'getObjects')) {
+			$objects                                                                                   = $objectHandler->getObjects($criteria, true);
+			$this->_registryArray['objects'][$objectHandler->_moduleName][$objectHandler->_itemname] = $objects;
 
-            return $objects;
-        } else {
-            return false;
-        }
-    }
+			return $objects;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Fetching objects from the registry
-     *
-     * @param string $itemname
-     * @param string $modulename
-     *
-     * @return the requested objects or FALSE if they don't exists in the registry
-     */
-    public function getObjects($itemname, $modulename)
-    {
-        if (!$modulename) {
-            global $xoopsModule;
-            if (!is_object($xoopsModule)) {
-                return false;
-            } else {
-                $modulename = $xoopsModule->dirname();
-            }
-        }
-        if (isset($this->_registryArray['objects'][$modulename][$itemname])) {
-            return $this->_registryArray['objects'][$modulename][$itemname];
-        } else {
-            // if they were not in registry, let's fetch them and add them to the reigistry
-            $moduleHandler = xoops_getModuleHandler($itemname, $modulename);
-            if (method_exists($moduleHandler, 'getObjects')) {
-                $objects = $moduleHandler->getObjects();
-            }
-            $this->_registryArray['objects'][$modulename][$itemname] = $objects;
+	/**
+	 * Fetching objects from the registry
+	 *
+	 * @param string $itemname
+	 * @param string $modulename
+	 *
+	 * @return the requested objects or FALSE if they don't exists in the registry
+	 */
+	public function getObjects($itemname, $modulename)
+	{
+		if (!$modulename) {
+			global $xoopsModule;
+			if (!is_object($xoopsModule)) {
+				return false;
+			} else {
+				$modulename = $xoopsModule->dirname();
+			}
+		}
+		if (isset($this->_registryArray['objects'][$modulename][$itemname])) {
+			return $this->_registryArray['objects'][$modulename][$itemname];
+		} else {
+			// if they were not in registry, let's fetch them and add them to the reigistry
+			$moduleHandler = xoops_getModuleHandler($itemname, $modulename);
+			if (method_exists($moduleHandler, 'getObjects')) {
+				$objects = $moduleHandler->getObjects();
+			}
+			$this->_registryArray['objects'][$modulename][$itemname] = $objects;
 
-            return $objects;
-        }
-    }
+			return $objects;
+		}
+	}
 
-    /**
-     * Fetching objects from the registry, as a list: objectid => identifier
-     *
-     * @param string $itemname
-     * @param string $modulename
-     *
-     * @return the requested objects or FALSE if they don't exists in the registry
-     */
-    public function getList($itemname, $modulename)
-    {
-        if (!$modulename) {
-            global $xoopsModule;
-            if (!is_object($xoopsModule)) {
-                return false;
-            } else {
-                $modulename = $xoopsModule->dirname();
-            }
-        }
-        if (isset($this->_registryArray['list'][$modulename][$itemname])) {
-            return $this->_registryArray['list'][$modulename][$itemname];
-        } else {
-            // if they were not in registry, let's fetch them and add them to the reigistry
-            $moduleHandler = xoops_getModuleHandler($itemname, $modulename);
-            if (method_exists($moduleHandler, 'getList')) {
-                $objects = $moduleHandler->getList();
-            }
-            $this->_registryArray['list'][$modulename][$itemname] = $objects;
+	/**
+	 * Fetching objects from the registry, as a list: objectid => identifier
+	 *
+	 * @param string $itemname
+	 * @param string $modulename
+	 *
+	 * @return the requested objects or FALSE if they don't exists in the registry
+	 */
+	public function getList($itemname, $modulename)
+	{
+		if (!$modulename) {
+			global $xoopsModule;
+			if (!is_object($xoopsModule)) {
+				return false;
+			} else {
+				$modulename = $xoopsModule->dirname();
+			}
+		}
+		if (isset($this->_registryArray['list'][$modulename][$itemname])) {
+			return $this->_registryArray['list'][$modulename][$itemname];
+		} else {
+			// if they were not in registry, let's fetch them and add them to the reigistry
+			$moduleHandler = xoops_getModuleHandler($itemname, $modulename);
+			if (method_exists($moduleHandler, 'getList')) {
+				$objects = $moduleHandler->getList();
+			}
+			$this->_registryArray['list'][$modulename][$itemname] = $objects;
 
-            return $objects;
-        }
-    }
+			return $objects;
+		}
+	}
 
-    /**
-     * Retreive a single object
-     *
-     * @param string $itemname
-     * @param string $key
-     *
-     * @param  bool  $modulename
-     * @return the  requestd object or FALSE if they don't exists in the registry
-     */
-    public function getSingleObject($itemname, $key, $modulename = false)
-    {
-        if (!$modulename) {
-            global $xoopsModule;
-            if (!is_object($xoopsModule)) {
-                return false;
-            } else {
-                $modulename = $xoopsModule->dirname();
-            }
-        }
-        if (isset($this->_registryArray['objects'][$modulename][$itemname][$key])) {
-            return $this->_registryArray['objects'][$modulename][$itemname][$key];
-        } else {
-            $objectHandler = xoops_getModuleHandler($itemname, $modulename);
-            $object        = $objectHandler->get($key);
-            if (!$object->isNew()) {
-                return $object;
-            } else {
-                return false;
-            }
-        }
-    }
+	/**
+	 * Retreive a single object
+	 *
+	 * @param string $itemname
+	 * @param string $key
+	 *
+	 * @param  bool  $modulename
+	 * @return the  requestd object or FALSE if they don't exists in the registry
+	 */
+	public function getSingleObject($itemname, $key, $modulename = false)
+	{
+		if (!$modulename) {
+			global $xoopsModule;
+			if (!is_object($xoopsModule)) {
+				return false;
+			} else {
+				$modulename = $xoopsModule->dirname();
+			}
+		}
+		if (isset($this->_registryArray['objects'][$modulename][$itemname][$key])) {
+			return $this->_registryArray['objects'][$modulename][$itemname][$key];
+		} else {
+			$objectHandler = xoops_getModuleHandler($itemname, $modulename);
+			$object        = $objectHandler->get($key);
+			if (!$object->isNew()) {
+				return $object;
+			} else {
+				return false;
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
         $objectHandler = xoops_getModuleHandler($item, $modulename);
 
         if (method_exists($objectHandler, 'getObjects')) {
-            $objects                                                                                   = $objectHandler->getObjects($criteria, true);
+            $objects = $objectHandler->getObjects($criteria, true);
             $this->_registryArray['objects'][$objectHandler->_moduleName][$objectHandler->_itemname] = $objects;
 
             return $objects;

class/smartobjecttable.php

Doc Comments +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 
     /**
      * SmartObjectColumn constructor.
-     * @param        $keyname
+     * @param        string $keyname
      * @param string $align
      * @param bool   $width
      * @param bool   $customMethodForValue
@@ -183,7 +183,7 @@ 
     }
 
     /**
-     * @param $columnObj
+     * @param SmartObjectColumn $columnObj
      */
     public function addColumn($columnObj)
     {
@@ -192,7 +192,7 @@ 
 
     /**
      * @param $name
-     * @param $location
+     * @param string $location
      * @param $value
      */
     public function addIntroButton($name, $location, $value)

Indentation +845 added lines, -845 removed lines

@@ -21,77 +21,77 @@ 
  */
 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;
+	}
 }
 
 /**
@@ -105,778 +105,778 @@ 
  */
 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    = array();
-
-    /**
-     * Constructor
-     *
-     * @param object      $objectHandler {@link SmartPersistableObjectHandler}
-     * @param bool|object $criteria
-     * @param array       $actions       array representing the actions to offer
-     *
-     * @param bool        $userSide
-     * @internal param array $columns array representing the columns to display in the table
-     */
-    public function __construct($objectHandler, $criteria = false, $actions = array('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 = array();
-        $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                 = array(
-            '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             = array();
-        $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 = array('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 = array())
-    {
-        $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 = array();
-
-        $doWeHaveActions = false;
-
-        $objectclass = 'odd';
-        if (count($this->_objects) > 0) {
-            foreach ($this->_objects as $object) {
-                $aObject = array();
-
-                $i = 0;
-
-                $aColumns = array();
-
-                foreach ($this->_columns as $column) {
-                    $aColumn = array();
-
-                    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 = array();
-
-                // Adding the custom actions if any
-                foreach ($this->_custom_actions as $action) {
-                    if (method_exists($object, $action)) {
-                        $actions[] = $object->$action();
-                    }
-                }
-
-                include_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               = array();
-        $field             = array();
-        $field['caption']  = _CO_OBJ_NONE;
-        $field['selected'] = '';
-        $ret['default']    = $field;
-        unset($field);
-
-        if ($this->_filterseloptions) {
-            foreach ($this->_filterseloptions as $key => $value) {
-                $field = array();
-                if (is_array($value)) {
-                    $field['caption']  = $key;
-                    $field['selected'] = $this->_filtersel == $key ? "selected='selected'" : '';
-                } else {
-                    $field['caption']  = $this->_tempObject->vars[$key]['form_caption'];
-                    $field['selected'] = $this->_filtersel == $key ? "selected='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 = array();
-
-        foreach ($this->_filtersel2options as $key => $value) {
-            $field             = array();
-            $field['caption']  = $value;
-            $field['selected'] = $this->_filtersel2 == $key ? "selected='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                    = array();
-        $ret['all']['caption']  = _CO_SOBJECT_LIMIT_ALL;
-        $ret['all']['selected'] = ('all' === $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['5']['caption']  = '5';
-        $ret['5']['selected'] = ('5' == $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['10']['caption']  = '10';
-        $ret['10']['selected'] = ('10' == $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['15']['caption']  = '15';
-        $ret['15']['selected'] = ('15' == $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['20']['caption']  = '20';
-        $ret['20']['selected'] = ('20' == $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['25']['caption']  = '25';
-        $ret['25']['selected'] = ('25' == $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['30']['caption']  = '30';
-        $ret['30']['selected'] = ('30' == $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['35']['caption']  = '35';
-        $ret['35']['selected'] = ('35' == $this->_limitsel) ? "selected='selected'" : '';
-
-        $ret['40']['caption']  = '40';
-        $ret['40']['selected'] = ('40' == $this->_limitsel) ? "selected='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                    = array();
-        $ret['ASC']['caption']  = _CO_SOBJECT_SORT_ASC;
-        $ret['ASC']['selected'] = ('ASC' === $this->_ordersel) ? "selected='selected'" : '';
-
-        $ret['DESC']['caption']  = _CO_SOBJECT_SORT_DESC;
-        $ret['DESC']['selected'] = ('DESC' === $this->_ordersel) ? "selected='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)
-    {
-        include_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);
-
-        include_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 = 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 = array();
-
-            $not_needed_params = array('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 = array();
-        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                     = array();
-        $orderArray['ASC']['image']     = 'desc.png';
-        $orderArray['ASC']['neworder']  = 'DESC';
-        $orderArray['DESC']['image']    = 'asc.png';
-        $orderArray['DESC']['neworder'] = 'ASC';
-
-        $aColumns = array();
-
-        foreach ($this->_columns as $column) {
-            $qs_param         = '';
-            $aColumn          = array();
-            $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    = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param object      $objectHandler {@link SmartPersistableObjectHandler}
+	 * @param bool|object $criteria
+	 * @param array       $actions       array representing the actions to offer
+	 *
+	 * @param bool        $userSide
+	 * @internal param array $columns array representing the columns to display in the table
+	 */
+	public function __construct($objectHandler, $criteria = false, $actions = array('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 = array();
+		$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                 = array(
+			'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             = array();
+		$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 = array('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 = array())
+	{
+		$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 = array();
+
+		$doWeHaveActions = false;
+
+		$objectclass = 'odd';
+		if (count($this->_objects) > 0) {
+			foreach ($this->_objects as $object) {
+				$aObject = array();
+
+				$i = 0;
+
+				$aColumns = array();
+
+				foreach ($this->_columns as $column) {
+					$aColumn = array();
+
+					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 = array();
+
+				// Adding the custom actions if any
+				foreach ($this->_custom_actions as $action) {
+					if (method_exists($object, $action)) {
+						$actions[] = $object->$action();
+					}
+				}
+
+				include_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               = array();
+		$field             = array();
+		$field['caption']  = _CO_OBJ_NONE;
+		$field['selected'] = '';
+		$ret['default']    = $field;
+		unset($field);
+
+		if ($this->_filterseloptions) {
+			foreach ($this->_filterseloptions as $key => $value) {
+				$field = array();
+				if (is_array($value)) {
+					$field['caption']  = $key;
+					$field['selected'] = $this->_filtersel == $key ? "selected='selected'" : '';
+				} else {
+					$field['caption']  = $this->_tempObject->vars[$key]['form_caption'];
+					$field['selected'] = $this->_filtersel == $key ? "selected='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 = array();
+
+		foreach ($this->_filtersel2options as $key => $value) {
+			$field             = array();
+			$field['caption']  = $value;
+			$field['selected'] = $this->_filtersel2 == $key ? "selected='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                    = array();
+		$ret['all']['caption']  = _CO_SOBJECT_LIMIT_ALL;
+		$ret['all']['selected'] = ('all' === $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['5']['caption']  = '5';
+		$ret['5']['selected'] = ('5' == $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['10']['caption']  = '10';
+		$ret['10']['selected'] = ('10' == $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['15']['caption']  = '15';
+		$ret['15']['selected'] = ('15' == $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['20']['caption']  = '20';
+		$ret['20']['selected'] = ('20' == $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['25']['caption']  = '25';
+		$ret['25']['selected'] = ('25' == $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['30']['caption']  = '30';
+		$ret['30']['selected'] = ('30' == $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['35']['caption']  = '35';
+		$ret['35']['selected'] = ('35' == $this->_limitsel) ? "selected='selected'" : '';
+
+		$ret['40']['caption']  = '40';
+		$ret['40']['selected'] = ('40' == $this->_limitsel) ? "selected='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                    = array();
+		$ret['ASC']['caption']  = _CO_SOBJECT_SORT_ASC;
+		$ret['ASC']['selected'] = ('ASC' === $this->_ordersel) ? "selected='selected'" : '';
+
+		$ret['DESC']['caption']  = _CO_SOBJECT_SORT_DESC;
+		$ret['DESC']['selected'] = ('DESC' === $this->_ordersel) ? "selected='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)
+	{
+		include_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);
+
+		include_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 = 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 = array();
+
+			$not_needed_params = array('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 = array();
+		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                     = array();
+		$orderArray['ASC']['image']     = 'desc.png';
+		$orderArray['ASC']['neworder']  = 'DESC';
+		$orderArray['DESC']['image']    = 'asc.png';
+		$orderArray['DESC']['neworder'] = 'ASC';
+
+		$aColumns = array();
+
+		foreach ($this->_columns as $column) {
+			$qs_param         = '';
+			$aColumn          = array();
+			$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 +2 added lines, -2 removed lines

@@ -174,7 +174,7 @@ 
      */
     public function addActionButton($op, $caption = false, $text = false)
     {
-        $action                 = array(
+        $action = array(
             'op'      => $op,
             'caption' => $caption,
             'text'    => $text
@@ -678,7 +678,7 @@ 
          */
         $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();
 

include/captcha/scripts/img.php

Doc Comments +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
     }
 
     /**
-     * @param         $name
+     * @param         string $name
      * @param  string $extension
      * @return array
      */
@@ -255,7 +255,7 @@ 
     /**
      * Return random background
      *
-     * @return array
+     * @return string|null
      */
     public function loadBackground()
     {

Indentation +409 added lines, -409 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * Image Creation script
- *
- * D.J.
- */
+	 * Image Creation script
+	 *
+	 * D.J.
+	 */
 
 include dirname(dirname(dirname(dirname(dirname(__DIR__))))) . '/mainfile.php';
 error_reporting(0);
 $xoopsLogger->activated = false;
 
 if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^' . preg_quote(XOOPS_URL, '/') . '/', $_SERVER['HTTP_REFERER'])) {
-    exit();
+	exit();
 }
 
 /**
@@ -18,185 +18,185 @@ 
  */
 class XoopsCaptchaImageHandler
 {
-    public $config = array();
-    //var $mode = "gd"; // GD or bmp
-    public $code;
-    public $invalid = false;
-
-    public $font;
-    public $spacing;
-    public $width;
-    public $height;
-
-    /**
-     * XoopsCaptchaImageHandler constructor.
-     */
-    public function __construct()
-    {
-        if (empty($_SESSION['XoopsCaptcha_name'])) {
-            $this->invalid = true;
-        }
-
-        if (!extension_loaded('gd')) {
-            $this->mode = 'bmp';
-        } else {
-            $required_functions = array('imagecreatetruecolor', 'imagecolorallocate', 'imagefilledrectangle', 'imagejpeg', 'imagedestroy', 'imageftbbox');
-            foreach ($required_functions as $func) {
-                if (!function_exists($func)) {
-                    $this->mode = 'bmp';
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Loading configs from CAPTCHA class
-     * @param array $config
-     */
-    public function setConfig($config = array())
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
-
-    public function loadImage()
-    {
-        $this->createCode();
-        $this->setCode();
-        $this->createImage();
-    }
-
-    /**
-     * Create Code
-     */
-    public function createCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        if ($this->mode === 'bmp') {
-            $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
-        } else {
-            $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
-            if (!$this->config['casesensitive']) {
-                $this->code = strtoupper($this->code);
-            }
-        }
-    }
-
-    public function setCode()
-    {
-        if ($this->invalid) {
-            return;
-        }
-
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
-
-        // Increase the attempt records on refresh
-        if (!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
-            if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
-                $this->invalid = true;
-            }
-        }
-    }
-
-    /**
-     * @param  string $file
-     * @return string|void
-     */
-    public function createImage($file = '')
-    {
-        if ($this->invalid) {
-            header('Content-type: image/gif');
-            readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
-
-            return;
-        }
-
-        if ($this->mode === 'bmp') {
-            return $this->createImageBmp();
-        } else {
-            return $this->createImageGd();
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with GD
-     *  Originated from DuGris' SecurityImage
-     * @param string $file
-     */
-    //  --------------------------------------------------------------------------- //
-    // Class: SecurityImage 1.5                                                    //
-    // Author: DuGris aka L. Jen <http://www.dugris.info>                           //
-    // Email: DuGris@wanadoo.fr                                                    //
-    // Licence: GNU                                                                 //
-    // Project: XOOPS Project                                                   //
-    //  --------------------------------------------------------------------------- //
-    public function createImageGd($file = '')
-    {
-        $this->loadFont();
-        $this->setImageSize();
-
-        $this->oImage = imagecreatetruecolor($this->width, $this->height);
-        $background   = imagecolorallocate($this->oImage, 255, 255, 255);
-        imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
-
-        switch ($this->config['background_type']) {
-            default:
-            case 0:
-                $this->drawBars();
-                break;
-
-            case 1:
-                $this->drawCircles();
-                break;
-
-            case 2:
-                $this->drawLines();
-                break;
-
-            case 3:
-                $this->drawRectangles();
-                break;
-
-            case 4:
-                $this->drawEllipses();
-                break;
-
-            case 5:
-                $this->drawPolygons();
-                break;
-
-            case 100:
-                $this->createFromFile();
-                break;
-        }
-        $this->drawBorder();
-        $this->drawCode();
-
-        if (empty($file)) {
-            header('Content-type: image/jpeg');
-            imagejpeg($this->oImage);
-        } else {
-            imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
-        }
-        imagedestroy($this->oImage);
-    }
-
-    /**
-     * @param         $name
-     * @param  string $extension
-     * @return array
-     */
-    public function _getList($name, $extension = '')
-    {
-        $items = array();
-        /*
+	public $config = array();
+	//var $mode = "gd"; // GD or bmp
+	public $code;
+	public $invalid = false;
+
+	public $font;
+	public $spacing;
+	public $width;
+	public $height;
+
+	/**
+	 * XoopsCaptchaImageHandler constructor.
+	 */
+	public function __construct()
+	{
+		if (empty($_SESSION['XoopsCaptcha_name'])) {
+			$this->invalid = true;
+		}
+
+		if (!extension_loaded('gd')) {
+			$this->mode = 'bmp';
+		} else {
+			$required_functions = array('imagecreatetruecolor', 'imagecolorallocate', 'imagefilledrectangle', 'imagejpeg', 'imagedestroy', 'imageftbbox');
+			foreach ($required_functions as $func) {
+				if (!function_exists($func)) {
+					$this->mode = 'bmp';
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Loading configs from CAPTCHA class
+	 * @param array $config
+	 */
+	public function setConfig($config = array())
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
+
+	public function loadImage()
+	{
+		$this->createCode();
+		$this->setCode();
+		$this->createImage();
+	}
+
+	/**
+	 * Create Code
+	 */
+	public function createCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		if ($this->mode === 'bmp') {
+			$this->config['num_chars'] = 4;
+			$this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
+		} else {
+			$this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
+			if (!$this->config['casesensitive']) {
+				$this->code = strtoupper($this->code);
+			}
+		}
+	}
+
+	public function setCode()
+	{
+		if ($this->invalid) {
+			return;
+		}
+
+		$_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+		$maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+
+		// Increase the attempt records on refresh
+		if (!empty($maxAttempts)) {
+			$_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
+			if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+				$this->invalid = true;
+			}
+		}
+	}
+
+	/**
+	 * @param  string $file
+	 * @return string|void
+	 */
+	public function createImage($file = '')
+	{
+		if ($this->invalid) {
+			header('Content-type: image/gif');
+			readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
+
+			return;
+		}
+
+		if ($this->mode === 'bmp') {
+			return $this->createImageBmp();
+		} else {
+			return $this->createImageGd();
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with GD
+	 *  Originated from DuGris' SecurityImage
+	 * @param string $file
+	 */
+	//  --------------------------------------------------------------------------- //
+	// Class: SecurityImage 1.5                                                    //
+	// Author: DuGris aka L. Jen <http://www.dugris.info>                           //
+	// Email: DuGris@wanadoo.fr                                                    //
+	// Licence: GNU                                                                 //
+	// Project: XOOPS Project                                                   //
+	//  --------------------------------------------------------------------------- //
+	public function createImageGd($file = '')
+	{
+		$this->loadFont();
+		$this->setImageSize();
+
+		$this->oImage = imagecreatetruecolor($this->width, $this->height);
+		$background   = imagecolorallocate($this->oImage, 255, 255, 255);
+		imagefilledrectangle($this->oImage, 0, 0, $this->width, $this->height, $background);
+
+		switch ($this->config['background_type']) {
+			default:
+			case 0:
+				$this->drawBars();
+				break;
+
+			case 1:
+				$this->drawCircles();
+				break;
+
+			case 2:
+				$this->drawLines();
+				break;
+
+			case 3:
+				$this->drawRectangles();
+				break;
+
+			case 4:
+				$this->drawEllipses();
+				break;
+
+			case 5:
+				$this->drawPolygons();
+				break;
+
+			case 100:
+				$this->createFromFile();
+				break;
+		}
+		$this->drawBorder();
+		$this->drawCode();
+
+		if (empty($file)) {
+			header('Content-type: image/jpeg');
+			imagejpeg($this->oImage);
+		} else {
+			imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
+		}
+		imagedestroy($this->oImage);
+	}
+
+	/**
+	 * @param         $name
+	 * @param  string $extension
+	 * @return array
+	 */
+	public function _getList($name, $extension = '')
+	{
+		$items = array();
+		/*
          if (@ include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.ini.php") {
          load_functions("cache");
          if ($items = mod_loadCacheFile("captcha_{$name}", "captcha")) {
@@ -204,231 +204,231 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $file_path = $this->config['rootpath'] . "/{$name}";
-        $files     = XoopsLists::getFileListAsArray($file_path);
-        foreach ($files as $item) {
-            if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
-                $items[] = $item;
-            }
-        }
-        if (function_exists('mod_createCacheFile')) {
-            mod_createCacheFile($items, "captcha_{$name}", 'captcha');
-        }
-
-        return $items;
-    }
-
-    public function loadFont()
-    {
-        $fonts      = $this->_getList('fonts', 'ttf');
-        $this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
-    }
-
-    public function setImageSize()
-    {
-        $MaxCharWidth  = 0;
-        $MaxCharHeight = 0;
-        $oImage        = imagecreatetruecolor(100, 100);
-        $text_color    = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-        $FontSize      = $this->config['fontsize_max'];
-        for ($Angle = -30; $Angle <= 30; ++$Angle) {
-            for ($i = 65; $i <= 90; ++$i) {
-                $CharDetails   = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
-                $_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
-                if ($_MaxCharWidth > $MaxCharWidth) {
-                    $MaxCharWidth = $_MaxCharWidth;
-                }
-                $_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
-                if ($_MaxCharHeight > $MaxCharHeight) {
-                    $MaxCharHeight = $_MaxCharHeight;
-                }
-            }
-        }
-        imagedestroy($oImage);
-
-        $this->height  = $MaxCharHeight + 2;
-        $this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
-        $this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
-    }
-
-    /**
-     * Return random background
-     *
-     * @return array
-     */
-    public function loadBackground()
-    {
-        $RandBackground = null;
-        if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
-            $RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
-        }
-
-        return $RandBackground;
-    }
-
-    /**
-     * Draw Image background
-     */
-    public function createFromFile()
-    {
-        if ($RandImage = $this->loadBackground()) {
-            $ImageType = @getimagesize($RandImage);
-            switch (@$ImageType[2]) {
-                case 1:
-                    $BackgroundImage = imagecreatefromgif($RandImage);
-                    break;
-
-                case 2:
-                    $BackgroundImage = imagecreatefromjpeg($RandImage);
-                    break;
-
-                case 3:
-                    $BackgroundImage = imagecreatefrompng($RandImage);
-                    break;
-            }
-        }
-        if (!empty($BackgroundImage)) {
-            imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
-            imagedestroy($BackgroundImage);
-        } else {
-            $this->drawBars();
-        }
-    }
-
-    /**
-     * Draw Code
-     */
-    public function drawCode()
-    {
-        for ($i = 0; $i < $this->config['num_chars']; ++$i) {
-            // select random greyscale colour
-            $text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-
-            // write text to image
-            $Angle = mt_rand(10, 30);
-            if ($i % 2) {
-                $Angle = mt_rand(-10, -30);
-            }
-
-            // select random font size
-            $FontSize = mt_rand($this->config['fontsize_min'], $this->config['fontsize_max']);
-
-            $CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
-            $CharHeight  = abs($CharDetails[1] + $CharDetails[5]);
-
-            // calculate character starting coordinates
-            $posX = ($this->spacing / 2) + ($i * $this->spacing);
-            $posY = 2 + ($this->height / 2) + ($CharHeight / 4);
-
-            imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
-        }
-    }
-
-    /**
-     * Draw Border
-     */
-    public function drawBorder()
-    {
-        $rgb          = mt_rand(50, 150);
-        $border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
-        imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
-    }
-
-    /**
-     * Draw Circles background
-     */
-    public function drawCircles()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Lines background
-     */
-    public function drawLines()
-    {
-        for ($i = 0; $i < $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Rectangles background
-     */
-    public function drawRectangles()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw Bars background
-     */
-    public function drawBars()
-    {
-        for ($i = 0; $i <= $this->height;) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
-            $i = $i + 2.5;
-        }
-        for ($i = 0; $i <= $this->width;) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
-            $i = $i + 2.5;
-        }
-    }
-
-    /**
-     * Draw Ellipses background
-     */
-    public function drawEllipses()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
-        }
-    }
-
-    /**
-     * Draw polygons background
-     */
-    public function drawPolygons()
-    {
-        for ($i = 1; $i <= $this->config['background_num']; ++$i) {
-            $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
-            $coords      = array();
-            for ($j = 1; $j <= $this->config['polygon_point']; ++$j) {
-                $coords[] = mt_rand(0, $this->width);
-                $coords[] = mt_rand(0, $this->height);
-            }
-            imagefilledpolygon($this->oImage, $coords, $this->config['polygon_point'], $randomcolor);
-        }
-    }
-
-    /**
-     *  Create CAPTCHA iamge with BMP
-     *  TODO
-     * @param  string $file
-     * @return string
-     */
-    public function createImageBmp($file = '')
-    {
-        $image = '';
-
-        if (empty($file)) {
-            header('Content-type: image/bmp');
-            echo $image;
-        } else {
-            return $image;
-        }
-    }
+		require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+		$file_path = $this->config['rootpath'] . "/{$name}";
+		$files     = XoopsLists::getFileListAsArray($file_path);
+		foreach ($files as $item) {
+			if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
+				$items[] = $item;
+			}
+		}
+		if (function_exists('mod_createCacheFile')) {
+			mod_createCacheFile($items, "captcha_{$name}", 'captcha');
+		}
+
+		return $items;
+	}
+
+	public function loadFont()
+	{
+		$fonts      = $this->_getList('fonts', 'ttf');
+		$this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
+	}
+
+	public function setImageSize()
+	{
+		$MaxCharWidth  = 0;
+		$MaxCharHeight = 0;
+		$oImage        = imagecreatetruecolor(100, 100);
+		$text_color    = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+		$FontSize      = $this->config['fontsize_max'];
+		for ($Angle = -30; $Angle <= 30; ++$Angle) {
+			for ($i = 65; $i <= 90; ++$i) {
+				$CharDetails   = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
+				$_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
+				if ($_MaxCharWidth > $MaxCharWidth) {
+					$MaxCharWidth = $_MaxCharWidth;
+				}
+				$_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
+				if ($_MaxCharHeight > $MaxCharHeight) {
+					$MaxCharHeight = $_MaxCharHeight;
+				}
+			}
+		}
+		imagedestroy($oImage);
+
+		$this->height  = $MaxCharHeight + 2;
+		$this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
+		$this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
+	}
+
+	/**
+	 * Return random background
+	 *
+	 * @return array
+	 */
+	public function loadBackground()
+	{
+		$RandBackground = null;
+		if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
+			$RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
+		}
+
+		return $RandBackground;
+	}
+
+	/**
+	 * Draw Image background
+	 */
+	public function createFromFile()
+	{
+		if ($RandImage = $this->loadBackground()) {
+			$ImageType = @getimagesize($RandImage);
+			switch (@$ImageType[2]) {
+				case 1:
+					$BackgroundImage = imagecreatefromgif($RandImage);
+					break;
+
+				case 2:
+					$BackgroundImage = imagecreatefromjpeg($RandImage);
+					break;
+
+				case 3:
+					$BackgroundImage = imagecreatefrompng($RandImage);
+					break;
+			}
+		}
+		if (!empty($BackgroundImage)) {
+			imagecopyresized($this->oImage, $BackgroundImage, 0, 0, 0, 0, imagesx($this->oImage), imagesy($this->oImage), imagesx($BackgroundImage), imagesy($BackgroundImage));
+			imagedestroy($BackgroundImage);
+		} else {
+			$this->drawBars();
+		}
+	}
+
+	/**
+	 * Draw Code
+	 */
+	public function drawCode()
+	{
+		for ($i = 0; $i < $this->config['num_chars']; ++$i) {
+			// select random greyscale colour
+			$text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+
+			// write text to image
+			$Angle = mt_rand(10, 30);
+			if ($i % 2) {
+				$Angle = mt_rand(-10, -30);
+			}
+
+			// select random font size
+			$FontSize = mt_rand($this->config['fontsize_min'], $this->config['fontsize_max']);
+
+			$CharDetails = imageftbbox($FontSize, $Angle, $this->font, $this->code[$i], array());
+			$CharHeight  = abs($CharDetails[1] + $CharDetails[5]);
+
+			// calculate character starting coordinates
+			$posX = ($this->spacing / 2) + ($i * $this->spacing);
+			$posY = 2 + ($this->height / 2) + ($CharHeight / 4);
+
+			imagefttext($this->oImage, $FontSize, $Angle, $posX, $posY, $text_color, $this->font, $this->code[$i], array());
+		}
+	}
+
+	/**
+	 * Draw Border
+	 */
+	public function drawBorder()
+	{
+		$rgb          = mt_rand(50, 150);
+		$border_color = imagecolorallocate($this->oImage, $rgb, $rgb, $rgb);
+		imagerectangle($this->oImage, 0, 0, $this->width - 1, $this->height - 1, $border_color);
+	}
+
+	/**
+	 * Draw Circles background
+	 */
+	public function drawCircles()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Lines background
+	 */
+	public function drawLines()
+	{
+		for ($i = 0; $i < $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Rectangles background
+	 */
+	public function drawRectangles()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw Bars background
+	 */
+	public function drawBars()
+	{
+		for ($i = 0; $i <= $this->height;) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, 0, $i, $this->width, $i, $randomcolor);
+			$i = $i + 2.5;
+		}
+		for ($i = 0; $i <= $this->width;) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageline($this->oImage, $i, 0, $i, $this->height, $randomcolor);
+			$i = $i + 2.5;
+		}
+	}
+
+	/**
+	 * Draw Ellipses background
+	 */
+	public function drawEllipses()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor);
+		}
+	}
+
+	/**
+	 * Draw polygons background
+	 */
+	public function drawPolygons()
+	{
+		for ($i = 1; $i <= $this->config['background_num']; ++$i) {
+			$randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255));
+			$coords      = array();
+			for ($j = 1; $j <= $this->config['polygon_point']; ++$j) {
+				$coords[] = mt_rand(0, $this->width);
+				$coords[] = mt_rand(0, $this->height);
+			}
+			imagefilledpolygon($this->oImage, $coords, $this->config['polygon_point'], $randomcolor);
+		}
+	}
+
+	/**
+	 *  Create CAPTCHA iamge with BMP
+	 *  TODO
+	 * @param  string $file
+	 * @return string
+	 */
+	public function createImageBmp($file = '')
+	{
+		$image = '';
+
+		if (empty($file)) {
+			header('Content-type: image/bmp');
+			echo $image;
+		} else {
+			return $image;
+		}
+	}
 }
 
 $config        = @include '../config.php';

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
 
         if ($this->mode === 'bmp') {
             $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
+            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int) str_pad('9', $this->config['num_chars'], '9'));
         } else {
             $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
             if (!$this->config['casesensitive']) {
@@ -93,8 +93,8 @@ 
             return;
         }
 
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
+        $maxAttempts                          = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         // Increase the attempt records on refresh
         if (!empty($maxAttempts)) {
@@ -248,7 +248,7 @@ 
         imagedestroy($oImage);
 
         $this->height  = $MaxCharHeight + 2;
-        $this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
+        $this->spacing = (int) (($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
         $this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
     }
 
@@ -431,7 +431,7 @@ 
     }
 }
 
-$config        = @include '../config.php';
+$config = @include '../config.php';
 $imageHandler = new XoopsCaptchaImageHandler();
 $imageHandler->setConfig($config);
 $imageHandler->loadImage();

include/functions.php

Doc Comments +13 added lines, -13 removed lines

@@ -325,7 +325,7 @@ 
 }
 
 /**
- * @param         $key
+ * @param         string $key
  * @param  bool   $moduleName
  * @param  string $default
  * @return null|string
@@ -387,7 +387,7 @@ 
 
 /**
  * Thanks to the NewBB2 Development Team
- * @param $target
+ * @param string $target
  * @return bool
  */
 function smart_admin_mkdir($target)
@@ -540,7 +540,7 @@ 
 
 /**
  * @param $dirname
- * @return bool
+ * @return boolean|null
  */
 function smart_deleteFile($dirname)
 {
@@ -737,7 +737,7 @@ 
 }
 
 /**
- * @param $name
+ * @param string $name
  */
 function smart_close_collapsable($name)
 {
@@ -747,7 +747,7 @@ 
 }
 
 /**
- * @param     $name
+ * @param     string $name
  * @param     $value
  * @param int $time
  */
@@ -761,7 +761,7 @@ 
 }
 
 /**
- * @param         $name
+ * @param         string $name
  * @param  string $default
  * @return string
  */
@@ -894,7 +894,7 @@ 
 }
 
 /**
- * @param $src
+ * @param string $src
  */
 function smart_addScript($src)
 {
@@ -1071,8 +1071,8 @@ 
 }
 
 /**
- * @param $module
- * @param $file
+ * @param string $module
+ * @param string $file
  */
 function smart_loadLanguageFile($module, $file)
 {
@@ -1188,7 +1188,7 @@ 
  * This function should be able to cover almost all floats that appear in an european environment.
  * @param       $str
  * @param  bool $set
- * @return float|int
+ * @return double
  */
 function smart_getfloat($str, $set = false)
 {
@@ -1223,7 +1223,7 @@ 
 /**
  * @param       $var
  * @param  bool $currencyObj
- * @return float|int|mixed|string
+ * @return string
  */
 function smart_currency($var, $currencyObj = false)
 {
@@ -1251,7 +1251,7 @@ 
 
 /**
  * @param $var
- * @return float|int|mixed|string
+ * @return string
  */
 function smart_float($var)
 {
@@ -1299,7 +1299,7 @@ 
 /**
  * @param $moduleName
  * @param $items
- * @return array
+ * @return string[]
  */
 function smart_getTablesArray($moduleName, $items)
 {

Spacing +21 added lines, -21 removed lines

@@ -468,7 +468,7 @@ 
 {
     static $smartModules;
     if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
+        $ret = & $smartModules[$moduleName];
 
         return $ret;
     }
@@ -504,7 +504,7 @@ 
 {
     static $smartConfigs;
     if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
+        $ret = & $smartConfigs[$moduleName];
 
         return $ret;
     }
@@ -532,7 +532,7 @@ 
             return $ret;
         }
         $hModConfig                = xoops_getHandler('config');
-        $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+        $smartConfigs[$moduleName] = & $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
     }
 
     return $smartConfigs[$moduleName];
@@ -578,17 +578,17 @@ 
     if (!is_numeric($userid)) {
         return $userid;
     }
-    $userid = (int)$userid;
+    $userid = (int) $userid;
     if ($userid > 0) {
         if ($users == array()) {
             //fetching users
             $memberHandler = xoops_getHandler('member');
-            $user           =& $memberHandler->getUser($userid);
+            $user = & $memberHandler->getUser($userid);
         } else {
             if (!isset($users[$userid])) {
                 return $GLOBALS['xoopsConfig']['anonymous'];
             }
-            $user =& $users[$userid];
+            $user = & $users[$userid];
         }
         if (is_object($user)) {
             $ts        = MyTextSanitizer:: getInstance();
@@ -861,7 +861,7 @@ 
     $tpl = new XoopsTpl();
 
     $hModule      = xoops_getHandler('module');
-    $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
+    $versioninfo  = & $hModule->get($xoopsModule->getVar('mid'));
     $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
     $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'/></a>";
     $tpl->assign('modfooter', $modfooter);
@@ -976,7 +976,7 @@ 
 function smart_htmlnumericentities($str)
 {
     //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) { return '&#' . ord($m[0]) . chr(59); }, $str);
+    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function($m) { return '&#' . ord($m[0]) . chr(59); }, $str);
 }
 
 /**
@@ -994,7 +994,7 @@ 
         }
         $class = 'Xoops' . ucfirst($name) . 'Handler';
         if (class_exists($class)) {
-            $handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
+            $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
         }
     }
     if (!isset($handlers[$name]) && !$optional) {
@@ -1143,11 +1143,11 @@ 
     // common HTML entities to their text equivalent.
     // Credits: newbb2
     $search = array(
-        "'<script[^>]*?>.*?</script>'si",  // Strip out javascript
-        "'<img.*?/>'si",       // Strip out img tags
-        "'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
-        "'([\r\n])[\s]+'",                // Strip out white space
-        "'&(quot|#34);'i",                // Replace HTML entities
+        "'<script[^>]*?>.*?</script>'si", // Strip out javascript
+        "'<img.*?/>'si", // Strip out img tags
+        "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+        "'([\r\n])[\s]+'", // Strip out white space
+        "'&(quot|#34);'i", // Replace HTML entities
         "'&(amp|#38);'i",
         "'&(lt|#60);'i",
         "'&(gt|#62);'i",
@@ -1157,7 +1157,7 @@ 
         "'&(pound|#163);'i",
         "'&(copy|#169);'i",
         "'&#(\d+);'e"
-    );                    // evaluate as php
+    ); // evaluate as php
 
     $replace = array(
         '',
@@ -1197,21 +1197,21 @@ 
         $str = $match[0];
         if (false !== strpos($str, ',')) {
             // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+            $str = str_replace('.', '', $str); // Erase thousand seps
+            $str = str_replace(',', '.', $str); // Convert , to . for floatval command
 
-            return (float)$str;
+            return (float) $str;
         } else {
             // No comma exists, so we have to decide, how a single dot shall be treated
             if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == true && $set['single_dot_as_decimal'] == true) {
                 // Treat single dot as decimal separator
-                return (float)$str;
+                return (float) $str;
             } else {
                 //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
                 // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
+                $str = str_replace('.', '', $str); // Erase thousand seps
 
-                return (float)$str;
+                return (float) $str;
             }
         }
     } else {

Indentation +712 added lines, -712 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 /**
- *
- * Module: SmartRental
- * Author: The SmartFactory <www.smartfactory.ca>
- * Licence: GNU
- * @param $cssfile
- * @return string
- */
+	 *
+	 * Module: SmartRental
+	 * Author: The SmartFactory <www.smartfactory.ca>
+	 * Licence: GNU
+	 * @param $cssfile
+	 * @return string
+	 */
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 function smart_get_css_link($cssfile)
 {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '" />';
+	$ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '" />';
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -21,9 +21,9 @@ 
  */
 function smart_get_page_before_form()
 {
-    global $smart_previous_page;
+	global $smart_previous_page;
 
-    return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
+	return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
 }
 
 /**
@@ -34,29 +34,29 @@ 
  */
 function smart_userIsAdmin($module = false)
 {
-    global $xoopsUser;
-    static $smart_isAdmin;
-    if (!$module) {
-        global $xoopsModule;
-        $module = $xoopsModule->getVar('dirname');
-    }
-    if (isset($smart_isAdmin[$module])) {
-        return $smart_isAdmin[$module];
-    }
-    if (!$xoopsUser) {
-        $smart_isAdmin[$module] = false;
-
-        return $smart_isAdmin[$module];
-    }
-    $smart_isAdmin[$module] = false;
-    $smartModule            = smart_getModuleInfo($module);
-    if (!is_object($smartModule)) {
-        return false;
-    }
-    $module_id              = $smartModule->getVar('mid');
-    $smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
-
-    return $smart_isAdmin[$module];
+	global $xoopsUser;
+	static $smart_isAdmin;
+	if (!$module) {
+		global $xoopsModule;
+		$module = $xoopsModule->getVar('dirname');
+	}
+	if (isset($smart_isAdmin[$module])) {
+		return $smart_isAdmin[$module];
+	}
+	if (!$xoopsUser) {
+		$smart_isAdmin[$module] = false;
+
+		return $smart_isAdmin[$module];
+	}
+	$smart_isAdmin[$module] = false;
+	$smartModule            = smart_getModuleInfo($module);
+	if (!is_object($smartModule)) {
+		return false;
+	}
+	$module_id              = $smartModule->getVar('mid');
+	$smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
+
+	return $smart_isAdmin[$module];
 }
 
 /**
@@ -64,13 +64,13 @@ 
  */
 function smart_isXoops22()
 {
-    $xoops22 = false;
-    $xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
-    if (substr($xv, 2, 1) == '2') {
-        $xoops22 = true;
-    }
+	$xoops22 = false;
+	$xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
+	if (substr($xv, 2, 1) == '2') {
+		$xoops22 = true;
+	}
 
-    return $xoops22;
+	return $xoops22;
 }
 
 /**
@@ -81,34 +81,34 @@ 
  */
 function smart_getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false)
 {
-    if (!$moduleName) {
-        global $xoopsModule;
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (!isset($smartModule)) {
-        return '';
-    }
-
-    if ($forBreadCrumb && (isset($smartModuleConfig['show_mod_name_breadcrumb']) && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
-        return '';
-    }
-    if (!$withLink) {
-        return $smartModule->getVar('name');
-    } else {
-        $seoMode = smart_getModuleModeSEO($moduleName);
-        if ($seoMode === 'rewrite') {
-            $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
-        } elseif ($seoMode === 'pathinfo') {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
-        } else {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
-        }
-
-        return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
-    }
+	if (!$moduleName) {
+		global $xoopsModule;
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (!isset($smartModule)) {
+		return '';
+	}
+
+	if ($forBreadCrumb && (isset($smartModuleConfig['show_mod_name_breadcrumb']) && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
+		return '';
+	}
+	if (!$withLink) {
+		return $smartModule->getVar('name');
+	} else {
+		$seoMode = smart_getModuleModeSEO($moduleName);
+		if ($seoMode === 'rewrite') {
+			$seoModuleName = smart_getModuleNameForSEO($moduleName);
+			$ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+		} elseif ($seoMode === 'pathinfo') {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+		} else {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+		}
+
+		return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+	}
 }
 
 /**
@@ -117,14 +117,14 @@ 
  */
 function smart_getModuleNameForSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (isset($smartModuleConfig['seo_module_name'])) {
-        return $smartModuleConfig['seo_module_name'];
-    }
-    $ret = smart_getModuleName(false, false, $moduleName);
-
-    return strtolower($ret);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (isset($smartModuleConfig['seo_module_name'])) {
+		return $smartModuleConfig['seo_module_name'];
+	}
+	$ret = smart_getModuleName(false, false, $moduleName);
+
+	return strtolower($ret);
 }
 
 /**
@@ -133,10 +133,10 @@ 
  */
 function smart_getModuleModeSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
+	return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
 }
 
 /**
@@ -145,10 +145,10 @@ 
  */
 function smart_getModuleIncludeIdSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return !empty($smartModuleConfig['seo_inc_id']);
+	return !empty($smartModuleConfig['seo_inc_id']);
 }
 
 /**
@@ -157,26 +157,26 @@ 
  */
 function smart_getenv($key)
 {
-    $ret = '';
-    $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
+	$ret = '';
+	$ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
 
-    return $ret;
+	return $ret;
 }
 
 function smart_xoops_cp_header()
 {
-    xoops_cp_header();
-    global $xoopsModule, $xoopsConfig;
-    /**
-     * include SmartObject admin language file
-     */
-    $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    if (file_exists($fileName)) {
-        include_once $fileName;
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    ?>
+	xoops_cp_header();
+	global $xoopsModule, $xoopsConfig;
+	/**
+	 * include SmartObject admin language file
+	 */
+	$fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	if (file_exists($fileName)) {
+		include_once $fileName;
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	?>
     <script type='text/javascript'>
         <!--
         var smart_url = '<?php echo SMARTOBJECT_URL ?>';
@@ -189,14 +189,14 @@ 
         src='<?php echo SMARTOBJECT_URL ?>include/smart.js'></script>
     <?php
 
-    /**
-     * Include the admin language constants for the SmartObject Framework
-     */
-    $admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
-    if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
-    }
-    include_once($admin_file);
+	/**
+	 * Include the admin language constants for the SmartObject Framework
+	 */
+	$admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
+	if (!file_exists($admin_file)) {
+		$admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
+	}
+	include_once($admin_file);
 }
 
 /**
@@ -210,21 +210,21 @@ 
  */
 function smart_TableExists($table)
 {
-    $bRetVal = false;
-    //Verifies that a MySQL table exists
-    $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
-    $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
-    $ret      = $xoopsDB->queryF($sql);
-    while (list($m_table) = $xoopsDB->fetchRow($ret)) {
-        if ($m_table == $realname) {
-            $bRetVal = true;
-            break;
-        }
-    }
-    $xoopsDB->freeRecordSet($ret);
-
-    return $bRetVal;
+	$bRetVal = false;
+	//Verifies that a MySQL table exists
+	$xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
+	$realname = $xoopsDB->prefix($table);
+	$sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+	$ret      = $xoopsDB->queryF($sql);
+	while (list($m_table) = $xoopsDB->fetchRow($ret)) {
+		if ($m_table == $realname) {
+			$bRetVal = true;
+			break;
+		}
+	}
+	$xoopsDB->freeRecordSet($ret);
+
+	return $bRetVal;
 }
 
 /**
@@ -239,19 +239,19 @@ 
  */
 function smart_GetMeta($key, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
-    $ret     = $xoopsDB->query($sql);
-    if (!$ret) {
-        $value = false;
-    } else {
-        list($value) = $xoopsDB->fetchRow($ret);
-    }
-
-    return $value;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+	$ret     = $xoopsDB->query($sql);
+	if (!$ret) {
+		$value = false;
+	} else {
+		list($value) = $xoopsDB->fetchRow($ret);
+	}
+
+	return $value;
 }
 
 /**
@@ -259,12 +259,12 @@ 
  */
 function smart_getCurrentModuleName()
 {
-    global $xoopsModule;
-    if (is_object($xoopsModule)) {
-        return $xoopsModule->getVar('dirname');
-    } else {
-        return false;
-    }
+	global $xoopsModule;
+	if (is_object($xoopsModule)) {
+		return $xoopsModule->getVar('dirname');
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -280,22 +280,22 @@ 
  */
 function smart_SetMeta($key, $value, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $ret     = smart_GetMeta($key, $moduleName);
-    if ($ret === '0' || $ret > 0) {
-        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
-    } else {
-        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
-    }
-    $ret = $xoopsDB->queryF($sql);
-    if (!$ret) {
-        return false;
-    }
-
-    return true;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$ret     = smart_GetMeta($key, $moduleName);
+	if ($ret === '0' || $ret > 0) {
+		$sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+	} else {
+		$sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+	}
+	$ret = $xoopsDB->queryF($sql);
+	if (!$ret) {
+		return false;
+	}
+
+	return true;
 }
 
 // Thanks to Mithrandir:-)
@@ -308,20 +308,20 @@ 
  */
 function smart_substr($str, $start, $length, $trimmarker = '...')
 {
-    // if the string is empty, let's get out ;-)
-    if ($str == '') {
-        return $str;
-    }
-    // reverse a string that is shortened with '' as trimmarker
-    $reversed_string = strrev(xoops_substr($str, $start, $length, ''));
-    // find first space in reversed string
-    $position_of_space = strpos($reversed_string, ' ', 0);
-    // truncate the original string to a length of $length
-    // minus the position of the last space
-    // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
-
-    return $truncated_string;
+	// if the string is empty, let's get out ;-)
+	if ($str == '') {
+		return $str;
+	}
+	// reverse a string that is shortened with '' as trimmarker
+	$reversed_string = strrev(xoops_substr($str, $start, $length, ''));
+	// find first space in reversed string
+	$position_of_space = strpos($reversed_string, ' ', 0);
+	// truncate the original string to a length of $length
+	// minus the position of the last space
+	// plus the length of the $trimmarker
+	$truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
+
+	return $truncated_string;
 }
 
 /**
@@ -332,19 +332,19 @@ 
  */
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined')
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $configs = smart_getModuleConfig($moduleName);
-    if (isset($configs[$key])) {
-        return $configs[$key];
-    } else {
-        if ($default === 'default_is_undefined') {
-            return null;
-        } else {
-            return $default;
-        }
-    }
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$configs = smart_getModuleConfig($moduleName);
+	if (isset($configs[$key])) {
+		return $configs[$key];
+	} else {
+		if ($default === 'default_is_undefined') {
+			return null;
+		} else {
+			return $default;
+		}
+	}
 }
 
 /**
@@ -357,32 +357,32 @@ 
  */
 function smart_copyr($source, $dest)
 {
-    // Simple copy for a file
-    if (is_file($source)) {
-        return copy($source, $dest);
-    }
-    // Make destination directory
-    if (!is_dir($dest)) {
-        mkdir($dest);
-    }
-    // Loop through the folder
-    $dir = dir($source);
-    while (false !== $entry = $dir->read()) {
-        // Skip pointers
-        if ($entry === '.' || $entry === '..') {
-            continue;
-        }
-        // Deep copy directories
-        if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
-            copyr("$source/$entry", "$dest/$entry");
-        } else {
-            copy("$source/$entry", "$dest/$entry");
-        }
-    }
-    // Clean up
-    $dir->close();
-
-    return true;
+	// Simple copy for a file
+	if (is_file($source)) {
+		return copy($source, $dest);
+	}
+	// Make destination directory
+	if (!is_dir($dest)) {
+		mkdir($dest);
+	}
+	// Loop through the folder
+	$dir = dir($source);
+	while (false !== $entry = $dir->read()) {
+		// Skip pointers
+		if ($entry === '.' || $entry === '..') {
+			continue;
+		}
+		// Deep copy directories
+		if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
+			copyr("$source/$entry", "$dest/$entry");
+		} else {
+			copy("$source/$entry", "$dest/$entry");
+		}
+	}
+	// Clean up
+	$dir->close();
+
+	return true;
 }
 
 /**
@@ -392,26 +392,26 @@ 
  */
 function smart_admin_mkdir($target)
 {
-    // http://www.php.net/manual/en/function.mkdir.php
-    // saint at corenova.com
-    // bart at cdasites dot com
-    if (is_dir($target) || empty($target)) {
-        return true; // best case check first
-    }
-    if (file_exists($target) && !is_dir($target)) {
-        return false;
-    }
-    if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
-        if (!file_exists($target)) {
-            $res = mkdir($target, 0777); // crawl back up & create dir tree
-            smart_admin_chmod($target);
-
-            return $res;
-        }
-    }
-    $res = is_dir($target);
-
-    return $res;
+	// http://www.php.net/manual/en/function.mkdir.php
+	// saint at corenova.com
+	// bart at cdasites dot com
+	if (is_dir($target) || empty($target)) {
+		return true; // best case check first
+	}
+	if (file_exists($target) && !is_dir($target)) {
+		return false;
+	}
+	if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
+		if (!file_exists($target)) {
+			$res = mkdir($target, 0777); // crawl back up & create dir tree
+			smart_admin_chmod($target);
+
+			return $res;
+		}
+	}
+	$res = is_dir($target);
+
+	return $res;
 }
 
 /**
@@ -422,7 +422,7 @@ 
  */
 function smart_admin_chmod($target, $mode = 0777)
 {
-    return @ chmod($target, $mode);
+	return @ chmod($target, $mode);
 }
 
 /**
@@ -433,31 +433,31 @@ 
  */
 function smart_imageResize($src, $maxWidth, $maxHeight)
 {
-    $width  = '';
-    $height = '';
-    $type   = '';
-    $attr   = '';
-    if (file_exists($src)) {
-        list($width, $height, $type, $attr) = getimagesize($src);
-        if ($width > $maxWidth) {
-            $originalWidth = $width;
-            $width         = $maxWidth;
-            $height        = $width * $height / $originalWidth;
-        }
-        if ($height > $maxHeight) {
-            $originalHeight = $height;
-            $height         = $maxHeight;
-            $width          = $height * $width / $originalHeight;
-        }
-        $attr = " width='$width' height='$height'";
-    }
-
-    return array(
-        $width,
-        $height,
-        $type,
-        $attr
-    );
+	$width  = '';
+	$height = '';
+	$type   = '';
+	$attr   = '';
+	if (file_exists($src)) {
+		list($width, $height, $type, $attr) = getimagesize($src);
+		if ($width > $maxWidth) {
+			$originalWidth = $width;
+			$width         = $maxWidth;
+			$height        = $width * $height / $originalWidth;
+		}
+		if ($height > $maxHeight) {
+			$originalHeight = $height;
+			$height         = $maxHeight;
+			$width          = $height * $width / $originalHeight;
+		}
+		$attr = " width='$width' height='$height'";
+	}
+
+	return array(
+		$width,
+		$height,
+		$type,
+		$attr
+	);
 }
 
 /**
@@ -466,34 +466,34 @@ 
  */
 function smart_getModuleInfo($moduleName = false)
 {
-    static $smartModules;
-    if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
-
-            return $smartModules[$xoopsModule->getVar('dirname')];
-        }
-    }
-    if (!isset($smartModules[$moduleName])) {
-        if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-            $smartModules[$moduleName] = $xoopsModule;
-        } else {
-            $hModule = xoops_getHandler('module');
-            if ($moduleName !== 'xoops') {
-                $smartModules[$moduleName] = $hModule->getByDirname($moduleName);
-            } else {
-                $smartModules[$moduleName] = $hModule->getByDirname('system');
-            }
-        }
-    }
-
-    return $smartModules[$moduleName];
+	static $smartModules;
+	if (isset($smartModules[$moduleName])) {
+		$ret =& $smartModules[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
+
+			return $smartModules[$xoopsModule->getVar('dirname')];
+		}
+	}
+	if (!isset($smartModules[$moduleName])) {
+		if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+			$smartModules[$moduleName] = $xoopsModule;
+		} else {
+			$hModule = xoops_getHandler('module');
+			if ($moduleName !== 'xoops') {
+				$smartModules[$moduleName] = $hModule->getByDirname($moduleName);
+			} else {
+				$smartModules[$moduleName] = $hModule->getByDirname('system');
+			}
+		}
+	}
+
+	return $smartModules[$moduleName];
 }
 
 /**
@@ -502,40 +502,40 @@ 
  */
 function smart_getModuleConfig($moduleName = false)
 {
-    static $smartConfigs;
-    if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule, $xoopsModuleConfig;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
-
-            return $smartConfigs[$xoopsModule->getVar('dirname')];
-        }
-    }
-    // if we still did not found the xoopsModule, this is because there is none
-    if (!$moduleName) {
-        $ret = false;
-
-        return $ret;
-    }
-    if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-        $smartConfigs[$moduleName] = $xoopsModuleConfig;
-    } else {
-        $module = smart_getModuleInfo($moduleName);
-        if (!is_object($module)) {
-            $ret = false;
-
-            return $ret;
-        }
-        $hModConfig                = xoops_getHandler('config');
-        $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
-    }
-
-    return $smartConfigs[$moduleName];
+	static $smartConfigs;
+	if (isset($smartConfigs[$moduleName])) {
+		$ret =& $smartConfigs[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule, $xoopsModuleConfig;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
+
+			return $smartConfigs[$xoopsModule->getVar('dirname')];
+		}
+	}
+	// if we still did not found the xoopsModule, this is because there is none
+	if (!$moduleName) {
+		$ret = false;
+
+		return $ret;
+	}
+	if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+		$smartConfigs[$moduleName] = $xoopsModuleConfig;
+	} else {
+		$module = smart_getModuleInfo($moduleName);
+		if (!is_object($module)) {
+			$ret = false;
+
+			return $ret;
+		}
+		$hModConfig                = xoops_getHandler('config');
+		$smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+	}
+
+	return $smartConfigs[$moduleName];
 }
 
 /**
@@ -544,10 +544,10 @@ 
  */
 function smart_deleteFile($dirname)
 {
-    // Simple delete for a file
-    if (is_file($dirname)) {
-        return unlink($dirname);
-    }
+	// Simple delete for a file
+	if (is_file($dirname)) {
+		return unlink($dirname);
+	}
 }
 
 /**
@@ -556,12 +556,12 @@ 
  */
 function smart_formatErrors($errors = array())
 {
-    $ret = '';
-    foreach ($errors as $key => $value) {
-        $ret .= '<br /> - ' . $value;
-    }
+	$ret = '';
+	foreach ($errors as $key => $value) {
+		$ret .= '<br /> - ' . $value;
+	}
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -575,46 +575,46 @@ 
  */
 function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array(), $withContact = false)
 {
-    if (!is_numeric($userid)) {
-        return $userid;
-    }
-    $userid = (int)$userid;
-    if ($userid > 0) {
-        if ($users == array()) {
-            //fetching users
-            $memberHandler = xoops_getHandler('member');
-            $user           =& $memberHandler->getUser($userid);
-        } else {
-            if (!isset($users[$userid])) {
-                return $GLOBALS['xoopsConfig']['anonymous'];
-            }
-            $user =& $users[$userid];
-        }
-        if (is_object($user)) {
-            $ts        = MyTextSanitizer:: getInstance();
-            $username  = $user->getVar('uname');
-            $fullname  = '';
-            $fullname2 = $user->getVar('name');
-            if ($name && !empty($fullname2)) {
-                $fullname = $user->getVar('name');
-            }
-            if (!empty($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
-            } else {
-                $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
-            }
-            // add contact info: email + PM
-            if ($withContact) {
-                $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"/></a>';
-                $js = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"/></a>';
-            }
-
-            return $linkeduser;
-        }
-    }
-
-    return $GLOBALS['xoopsConfig']['anonymous'];
+	if (!is_numeric($userid)) {
+		return $userid;
+	}
+	$userid = (int)$userid;
+	if ($userid > 0) {
+		if ($users == array()) {
+			//fetching users
+			$memberHandler = xoops_getHandler('member');
+			$user           =& $memberHandler->getUser($userid);
+		} else {
+			if (!isset($users[$userid])) {
+				return $GLOBALS['xoopsConfig']['anonymous'];
+			}
+			$user =& $users[$userid];
+		}
+		if (is_object($user)) {
+			$ts        = MyTextSanitizer:: getInstance();
+			$username  = $user->getVar('uname');
+			$fullname  = '';
+			$fullname2 = $user->getVar('name');
+			if ($name && !empty($fullname2)) {
+				$fullname = $user->getVar('name');
+			}
+			if (!empty($fullname)) {
+				$linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+			} else {
+				$linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+			}
+			// add contact info: email + PM
+			if ($withContact) {
+				$linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"/></a>';
+				$js = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
+				$linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"/></a>';
+			}
+
+			return $linkeduser;
+		}
+	}
+
+	return $GLOBALS['xoopsConfig']['anonymous'];
 }
 
 /**
@@ -625,33 +625,33 @@ 
  */
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
 {
-    global $xoopsModule, $xoopsConfig;
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
-    }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    $headermenu = array();
-    $adminmenu  = array();
-    include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
-    $tpl = new XoopsTpl();
-    $tpl->assign(array(
-                     'headermenu'      => $headermenu,
-                     'adminmenu'       => $adminmenu,
-                     'current'         => $currentoption,
-                     'breadcrumb'      => $breadcrumb,
-                     'headermenucount' => count($headermenu),
-                     'submenus'        => $submenus,
-                     'currentsub'      => $currentsub,
-                     'submenuscount'   => count($submenus)
-                 ));
-    $tpl->display('db:smartobject_admin_menu.tpl');
+	global $xoopsModule, $xoopsConfig;
+	include_once XOOPS_ROOT_PATH . '/class/template.php';
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+	}
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	$headermenu = array();
+	$adminmenu  = array();
+	include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+	$tpl = new XoopsTpl();
+	$tpl->assign(array(
+					 'headermenu'      => $headermenu,
+					 'adminmenu'       => $adminmenu,
+					 'current'         => $currentoption,
+					 'breadcrumb'      => $breadcrumb,
+					 'headermenucount' => count($headermenu),
+					 'submenus'        => $submenus,
+					 'currentsub'      => $currentsub,
+					 'submenuscount'   => count($submenus)
+				 ));
+	$tpl->display('db:smartobject_admin_menu.tpl');
 }
 
 /**
@@ -661,13 +661,13 @@ 
  */
 function smart_collapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ($dsc != '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ($dsc != '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -677,15 +677,15 @@ 
  */
 function smart_ajaxCollapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    $onClick = "ajaxtogglecollapse('$id')";
-    //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ($dsc != '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	$onClick = "ajaxtogglecollapse('$id')";
+	//$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
+	echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ($dsc != '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -712,20 +712,20 @@ 
  */
 function smart_openclose_collapsable($name)
 {
-    $urls        = smart_getCurrentUrls();
-    $path        = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
-    $cookie_name = str_replace('.', '_', $cookie_name);
-    $cookie      = smart_getCookieVar($cookie_name, '');
-    if ($cookie === 'none') {
-        echo '
+	$urls        = smart_getCurrentUrls();
+	$path        = $urls['phpself'];
+	$cookie_name = $path . '_smart_collaps_' . $name;
+	$cookie_name = str_replace('.', '_', $cookie_name);
+	$cookie      = smart_getCookieVar($cookie_name, '');
+	if ($cookie === 'none') {
+		echo '
                 <script type="text/javascript"><!--
                 togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
                     //-->
                 </script>
                 ';
-    }
-    /*  if ($cookie == 'none') {
+	}
+	/*  if ($cookie == 'none') {
      echo '
      <script type="text/javascript"><!--
      hideElement("' . $name . '");
@@ -741,9 +741,9 @@ 
  */
 function smart_close_collapsable($name)
 {
-    echo '</div>';
-    smart_openclose_collapsable($name);
-    echo '<br />';
+	echo '</div>';
+	smart_openclose_collapsable($name);
+	echo '<br />';
 }
 
 /**
@@ -753,11 +753,11 @@ 
  */
 function smart_setCookieVar($name, $value, $time = 0)
 {
-    if ($time == 0) {
-        $time = time() + 3600 * 24 * 365;
-        //$time = '';
-    }
-    setcookie($name, $value, $time, '/');
+	if ($time == 0) {
+		$time = time() + 3600 * 24 * 365;
+		//$time = '';
+	}
+	setcookie($name, $value, $time, '/');
 }
 
 /**
@@ -767,12 +767,12 @@ 
  */
 function smart_getCookieVar($name, $default = '')
 {
-    $name = str_replace('.', '_', $name);
-    if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
-        return $_COOKIE[$name];
-    } else {
-        return $default;
-    }
+	$name = str_replace('.', '_', $name);
+	if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
+		return $_COOKIE[$name];
+	} else {
+		return $default;
+	}
 }
 
 /**
@@ -780,25 +780,25 @@ 
  */
 function smart_getCurrentUrls()
 {
-    $urls        = array();
-    $http        = (strpos(XOOPS_URL, 'https://') === false) ? 'http://' : 'https://';
-    $phpself     = $_SERVER['PHP_SELF'];
-    $httphost    = $_SERVER['HTTP_HOST'];
-    $querystring = $_SERVER['QUERY_STRING'];
-    if ($querystring != '') {
-        $querystring = '?' . $querystring;
-    }
-    $currenturl           = $http . $httphost . $phpself . $querystring;
-    $urls                 = array();
-    $urls['http']         = $http;
-    $urls['httphost']     = $httphost;
-    $urls['phpself']      = $phpself;
-    $urls['querystring']  = $querystring;
-    $urls['full_phpself'] = $http . $httphost . $phpself;
-    $urls['full']         = $currenturl;
-    $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
-
-    return $urls;
+	$urls        = array();
+	$http        = (strpos(XOOPS_URL, 'https://') === false) ? 'http://' : 'https://';
+	$phpself     = $_SERVER['PHP_SELF'];
+	$httphost    = $_SERVER['HTTP_HOST'];
+	$querystring = $_SERVER['QUERY_STRING'];
+	if ($querystring != '') {
+		$querystring = '?' . $querystring;
+	}
+	$currenturl           = $http . $httphost . $phpself . $querystring;
+	$urls                 = array();
+	$urls['http']         = $http;
+	$urls['httphost']     = $httphost;
+	$urls['phpself']      = $phpself;
+	$urls['querystring']  = $querystring;
+	$urls['full_phpself'] = $http . $httphost . $phpself;
+	$urls['full']         = $currenturl;
+	$urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+
+	return $urls;
 }
 
 /**
@@ -806,9 +806,9 @@ 
  */
 function smart_getCurrentPage()
 {
-    $urls = smart_getCurrentUrls();
+	$urls = smart_getCurrentUrls();
 
-    return $urls['full'];
+	return $urls['full'];
 }
 
 /**
@@ -855,29 +855,29 @@ 
  */
 function smart_modFooter()
 {
-    global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
-
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    $tpl = new XoopsTpl();
-
-    $hModule      = xoops_getHandler('module');
-    $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-    $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-    $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'/></a>";
-    $tpl->assign('modfooter', $modfooter);
-
-    if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
-        define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br />Do you need new features not yet available?');
-    }
-    $smartobjectConfig = smart_getModuleConfig('smartobject');
-    $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.html');
+	global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+
+	include_once XOOPS_ROOT_PATH . '/class/template.php';
+	$tpl = new XoopsTpl();
+
+	$hModule      = xoops_getHandler('module');
+	$versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
+	$modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
+	$modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'/></a>";
+	$tpl->assign('modfooter', $modfooter);
+
+	if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
+		define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br />Do you need new features not yet available?');
+	}
+	$smartobjectConfig = smart_getModuleConfig('smartobject');
+	$tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
+	$tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.html');
 }
 
 function smart_xoops_cp_footer()
 {
-    smart_modFooter();
-    xoops_cp_footer();
+	smart_modFooter();
+	xoops_cp_footer();
 }
 
 /**
@@ -886,11 +886,11 @@ 
  */
 function smart_sanitizeForCommonTags($text)
 {
-    global $xoopsConfig;
-    $text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
-    $text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
+	global $xoopsConfig;
+	$text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
+	$text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -898,7 +898,7 @@ 
  */
 function smart_addScript($src)
 {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+	echo '<script src="' . $src . '" type="text/javascript"></script>';
 }
 
 /**
@@ -906,17 +906,17 @@ 
  */
 function smart_addStyle($src)
 {
-    if ($src === 'smartobject') {
-        $src = SMARTOBJECT_URL . 'assets/css/module.css';
-    }
-    echo smart_get_css_link($src);
+	if ($src === 'smartobject') {
+		$src = SMARTOBJECT_URL . 'assets/css/module.css';
+	}
+	echo smart_get_css_link($src);
 }
 
 function smart_addAdminAjaxSupport()
 {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
 }
 
 /**
@@ -925,11 +925,11 @@ 
  */
 function smart_sanitizeForSmartpopupLink($text)
 {
-    $patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
-    $replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
-    $ret            = preg_replace($patterns, $replacements, $text);
+	$patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
+	$replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
+	$ret            = preg_replace($patterns, $replacements, $text);
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -944,25 +944,25 @@ 
  */
 function smart_getImageSize($url, & $width, & $height)
 {
-    if (empty($width) || empty($height)) {
-        if (!$dimension = @ getimagesize($url)) {
-            return false;
-        }
-        if (!empty($width)) {
-            $height = $dimension[1] * $width / $dimension[0];
-        } elseif (!empty($height)) {
-            $width = $dimension[0] * $height / $dimension[1];
-        } else {
-            list($width, $height) = array(
-                $dimension[0],
-                $dimension[1]
-            );
-        }
-
-        return true;
-    } else {
-        return true;
-    }
+	if (empty($width) || empty($height)) {
+		if (!$dimension = @ getimagesize($url)) {
+			return false;
+		}
+		if (!empty($width)) {
+			$height = $dimension[1] * $width / $dimension[0];
+		} elseif (!empty($height)) {
+			$width = $dimension[0] * $height / $dimension[1];
+		} else {
+			list($width, $height) = array(
+				$dimension[0],
+				$dimension[1]
+			);
+		}
+
+		return true;
+	} else {
+		return true;
+	}
 }
 
 /**
@@ -975,8 +975,8 @@ 
  */
 function smart_htmlnumericentities($str)
 {
-    //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) { return '&#' . ord($m[0]) . chr(59); }, $str);
+	//    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
+	return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) { return '&#' . ord($m[0]) . chr(59); }, $str);
 }
 
 /**
@@ -986,24 +986,24 @@ 
  */
 function smart_getcorehandler($name, $optional = false)
 {
-    static $handlers;
-    $name = strtolower(trim($name));
-    if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
-            require_once $hnd_file;
-        }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
-        if (class_exists($class)) {
-            $handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
-        }
-    }
-    if (!isset($handlers[$name]) && !$optional) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br />Handler Name: ' . $name, E_USER_ERROR);
-    }
-    if (isset($handlers[$name])) {
-        return $handlers[$name];
-    }
-    $inst = false;
+	static $handlers;
+	$name = strtolower(trim($name));
+	if (!isset($handlers[$name])) {
+		if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+			require_once $hnd_file;
+		}
+		$class = 'Xoops' . ucfirst($name) . 'Handler';
+		if (class_exists($class)) {
+			$handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
+		}
+	}
+	if (!isset($handlers[$name]) && !$optional) {
+		trigger_error('Class <b>' . $class . '</b> does not exist<br />Handler Name: ' . $name, E_USER_ERROR);
+	}
+	if (isset($handlers[$name])) {
+		return $handlers[$name];
+	}
+	$inst = false;
 }
 
 /**
@@ -1012,15 +1012,15 @@ 
  */
 function smart_sanitizeAdsenses_callback($matches)
 {
-    global $smartobjectAdsenseHandler;
-    if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
-        $adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
-        $ret        = $adsenseObj->render();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectAdsenseHandler;
+	if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
+		$adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
+		$ret        = $adsenseObj->render();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1029,13 +1029,13 @@ 
  */
 function smart_sanitizeAdsenses($text)
 {
-    $patterns     = array();
-    $replacements = array();
+	$patterns     = array();
+	$replacements = array();
 
-    $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
+	$patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1044,15 +1044,15 @@ 
  */
 function smart_sanitizeCustomtags_callback($matches)
 {
-    global $smartobjectCustomtagHandler;
-    if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
-        $customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
-        $ret       = $customObj->renderWithPhp();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectCustomtagHandler;
+	if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
+		$customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
+		$ret       = $customObj->renderWithPhp();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1061,13 +1061,13 @@ 
  */
 function smart_sanitizeCustomtags($text)
 {
-    $patterns     = array();
-    $replacements = array();
+	$patterns     = array();
+	$replacements = array();
 
-    $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
+	$patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1076,20 +1076,20 @@ 
  */
 function smart_loadLanguageFile($module, $file)
 {
-    global $xoopsConfig;
-
-    $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
-    if (!file_exists($filename)) {
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
-    }
-    if (file_exists($filename)) {
-        include_once($filename);
-    }
+	global $xoopsConfig;
+
+	$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+	if (!file_exists($filename)) {
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+	}
+	if (file_exists($filename)) {
+		include_once($filename);
+	}
 }
 
 function smart_loadCommonLanguageFile()
 {
-    smart_loadLanguageFile('smartobject', 'common');
+	smart_loadLanguageFile('smartobject', 'common');
 }
 
 /**
@@ -1099,35 +1099,35 @@ 
  */
 function smart_purifyText($text, $keyword = false)
 {
-    global $myts;
-    $text = str_replace('&nbsp;', ' ', $text);
-    $text = str_replace('<br />', ' ', $text);
-    $text = str_replace('<br/>', ' ', $text);
-    $text = str_replace('<br', ' ', $text);
-    $text = strip_tags($text);
-    $text = html_entity_decode($text);
-    $text = $myts->undoHtmlSpecialChars($text);
-    $text = str_replace(')', ' ', $text);
-    $text = str_replace('(', ' ', $text);
-    $text = str_replace(':', ' ', $text);
-    $text = str_replace('&euro', ' euro ', $text);
-    $text = str_replace('&hellip', '...', $text);
-    $text = str_replace('&rsquo', ' ', $text);
-    $text = str_replace('!', ' ', $text);
-    $text = str_replace('?', ' ', $text);
-    $text = str_replace('"', ' ', $text);
-    $text = str_replace('-', ' ', $text);
-    $text = str_replace('\n', ' ', $text);
-    $text = str_replace('&#8213;', ' ', $text);
-
-    if ($keyword) {
-        $text = str_replace('.', ' ', $text);
-        $text = str_replace(',', ' ', $text);
-        $text = str_replace('\'', ' ', $text);
-    }
-    $text = str_replace(';', ' ', $text);
-
-    return $text;
+	global $myts;
+	$text = str_replace('&nbsp;', ' ', $text);
+	$text = str_replace('<br />', ' ', $text);
+	$text = str_replace('<br/>', ' ', $text);
+	$text = str_replace('<br', ' ', $text);
+	$text = strip_tags($text);
+	$text = html_entity_decode($text);
+	$text = $myts->undoHtmlSpecialChars($text);
+	$text = str_replace(')', ' ', $text);
+	$text = str_replace('(', ' ', $text);
+	$text = str_replace(':', ' ', $text);
+	$text = str_replace('&euro', ' euro ', $text);
+	$text = str_replace('&hellip', '...', $text);
+	$text = str_replace('&rsquo', ' ', $text);
+	$text = str_replace('!', ' ', $text);
+	$text = str_replace('?', ' ', $text);
+	$text = str_replace('"', ' ', $text);
+	$text = str_replace('-', ' ', $text);
+	$text = str_replace('\n', ' ', $text);
+	$text = str_replace('&#8213;', ' ', $text);
+
+	if ($keyword) {
+		$text = str_replace('.', ' ', $text);
+		$text = str_replace(',', ' ', $text);
+		$text = str_replace('\'', ' ', $text);
+	}
+	$text = str_replace(';', ' ', $text);
+
+	return $text;
 }
 
 /**
@@ -1136,49 +1136,49 @@ 
  */
 function smart_html2text($document)
 {
-    // PHP Manual:: function preg_replace
-    // $document should contain an HTML document.
-    // This will remove HTML tags, javascript sections
-    // and white space. It will also convert some
-    // common HTML entities to their text equivalent.
-    // Credits: newbb2
-    $search = array(
-        "'<script[^>]*?>.*?</script>'si",  // Strip out javascript
-        "'<img.*?/>'si",       // Strip out img tags
-        "'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
-        "'([\r\n])[\s]+'",                // Strip out white space
-        "'&(quot|#34);'i",                // Replace HTML entities
-        "'&(amp|#38);'i",
-        "'&(lt|#60);'i",
-        "'&(gt|#62);'i",
-        "'&(nbsp|#160);'i",
-        "'&(iexcl|#161);'i",
-        "'&(cent|#162);'i",
-        "'&(pound|#163);'i",
-        "'&(copy|#169);'i",
-        "'&#(\d+);'e"
-    );                    // evaluate as php
-
-    $replace = array(
-        '',
-        '',
-        '',
-        "\\1",
-        "\"",
-        '&',
-        '<',
-        '>',
-        ' ',
-        chr(161),
-        chr(162),
-        chr(163),
-        chr(169),
-        "chr(\\1)"
-    );
-
-    $text = preg_replace($search, $replace, $document);
-
-    return $text;
+	// PHP Manual:: function preg_replace
+	// $document should contain an HTML document.
+	// This will remove HTML tags, javascript sections
+	// and white space. It will also convert some
+	// common HTML entities to their text equivalent.
+	// Credits: newbb2
+	$search = array(
+		"'<script[^>]*?>.*?</script>'si",  // Strip out javascript
+		"'<img.*?/>'si",       // Strip out img tags
+		"'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
+		"'([\r\n])[\s]+'",                // Strip out white space
+		"'&(quot|#34);'i",                // Replace HTML entities
+		"'&(amp|#38);'i",
+		"'&(lt|#60);'i",
+		"'&(gt|#62);'i",
+		"'&(nbsp|#160);'i",
+		"'&(iexcl|#161);'i",
+		"'&(cent|#162);'i",
+		"'&(pound|#163);'i",
+		"'&(copy|#169);'i",
+		"'&#(\d+);'e"
+	);                    // evaluate as php
+
+	$replace = array(
+		'',
+		'',
+		'',
+		"\\1",
+		"\"",
+		'&',
+		'<',
+		'>',
+		' ',
+		chr(161),
+		chr(162),
+		chr(163),
+		chr(169),
+		"chr(\\1)"
+	);
+
+	$text = preg_replace($search, $replace, $document);
+
+	return $text;
 }
 
 /**
@@ -1192,32 +1192,32 @@ 
  */
 function smart_getfloat($str, $set = false)
 {
-    if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
-        // Found number in $str, so set $str that number
-        $str = $match[0];
-        if (false !== strpos($str, ',')) {
-            // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
-
-            return (float)$str;
-        } else {
-            // No comma exists, so we have to decide, how a single dot shall be treated
-            if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == true && $set['single_dot_as_decimal'] == true) {
-                // Treat single dot as decimal separator
-                return (float)$str;
-            } else {
-                //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
-                // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-
-                return (float)$str;
-            }
-        }
-    } else {
-        // No number found, return zero
-        return 0;
-    }
+	if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
+		// Found number in $str, so set $str that number
+		$str = $match[0];
+		if (false !== strpos($str, ',')) {
+			// A comma exists, that makes it easy, cos we assume it separates the decimal part.
+			$str = str_replace('.', '', $str);    // Erase thousand seps
+			$str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+
+			return (float)$str;
+		} else {
+			// No comma exists, so we have to decide, how a single dot shall be treated
+			if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == true && $set['single_dot_as_decimal'] == true) {
+				// Treat single dot as decimal separator
+				return (float)$str;
+			} else {
+				//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
+				// Else, treat all dots as thousand seps
+				$str = str_replace('.', '', $str);    // Erase thousand seps
+
+				return (float)$str;
+			}
+		}
+	} else {
+		// No number found, return zero
+		return 0;
+	}
 }
 
 /**
@@ -1227,26 +1227,26 @@ 
  */
 function smart_currency($var, $currencyObj = false)
 {
-    $ret = smart_getfloat($var, array('single_dot_as_decimal' => true));
-    $ret = round($ret, 2);
-    // make sur we have at least .00 in the $var
-    $decimal_section_original = strstr($ret, '.');
-    $decimal_section          = $decimal_section_original;
-    if ($decimal_section) {
-        if (strlen($decimal_section) == 1) {
-            $decimal_section = '.00';
-        } elseif (strlen($decimal_section) == 2) {
-            $decimal_section = $decimal_section . '0';
-        }
-        $ret = str_replace($decimal_section_original, $decimal_section, $ret);
-    } else {
-        $ret = $ret . '.00';
-    }
-    if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
-    }
-
-    return $ret;
+	$ret = smart_getfloat($var, array('single_dot_as_decimal' => true));
+	$ret = round($ret, 2);
+	// make sur we have at least .00 in the $var
+	$decimal_section_original = strstr($ret, '.');
+	$decimal_section          = $decimal_section_original;
+	if ($decimal_section) {
+		if (strlen($decimal_section) == 1) {
+			$decimal_section = '.00';
+		} elseif (strlen($decimal_section) == 2) {
+			$decimal_section = $decimal_section . '0';
+		}
+		$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+	} else {
+		$ret = $ret . '.00';
+	}
+	if ($currencyObj) {
+		$ret = $ret . ' ' . $currencyObj->getCode();
+	}
+
+	return $ret;
 }
 
 /**
@@ -1255,7 +1255,7 @@ 
  */
 function smart_float($var)
 {
-    return smart_currency($var);
+	return smart_currency($var);
 }
 
 /**
@@ -1264,16 +1264,16 @@ 
  */
 function smart_getModuleAdminLink($moduleName = false)
 {
-    global $xoopsModule;
-    if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $ret = '';
-    if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
-    }
-
-    return $ret;
+	global $xoopsModule;
+	if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$ret = '';
+	if ($moduleName) {
+		$ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+	}
+
+	return $ret;
 }
 
 /**
@@ -1281,19 +1281,19 @@ 
  */
 function smart_getEditors()
 {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
-    if (!file_exists($filename)) {
-        return false;
-    }
-    include_once $filename;
-    $xoopseditorHandler = XoopsEditorHandler::getInstance();
-    $aList               = $xoopseditorHandler->getList();
-    $ret                 = array();
-    foreach ($aList as $k => $v) {
-        $ret[$v] = $k;
-    }
-
-    return $ret;
+	$filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+	if (!file_exists($filename)) {
+		return false;
+	}
+	include_once $filename;
+	$xoopseditorHandler = XoopsEditorHandler::getInstance();
+	$aList               = $xoopseditorHandler->getList();
+	$ret                 = array();
+	foreach ($aList as $k => $v) {
+		$ret[$v] = $k;
+	}
+
+	return $ret;
 }
 
 /**
@@ -1303,11 +1303,11 @@ 
  */
 function smart_getTablesArray($moduleName, $items)
 {
-    $ret = array();
-    foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
-    }
-    $ret[] = $moduleName . '_meta';
+	$ret = array();
+	foreach ($items as $item) {
+		$ret[] = $moduleName . '_' . $item;
+	}
+	$ret[] = $moduleName . '_meta';
 
-    return $ret;
+	return $ret;
 }

include/projax_/classes/JavaScript.php

Doc Comments +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
     /**
      * @param $javascript
-     * @return mixed|string
+     * @return string
      */
     public function escape($javascript)
     {
@@ -48,7 +48,7 @@ 
 
     /**
      * @param       $name
-     * @param       $function
+     * @param       string $function
      * @param  null $html_options
      * @return string
      */

Indentation +75 added lines, -75 removed lines

@@ -15,90 +15,90 @@
  */
 class JavaScript
 {
-    /**
-     * @param       $name
-     * @param  null $function
-     * @return string
-     */
-    public function button_to_function($name, $function = null)
-    {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
-    }
+	/**
+	 * @param       $name
+	 * @param  null $function
+	 * @return string
+	 */
+	public function button_to_function($name, $function = null)
+	{
+		return '<input type="button" value="' . $name . '" onclick="' . $function . '" />';
+	}
 
-    /**
-     * @param $javascript
-     * @return mixed|string
-     */
-    public function escape($javascript)
-    {
-        $javascript = addslashes($javascript);
-        $javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
+	/**
+	 * @param $javascript
+	 * @return mixed|string
+	 */
+	public function escape($javascript)
+	{
+		$javascript = addslashes($javascript);
+		$javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
 
-        return $javascript;
-    }
+		return $javascript;
+	}
 
-    /**
-     * @param $content
-     * @return string
-     */
-    public function tag($content)
-    {
-        return '<script type="text/javascript">' . $content . '</script>';
-    }
+	/**
+	 * @param $content
+	 * @return string
+	 */
+	public function tag($content)
+	{
+		return '<script type="text/javascript">' . $content . '</script>';
+	}
 
-    /**
-     * @param       $name
-     * @param       $function
-     * @param  null $html_options
-     * @return string
-     */
-    public function link_to_function($name, $function, $html_options = null)
-    {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
-    }
+	/**
+	 * @param       $name
+	 * @param       $function
+	 * @param  null $html_options
+	 * @return string
+	 */
+	public function link_to_function($name, $function, $html_options = null)
+	{
+		return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;" />' . $name . '</a>';
+	}
 
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @param $option
-     * @return string
-     */
-    public function _array_or_string_for_javascript($option)
-    {
-        $return_val = '';
-        if (is_array($option)) {
-            foreach ($option as $value) {
-                if (!empty($return_val)) {
-                    $ret_val .= ', ';
-                }
-                $return_val .= $value;
-            }
+	/**
+	 * @param $option
+	 * @return string
+	 */
+	public function _array_or_string_for_javascript($option)
+	{
+		$return_val = '';
+		if (is_array($option)) {
+			foreach ($option as $value) {
+				if (!empty($return_val)) {
+					$ret_val .= ', ';
+				}
+				$return_val .= $value;
+			}
 
-            return '[' . $return_val . ']';
-        }
+			return '[' . $return_val . ']';
+		}
 
-        return "'$option'";
-    }
+		return "'$option'";
+	}
 
-    /**
-     * @param $options
-     * @return string
-     */
-    public function _options_for_javascript($options)
-    {
-        $return_val = '';
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function _options_for_javascript($options)
+	{
+		$return_val = '';
 
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (!empty($return_val)) {
-                    $return_val .= ', ';
-                }
-                $return_val .= "$var:$val";
-            }
-        }
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (!empty($return_val)) {
+					$return_val .= ', ';
+				}
+				$return_val .= "$var:$val";
+			}
+		}
 
-        return '{' . $return_val . '}';
-    }
+		return '{' . $return_val . '}';
+	}
 }