mambax7 / smartobject

class/smartobjectcategory.php

Indentation +204 added lines, -204 removed lines

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

Spacing +5 added lines, -5 removed lines

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

class/smartobjecttreetable.php

Indentation +153 added lines, -153 removed lines

@@ -22,157 +22,157 @@
  */
 class SmartObjectTreeTable extends SmartObjectTable
 {
-    /**
-     * SmartObjectTreeTable constructor.
-     * @param SmartPersistableObjectHandler $objectHandler
-     * @param bool                          $criteria
-     * @param array                         $actions
-     * @param bool                          $userSide
-     */
-    public function __construct(
-        SmartPersistableObjectHandler $objectHandler,
-        $criteria = false,
-        $actions = array('edit', 'delete'),
-        $userSide = false
-    ) {
-        $this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
-        $this->_isTree = true;
-    }
-
-    /**
-     * Get children objects given a specific parentid
-     *
-     * @var    int $parentid id of the parent which children we want to retreive
-     * @return array of SmartObject
-     */
-    public function getChildrenOf($parentid = 0)
-    {
-        return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
-    }
-
-    /**
-     * @param     $object
-     * @param int $level
-     */
-    public function createTableRow($object, $level = 0)
-    {
-        $aObject = array();
-
-        $i = 0;
-
-        $aColumns        = array();
-        $doWeHaveActions = false;
-
-        foreach ($this->_columns as $column) {
-            $aColumn = array();
-
-            if ($i == 0) {
-                $class = 'head';
-            } elseif ($i % 2 == 0) {
-                $class = 'even';
-            } else {
-                $class = 'odd';
-            }
-
-            if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
-                $method = $column->_customMethodForValue;
-                $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());
-                }
-            }
-
-            $space = '';
-            if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                for ($i = 0; $i < $level; ++$i) {
-                    $space .= '--';
-                }
-            }
-
-            if ($space !== '') {
-                $space .= '&nbsp;';
-            }
-
-            $aColumn['value'] = $space . $value;
-            $aColumn['class'] = $class;
-            $aColumn['width'] = $column->getWidth();
-            $aColumn['align'] = $column->getAlign();
-            $aColumn['key']   = $column->getKeyName();
-
-            $aColumns[] = $aColumn;
-            ++$i;
-        }
-
-        $aObject['columns'] = $aColumns;
-
-        $class            = $class === 'even' ? 'odd' : 'even';
-        $aObject['class'] = $class;
-
-        $actions = array();
-
-        // Adding the custom actions if any
-        foreach ($this->_custom_actions as $action) {
-            if (method_exists($object, $action)) {
-                $actions[] = $object->$action();
-            }
-        }
-
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($this->_objectHandler);
-
-        if (in_array('edit', $this->_actions)) {
-            $actions[] = $controller->getEditItemLink($object, false, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $actions[] = $controller->getDeleteItemLink($object, false, true);
-        }
-        $aObject['actions'] = $actions;
-
-        $this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
-        $aObject['id']     = $object->id();
-        $this->_aObjects[] = $aObject;
-
-        $childrenObjects = $this->getChildrenOf($object->id());
-
-        $this->_hasActions = $this->_hasActions ? true : count($actions) > 0;
-
-        if ($childrenObjects) {
-            ++$level;
-            foreach ($childrenObjects as $subObject) {
-                $this->createTableRow($subObject, $level);
-            }
-        }
-    }
-
-    public function createTableRows()
-    {
-        $this->_aObjects = array();
-
-        if (count($this->_objects) > 0) {
-            foreach ($this->getChildrenOf() as $object) {
-                $this->createTableRow($object);
-            }
-
-            $this->_tpl->assign('smartobject_objects', $this->_aObjects);
-        } else {
-            $colspan = count($this->_columns) + 1;
-            $this->_tpl->assign('smartobject_colspan', $colspan);
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function fetchObjects()
-    {
-        $ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
-
-        return $ret;
-    }
+	/**
+	 * SmartObjectTreeTable constructor.
+	 * @param SmartPersistableObjectHandler $objectHandler
+	 * @param bool                          $criteria
+	 * @param array                         $actions
+	 * @param bool                          $userSide
+	 */
+	public function __construct(
+		SmartPersistableObjectHandler $objectHandler,
+		$criteria = false,
+		$actions = array('edit', 'delete'),
+		$userSide = false
+	) {
+		$this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
+		$this->_isTree = true;
+	}
+
+	/**
+	 * Get children objects given a specific parentid
+	 *
+	 * @var    int $parentid id of the parent which children we want to retreive
+	 * @return array of SmartObject
+	 */
+	public function getChildrenOf($parentid = 0)
+	{
+		return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
+	}
+
+	/**
+	 * @param     $object
+	 * @param int $level
+	 */
+	public function createTableRow($object, $level = 0)
+	{
+		$aObject = array();
+
+		$i = 0;
+
+		$aColumns        = array();
+		$doWeHaveActions = false;
+
+		foreach ($this->_columns as $column) {
+			$aColumn = array();
+
+			if ($i == 0) {
+				$class = 'head';
+			} elseif ($i % 2 == 0) {
+				$class = 'even';
+			} else {
+				$class = 'odd';
+			}
+
+			if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
+				$method = $column->_customMethodForValue;
+				$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());
+				}
+			}
+
+			$space = '';
+			if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+				for ($i = 0; $i < $level; ++$i) {
+					$space .= '--';
+				}
+			}
+
+			if ($space !== '') {
+				$space .= '&nbsp;';
+			}
+
+			$aColumn['value'] = $space . $value;
+			$aColumn['class'] = $class;
+			$aColumn['width'] = $column->getWidth();
+			$aColumn['align'] = $column->getAlign();
+			$aColumn['key']   = $column->getKeyName();
+
+			$aColumns[] = $aColumn;
+			++$i;
+		}
+
+		$aObject['columns'] = $aColumns;
+
+		$class            = $class === 'even' ? 'odd' : 'even';
+		$aObject['class'] = $class;
+
+		$actions = array();
+
+		// Adding the custom actions if any
+		foreach ($this->_custom_actions as $action) {
+			if (method_exists($object, $action)) {
+				$actions[] = $object->$action();
+			}
+		}
+
+		require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($this->_objectHandler);
+
+		if (in_array('edit', $this->_actions)) {
+			$actions[] = $controller->getEditItemLink($object, false, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$actions[] = $controller->getDeleteItemLink($object, false, true);
+		}
+		$aObject['actions'] = $actions;
+
+		$this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
+		$aObject['id']     = $object->id();
+		$this->_aObjects[] = $aObject;
+
+		$childrenObjects = $this->getChildrenOf($object->id());
+
+		$this->_hasActions = $this->_hasActions ? true : count($actions) > 0;
+
+		if ($childrenObjects) {
+			++$level;
+			foreach ($childrenObjects as $subObject) {
+				$this->createTableRow($subObject, $level);
+			}
+		}
+	}
+
+	public function createTableRows()
+	{
+		$this->_aObjects = array();
+
+		if (count($this->_objects) > 0) {
+			foreach ($this->getChildrenOf() as $object) {
+				$this->createTableRow($object);
+			}
+
+			$this->_tpl->assign('smartobject_objects', $this->_aObjects);
+		} else {
+			$colspan = count($this->_columns) + 1;
+			$this->_tpl->assign('smartobject_colspan', $colspan);
+		}
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function fetchObjects()
+	{
+		$ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
+
+		return $ret;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * @subpackage SmartObjectTable
  */
 
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
 
 /**
  * SmartObjectTreeTable class
@@ -99,7 +99,7 @@ 
                 $space .= ' ';
             }
 
-            $aColumn['value'] = $space . $value;
+            $aColumn['value'] = $space.$value;
             $aColumn['class'] = $class;
             $aColumn['width'] = $column->getWidth();
             $aColumn['align'] = $column->getAlign();
@@ -123,7 +123,7 @@ 
             }
         }
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
         $controller = new SmartObjectController($this->_objectHandler);
 
         if (in_array('edit', $this->_actions)) {

class/smartdbupdater.php

Indentation +817 added lines, -817 removed lines

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

Spacing +33 added lines, -33 removed lines

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

class/smartobjectabout.php

Indentation +161 added lines, -161 removed lines

@@ -19,165 +19,165 @@
  */
 class SmartobjectAbout
 {
-    public $_lang_aboutTitle;
-    public $_lang_author_info;
-    public $_lang_developer_lead;
-    public $_lang_developer_contributor;
-    public $_lang_developer_website;
-    public $_lang_developer_email;
-    public $_lang_developer_credits;
-    public $_lang_module_info;
-    public $_lang_module_status;
-    public $_lang_module_release_date;
-    public $_lang_module_demo;
-    public $_lang_module_support;
-    public $_lang_module_bug;
-    public $_lang_module_submit_bug;
-    public $_lang_module_feature;
-    public $_lang_module_submit_feature;
-    public $_lang_module_disclaimer;
-    public $_lang_author_word;
-    public $_lang_version_history;
-    public $_lang_by;
-    public $_tpl;
-
-    /**
-     * SmartobjectAbout constructor.
-     * @param string $aboutTitle
-     */
-    public function __construct($aboutTitle = 'About')
-    {
-        global $xoopsModule, $xoopsConfig;
-
-        $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
-        if (file_exists($fileName)) {
-            require_once $fileName;
-        } else {
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
-        }
-        $this->_aboutTitle = $aboutTitle;
-
-        $this->_lang_developer_contributor = _CO_SOBJECT_DEVELOPER_CONTRIBUTOR;
-        $this->_lang_developer_website     = _CO_SOBJECT_DEVELOPER_WEBSITE;
-        $this->_lang_developer_email       = _CO_SOBJECT_DEVELOPER_EMAIL;
-        $this->_lang_developer_credits     = _CO_SOBJECT_DEVELOPER_CREDITS;
-        $this->_lang_module_info           = _CO_SOBJECT_MODULE_INFO;
-        $this->_lang_module_status         = _CO_SOBJECT_MODULE_STATUS;
-        $this->_lang_module_release_date   = _CO_SOBJECT_MODULE_RELEASE_DATE;
-        $this->_lang_module_demo           = _CO_SOBJECT_MODULE_DEMO;
-        $this->_lang_module_support        = _CO_SOBJECT_MODULE_SUPPORT;
-        $this->_lang_module_bug            = _CO_SOBJECT_MODULE_BUG;
-        $this->_lang_module_submit_bug     = _CO_SOBJECT_MODULE_SUBMIT_BUG;
-        $this->_lang_module_feature        = _CO_SOBJECT_MODULE_FEATURE;
-        $this->_lang_module_submit_feature = _CO_SOBJECT_MODULE_SUBMIT_FEATURE;
-        $this->_lang_module_disclaimer     = _CO_SOBJECT_MODULE_DISCLAIMER;
-        $this->_lang_author_word           = _CO_SOBJECT_AUTHOR_WORD;
-        $this->_lang_version_history       = _CO_SOBJECT_VERSION_HISTORY;
-    }
-
-    /**
-     * @param $value
-     * @return mixed
-     */
-    public function sanitize($value)
-    {
-        $myts = MyTextSanitizer::getInstance();
-
-        return $myts->displayTarea($value, 1);
-    }
-
-    public function render()
-    {
-        /**
-         * @todo move the output to a template
-         * @todo make the output XHTML compliant
-         */
-
-        $myts = MyTextSanitizer::getInstance();
-
-        global $xoopsModule;
-
-        smart_xoops_cp_header();
-
-        /** @var XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $versioninfo   = $moduleHandler->get($xoopsModule->getVar('mid'));
-
-        //smart_adminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
-
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
-
-        // ---
-        // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
-        //      $this->_tpl = new XoopsTpl();
-        $this->_tpl = new XoopsTpl();
-        // ---
-
-        $this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
-        $this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
-        $this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
-        $this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
-        $this->_tpl->assign('module_status_version', $versioninfo->getInfo('status_version'));
-
-        // Left headings...
-        if ($versioninfo->getInfo('author_realname') !== '') {
-            $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
-        } else {
-            $author_name = $versioninfo->getInfo('author');
-        }
-        $this->_tpl->assign('module_author_name', $author_name);
-
-        $this->_tpl->assign('module_license', $versioninfo->getInfo('license'));
-
-        $this->_tpl->assign('module_credits', $versioninfo->getInfo('credits'));
-
-        // Developers Information
-        $this->_tpl->assign('module_developer_lead', $versioninfo->getInfo('developer_lead'));
-        $this->_tpl->assign('module_developer_contributor', $versioninfo->getInfo('developer_contributor'));
-        $this->_tpl->assign('module_developer_website_url', $versioninfo->getInfo('developer_website_url'));
-        $this->_tpl->assign('module_developer_website_name', $versioninfo->getInfo('developer_website_name'));
-        $this->_tpl->assign('module_developer_email', $versioninfo->getInfo('developer_email'));
-
-        $people = $versioninfo->getInfo('people');
-        if ($people) {
-            $this->_tpl->assign('module_people_developers', isset($people['developers']) ? array_map(array($this, 'sanitize'), $people['developers']) : false);
-            $this->_tpl->assign('module_people_testers', isset($people['testers']) ? array_map(array($this, 'sanitize'), $people['testers']) : false);
-            $this->_tpl->assign('module_people_translators', isset($people['translators']) ? array_map(array($this, 'sanitize'), $people['translators']) : false);
-            $this->_tpl->assign('module_people_documenters', isset($people['documenters']) ? array_map(array($this, 'sanitize'), $people['documenters']) : false);
-            $this->_tpl->assign('module_people_other', isset($people['other']) ? array_map(array($this, 'sanitize'), $people['other']) : false);
-        }
-        //$this->_tpl->assign('module_developers', $versioninfo->getInfo('developer_email'));
-
-        // Module Development information
-        $this->_tpl->assign('module_date', $versioninfo->getInfo('date'));
-        $this->_tpl->assign('module_status', $versioninfo->getInfo('status'));
-        $this->_tpl->assign('module_demo_site_url', $versioninfo->getInfo('demo_site_url'));
-        $this->_tpl->assign('module_demo_site_name', $versioninfo->getInfo('demo_site_name'));
-        $this->_tpl->assign('module_support_site_url', $versioninfo->getInfo('support_site_url'));
-        $this->_tpl->assign('module_support_site_name', $versioninfo->getInfo('support_site_name'));
-        $this->_tpl->assign('module_submit_bug', $versioninfo->getInfo('submit_bug'));
-        $this->_tpl->assign('module_submit_feature', $versioninfo->getInfo('submit_feature'));
-
-        // Warning
-        $this->_tpl->assign('module_warning', $this->sanitize($versioninfo->getInfo('warning')));
-
-        // Author's note
-        $this->_tpl->assign('module_author_word', $versioninfo->getInfo('author_word'));
-
-        // For changelog thanks to 3Dev
-        global $xoopsModule;
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
-        if (is_file($filename)) {
-            $filesize = filesize($filename);
-            $handle   = fopen($filename, 'r');
-            $this->_tpl->assign('module_version_history', $myts->displayTarea(fread($handle, $filesize), true));
-            fclose($handle);
-        }
-
-        $this->_tpl->display('db:smartobject_about.tpl');
-
-        smart_modFooter();
-
-        xoops_cp_footer();
-    }
+	public $_lang_aboutTitle;
+	public $_lang_author_info;
+	public $_lang_developer_lead;
+	public $_lang_developer_contributor;
+	public $_lang_developer_website;
+	public $_lang_developer_email;
+	public $_lang_developer_credits;
+	public $_lang_module_info;
+	public $_lang_module_status;
+	public $_lang_module_release_date;
+	public $_lang_module_demo;
+	public $_lang_module_support;
+	public $_lang_module_bug;
+	public $_lang_module_submit_bug;
+	public $_lang_module_feature;
+	public $_lang_module_submit_feature;
+	public $_lang_module_disclaimer;
+	public $_lang_author_word;
+	public $_lang_version_history;
+	public $_lang_by;
+	public $_tpl;
+
+	/**
+	 * SmartobjectAbout constructor.
+	 * @param string $aboutTitle
+	 */
+	public function __construct($aboutTitle = 'About')
+	{
+		global $xoopsModule, $xoopsConfig;
+
+		$fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+		if (file_exists($fileName)) {
+			require_once $fileName;
+		} else {
+			require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+		}
+		$this->_aboutTitle = $aboutTitle;
+
+		$this->_lang_developer_contributor = _CO_SOBJECT_DEVELOPER_CONTRIBUTOR;
+		$this->_lang_developer_website     = _CO_SOBJECT_DEVELOPER_WEBSITE;
+		$this->_lang_developer_email       = _CO_SOBJECT_DEVELOPER_EMAIL;
+		$this->_lang_developer_credits     = _CO_SOBJECT_DEVELOPER_CREDITS;
+		$this->_lang_module_info           = _CO_SOBJECT_MODULE_INFO;
+		$this->_lang_module_status         = _CO_SOBJECT_MODULE_STATUS;
+		$this->_lang_module_release_date   = _CO_SOBJECT_MODULE_RELEASE_DATE;
+		$this->_lang_module_demo           = _CO_SOBJECT_MODULE_DEMO;
+		$this->_lang_module_support        = _CO_SOBJECT_MODULE_SUPPORT;
+		$this->_lang_module_bug            = _CO_SOBJECT_MODULE_BUG;
+		$this->_lang_module_submit_bug     = _CO_SOBJECT_MODULE_SUBMIT_BUG;
+		$this->_lang_module_feature        = _CO_SOBJECT_MODULE_FEATURE;
+		$this->_lang_module_submit_feature = _CO_SOBJECT_MODULE_SUBMIT_FEATURE;
+		$this->_lang_module_disclaimer     = _CO_SOBJECT_MODULE_DISCLAIMER;
+		$this->_lang_author_word           = _CO_SOBJECT_AUTHOR_WORD;
+		$this->_lang_version_history       = _CO_SOBJECT_VERSION_HISTORY;
+	}
+
+	/**
+	 * @param $value
+	 * @return mixed
+	 */
+	public function sanitize($value)
+	{
+		$myts = MyTextSanitizer::getInstance();
+
+		return $myts->displayTarea($value, 1);
+	}
+
+	public function render()
+	{
+		/**
+		 * @todo move the output to a template
+		 * @todo make the output XHTML compliant
+		 */
+
+		$myts = MyTextSanitizer::getInstance();
+
+		global $xoopsModule;
+
+		smart_xoops_cp_header();
+
+		/** @var XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$versioninfo   = $moduleHandler->get($xoopsModule->getVar('mid'));
+
+		//smart_adminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
+
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
+
+		// ---
+		// 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
+		//      $this->_tpl = new XoopsTpl();
+		$this->_tpl = new XoopsTpl();
+		// ---
+
+		$this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
+		$this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
+		$this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
+		$this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
+		$this->_tpl->assign('module_status_version', $versioninfo->getInfo('status_version'));
+
+		// Left headings...
+		if ($versioninfo->getInfo('author_realname') !== '') {
+			$author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
+		} else {
+			$author_name = $versioninfo->getInfo('author');
+		}
+		$this->_tpl->assign('module_author_name', $author_name);
+
+		$this->_tpl->assign('module_license', $versioninfo->getInfo('license'));
+
+		$this->_tpl->assign('module_credits', $versioninfo->getInfo('credits'));
+
+		// Developers Information
+		$this->_tpl->assign('module_developer_lead', $versioninfo->getInfo('developer_lead'));
+		$this->_tpl->assign('module_developer_contributor', $versioninfo->getInfo('developer_contributor'));
+		$this->_tpl->assign('module_developer_website_url', $versioninfo->getInfo('developer_website_url'));
+		$this->_tpl->assign('module_developer_website_name', $versioninfo->getInfo('developer_website_name'));
+		$this->_tpl->assign('module_developer_email', $versioninfo->getInfo('developer_email'));
+
+		$people = $versioninfo->getInfo('people');
+		if ($people) {
+			$this->_tpl->assign('module_people_developers', isset($people['developers']) ? array_map(array($this, 'sanitize'), $people['developers']) : false);
+			$this->_tpl->assign('module_people_testers', isset($people['testers']) ? array_map(array($this, 'sanitize'), $people['testers']) : false);
+			$this->_tpl->assign('module_people_translators', isset($people['translators']) ? array_map(array($this, 'sanitize'), $people['translators']) : false);
+			$this->_tpl->assign('module_people_documenters', isset($people['documenters']) ? array_map(array($this, 'sanitize'), $people['documenters']) : false);
+			$this->_tpl->assign('module_people_other', isset($people['other']) ? array_map(array($this, 'sanitize'), $people['other']) : false);
+		}
+		//$this->_tpl->assign('module_developers', $versioninfo->getInfo('developer_email'));
+
+		// Module Development information
+		$this->_tpl->assign('module_date', $versioninfo->getInfo('date'));
+		$this->_tpl->assign('module_status', $versioninfo->getInfo('status'));
+		$this->_tpl->assign('module_demo_site_url', $versioninfo->getInfo('demo_site_url'));
+		$this->_tpl->assign('module_demo_site_name', $versioninfo->getInfo('demo_site_name'));
+		$this->_tpl->assign('module_support_site_url', $versioninfo->getInfo('support_site_url'));
+		$this->_tpl->assign('module_support_site_name', $versioninfo->getInfo('support_site_name'));
+		$this->_tpl->assign('module_submit_bug', $versioninfo->getInfo('submit_bug'));
+		$this->_tpl->assign('module_submit_feature', $versioninfo->getInfo('submit_feature'));
+
+		// Warning
+		$this->_tpl->assign('module_warning', $this->sanitize($versioninfo->getInfo('warning')));
+
+		// Author's note
+		$this->_tpl->assign('module_author_word', $versioninfo->getInfo('author_word'));
+
+		// For changelog thanks to 3Dev
+		global $xoopsModule;
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
+		if (is_file($filename)) {
+			$filesize = filesize($filename);
+			$handle   = fopen($filename, 'r');
+			$this->_tpl->assign('module_version_history', $myts->displayTarea(fread($handle, $filesize), true));
+			fclose($handle);
+		}
+
+		$this->_tpl->display('db:smartobject_about.tpl');
+
+		smart_modFooter();
+
+		xoops_cp_footer();
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -49,11 +49,11 @@ 
     {
         global $xoopsModule, $xoopsConfig;
 
-        $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+        $fileName = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php';
         if (file_exists($fileName)) {
             require_once $fileName;
         } else {
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/modinfo.php';
         }
         $this->_aboutTitle = $aboutTitle;
 
@@ -105,7 +105,7 @@ 
 
         //smart_adminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         // ---
         // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
@@ -113,7 +113,7 @@ 
         $this->_tpl = new XoopsTpl();
         // ---
 
-        $this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
+        $this->_tpl->assign('module_url', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/');
         $this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
         $this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
         $this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
@@ -121,7 +121,7 @@ 
 
         // Left headings...
         if ($versioninfo->getInfo('author_realname') !== '') {
-            $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
+            $author_name = $versioninfo->getInfo('author').' ('.$versioninfo->getInfo('author_realname').')';
         } else {
             $author_name = $versioninfo->getInfo('author');
         }
@@ -166,7 +166,7 @@ 
 
         // For changelog thanks to 3Dev
         global $xoopsModule;
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/changelog.txt';
         if (is_file($filename)) {
             $filesize = filesize($filename);
             $handle   = fopen($filename, 'r');

class/smartobjecttag.php

Indentation +33 added lines, -33 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 // -------------------------------------------------------------------------//
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartmlobject.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartmlobject.php';
 
 /**
  * Class SmartobjectTag
@@ -69,7 +69,7 @@ 
      */
     public function getLanguages()
     {
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
         $aLanguages     = XoopsLists::getLangList();
         $ret['default'] = _CO_SOBJECT_ALL;
         foreach ($aLanguages as $lang) {

class/smartplugins.php

Indentation +115 added lines, -115 removed lines

@@ -5,68 +5,68 @@ 
  */
 class SmartPlugin
 {
-    public $_infoArray;
-
-    /**
-     * SmartPlugin constructor.
-     * @param $array
-     */
-    public function __construct($array)
-    {
-        $this->_infoArray = $array;
-    }
-
-    /**
-     * @param $item
-     * @return bool
-     */
-    public function getItemInfo($item)
-    {
-        if (isset($this->_infoArray['items'][$item])) {
-            return $this->_infoArray['items'][$item];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getItemList()
-    {
-        $itemsArray = $this->_infoArray['items'];
-        foreach ($itemsArray as $k => $v) {
-            $ret[$k] = $v['caption'];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @return bool|int|string
-     */
-    public function getItem()
-    {
-        $ret = false;
-        foreach ($this->_infoArray['items'] as $k => $v) {
-            $search_str = str_replace('%u', '', $v['url']);
-            if (strpos($_SERVER['PHP_SELF'] . '?' . $_SERVER['QUERY_STRING'], $search_str) > 0) {
-                $ret = $k;
-                break;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $item
-     * @return mixed
-     */
-    public function getItemIdForItem($item)
-    {
-        return $_REQUEST[$this->_infoArray['items'][$item]['request']];
-    }
+	public $_infoArray;
+
+	/**
+	 * SmartPlugin constructor.
+	 * @param $array
+	 */
+	public function __construct($array)
+	{
+		$this->_infoArray = $array;
+	}
+
+	/**
+	 * @param $item
+	 * @return bool
+	 */
+	public function getItemInfo($item)
+	{
+		if (isset($this->_infoArray['items'][$item])) {
+			return $this->_infoArray['items'][$item];
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getItemList()
+	{
+		$itemsArray = $this->_infoArray['items'];
+		foreach ($itemsArray as $k => $v) {
+			$ret[$k] = $v['caption'];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @return bool|int|string
+	 */
+	public function getItem()
+	{
+		$ret = false;
+		foreach ($this->_infoArray['items'] as $k => $v) {
+			$search_str = str_replace('%u', '', $v['url']);
+			if (strpos($_SERVER['PHP_SELF'] . '?' . $_SERVER['QUERY_STRING'], $search_str) > 0) {
+				$ret = $k;
+				break;
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $item
+	 * @return mixed
+	 */
+	public function getItemIdForItem($item)
+	{
+		return $_REQUEST[$this->_infoArray['items'][$item]['request']];
+	}
 }
 
 /**
@@ -74,57 +74,57 @@ 
  */
 class SmartPluginHandler
 {
-    public $pluginPatterns = false;
-
-    /**
-     * @param $dirname
-     * @return bool|SmartPlugin
-     */
-    public function getPlugin($dirname)
-    {
-        $pluginName = SMARTOBJECT_ROOT_PATH . 'plugins/' . $dirname . '.php';
-        if (file_exists($pluginName)) {
-            require_once $pluginName;
-            $function = 'smartobject_plugin_' . $dirname;
-            if (function_exists($function)) {
-                $array = $function();
-                $ret   = new SmartPlugin($array);
-
-                return $ret;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPluginsArray()
-    {
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-
-        $moduleHandler = xoops_getHandler('module');
-        $criteria      = new CriteriaCompo();
-        $criteria->add(new Criteria('isactive', 1));
-        $tempModulesObj = $moduleHandler->getObjects($criteria);
-        $modulesObj     = array();
-        foreach ($tempModulesObj as $moduleObj) {
-            $modulesObj[$moduleObj->getVar('dirname')] = $moduleObj;
-        }
-
-        $aFiles = XoopsLists::getFileListAsArray(SMARTOBJECT_ROOT_PATH . 'plugins/');
-        $ret    = array();
-        foreach ($aFiles as $file) {
-            if (substr($file, strlen($file) - 4, 4) === '.php') {
-                $pluginName                = str_replace('.php', '', $file);
-                $module_xoops_version_file = XOOPS_ROOT_PATH . "/modules/$pluginName/xoops_version.php";
-                if (file_exists($module_xoops_version_file) && isset($modulesObj[$pluginName])) {
-                    $ret[$pluginName] = $modulesObj[$pluginName]->getVar('name');
-                }
-            }
-        }
-
-        return $ret;
-    }
+	public $pluginPatterns = false;
+
+	/**
+	 * @param $dirname
+	 * @return bool|SmartPlugin
+	 */
+	public function getPlugin($dirname)
+	{
+		$pluginName = SMARTOBJECT_ROOT_PATH . 'plugins/' . $dirname . '.php';
+		if (file_exists($pluginName)) {
+			require_once $pluginName;
+			$function = 'smartobject_plugin_' . $dirname;
+			if (function_exists($function)) {
+				$array = $function();
+				$ret   = new SmartPlugin($array);
+
+				return $ret;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getPluginsArray()
+	{
+		require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+
+		$moduleHandler = xoops_getHandler('module');
+		$criteria      = new CriteriaCompo();
+		$criteria->add(new Criteria('isactive', 1));
+		$tempModulesObj = $moduleHandler->getObjects($criteria);
+		$modulesObj     = array();
+		foreach ($tempModulesObj as $moduleObj) {
+			$modulesObj[$moduleObj->getVar('dirname')] = $moduleObj;
+		}
+
+		$aFiles = XoopsLists::getFileListAsArray(SMARTOBJECT_ROOT_PATH . 'plugins/');
+		$ret    = array();
+		foreach ($aFiles as $file) {
+			if (substr($file, strlen($file) - 4, 4) === '.php') {
+				$pluginName                = str_replace('.php', '', $file);
+				$module_xoops_version_file = XOOPS_ROOT_PATH . "/modules/$pluginName/xoops_version.php";
+				if (file_exists($module_xoops_version_file) && isset($modulesObj[$pluginName])) {
+					$ret[$pluginName] = $modulesObj[$pluginName]->getVar('name');
+				}
+			}
+		}
+
+		return $ret;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
         $ret = false;
         foreach ($this->_infoArray['items'] as $k => $v) {
             $search_str = str_replace('%u', '', $v['url']);
-            if (strpos($_SERVER['PHP_SELF'] . '?' . $_SERVER['QUERY_STRING'], $search_str) > 0) {
+            if (strpos($_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'], $search_str) > 0) {
                 $ret = $k;
                 break;
             }
@@ -82,10 +82,10 @@ 
      */
     public function getPlugin($dirname)
     {
-        $pluginName = SMARTOBJECT_ROOT_PATH . 'plugins/' . $dirname . '.php';
+        $pluginName = SMARTOBJECT_ROOT_PATH.'plugins/'.$dirname.'.php';
         if (file_exists($pluginName)) {
             require_once $pluginName;
-            $function = 'smartobject_plugin_' . $dirname;
+            $function = 'smartobject_plugin_'.$dirname;
             if (function_exists($function)) {
                 $array = $function();
                 $ret   = new SmartPlugin($array);
@@ -102,7 +102,7 @@ 
      */
     public function getPluginsArray()
     {
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
 
         $moduleHandler = xoops_getHandler('module');
         $criteria      = new CriteriaCompo();
@@ -113,12 +113,12 @@ 
             $modulesObj[$moduleObj->getVar('dirname')] = $moduleObj;
         }
 
-        $aFiles = XoopsLists::getFileListAsArray(SMARTOBJECT_ROOT_PATH . 'plugins/');
+        $aFiles = XoopsLists::getFileListAsArray(SMARTOBJECT_ROOT_PATH.'plugins/');
         $ret    = array();
         foreach ($aFiles as $file) {
             if (substr($file, strlen($file) - 4, 4) === '.php') {
                 $pluginName                = str_replace('.php', '', $file);
-                $module_xoops_version_file = XOOPS_ROOT_PATH . "/modules/$pluginName/xoops_version.php";
+                $module_xoops_version_file = XOOPS_ROOT_PATH."/modules/$pluginName/xoops_version.php";
                 if (file_exists($module_xoops_version_file) && isset($modulesObj[$pluginName])) {
                     $ret[$pluginName] = $modulesObj[$pluginName]->getVar('name');
                 }

class/rating.php

Spacing +6 added lines, -6 removed lines

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

class/smartaddto.php

Indentation +51 added lines, -51 removed lines

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

class/utility.php

Indentation +138 added lines, -138 removed lines

@@ -5,149 +5,149 @@
  */
 class SmartObjectUtility extends XoopsObject
 {
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     *
-     * @return void
-     */
-    public static function createFolder($folder)
-    {
-        //        try {
-        //            if (!mkdir($folder) && !is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-        //            } else {
-        //                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-        //            }
-        //        }
-        //        catch (Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        //        }
-        try {
-            if (!file_exists($folder)) {
-                if (!mkdir($folder) && !is_dir($folder)) {
-                    throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-                } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-                }
-            }
-        } catch (Exception $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 *
+	 * @return void
+	 */
+	public static function createFolder($folder)
+	{
+		//        try {
+		//            if (!mkdir($folder) && !is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+		//            } else {
+		//                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+		//            }
+		//        }
+		//        catch (Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		//        }
+		try {
+			if (!file_exists($folder)) {
+				if (!mkdir($folder) && !is_dir($folder)) {
+					throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+				} else {
+					file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+				}
+			}
+		} catch (Exception $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
 
-    /**
-     * @param $file
-     * @param $folder
-     * @return bool
-     */
-    public static function copyFile($file, $folder)
-    {
-        return copy($file, $folder);
-        //        try {
-        //            if (!is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
-        //            } else {
-        //                return copy($file, $folder);
-        //            }
-        //        } catch (Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
-        //        }
-        //        return false;
-    }
+	/**
+	 * @param $file
+	 * @param $folder
+	 * @return bool
+	 */
+	public static function copyFile($file, $folder)
+	{
+		return copy($file, $folder);
+		//        try {
+		//            if (!is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
+		//            } else {
+		//                return copy($file, $folder);
+		//            }
+		//        } catch (Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
+		//        }
+		//        return false;
+	}
 
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst)
-    {
-        $dir = opendir($src);
-        //    @mkdir($dst);
-        while (false !== ($file = readdir($dir))) {
-            if (($file !== '.') && ($file !== '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
-                } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
-                }
-            }
-        }
-        closedir($dir);
-    }
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst)
+	{
+		$dir = opendir($src);
+		//    @mkdir($dst);
+		while (false !== ($file = readdir($dir))) {
+			if (($file !== '.') && ($file !== '..')) {
+				if (is_dir($src . '/' . $file)) {
+					self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+				} else {
+					copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		closedir($dir);
+	}
 
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param XoopsModule $module
-     *
-     * @param null|string $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(__DIR__));
-        if (null === $module) {
-            $module = XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        $currArray  = explode('.', $currentVer);
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $reqArray = explode('.', $requiredVer);
-        $success  = true;
-        foreach ($reqArray as $k => $v) {
-            if (isset($currArray[$k])) {
-                if ($currArray[$k] > $v) {
-                    break;
-                } elseif ($currArray[$k] == $v) {
-                    continue;
-                } else {
-                    $success = false;
-                    break;
-                }
-            } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
-                    $success = false;
-                    break;
-                }
-            }
-        }
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param XoopsModule $module
+	 *
+	 * @param null|string $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(__DIR__));
+		if (null === $module) {
+			$module = XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		$currArray  = explode('.', $currentVer);
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$reqArray = explode('.', $requiredVer);
+		$success  = true;
+		foreach ($reqArray as $k => $v) {
+			if (isset($currArray[$k])) {
+				if ($currArray[$k] > $v) {
+					break;
+				} elseif ($currArray[$k] == $v) {
+					continue;
+				} else {
+					$success = false;
+					break;
+				}
+			} else {
+				if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+					$success = false;
+					break;
+				}
+			}
+		}
 
-        if (!$success) {
-            $module->setErrors(sprintf(_AM_XXXXX_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
-        }
+		if (!$success) {
+			$module->setErrors(sprintf(_AM_XXXXX_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(XoopsModule $module)
-    {
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  = $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(_AM_XXXXX_ERROR_BAD_PHP, $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(XoopsModule $module)
+	{
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  = $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(_AM_XXXXX_ERROR_BAD_PHP, $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
                 if (!mkdir($folder) && !is_dir($folder)) {
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                    file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
                 }
             }
         } catch (Exception $e) {
@@ -67,10 +67,10 @@ 
         //    @mkdir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file !== '.') && ($file !== '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -97,7 +97,7 @@ 
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         $currArray  = explode('.', $currentVer);
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $reqArray = explode('.', $requiredVer);
         $success  = true;
@@ -112,7 +112,7 @@ 
                     break;
                 }
             } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+                if ((int) $v > 0) { // handles versions like x.x.x.0_RC2
                     $success = false;
                     break;
                 }