mambax7 / smartobject

class/SmartobjectRating.php

Indentation +119 added lines, -119 removed lines

@@ -30,123 +30,123 @@
  */
 class SmartobjectRating extends Smartobject\BaseSmartObject
 {
-    public $_modulePlugin = false;
-
-    /**
-     * SmartobjectRating constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
-        $this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
-        $this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
-        $this->quickInitVar('uid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_UID);
-        $this->quickInitVar('date', XOBJ_DTYPE_LTIME, true, _CO_SOBJECT_RATING_DATE);
-        $this->quickInitVar('rate', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_RATE);
-
-        $this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
-
-        $this->setControl('dirname', [
-            'handler'  => 'rating',
-            'method'   => 'getModuleList',
-            'onSelect' => 'submit'
-        ]);
-
-        $this->setControl('item', [
-            'object' => &$this,
-            'method' => 'getItemList'
-        ]);
-
-        $this->setControl('uid', 'user');
-
-        $this->setControl('rate', [
-            'handler' => 'rating',
-            'method'  => 'getRateList'
-        ]);
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ('s' === $format && in_array($key, ['name', 'dirname'])) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        $ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, []);
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function dirname()
-    {
-        global $smartobjectRatingHandler;
-        $moduleArray = $smartobjectRatingHandler->getModuleList();
-
-        return $moduleArray[$this->getVar('dirname', 'n')];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getItemList()
-    {
-        $plugin = $this->getModulePlugin();
-
-        return $plugin->getItemList();
-    }
-
-    /**
-     * @return string
-     */
-    public function getItemValue()
-    {
-        $moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
-        $plugin         = $this->getModulePlugin();
-        $pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
-        if (!$pluginItemInfo) {
-            return '';
-        }
-        $itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
-        $ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getRateValue()
-    {
-        return $this->getVar('rate');
-    }
-
-    /**
-     * @return bool
-     */
-    public function getModulePlugin()
-    {
-        if (!$this->_modulePlugin) {
-            global $smartobjectRatingHandler;
-            $this->_modulePlugin = $smartobjectRatingHandler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
-        }
-
-        return $this->_modulePlugin;
-    }
+	public $_modulePlugin = false;
+
+	/**
+	 * SmartobjectRating constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
+		$this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
+		$this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
+		$this->quickInitVar('uid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_UID);
+		$this->quickInitVar('date', XOBJ_DTYPE_LTIME, true, _CO_SOBJECT_RATING_DATE);
+		$this->quickInitVar('rate', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_RATE);
+
+		$this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
+
+		$this->setControl('dirname', [
+			'handler'  => 'rating',
+			'method'   => 'getModuleList',
+			'onSelect' => 'submit'
+		]);
+
+		$this->setControl('item', [
+			'object' => &$this,
+			'method' => 'getItemList'
+		]);
+
+		$this->setControl('uid', 'user');
+
+		$this->setControl('rate', [
+			'handler' => 'rating',
+			'method'  => 'getRateList'
+		]);
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ('s' === $format && in_array($key, ['name', 'dirname'])) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		$ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, []);
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function dirname()
+	{
+		global $smartobjectRatingHandler;
+		$moduleArray = $smartobjectRatingHandler->getModuleList();
+
+		return $moduleArray[$this->getVar('dirname', 'n')];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getItemList()
+	{
+		$plugin = $this->getModulePlugin();
+
+		return $plugin->getItemList();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getItemValue()
+	{
+		$moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
+		$plugin         = $this->getModulePlugin();
+		$pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
+		if (!$pluginItemInfo) {
+			return '';
+		}
+		$itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
+		$ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getRateValue()
+	{
+		return $this->getVar('rate');
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getModulePlugin()
+	{
+		if (!$this->_modulePlugin) {
+			global $smartobjectRatingHandler;
+			$this->_modulePlugin = $smartobjectRatingHandler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
+		}
+
+		return $this->_modulePlugin;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -117,14 +117,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;
     }

class/SmartObjectTree.php

Indentation +13 added lines, -13 removed lines

@@ -30,17 +30,17 @@
  */
 class SmartObjectTree extends \XoopsObjectTree
 {
-    public function _initialize()
-    {
-        foreach (array_keys($this->_objects) as $i) {
-            $key1                         = $this->_objects[$i]->getVar($this->_myId);
-            $this->tree[$key1]['obj']     = $this->_objects[$i];
-            $key2                         = $this->_objects[$i]->getVar($this->_parentId, 'e');
-            $this->tree[$key1]['parent']  = $key2;
-            $this->tree[$key2]['child'][] = $key1;
-            if (isset($this->_rootId)) {
-                $this->tree[$key1]['root'] = $this->_objects[$i]->getVar($this->_rootId);
-            }
-        }
-    }
+	public function _initialize()
+	{
+		foreach (array_keys($this->_objects) as $i) {
+			$key1                         = $this->_objects[$i]->getVar($this->_myId);
+			$this->tree[$key1]['obj']     = $this->_objects[$i];
+			$key2                         = $this->_objects[$i]->getVar($this->_parentId, 'e');
+			$this->tree[$key1]['parent']  = $key2;
+			$this->tree[$key2]['child'][] = $key1;
+			if (isset($this->_rootId)) {
+				$this->tree[$key1]['root'] = $this->_objects[$i]->getVar($this->_rootId);
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/class/tree.php';
+require_once XOOPS_ROOT_PATH.'/class/tree.php';
 
 /**
  * Class smartobjecttree

class/SmartPersistableMlObjectHandler.php

Indentation +49 added lines, -49 removed lines

@@ -21,60 +21,60 @@
  */
 class SmartPersistableMlObjectHandler extends Smartobject\SmartPersistableObjectHandler
 {
-    /**
-     * @param  null|\CriteriaElement  $criteria
-     * @param  bool $id_as_key
-     * @param  bool $as_object
-     * @param  bool $debug
-     * @param  bool $language
-     * @return array
-     */
-    public function getObjects(
-        \CriteriaElement $criteria = null,
-        $id_as_key = false,
-        $as_object = true,
-        $debug = false,
-        $language = false
-    ) {
-        // Create the first part of the SQL query to join the "_text" table
-        $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
+	/**
+	 * @param  null|\CriteriaElement  $criteria
+	 * @param  bool $id_as_key
+	 * @param  bool $as_object
+	 * @param  bool $debug
+	 * @param  bool $language
+	 * @return array
+	 */
+	public function getObjects(
+		\CriteriaElement $criteria = null,
+		$id_as_key = false,
+		$as_object = true,
+		$debug = false,
+		$language = false
+	) {
+		// Create the first part of the SQL query to join the "_text" table
+		$sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
 
-        if ($language) {
-            // If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
+		if ($language) {
+			// If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
 
-            // if no criteria was previously created, let's create it
-            if (!$criteria) {
-                $criteria = new \CriteriaCompo();
-            }
-            $criteria->add(new \Criteria('language', $language));
+			// if no criteria was previously created, let's create it
+			if (!$criteria) {
+				$criteria = new \CriteriaCompo();
+			}
+			$criteria->add(new \Criteria('language', $language));
 
-            return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-        }
+			return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+		}
 
-        return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
-    }
+		return parent::getObjects($criteria, $id_as_key, $as_object, $debug, $sql);
+	}
 
-    /**
-     * @param  mixed $id
-     * @param  bool  $language
-     * @param  bool  $as_object
-     * @param  bool  $debug
-     * @return mixed
-     */
-    public function &get($id, $language = false, $as_object = true, $debug = false)
-    {
-        if (!$language) {
-            return parent::get($id, $as_object, $debug);
-        } else {
-            $criteria = new \CriteriaCompo();
-            $criteria->add(new \Criteria('language', $language));
+	/**
+	 * @param  mixed $id
+	 * @param  bool  $language
+	 * @param  bool  $as_object
+	 * @param  bool  $debug
+	 * @return mixed
+	 */
+	public function &get($id, $language = false, $as_object = true, $debug = false)
+	{
+		if (!$language) {
+			return parent::get($id, $as_object, $debug);
+		} else {
+			$criteria = new \CriteriaCompo();
+			$criteria->add(new \Criteria('language', $language));
 
-            return parent::get($id, $as_object, $debug, $criteria);
-        }
-    }
+			return parent::get($id, $as_object, $debug, $criteria);
+		}
+	}
 
-    public function changeTableNameForML()
-    {
-        $this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
-    }
+	public function changeTableNameForML()
+	{
+		$this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
         $language = false
     ) {
         // Create the first part of the SQL query to join the "_text" table
-        $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->table . '_text AS ' . $this->_itemname . '_text ON ' . $this->_itemname . '.' . $this->keyName . '=' . $this->_itemname . '_text.' . $this->keyName;
+        $sql = 'SELECT * FROM '.$this->table.' AS '.$this->_itemname.' INNER JOIN '.$this->table.'_text AS '.$this->_itemname.'_text ON '.$this->_itemname.'.'.$this->keyName.'='.$this->_itemname.'_text.'.$this->keyName;
 
         if ($language) {
             // If a language was specified, then let's create a WHERE clause to only return the objects associated with this language
@@ -75,6 +75,6 @@ 
 
     public function changeTableNameForML()
     {
-        $this->table = $this->db->prefix($this->_moduleName . '_' . $this->_itemname . '_text');
+        $this->table = $this->db->prefix($this->_moduleName.'_'.$this->_itemname.'_text');
     }
 }

class/SmartObjectTreeTable.php

Indentation +153 added lines, -153 removed lines

@@ -25,157 +25,157 @@
  */
 class SmartObjectTreeTable extends Smartobject\BaseSmartObjectTable
 {
-    /**
-     * SmartObjectTreeTable constructor.
-     * @param SmartPersistableObjectHandler $objectHandler
-     * @param bool                          $criteria
-     * @param array                         $actions
-     * @param bool                          $userSide
-     */
-    public function __construct(
-        SmartPersistableObjectHandler $objectHandler,
-        $criteria = false,
-        $actions = ['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 = [];
-
-        $i = 0;
-
-        $aColumns        = [];
-        $doWeHaveActions = false;
-
-        foreach ($this->_columns as $column) {
-            $aColumn = [];
-
-            if (0 == $i) {
-                $class = 'head';
-            } elseif (0 == $i % 2) {
-                $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            = 'even' === $class ? 'odd' : 'even';
-        $aObject['class'] = $class;
-
-        $actions = [];
-
-        // Adding the custom actions if any
-        foreach ($this->_custom_actions as $action) {
-            if (method_exists($object, $action)) {
-                $actions[] = $object->$action();
-            }
-        }
-
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($this->_objectHandler);
-
-        if (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 = [];
-
-        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 = ['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 = [];
+
+		$i = 0;
+
+		$aColumns        = [];
+		$doWeHaveActions = false;
+
+		foreach ($this->_columns as $column) {
+			$aColumn = [];
+
+			if (0 == $i) {
+				$class = 'head';
+			} elseif (0 == $i % 2) {
+				$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            = 'even' === $class ? 'odd' : 'even';
+		$aObject['class'] = $class;
+
+		$actions = [];
+
+		// Adding the custom actions if any
+		foreach ($this->_custom_actions as $action) {
+			if (method_exists($object, $action)) {
+				$actions[] = $object->$action();
+			}
+		}
+
+		require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($this->_objectHandler);
+
+		if (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 = [];
+
+		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

@@ -12,7 +12,7 @@ 
 
 use XoopsModules\Smartobject;
 
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
 
 /**
  * SmartObjectTreeTable class
@@ -102,7 +102,7 @@ 
                 $space .= ' ';
             }
 
-            $aColumn['value'] = $space . $value;
+            $aColumn['value'] = $space.$value;
             $aColumn['class'] = $class;
             $aColumn['width'] = $column->getWidth();
             $aColumn['align'] = $column->getAlign();
@@ -126,7 +126,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/SmartPlugin.php

Indentation +55 added lines, -55 removed lines

@@ -25,66 +25,66 @@
  */
 class SmartPlugin
 {
-    public $_infoArray;
+	public $_infoArray;
 
-    /**
-     * SmartPlugin constructor.
-     * @param $array
-     */
-    public function __construct($array)
-    {
-        $this->_infoArray = $array;
-    }
+	/**
+	 * 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;
-        }
-    }
+	/**
+	 * @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 mixed
+	 */
+	public function getItemList()
+	{
+		$itemsArray = $this->_infoArray['items'];
+		foreach ($itemsArray as $k => $v) {
+			$ret[$k] = $v['caption'];
+		}
 
-        return $ret;
-    }
+		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 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;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param $item
-     * @return mixed
-     */
-    public function getItemIdForItem($item)
-    {
-        return $_REQUEST[$this->_infoArray['items'][$item]['request']];
-    }
+	/**
+	 * @param $item
+	 * @return mixed
+	 */
+	public function getItemIdForItem($item)
+	{
+		return $_REQUEST[$this->_infoArray['items'][$item]['request']];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,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;
             }

class/SmartobjectCategory.php

Indentation +117 added lines, -117 removed lines

@@ -20,121 +20,121 @@
  */
 class SmartobjectCategory extends Smartobject\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', ['name' => 'image']);
-        $this->setControl('parentid', ['name' => 'parentcategory']);
-        $this->setControl('description', [
-            '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 ('s' === $format && in_array($key, ['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 ('-1' == $ret) {
-            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 (0 != $parentid) {
-                $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', ['name' => 'image']);
+		$this->setControl('parentid', ['name' => 'parentcategory']);
+		$this->setControl('description', [
+			'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 ('s' === $format && in_array($key, ['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 ('-1' == $ret) {
+			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 (0 != $parentid) {
+				$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;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
         global $myts;
         $objectArray = parent::toArray();
         if ($objectArray['image']) {
-            $objectArray['image'] = $this->getImageDir() . $objectArray['image'];
+            $objectArray['image'] = $this->getImageDir().$objectArray['image'];
         }
 
         return $objectArray;
@@ -113,7 +113,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) {
@@ -130,7 +130,7 @@ 
                     exit;
                 }
                 $parentid = $parentObj->getVar('parentid');
-                $ret      = $parentObj->getCategoryPath($withAllLink, $currentCategory) . ' > ' . $ret;
+                $ret      = $parentObj->getCategoryPath($withAllLink, $currentCategory).' > '.$ret;
             }
             $this->_categoryPath = $ret;
         }

class/SmartobjectAdsenseHandler.php

Indentation +112 added lines, -112 removed lines

@@ -30,116 +30,116 @@
  */
 class SmartobjectAdsenseHandler extends Smartobject\SmartPersistableObjectHandler
 {
-    public $adFormats;
-    public $adFormatsList;
-    public $objects = false;
-
-    /**
-     * SmartobjectAdsenseHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'adsense', 'adsenseid', 'description', '', 'smartobject');
-        $this->adFormats     = [];
-        $this->adFormatsList = [];
-
-        $this->adFormats['728x90_as']['caption'] = '728 X 90 Leaderboard';
-        $this->adFormats['728x90_as']['width']   = 728;
-        $this->adFormats['728x90_as']['height']  = 90;
-        $this->adFormatsList['728x90_as']        = $this->adFormats['728x90_as']['caption'];
-
-        $this->adFormats['468x60_as']['caption'] = '468 X 60 Banner';
-        $this->adFormats['468x60_as']['width']   = 468;
-        $this->adFormats['468x60_as']['height']  = 60;
-        $this->adFormatsList['468x60_as']        = $this->adFormats['468x60_as']['caption'];
-
-        $this->adFormats['234x60_as']['caption'] = '234 X 60 Half Banner';
-        $this->adFormats['234x60_as']['width']   = 234;
-        $this->adFormats['234x60_as']['height']  = 60;
-        $this->adFormatsList['234x60_as']        = $this->adFormats['234x60_as']['caption'];
-
-        $this->adFormats['120x600_as']['caption'] = '120 X 600 Skyscraper';
-        $this->adFormats['120x600_as']['width']   = 120;
-        $this->adFormats['120x600_as']['height']  = 600;
-        $this->adFormatsList['120x600_as']        = $this->adFormats['120x600_as']['caption'];
-
-        $this->adFormats['160x600_as']['caption'] = '160 X 600 Wide Skyscraper';
-        $this->adFormats['160x600_as']['width']   = 160;
-        $this->adFormats['160x600_as']['height']  = 600;
-        $this->adFormatsList['160x600_as']        = $this->adFormats['160x600_as']['caption'];
-
-        $this->adFormats['120x240_as']['caption'] = '120 X 240 Vertical Banner';
-        $this->adFormats['120x240_as']['width']   = 120;
-        $this->adFormats['120x240_as']['height']  = 240;
-        $this->adFormatsList['120x240_as']        = $this->adFormats['120x240_as']['caption'];
-
-        $this->adFormats['336x280_as']['caption'] = '336 X 280 Large Rectangle';
-        $this->adFormats['336x280_as']['width']   = 136;
-        $this->adFormats['336x280_as']['height']  = 280;
-        $this->adFormatsList['336x280_as']        = $this->adFormats['336x280_as']['caption'];
-
-        $this->adFormats['300x250_as']['caption'] = '300 X 250 Medium Rectangle';
-        $this->adFormats['300x250_as']['width']   = 300;
-        $this->adFormats['300x250_as']['height']  = 250;
-        $this->adFormatsList['300x250_as']        = $this->adFormats['300x250_as']['caption'];
-
-        $this->adFormats['250x250_as']['caption'] = '250 X 250 Square';
-        $this->adFormats['250x250_as']['width']   = 250;
-        $this->adFormats['250x250_as']['height']  = 250;
-        $this->adFormatsList['250x250_as']        = $this->adFormats['250x250_as']['caption'];
-
-        $this->adFormats['200x200_as']['caption'] = '200 X 200 Small Square';
-        $this->adFormats['200x200_as']['width']   = 200;
-        $this->adFormats['200x200_as']['height']  = 200;
-        $this->adFormatsList['200x200_as']        = $this->adFormats['200x200_as']['caption'];
-
-        $this->adFormats['180x150_as']['caption'] = '180 X 150 Small Rectangle';
-        $this->adFormats['180x150_as']['width']   = 180;
-        $this->adFormats['180x150_as']['height']  = 150;
-        $this->adFormatsList['180x150_as']        = $this->adFormats['180x150_as']['caption'];
-
-        $this->adFormats['125x125_as']['caption'] = '125 X 125 Button';
-        $this->adFormats['125x125_as']['width']   = 125;
-        $this->adFormats['125x125_as']['height']  = 125;
-        $this->adFormatsList['125x125_as']        = $this->adFormats['125x125_as']['caption'];
-    }
-
-    /**
-     * @return array
-     */
-    public function getFormats()
-    {
-        return $this->adFormatsList;
-    }
-
-    /**
-     * @param $obj
-     * @return bool
-     */
-    public function beforeSave($obj)
-    {
-        if ('' === $obj->getVar('tag')) {
-            $obj->setVar('tag', $title = $obj->generateTag());
-        }
-
-        return true;
-    }
-
-    /**
-     * @return array|bool
-     */
-    public function getAdsensesByTag()
-    {
-        if (!$this->objects) {
-            $adsensesObj =& $this->getObjects(null, true);
-            $ret         = [];
-            foreach ($adsensesObj as $adsenseObj) {
-                $ret[$adsenseObj->getVar('tag')] = $adsenseObj;
-            }
-            $this->objects = $ret;
-        }
-
-        return $this->objects;
-    }
+	public $adFormats;
+	public $adFormatsList;
+	public $objects = false;
+
+	/**
+	 * SmartobjectAdsenseHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'adsense', 'adsenseid', 'description', '', 'smartobject');
+		$this->adFormats     = [];
+		$this->adFormatsList = [];
+
+		$this->adFormats['728x90_as']['caption'] = '728 X 90 Leaderboard';
+		$this->adFormats['728x90_as']['width']   = 728;
+		$this->adFormats['728x90_as']['height']  = 90;
+		$this->adFormatsList['728x90_as']        = $this->adFormats['728x90_as']['caption'];
+
+		$this->adFormats['468x60_as']['caption'] = '468 X 60 Banner';
+		$this->adFormats['468x60_as']['width']   = 468;
+		$this->adFormats['468x60_as']['height']  = 60;
+		$this->adFormatsList['468x60_as']        = $this->adFormats['468x60_as']['caption'];
+
+		$this->adFormats['234x60_as']['caption'] = '234 X 60 Half Banner';
+		$this->adFormats['234x60_as']['width']   = 234;
+		$this->adFormats['234x60_as']['height']  = 60;
+		$this->adFormatsList['234x60_as']        = $this->adFormats['234x60_as']['caption'];
+
+		$this->adFormats['120x600_as']['caption'] = '120 X 600 Skyscraper';
+		$this->adFormats['120x600_as']['width']   = 120;
+		$this->adFormats['120x600_as']['height']  = 600;
+		$this->adFormatsList['120x600_as']        = $this->adFormats['120x600_as']['caption'];
+
+		$this->adFormats['160x600_as']['caption'] = '160 X 600 Wide Skyscraper';
+		$this->adFormats['160x600_as']['width']   = 160;
+		$this->adFormats['160x600_as']['height']  = 600;
+		$this->adFormatsList['160x600_as']        = $this->adFormats['160x600_as']['caption'];
+
+		$this->adFormats['120x240_as']['caption'] = '120 X 240 Vertical Banner';
+		$this->adFormats['120x240_as']['width']   = 120;
+		$this->adFormats['120x240_as']['height']  = 240;
+		$this->adFormatsList['120x240_as']        = $this->adFormats['120x240_as']['caption'];
+
+		$this->adFormats['336x280_as']['caption'] = '336 X 280 Large Rectangle';
+		$this->adFormats['336x280_as']['width']   = 136;
+		$this->adFormats['336x280_as']['height']  = 280;
+		$this->adFormatsList['336x280_as']        = $this->adFormats['336x280_as']['caption'];
+
+		$this->adFormats['300x250_as']['caption'] = '300 X 250 Medium Rectangle';
+		$this->adFormats['300x250_as']['width']   = 300;
+		$this->adFormats['300x250_as']['height']  = 250;
+		$this->adFormatsList['300x250_as']        = $this->adFormats['300x250_as']['caption'];
+
+		$this->adFormats['250x250_as']['caption'] = '250 X 250 Square';
+		$this->adFormats['250x250_as']['width']   = 250;
+		$this->adFormats['250x250_as']['height']  = 250;
+		$this->adFormatsList['250x250_as']        = $this->adFormats['250x250_as']['caption'];
+
+		$this->adFormats['200x200_as']['caption'] = '200 X 200 Small Square';
+		$this->adFormats['200x200_as']['width']   = 200;
+		$this->adFormats['200x200_as']['height']  = 200;
+		$this->adFormatsList['200x200_as']        = $this->adFormats['200x200_as']['caption'];
+
+		$this->adFormats['180x150_as']['caption'] = '180 X 150 Small Rectangle';
+		$this->adFormats['180x150_as']['width']   = 180;
+		$this->adFormats['180x150_as']['height']  = 150;
+		$this->adFormatsList['180x150_as']        = $this->adFormats['180x150_as']['caption'];
+
+		$this->adFormats['125x125_as']['caption'] = '125 X 125 Button';
+		$this->adFormats['125x125_as']['width']   = 125;
+		$this->adFormats['125x125_as']['height']  = 125;
+		$this->adFormatsList['125x125_as']        = $this->adFormats['125x125_as']['caption'];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getFormats()
+	{
+		return $this->adFormatsList;
+	}
+
+	/**
+	 * @param $obj
+	 * @return bool
+	 */
+	public function beforeSave($obj)
+	{
+		if ('' === $obj->getVar('tag')) {
+			$obj->setVar('tag', $title = $obj->generateTag());
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public function getAdsensesByTag()
+	{
+		if (!$this->objects) {
+			$adsensesObj =& $this->getObjects(null, true);
+			$ret         = [];
+			foreach ($adsensesObj as $adsenseObj) {
+				$ret[$adsenseObj->getVar('tag')] = $adsenseObj;
+			}
+			$this->objects = $ret;
+		}
+
+		return $this->objects;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
     public function getAdsensesByTag()
     {
         if (!$this->objects) {
-            $adsensesObj =& $this->getObjects(null, true);
+            $adsensesObj = & $this->getObjects(null, true);
             $ret         = [];
             foreach ($adsensesObj as $adsenseObj) {
                 $ret[$adsenseObj->getVar('tag')] = $adsenseObj;

class/SmartobjectBasedUrl.php

Indentation +24 added lines, -24 removed lines

@@ -29,29 +29,29 @@
  */
 class SmartobjectBasedUrl extends Smartobject\BaseSmartObject
 {
-    /**
-     * SmartobjectBasedUrl constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('caption', XOBJ_DTYPE_TXTBOX, false);
-        $this->quickInitVar('description', XOBJ_DTYPE_TXTBOX, false);
-        $this->quickInitVar('url', XOBJ_DTYPE_TXTBOX, false);
-    }
+	/**
+	 * SmartobjectBasedUrl constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('caption', XOBJ_DTYPE_TXTBOX, false);
+		$this->quickInitVar('description', XOBJ_DTYPE_TXTBOX, false);
+		$this->quickInitVar('url', XOBJ_DTYPE_TXTBOX, false);
+	}
 
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 'e')
-    {
-        if (0 === strpos($key, 'url_')) {
-            return parent::getVar('url', $format);
-        } elseif (0 === strpos($key, 'caption_')) {
-            return parent::getVar('caption', $format);
-        } else {
-            return parent::getVar($key, $format);
-        }
-    }
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 'e')
+	{
+		if (0 === strpos($key, 'url_')) {
+			return parent::getVar('url', $format);
+		} elseif (0 === strpos($key, 'caption_')) {
+			return parent::getVar('caption', $format);
+		} else {
+			return parent::getVar($key, $format);
+		}
+	}
 }

class/SmartObjectExport.php

Indentation +105 added lines, -105 removed lines

@@ -41,116 +41,116 @@
  */
 class SmartObjectExport
 {
-    public $handler;
-    public $criteria;
-    public $fields;
-    public $format;
-    public $filename;
-    public $filepath;
-    public $options;
-    public $outputMethods = false;
-    public $notDisplayFields;
+	public $handler;
+	public $criteria;
+	public $fields;
+	public $format;
+	public $filename;
+	public $filepath;
+	public $options;
+	public $outputMethods = false;
+	public $notDisplayFields;
 
-    /**
-     * Constructor
-     *
-     * @param SmartPersistableObjectHandler $objectHandler SmartObjectHandler handling the data we want to export
-     * @param \CriteriaElement               $criteria      containing the criteria of the query fetching the objects to be exported
-     * @param array|bool                    $fields        fields to be exported. If FALSE then all fields will be exported
-     * @param bool|string                   $filename      name of the file to be created
-     * @param bool|string                   $filepath      path where the file will be saved
-     * @param string                        $format        format of the ouputed export. Currently only supports CSV
-     * @param array|bool                    $options       options of the format to be exported in
-     */
-    public function __construct(
-        SmartPersistableObjectHandler $objectHandler,
-        \CriteriaElement $criteria = null,
-        $fields = false,
-        $filename = false,
-        $filepath = false,
-        $format = 'csv',
-        $options = false
-    ) {
-        $this->handler          = $objectHandler;
-        $this->criteria         = $criteria;
-        $this->fields           = $fields;
-        $this->filename         = $filename;
-        $this->format           = $format;
-        $this->options          = $options;
-        $this->notDisplayFields = false;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param SmartPersistableObjectHandler $objectHandler SmartObjectHandler handling the data we want to export
+	 * @param \CriteriaElement               $criteria      containing the criteria of the query fetching the objects to be exported
+	 * @param array|bool                    $fields        fields to be exported. If FALSE then all fields will be exported
+	 * @param bool|string                   $filename      name of the file to be created
+	 * @param bool|string                   $filepath      path where the file will be saved
+	 * @param string                        $format        format of the ouputed export. Currently only supports CSV
+	 * @param array|bool                    $options       options of the format to be exported in
+	 */
+	public function __construct(
+		SmartPersistableObjectHandler $objectHandler,
+		\CriteriaElement $criteria = null,
+		$fields = false,
+		$filename = false,
+		$filepath = false,
+		$format = 'csv',
+		$options = false
+	) {
+		$this->handler          = $objectHandler;
+		$this->criteria         = $criteria;
+		$this->fields           = $fields;
+		$this->filename         = $filename;
+		$this->format           = $format;
+		$this->options          = $options;
+		$this->notDisplayFields = false;
+	}
 
-    /**
-     * Renders the export
-     * @param $filename
-     */
-    public function render($filename)
-    {
-        $this->filename = $filename;
+	/**
+	 * Renders the export
+	 * @param $filename
+	 */
+	public function render($filename)
+	{
+		$this->filename = $filename;
 
-        $objects        = $this->handler->getObjects($this->criteria);
-        $rows           = [];
-        $columnsHeaders = [];
-        $firstObject    = true;
-        foreach ($objects as $object) {
-            $row = [];
-            foreach ($object->vars as $key => $var) {
-                if ((!$this->fields || in_array($key, $this->fields)) && !in_array($key, $this->notDisplayFields)) {
-                    if ($this->outputMethods && isset($this->outputMethods[$key])
-                        && method_exists($object, $this->outputMethods[$key])) {
-                        $method    = $this->outputMethods[$key];
-                        $row[$key] = $object->$method();
-                    } else {
-                        $row[$key] = $object->getVar($key);
-                    }
-                    if ($firstObject) {
-                        // then set the columnsHeaders array as well
-                        $columnsHeaders[$key] = $var['form_caption'];
-                    }
-                }
-            }
-            $firstObject = false;
-            $rows[]      = $row;
-            unset($row);
-        }
-        $data                   = [];
-        $data['rows']           = $rows;
-        $data['columnsHeaders'] = $columnsHeaders;
-        $smartExportRenderer    = new SmartExportRenderer($data, $this->filename, $this->filepath, $this->format, $this->options);
-        $smartExportRenderer->execute();
-    }
+		$objects        = $this->handler->getObjects($this->criteria);
+		$rows           = [];
+		$columnsHeaders = [];
+		$firstObject    = true;
+		foreach ($objects as $object) {
+			$row = [];
+			foreach ($object->vars as $key => $var) {
+				if ((!$this->fields || in_array($key, $this->fields)) && !in_array($key, $this->notDisplayFields)) {
+					if ($this->outputMethods && isset($this->outputMethods[$key])
+						&& method_exists($object, $this->outputMethods[$key])) {
+						$method    = $this->outputMethods[$key];
+						$row[$key] = $object->$method();
+					} else {
+						$row[$key] = $object->getVar($key);
+					}
+					if ($firstObject) {
+						// then set the columnsHeaders array as well
+						$columnsHeaders[$key] = $var['form_caption'];
+					}
+				}
+			}
+			$firstObject = false;
+			$rows[]      = $row;
+			unset($row);
+		}
+		$data                   = [];
+		$data['rows']           = $rows;
+		$data['columnsHeaders'] = $columnsHeaders;
+		$smartExportRenderer    = new SmartExportRenderer($data, $this->filename, $this->filepath, $this->format, $this->options);
+		$smartExportRenderer->execute();
+	}
 
-    /**
-     * Set an array contaning the alternate methods to use instead of the default getVar()
-     *
-     * $outputMethods array example: 'uid' => 'getUserName'...
-     * @param $outputMethods
-     */
-    public function setOuptutMethods($outputMethods)
-    {
-        $this->outputMethods = $outputMethods;
-    }
+	/**
+	 * Set an array contaning the alternate methods to use instead of the default getVar()
+	 *
+	 * $outputMethods array example: 'uid' => 'getUserName'...
+	 * @param $outputMethods
+	 */
+	public function setOuptutMethods($outputMethods)
+	{
+		$this->outputMethods = $outputMethods;
+	}
 
-    /*
+	/*
      * Set an array of fields that we don't want in export
      */
-    /**
-     * @param $fields
-     */
-    public function setNotDisplayFields($fields)
-    {
-        if (!$this->notDisplayFields) {
-            if (is_array($fields)) {
-                $this->notDisplayFields = $fields;
-            } else {
-                $this->notDisplayFields = [$fields];
-            }
-        } else {
-            if (is_array($fields)) {
-                $this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
-            } else {
-                $this->notDisplayFields[] = $fields;
-            }
-        }
-    }
+	/**
+	 * @param $fields
+	 */
+	public function setNotDisplayFields($fields)
+	{
+		if (!$this->notDisplayFields) {
+			if (is_array($fields)) {
+				$this->notDisplayFields = $fields;
+			} else {
+				$this->notDisplayFields = [$fields];
+			}
+		} else {
+			if (is_array($fields)) {
+				$this->notDisplayFields = array_merge($this->notDisplayFields, $fields);
+			} else {
+				$this->notDisplayFields[] = $fields;
+			}
+		}
+	}
 }