mambax7 / smartobject

sendlink.php

Indentation +76 added lines, -76 removed lines

@@ -28,82 +28,82 @@
 $op = isset($_POST['op']) ? $_POST['op'] : '';
 
 switch ($op) {
-    case 'sendlink':
-
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectLinkHandler);
-
-        $linkObj = $controller->storeSmartObject();
-        if ($linkObj->hasError()) {
-            /**
-             * @todo inform user and propose to close the window if a problem occured when saving the link
-             */
-        }
-
-        $xoopsMailer = xoops_getMailer();
-        $xoopsMailer->useMail();
-        $xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
-
-        $xoopsMailer->setTemplate('sendlink.tpl');
-        $xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
-        $xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
-        $xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
-        $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-        $xoopsMailer->assign('MESSAGE', $_POST['body']);
-        $xoopsMailer->setToEmails($linkObj->getVar('to_email'));
-        $xoopsMailer->setFromEmail($linkObj->getVar('from_email'));
-        $xoopsMailer->setFromName($xoopsConfig['sitename']);
-        $xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
-
-        if (!$xoopsMailer->send(true)) {
-            $xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
-        } else {
-            $xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
-        }
-
-        break;
-
-    default:
-        if (isset($_GET['mid'])) {
-            $mid = $_GET['mid'];
-        } else {
-            /**
-             * @todo close the window if no mid is passed as GET
-             */
-        }
-
-        $hModule = xoops_getHandler('module');
-        $module  = $hModule->get($mid);
-        $linkObj->setVar('mid', $module->getVar('mid'));
-        $linkObj->setVar('mid_name', $module->getVar('name'));
-
-        if (isset($_GET['link'])) {
-            $link = $_GET['link'];
-        } else {
-            /**
-             * @todo close the window if no link is passed as GET
-             */
-        }
-        $linkObj->setVar('link', $link);
-
-        if (is_object($xoopsUser)) {
-            $linkObj->setVar('from_uid', $xoopsUser->getVar('uid'));
-            $linkObj->setVar('from_name', '' !== $xoopsUser->getVar('name') ? $xoopsUser->getVar('name') : $xoopsUser->getVar('uname'));
-            $linkObj->setVar('from_email', $xoopsUser->getVar('email'));
-        }
-
-        $linkObj->setVar('subject', sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $xoopsConfig['sitename']));
-        $linkObj->setVar('body', sprintf(_CO_SOBJECT_BODY_DEFAULT, $xoopsConfig['sitename'], $link));
-        $linkObj->setVar('date', time());
-        $linkObj->hideFieldFromForm(['from_uid', 'to_uid', 'link', 'mid', 'mid_name']);
-
-        $form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND, 'javascript:window.close();');
-
-        $form->assign($xoopsTpl);
-
-        $xoopsTpl->assign('showform', true);
-        break;
+	case 'sendlink':
+
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectLinkHandler);
+
+		$linkObj = $controller->storeSmartObject();
+		if ($linkObj->hasError()) {
+			/**
+			 * @todo inform user and propose to close the window if a problem occured when saving the link
+			 */
+		}
+
+		$xoopsMailer = xoops_getMailer();
+		$xoopsMailer->useMail();
+		$xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
+
+		$xoopsMailer->setTemplate('sendlink.tpl');
+		$xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
+		$xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
+		$xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
+		$xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+		$xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+		$xoopsMailer->assign('MESSAGE', $_POST['body']);
+		$xoopsMailer->setToEmails($linkObj->getVar('to_email'));
+		$xoopsMailer->setFromEmail($linkObj->getVar('from_email'));
+		$xoopsMailer->setFromName($xoopsConfig['sitename']);
+		$xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
+
+		if (!$xoopsMailer->send(true)) {
+			$xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
+		} else {
+			$xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
+		}
+
+		break;
+
+	default:
+		if (isset($_GET['mid'])) {
+			$mid = $_GET['mid'];
+		} else {
+			/**
+			 * @todo close the window if no mid is passed as GET
+			 */
+		}
+
+		$hModule = xoops_getHandler('module');
+		$module  = $hModule->get($mid);
+		$linkObj->setVar('mid', $module->getVar('mid'));
+		$linkObj->setVar('mid_name', $module->getVar('name'));
+
+		if (isset($_GET['link'])) {
+			$link = $_GET['link'];
+		} else {
+			/**
+			 * @todo close the window if no link is passed as GET
+			 */
+		}
+		$linkObj->setVar('link', $link);
+
+		if (is_object($xoopsUser)) {
+			$linkObj->setVar('from_uid', $xoopsUser->getVar('uid'));
+			$linkObj->setVar('from_name', '' !== $xoopsUser->getVar('name') ? $xoopsUser->getVar('name') : $xoopsUser->getVar('uname'));
+			$linkObj->setVar('from_email', $xoopsUser->getVar('email'));
+		}
+
+		$linkObj->setVar('subject', sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $xoopsConfig['sitename']));
+		$linkObj->setVar('body', sprintf(_CO_SOBJECT_BODY_DEFAULT, $xoopsConfig['sitename'], $link));
+		$linkObj->setVar('date', time());
+		$linkObj->hideFieldFromForm(['from_uid', 'to_uid', 'link', 'mid', 'mid_name']);
+
+		$form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND, 'javascript:window.close();');
+
+		$form->assign($xoopsTpl);
+
+		$xoopsTpl->assign('showform', true);
+		break;
 }
 
 $xoopsTpl->display('db:smartobject_sendlink.tpl');

preloads/autoloader.php

Indentation +19 added lines, -19 removed lines

@@ -4,29 +4,29 @@
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(function ($class) {
-    // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+	// project-specific namespace prefix
+	$prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
 
-    // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/../class/';
+	// base directory for the namespace prefix
+	$base_dir = __DIR__ . '/../class/';
 
-    // does the class use the namespace prefix?
-    $len      = strlen($prefix);
+	// does the class use the namespace prefix?
+	$len      = strlen($prefix);
 
-    if (0 !== strncmp($prefix, $class, $len)) {
-        return;
-    }
+	if (0 !== strncmp($prefix, $class, $len)) {
+		return;
+	}
 
-    // get the relative class name
-    $relative_class = substr($class, $len);
+	// get the relative class name
+	$relative_class = substr($class, $len);
 
-    // replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file           = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file           = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
 
-    // if the file exists, require it
-    if (file_exists($file)) {
-        require $file;
-    }
+	// if the file exists, require it
+	if (file_exists($file)) {
+		require $file;
+	}
 });

preloads/core.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
  */
 class SmartobjectCorePreload extends \XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args)
-    {
-        include __DIR__ . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args)
+	{
+		include __DIR__ . '/autoloader.php';
+	}
 }

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

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

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

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

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

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