mambax7 / smartobject

class/Adsense.php

Indentation +194 added lines, -194 removed lines

@@ -29,87 +29,87 @@ 
  */
 class Adsense extends Smartobject\BaseSmartObject
 {
-    /**
-     * SmartobjectAdsense constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('adsenseid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_ADSENSE_DESCRIPTION, _CO_SOBJECT_ADSENSE_DESCRIPTION_DSC);
-        $this->quickInitVar('client_id', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_CLIENT_ID, _CO_SOBJECT_ADSENSE_CLIENT_ID_DSC);
-        $this->quickInitVar('tag', XOBJ_DTYPE_TXTBOX, false, _CO_SOBJECT_ADSENSE_TAG, _CO_SOBJECT_ADSENSE_TAG_DSC);
-        $this->quickInitVar('format', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_FORMAT, _CO_SOBJECT_ADSENSE_FORMAT_DSC);
-        $this->quickInitVar('border_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BORDER_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
-        $this->quickInitVar('background_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BACKGROUND_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
-        $this->quickInitVar('link_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_LINK_COLOR, _CO_SOBJECT_ADSENSE_LINK_COLOR_DSC);
-        $this->quickInitVar('url_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_URL_COLOR, _CO_SOBJECT_ADSENSE_URL_COLOR_DSC);
-        $this->quickInitVar('text_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_TEXT_COLOR, _CO_SOBJECT_ADSENSE_TEXT_COLOR_DSC);
-        $this->quickInitVar('style', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_ADSENSE_STYLE, _CO_SOBJECT_ADSENSE_STYLE_DSC);
+	/**
+	 * SmartobjectAdsense constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('adsenseid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('description', XOBJ_DTYPE_TXTAREA, true, _CO_SOBJECT_ADSENSE_DESCRIPTION, _CO_SOBJECT_ADSENSE_DESCRIPTION_DSC);
+		$this->quickInitVar('client_id', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_CLIENT_ID, _CO_SOBJECT_ADSENSE_CLIENT_ID_DSC);
+		$this->quickInitVar('tag', XOBJ_DTYPE_TXTBOX, false, _CO_SOBJECT_ADSENSE_TAG, _CO_SOBJECT_ADSENSE_TAG_DSC);
+		$this->quickInitVar('format', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_FORMAT, _CO_SOBJECT_ADSENSE_FORMAT_DSC);
+		$this->quickInitVar('border_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BORDER_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
+		$this->quickInitVar('background_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_BACKGROUND_COLOR, _CO_SOBJECT_ADSENSE_BORDER_COLOR_DSC);
+		$this->quickInitVar('link_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_LINK_COLOR, _CO_SOBJECT_ADSENSE_LINK_COLOR_DSC);
+		$this->quickInitVar('url_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_URL_COLOR, _CO_SOBJECT_ADSENSE_URL_COLOR_DSC);
+		$this->quickInitVar('text_color', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_ADSENSE_TEXT_COLOR, _CO_SOBJECT_ADSENSE_TEXT_COLOR_DSC);
+		$this->quickInitVar('style', XOBJ_DTYPE_TXTAREA, false, _CO_SOBJECT_ADSENSE_STYLE, _CO_SOBJECT_ADSENSE_STYLE_DSC);
 
-        $this->setControl('format', [
-            'handler' => 'adsense',
-            'method'  => 'getFormats'
-        ]);
+		$this->setControl('format', [
+			'handler' => 'adsense',
+			'method'  => 'getFormats'
+		]);
 
-        $this->setControl('border_color', [
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ]);
+		$this->setControl('border_color', [
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		]);
 
-        $this->setControl('background_color', [
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ]);
+		$this->setControl('background_color', [
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		]);
 
-        $this->setControl('link_color', [
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ]);
+		$this->setControl('link_color', [
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		]);
 
-        $this->setControl('url_color', [
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ]);
+		$this->setControl('url_color', [
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		]);
 
-        $this->setControl('text_color', [
-            'name'      => 'text',
-            'size'      => 6,
-            'maxlength' => 6
-        ]);
-    }
+		$this->setControl('text_color', [
+			'name'      => 'text',
+			'size'      => 6,
+			'maxlength' => 6
+		]);
+	}
 
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ('s' === $format && in_array($key, [])) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ('s' === $format && in_array($key, [])) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
 
-        return parent::getVar($key, $format);
-    }
+		return parent::getVar($key, $format);
+	}
 
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        global $smartobjectAdsenseHandler;
-        if ('' !== $this->getVar('style', 'n')) {
-            $ret = '<div style="' . $this->getVar('style', 'n') . '">';
-        } else {
-            $ret = '<div>';
-        }
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		global $smartobjectAdsenseHandler;
+		if ('' !== $this->getVar('style', 'n')) {
+			$ret = '<div style="' . $this->getVar('style', 'n') . '">';
+		} else {
+			$ret = '<div>';
+		}
 
-        $ret .= '<script type="text/javascript"><!--
+		$ret .= '<script type="text/javascript"><!--
 google_ad_client = "' . $this->getVar('client_id', 'n') . '";
 google_ad_width = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['width'] . ';
 google_ad_height = ' . $smartobjectAdsenseHandler->adFormats[$this->getVar('format', 'n')]['height'] . ';
@@ -127,137 +127,137 @@ 
 </script>
 </div>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @return string
-     */
-    public function getXoopsCode()
-    {
-        $ret = '[adsense]' . $this->getVar('tag', 'n') . '[/adsense]';
+	/**
+	 * @return string
+	 */
+	public function getXoopsCode()
+	{
+		$ret = '[adsense]' . $this->getVar('tag', 'n') . '[/adsense]';
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param $var
-     * @return bool
-     */
-    public function emptyString($var)
-    {
-        return (strlen($var) > 0);
-    }
+	/**
+	 * @param $var
+	 * @return bool
+	 */
+	public function emptyString($var)
+	{
+		return (strlen($var) > 0);
+	}
 
-    /**
-     * @return mixed|string
-     */
-    public function generateTag()
-    {
-        $title = rawurlencode(strtolower($this->getVar('description', 'e')));
-        $title = xoops_substr($title, 0, 10, '');
-        // Transformation des ponctuations
-        $pattern = [
-            '/%09/', // Tab
-            '/%20/', // Space
-            '/%21/', // !
-            '/%22/', // "
-            '/%23/', // #
-            '/%25/', // %
-            '/%26/', // &
-            '/%27/', // '
-            '/%28/', // (
-            '/%29/', // )
-            '/%2C/', // ,
-            '/%2F/', // /
-            '/%3A/', // :
-            '/%3B/', // ;
-            '/%3C/', // <
-            '/%3D/', // =
-            '/%3E/', // >
-            '/%3F/', // ?
-            '/%40/', // @
-            '/%5B/', // [
-            '/%5C/', // \
-            '/%5D/', // ]
-            '/%5E/', // ^
-            '/%7B/', // {
-            '/%7C/', // |
-            '/%7D/', // }
-            '/%7E/', // ~
-            "/\./" // .
-        ];
-        $rep_pat = [
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-100',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-at-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-',
-            '-'
-        ];
-        $title   = preg_replace($pattern, $rep_pat, $title);
+	/**
+	 * @return mixed|string
+	 */
+	public function generateTag()
+	{
+		$title = rawurlencode(strtolower($this->getVar('description', 'e')));
+		$title = xoops_substr($title, 0, 10, '');
+		// Transformation des ponctuations
+		$pattern = [
+			'/%09/', // Tab
+			'/%20/', // Space
+			'/%21/', // !
+			'/%22/', // "
+			'/%23/', // #
+			'/%25/', // %
+			'/%26/', // &
+			'/%27/', // '
+			'/%28/', // (
+			'/%29/', // )
+			'/%2C/', // ,
+			'/%2F/', // /
+			'/%3A/', // :
+			'/%3B/', // ;
+			'/%3C/', // <
+			'/%3D/', // =
+			'/%3E/', // >
+			'/%3F/', // ?
+			'/%40/', // @
+			'/%5B/', // [
+			'/%5C/', // \
+			'/%5D/', // ]
+			'/%5E/', // ^
+			'/%7B/', // {
+			'/%7C/', // |
+			'/%7D/', // }
+			'/%7E/', // ~
+			"/\./" // .
+		];
+		$rep_pat = [
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-100',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-at-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-',
+			'-'
+		];
+		$title   = preg_replace($pattern, $rep_pat, $title);
 
-        // Transformation des caractères accentués
-        $pattern = [
-            '/%B0/', // °
-            '/%E8/', // è
-            '/%E9/', // é
-            '/%EA/', // ê
-            '/%EB/', // ë
-            '/%E7/', // ç
-            '/%E0/', // à
-            '/%E2/', // â
-            '/%E4/', // ä
-            '/%EE/', // î
-            '/%EF/', // ï
-            '/%F9/', // ù
-            '/%FC/', // ü
-            '/%FB/', // û
-            '/%F4/', // ô
-            '/%F6/', // ö
-        ];
-        $rep_pat = ['-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o'];
-        $title   = preg_replace($pattern, $rep_pat, $title);
+		// Transformation des caractères accentués
+		$pattern = [
+			'/%B0/', // °
+			'/%E8/', // è
+			'/%E9/', // é
+			'/%EA/', // ê
+			'/%EB/', // ë
+			'/%E7/', // ç
+			'/%E0/', // à
+			'/%E2/', // â
+			'/%E4/', // ä
+			'/%EE/', // î
+			'/%EF/', // ï
+			'/%F9/', // ù
+			'/%FC/', // ü
+			'/%FB/', // û
+			'/%F4/', // ô
+			'/%F6/', // ö
+		];
+		$rep_pat = ['-', 'e', 'e', 'e', 'e', 'c', 'a', 'a', 'a', 'i', 'i', 'u', 'u', 'u', 'o', 'o'];
+		$title   = preg_replace($pattern, $rep_pat, $title);
 
-        $tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
-        $tableau = array_filter($tableau, [$this, 'emptyString']); // Supprime les chaines vides du tableau
-        $title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
+		$tableau = explode('-', $title); // Transforme la chaine de caract�res en tableau
+		$tableau = array_filter($tableau, [$this, 'emptyString']); // Supprime les chaines vides du tableau
+		$title   = implode('-', $tableau); // Transforme un tableau en chaine de caract�res s�par� par un tiret
 
-        $title .= time();
-        $title = md5($title);
+		$title .= time();
+		$title = md5($title);
 
-        return $title;
-    }
+		return $title;
+	}
 
-    /**
-     * @return string
-     */
-    public function getCloneLink()
-    {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/adsense.php?op=clone&adsenseid=' . $this->getVar('adsenseid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" alt="' . _CO_SOBJECT_ADSENSE_CLONE . '" title="' . _CO_SOBJECT_ADSENSE_CLONE . '"></a>';
+	/**
+	 * @return string
+	 */
+	public function getCloneLink()
+	{
+		$ret = '<a href="' . SMARTOBJECT_URL . 'admin/adsense.php?op=clone&adsenseid=' . $this->getVar('adsenseid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'editcopy.png" alt="' . _CO_SOBJECT_ADSENSE_CLONE . '" title="' . _CO_SOBJECT_ADSENSE_CLONE . '"></a>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

class/PermissionHandler.php

Indentation +199 added lines, -199 removed lines

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

class/PrinterFriendly.php

Indentation +51 added lines, -51 removed lines

@@ -17,65 +17,65 @@
  */
 class PrinterFriendly
 {
-    public $_title;
-    public $_dsc;
-    public $_content;
-    public $_tpl;
-    public $_pageTitle = false;
-    public $_width     = 680;
+	public $_title;
+	public $_dsc;
+	public $_content;
+	public $_tpl;
+	public $_pageTitle = false;
+	public $_width     = 680;
 
-    /**
-     * SmartPrinterFriendly constructor.
-     * @param      $content
-     * @param bool $title
-     * @param bool $dsc
-     */
-    public function __construct($content, $title = false, $dsc = false)
-    {
-        $this->_title   = $title;
-        $this->_dsc     = $dsc;
-        $this->_content = $content;
-    }
+	/**
+	 * SmartPrinterFriendly constructor.
+	 * @param      $content
+	 * @param bool $title
+	 * @param bool $dsc
+	 */
+	public function __construct($content, $title = false, $dsc = false)
+	{
+		$this->_title   = $title;
+		$this->_dsc     = $dsc;
+		$this->_content = $content;
+	}
 
-    public function render()
-    {
-        /**
-         * @todo move the output to a template
-         * @todo make the output XHTML compliant
-         */
+	public function render()
+	{
+		/**
+		 * @todo move the output to a template
+		 * @todo make the output XHTML compliant
+		 */
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        $this->_tpl = new \XoopsTpl();
+		$this->_tpl = new \XoopsTpl();
 
-        $this->_tpl->assign('smartobject_print_pageTitle', $this->_pageTitle ?: $this->_title);
-        $this->_tpl->assign('smartobject_print_title', $this->_title);
-        $this->_tpl->assign('smartobject_print_dsc', $this->_dsc);
-        $this->_tpl->assign('smartobject_print_content', $this->_content);
-        $this->_tpl->assign('smartobject_print_width', $this->_width);
+		$this->_tpl->assign('smartobject_print_pageTitle', $this->_pageTitle ?: $this->_title);
+		$this->_tpl->assign('smartobject_print_title', $this->_title);
+		$this->_tpl->assign('smartobject_print_dsc', $this->_dsc);
+		$this->_tpl->assign('smartobject_print_content', $this->_content);
+		$this->_tpl->assign('smartobject_print_width', $this->_width);
 
-        $current_urls = Smartobject\Utility::getCurrentUrls();
-        $current_url  = $current_urls['full'];
+		$current_urls = Smartobject\Utility::getCurrentUrls();
+		$current_url  = $current_urls['full'];
 
-        $this->_tpl->assign('smartobject_print_currenturl', $current_url);
-        $this->_tpl->assign('smartobject_print_url', $this->url);
+		$this->_tpl->assign('smartobject_print_currenturl', $current_url);
+		$this->_tpl->assign('smartobject_print_url', $this->url);
 
-        $this->_tpl->display('db:smartobject_print.tpl');
-    }
+		$this->_tpl->display('db:smartobject_print.tpl');
+	}
 
-    /**
-     * @param $text
-     */
-    public function setPageTitle($text)
-    {
-        $this->_pageTitle = $text;
-    }
+	/**
+	 * @param $text
+	 */
+	public function setPageTitle($text)
+	{
+		$this->_pageTitle = $text;
+	}
 
-    /**
-     * @param $width
-     */
-    public function setWidth($width)
-    {
-        $this->_width = $width;
-    }
+	/**
+	 * @param $width
+	 */
+	public function setWidth($width)
+	{
+		$this->_width = $width;
+	}
 }

class/AdsenseHandler.php

Indentation +111 added lines, -111 removed lines

@@ -30,117 +30,117 @@
  */
 class AdsenseHandler extends Smartobject\PersistableObjectHandler
 {
-    public $adFormats;
-    public $adFormatsList;
-    public $objects = false;
+	public $adFormats;
+	public $adFormatsList;
+	public $objects = false;
 //    public $classname = Adsense::class;
 
-    /**
-     * SmartobjectAdsenseHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, Adsense::class, '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;
-    }
+	/**
+	 * SmartobjectAdsenseHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, Adsense::class, '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;
+	}
 }

class/Link.php

Indentation +148 added lines, -148 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -111,7 +111,7 @@ 
 
             return $ret;
         } else {
-            $ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+            $ret = '<a href="'.$ret.'" alt="'.$this->getVar('link', 'e').'" title="'.$this->getVar('link', 'e').'">'._AM_SOBJECT_SENT_LINKS_GOTO.'</a>';
 
             return $ret;
         }
@@ -122,7 +122,7 @@ 
      */
     public function getViewItemLink()
     {
-        $ret = '<a href="' . SMARTOBJECT_URL . 'admin/link.php?op=view&linkid=' . $this->getVar('linkid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'mail_find.png" alt="' . _AM_SOBJECT_SENT_LINK_VIEW . '" title="' . _AM_SOBJECT_SENT_LINK_VIEW . '"></a>';
+        $ret = '<a href="'.SMARTOBJECT_URL.'admin/link.php?op=view&linkid='.$this->getVar('linkid').'"><img src="'.SMARTOBJECT_IMAGES_ACTIONS_URL.'mail_find.png" alt="'._AM_SOBJECT_SENT_LINK_VIEW.'" title="'._AM_SOBJECT_SENT_LINK_VIEW.'"></a>';
 
         return $ret;
     }
@@ -137,10 +137,10 @@ 
         if ($this->getVar('from_uid')) {
             $user = Smartobject\Utility::getLinkedUnameFromId($this->getVar('from_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
         }
 
         return $user;
@@ -169,10 +169,10 @@ 
         if ($this->getVar('to_uid')) {
             $user = Smartobject\Utility::getLinkedUnameFromId($this->getVar('to_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
         }
 
         return $user;

class/About.php

Indentation +158 added lines, -158 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
 
         //Smartobject\Utility::getAdminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         // ---
         // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
@@ -114,7 +114,7 @@ 
         $this->_tpl = new \XoopsTpl();
         // ---
 
-        $this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
+        $this->_tpl->assign('module_url', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/');
         $this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
         $this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
         $this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
@@ -122,7 +122,7 @@ 
 
         // Left headings...
         if ('' !== $versioninfo->getInfo('author_realname')) {
-            $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
+            $author_name = $versioninfo->getInfo('author').' ('.$versioninfo->getInfo('author_realname').')';
         } else {
             $author_name = $versioninfo->getInfo('author');
         }
@@ -167,7 +167,7 @@ 
 
         // For changelog thanks to 3Dev
         global $xoopsModule;
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/changelog.txt';
         if (is_file($filename)) {
             $filesize = filesize($filename);
             $handle   = fopen($filename, 'r');

class/Form/SmartObjectForm.php

Indentation +698 added lines, -698 removed lines

@@ -40,548 +40,548 @@ 
  */
 class SmartObjectForm extends \XoopsThemeForm
 {
-    public $targetObject           = null;
-    public $form_fields            = null;
-    public $_cancel_js_action      = false;
-    public $_custom_button         = false;
-    public $_captcha               = false;
-    public $_form_name             = false;
-    public $_form_caption          = false;
-    public $_submit_button_caption = false;
-
-    /**
-     * SmartobjectForm constructor.
-     * @param string $target
-     * @param string $form_name
-     * @param string $form_caption
-     * @param string $form_action
-     * @param null   $form_fields
-     * @param bool   $submit_button_caption
-     * @param bool   $cancel_js_action
-     * @param bool   $captcha
-     */
-    public function __construct(
-        &$target,
-        $form_name,
-        $form_caption,
-        $form_action,
-        $form_fields = null,
-        $submit_button_caption = false,
-        $cancel_js_action = false,
-        $captcha = false
-    ) {
-        $this->targetObject           =& $target;
-        $this->form_fields            = $form_fields;
-        $this->_cancel_js_action      = $cancel_js_action;
-        $this->_captcha               = $captcha;
-        $this->_form_name             = $form_name;
-        $this->_form_caption          = $form_caption;
-        $this->_submit_button_caption = $submit_button_caption;
-
-        if (!isset($form_action)) {
-            $form_action = xoops_getenv('PHP_SELF');
-        }
-
-        parent::__construct($form_caption, $form_name, $form_action, 'post', true);
-        $this->setExtra('enctype="multipart/form-data"');
-
-        $this->createElements();
-
-        if ($captcha) {
-            $this->addCaptcha();
-        }
-
-        $this->createPermissionControls();
-
-        $this->createButtons($form_name, $form_caption, $submit_button_caption);
-    }
-
-    public function addCaptcha()
-    {
-        require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php';
-        $this->addElement(new \XoopsFormCaptcha(), true);
-    }
-
-    /**
-     * @param      $name
-     * @param      $caption
-     * @param bool $onclick
-     */
-    public function addCustomButton($name, $caption, $onclick = false)
-    {
-        $custom_button_array    = [
-            'name'    => $name,
-            'caption' => $caption,
-            'onclick' => $onclick
-        ];
-        $this->_custom_button[] = $custom_button_array;
-    }
-
-    /**
-     * Add an element to the form
-     *
-     * @param string|XoopsFormElement &$formElement reference to a {@link XoopsFormElement}
-     * @param bool                    $key
-     * @param bool                    $var
-     * @param bool|string             $required     is this a "required" element?
-     */
-    public function addElement($formElement, $key = false, $var = false, $required = 'notset')
-    {
-        if ($key) {
-            if ($this->targetObject->vars[$key]['readonly']) {
-                $formElement->setExtra('disabled="disabled"');
-                $formElement->setName($key . '-readonly');
-                // Since this element is disable, we still want to pass it's value in the form
-                $hidden = new \XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
-                $this->addElement($hidden);
-            }
-            $formElement->setDescription($var['form_dsc']);
-            if (isset($this->targetObject->controls[$key]['onSelect'])) {
-                $hidden = new \XoopsFormHidden('changedField', false);
-                $this->addElement($hidden);
-                $otherExtra      = isset($var['form_extra']) ? $var['form_extra'] : '';
-                $onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
-                $formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
-            } else {
-                if (isset($var['form_extra'])) {
-                    $formElement->setExtra($var['form_extra']);
-                }
-            }
-            $controls = $this->targetObject->controls;
-            if (isset($controls[$key]['js'])) {
-                $formElement->customValidationCode[] = $controls[$key]['js'];
-            }
-            parent::addElement($formElement, 'notset' === $required ? $var['required'] : $required);
-        } else {
-            parent::addElement($formElement, 'notset' === $required ? false : true);
-        }
-        unset($formElement);
-    }
-
-    public function createElements()
-    {
-        $controls = $this->targetObject->controls;
-        $vars     = $this->targetObject->vars;
-        foreach ($vars as $key => $var) {
-
-            // If $displayOnForm is false OR this is the primary key, it doesn't
-            // need to be displayed, then we only create an hidden field
-            if ($key == $this->targetObject->handler->keyName || !$var['displayOnForm']) {
-                $elementToAdd = new \XoopsFormHidden($key, $var['value']);
-                $this->addElement($elementToAdd, $key, $var, false);
-                unset($elementToAdd);
-            // If not, the we need to create the proper form control for this fields
-            } else {
-                // If this field has a specific control, we will use it
-
-                if ('parentid' === $key) {
-                    /**
-                     * Why this ?
-                     */
-                }
-                if (isset($controls[$key])) {
-                    /* If the control has name, it's because it's an object already present in the script
+	public $targetObject           = null;
+	public $form_fields            = null;
+	public $_cancel_js_action      = false;
+	public $_custom_button         = false;
+	public $_captcha               = false;
+	public $_form_name             = false;
+	public $_form_caption          = false;
+	public $_submit_button_caption = false;
+
+	/**
+	 * SmartobjectForm constructor.
+	 * @param string $target
+	 * @param string $form_name
+	 * @param string $form_caption
+	 * @param string $form_action
+	 * @param null   $form_fields
+	 * @param bool   $submit_button_caption
+	 * @param bool   $cancel_js_action
+	 * @param bool   $captcha
+	 */
+	public function __construct(
+		&$target,
+		$form_name,
+		$form_caption,
+		$form_action,
+		$form_fields = null,
+		$submit_button_caption = false,
+		$cancel_js_action = false,
+		$captcha = false
+	) {
+		$this->targetObject           =& $target;
+		$this->form_fields            = $form_fields;
+		$this->_cancel_js_action      = $cancel_js_action;
+		$this->_captcha               = $captcha;
+		$this->_form_name             = $form_name;
+		$this->_form_caption          = $form_caption;
+		$this->_submit_button_caption = $submit_button_caption;
+
+		if (!isset($form_action)) {
+			$form_action = xoops_getenv('PHP_SELF');
+		}
+
+		parent::__construct($form_caption, $form_name, $form_action, 'post', true);
+		$this->setExtra('enctype="multipart/form-data"');
+
+		$this->createElements();
+
+		if ($captcha) {
+			$this->addCaptcha();
+		}
+
+		$this->createPermissionControls();
+
+		$this->createButtons($form_name, $form_caption, $submit_button_caption);
+	}
+
+	public function addCaptcha()
+	{
+		require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/formcaptcha.php';
+		$this->addElement(new \XoopsFormCaptcha(), true);
+	}
+
+	/**
+	 * @param      $name
+	 * @param      $caption
+	 * @param bool $onclick
+	 */
+	public function addCustomButton($name, $caption, $onclick = false)
+	{
+		$custom_button_array    = [
+			'name'    => $name,
+			'caption' => $caption,
+			'onclick' => $onclick
+		];
+		$this->_custom_button[] = $custom_button_array;
+	}
+
+	/**
+	 * Add an element to the form
+	 *
+	 * @param string|XoopsFormElement &$formElement reference to a {@link XoopsFormElement}
+	 * @param bool                    $key
+	 * @param bool                    $var
+	 * @param bool|string             $required     is this a "required" element?
+	 */
+	public function addElement($formElement, $key = false, $var = false, $required = 'notset')
+	{
+		if ($key) {
+			if ($this->targetObject->vars[$key]['readonly']) {
+				$formElement->setExtra('disabled="disabled"');
+				$formElement->setName($key . '-readonly');
+				// Since this element is disable, we still want to pass it's value in the form
+				$hidden = new \XoopsFormHidden($key, $this->targetObject->vars[$key]['value']);
+				$this->addElement($hidden);
+			}
+			$formElement->setDescription($var['form_dsc']);
+			if (isset($this->targetObject->controls[$key]['onSelect'])) {
+				$hidden = new \XoopsFormHidden('changedField', false);
+				$this->addElement($hidden);
+				$otherExtra      = isset($var['form_extra']) ? $var['form_extra'] : '';
+				$onchangedString = "this.form.elements.changedField.value='$key'; this.form.elements.op.value='changedField'; submit()";
+				$formElement->setExtra('onchange="' . $onchangedString . '"' . ' ' . $otherExtra);
+			} else {
+				if (isset($var['form_extra'])) {
+					$formElement->setExtra($var['form_extra']);
+				}
+			}
+			$controls = $this->targetObject->controls;
+			if (isset($controls[$key]['js'])) {
+				$formElement->customValidationCode[] = $controls[$key]['js'];
+			}
+			parent::addElement($formElement, 'notset' === $required ? $var['required'] : $required);
+		} else {
+			parent::addElement($formElement, 'notset' === $required ? false : true);
+		}
+		unset($formElement);
+	}
+
+	public function createElements()
+	{
+		$controls = $this->targetObject->controls;
+		$vars     = $this->targetObject->vars;
+		foreach ($vars as $key => $var) {
+
+			// If $displayOnForm is false OR this is the primary key, it doesn't
+			// need to be displayed, then we only create an hidden field
+			if ($key == $this->targetObject->handler->keyName || !$var['displayOnForm']) {
+				$elementToAdd = new \XoopsFormHidden($key, $var['value']);
+				$this->addElement($elementToAdd, $key, $var, false);
+				unset($elementToAdd);
+			// If not, the we need to create the proper form control for this fields
+			} else {
+				// If this field has a specific control, we will use it
+
+				if ('parentid' === $key) {
+					/**
+					 * Why this ?
+					 */
+				}
+				if (isset($controls[$key])) {
+					/* If the control has name, it's because it's an object already present in the script
                      * for example, "user"
                      * If the field does not have a name, than we will use a "select" (ie XoopsFormSelect)
                      */
-                    if (!isset($controls[$key]['name']) || !$controls[$key]['name']) {
-                        $controls[$key]['name'] = 'select';
-                    }
-
-                    $form_select = $this->getControl($controls[$key]['name'], $key);
-
-                    // Adding on the form, the control for this field
-                    $this->addElement($form_select, $key, $var);
-                    unset($form_select);
-
-                // If this field don't have a specific control, we will use the standard one, depending on its data type
-                } else {
-                    switch ($var['data_type']) {
-
-                        case XOBJ_DTYPE_TXTBOX:
-
-                            $form_text = $this->getControl('text', $key);
-                            $this->addElement($form_text, $key, $var);
-                            unset($form_text);
-                            break;
-
-                        case XOBJ_DTYPE_INT:
-                            $this->targetObject->setControl($key, [
-                                'name' => 'text',
-                                'size' => '5'
-                            ]);
-                            $form_text = $this->getControl('text', $key);
-                            $this->addElement($form_text, $key, $var);
-                            unset($form_text);
-                            break;
-
-                        case XOBJ_DTYPE_FLOAT:
-                            $this->targetObject->setControl($key, [
-                                'name' => 'text',
-                                'size' => '5'
-                            ]);
-                            $form_text = $this->getControl('text', $key);
-                            $this->addElement($form_text, $key, $var);
-                            unset($form_text);
-                            break;
-
-                        case XOBJ_DTYPE_LTIME:
-                            $form_date_time = $this->getControl('date_time', $key);
-                            $this->addElement($form_date_time, $key, $var);
-                            unset($form_date_time);
-                            break;
-
-                        case XOBJ_DTYPE_STIME:
-                            $form_date_time = $this->getControl('date', $key);
-                            $this->addElement($form_date_time, $key, $var);
-                            unset($form_date_time);
-                            break;
-
-                        case XOBJ_DTYPE_TIME_ONLY:
-                            $form_time = $this->getControl('time', $key);
-                            $this->addElement($form_time, $key, $var);
-                            unset($form_time);
-                            break;
-
-                        case XOBJ_DTYPE_CURRENCY:
-                            $this->targetObject->setControl($key, [
-                                'name' => 'text',
-                                'size' => '15'
-                            ]);
-                            $form_currency = $this->getControl('text', $key);
-                            $this->addElement($form_currency, $key, $var);
-                            unset($form_currency);
-                            break;
-
-                        case XOBJ_DTYPE_URLLINK:
-                            $form_urllink = $this->getControl('urllink', $key);
-                            $this->addElement($form_urllink, $key, $var);
-                            unset($form_urllink);
-                            break;
-
-                        case XOBJ_DTYPE_FILE:
-                            $form_file = $this->getControl('richfile', $key);
-                            $this->addElement($form_file, $key, $var);
-                            unset($form_file);
-                            break;
-
-                        case XOBJ_DTYPE_TXTAREA:
-
-                            $form_text_area = $this->getTextArea($key, $var);
-                            $this->addElement($form_text_area, $key, $var);
-                            unset($form_text_area);
-                            break;
-
-                        case XOBJ_DTYPE_ARRAY:
-                            // TODO: To come...
-                            break;
-                        case XOBJ_DTYPE_SOURCE:
-                            // TODO: To come...
-                            break;
-                        case XOBJ_DTYPE_FORM_SECTION:
-                            $section_control = new SmartFormSection($key, $var['value']);
-                            $this->addElement($section_control, $key, $var);
-                            unset($section_control);
-                            break;
-                        case XOBJ_DTYPE_FORM_SECTION_CLOSE:
-                            $section_control = new SmartFormSectionClose($key, $var['value']);
-                            $this->addElement($section_control, $key, $var);
-                            unset($section_control);
-                            break;
-                    }
-                }
-            }
-        }
-        // Add an hidden field to store the URL of the page before this form
-        $this->addElement(new \XoopsFormHidden('smart_page_before_form', Smartobject\Utility::getPageBeforeForm()));
-    }
-
-    public function createPermissionControls()
-    {
-        $smartModuleConfig = $this->targetObject->handler->getModuleConfig();
-
-        $permissions = $this->targetObject->handler->getPermissions();
-
-        if ($permissions) {
-            $memberHandler = xoops_getHandler('member');
-            $group_list    = $memberHandler->getGroupList();
-            asort($group_list);
-            foreach ($permissions as $permission) {
-                if ($this->targetObject->isNew()) {
-                    if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
-                        $groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
-                    }
-                } else {
-                    $groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
-                }
-                $groups_select = new \XoopsFormSelect($permission['caption'], $permission['perm_name'], $groups_value, 4, true);
-                $groups_select->setDescription($permission['description']);
-                $groups_select->addOptionArray($group_list);
-                $this->addElement($groups_select);
-                unset($groups_select);
-            }
-        }
-    }
-
-    /**
-     * @param      $form_name
-     * @param      $form_caption
-     * @param bool $submit_button_caption
-     */
-    public function createButtons($form_name, $form_caption, $submit_button_caption = false)
-    {
-        $button_tray = new \XoopsFormElementTray('', '');
-        $button_tray->addElement(new \XoopsFormHidden('op', $form_name));
-        if (!$submit_button_caption) {
-            if ($this->targetObject->isNew()) {
-                $butt_create = new \XoopsFormButton('', 'create_button', _CO_SOBJECT_CREATE, 'submit');
-            } else {
-                $butt_create = new \XoopsFormButton('', 'modify_button', _CO_SOBJECT_MODIFY, 'submit');
-            }
-        } else {
-            $butt_create = new \XoopsFormButton('', 'modify_button', $submit_button_caption, 'submit');
-        }
-        $butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
-        $button_tray->addElement($butt_create);
-
-        //creating custom buttons
-        if ($this->_custom_button) {
-            foreach ($this->_custom_button as $custom_button) {
-                $butt_custom = new \XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
-                if ($custom_button['onclick']) {
-                    $butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
-                }
-                $button_tray->addElement($butt_custom);
-                unset($butt_custom);
-            }
-        }
-
-        // creating the "cancel" button
-        $butt_cancel = new \XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
-        if ($this->_cancel_js_action) {
-            $butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
-        } else {
-            $butt_cancel->setExtra('onclick="history.go(-1)"');
-        }
-        $button_tray->addElement($butt_cancel);
-
-        $this->addElement($button_tray);
-    }
-
-    /**
-     * @param $controlName
-     * @param $key
-     * @return \XoopsFormLabel
-     */
-    public function getControl($controlName, $key)
-    {
-        switch ($controlName) {
-            case 'check':
+					if (!isset($controls[$key]['name']) || !$controls[$key]['name']) {
+						$controls[$key]['name'] = 'select';
+					}
+
+					$form_select = $this->getControl($controls[$key]['name'], $key);
+
+					// Adding on the form, the control for this field
+					$this->addElement($form_select, $key, $var);
+					unset($form_select);
+
+				// If this field don't have a specific control, we will use the standard one, depending on its data type
+				} else {
+					switch ($var['data_type']) {
+
+						case XOBJ_DTYPE_TXTBOX:
+
+							$form_text = $this->getControl('text', $key);
+							$this->addElement($form_text, $key, $var);
+							unset($form_text);
+							break;
+
+						case XOBJ_DTYPE_INT:
+							$this->targetObject->setControl($key, [
+								'name' => 'text',
+								'size' => '5'
+							]);
+							$form_text = $this->getControl('text', $key);
+							$this->addElement($form_text, $key, $var);
+							unset($form_text);
+							break;
+
+						case XOBJ_DTYPE_FLOAT:
+							$this->targetObject->setControl($key, [
+								'name' => 'text',
+								'size' => '5'
+							]);
+							$form_text = $this->getControl('text', $key);
+							$this->addElement($form_text, $key, $var);
+							unset($form_text);
+							break;
+
+						case XOBJ_DTYPE_LTIME:
+							$form_date_time = $this->getControl('date_time', $key);
+							$this->addElement($form_date_time, $key, $var);
+							unset($form_date_time);
+							break;
+
+						case XOBJ_DTYPE_STIME:
+							$form_date_time = $this->getControl('date', $key);
+							$this->addElement($form_date_time, $key, $var);
+							unset($form_date_time);
+							break;
+
+						case XOBJ_DTYPE_TIME_ONLY:
+							$form_time = $this->getControl('time', $key);
+							$this->addElement($form_time, $key, $var);
+							unset($form_time);
+							break;
+
+						case XOBJ_DTYPE_CURRENCY:
+							$this->targetObject->setControl($key, [
+								'name' => 'text',
+								'size' => '15'
+							]);
+							$form_currency = $this->getControl('text', $key);
+							$this->addElement($form_currency, $key, $var);
+							unset($form_currency);
+							break;
+
+						case XOBJ_DTYPE_URLLINK:
+							$form_urllink = $this->getControl('urllink', $key);
+							$this->addElement($form_urllink, $key, $var);
+							unset($form_urllink);
+							break;
+
+						case XOBJ_DTYPE_FILE:
+							$form_file = $this->getControl('richfile', $key);
+							$this->addElement($form_file, $key, $var);
+							unset($form_file);
+							break;
+
+						case XOBJ_DTYPE_TXTAREA:
+
+							$form_text_area = $this->getTextArea($key, $var);
+							$this->addElement($form_text_area, $key, $var);
+							unset($form_text_area);
+							break;
+
+						case XOBJ_DTYPE_ARRAY:
+							// TODO: To come...
+							break;
+						case XOBJ_DTYPE_SOURCE:
+							// TODO: To come...
+							break;
+						case XOBJ_DTYPE_FORM_SECTION:
+							$section_control = new SmartFormSection($key, $var['value']);
+							$this->addElement($section_control, $key, $var);
+							unset($section_control);
+							break;
+						case XOBJ_DTYPE_FORM_SECTION_CLOSE:
+							$section_control = new SmartFormSectionClose($key, $var['value']);
+							$this->addElement($section_control, $key, $var);
+							unset($section_control);
+							break;
+					}
+				}
+			}
+		}
+		// Add an hidden field to store the URL of the page before this form
+		$this->addElement(new \XoopsFormHidden('smart_page_before_form', Smartobject\Utility::getPageBeforeForm()));
+	}
+
+	public function createPermissionControls()
+	{
+		$smartModuleConfig = $this->targetObject->handler->getModuleConfig();
+
+		$permissions = $this->targetObject->handler->getPermissions();
+
+		if ($permissions) {
+			$memberHandler = xoops_getHandler('member');
+			$group_list    = $memberHandler->getGroupList();
+			asort($group_list);
+			foreach ($permissions as $permission) {
+				if ($this->targetObject->isNew()) {
+					if (isset($smartModuleConfig['def_perm_' . $permission['perm_name']])) {
+						$groups_value = $smartModuleConfig['def_perm_' . $permission['perm_name']];
+					}
+				} else {
+					$groups_value = $this->targetObject->getGroupPerm($permission['perm_name']);
+				}
+				$groups_select = new \XoopsFormSelect($permission['caption'], $permission['perm_name'], $groups_value, 4, true);
+				$groups_select->setDescription($permission['description']);
+				$groups_select->addOptionArray($group_list);
+				$this->addElement($groups_select);
+				unset($groups_select);
+			}
+		}
+	}
+
+	/**
+	 * @param      $form_name
+	 * @param      $form_caption
+	 * @param bool $submit_button_caption
+	 */
+	public function createButtons($form_name, $form_caption, $submit_button_caption = false)
+	{
+		$button_tray = new \XoopsFormElementTray('', '');
+		$button_tray->addElement(new \XoopsFormHidden('op', $form_name));
+		if (!$submit_button_caption) {
+			if ($this->targetObject->isNew()) {
+				$butt_create = new \XoopsFormButton('', 'create_button', _CO_SOBJECT_CREATE, 'submit');
+			} else {
+				$butt_create = new \XoopsFormButton('', 'modify_button', _CO_SOBJECT_MODIFY, 'submit');
+			}
+		} else {
+			$butt_create = new \XoopsFormButton('', 'modify_button', $submit_button_caption, 'submit');
+		}
+		$butt_create->setExtra('onclick="this.form.elements.op.value=\'' . $form_name . '\'"');
+		$button_tray->addElement($butt_create);
+
+		//creating custom buttons
+		if ($this->_custom_button) {
+			foreach ($this->_custom_button as $custom_button) {
+				$butt_custom = new \XoopsFormButton('', $custom_button['name'], $custom_button['caption'], 'submit');
+				if ($custom_button['onclick']) {
+					$butt_custom->setExtra('onclick="' . $custom_button['onclick'] . '"');
+				}
+				$button_tray->addElement($butt_custom);
+				unset($butt_custom);
+			}
+		}
+
+		// creating the "cancel" button
+		$butt_cancel = new \XoopsFormButton('', 'cancel_button', _CO_SOBJECT_CANCEL, 'button');
+		if ($this->_cancel_js_action) {
+			$butt_cancel->setExtra('onclick="' . $this->_cancel_js_action . '"');
+		} else {
+			$butt_cancel->setExtra('onclick="history.go(-1)"');
+		}
+		$button_tray->addElement($butt_cancel);
+
+		$this->addElement($button_tray);
+	}
+
+	/**
+	 * @param $controlName
+	 * @param $key
+	 * @return \XoopsFormLabel
+	 */
+	public function getControl($controlName, $key)
+	{
+		switch ($controlName) {
+			case 'check':
 //                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformcheckelement.php';
-                $control    = $this->targetObject->getControl($key);
-                $controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                $controlObj->addOptionArray($control['options']);
+				$control    = $this->targetObject->getControl($key);
+				$controlObj = new SmartFormCheckElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				$controlObj->addOptionArray($control['options']);
 
-                return $controlObj;
-                break;
+				return $controlObj;
+				break;
 
-            case 'color':
-                $control    = $this->targetObject->getControl($key);
-                $controlObj = new \XoopsFormColorPicker($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+			case 'color':
+				$control    = $this->targetObject->getControl($key);
+				$controlObj = new \XoopsFormColorPicker($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
 
-                return $controlObj;
-                break;
+				return $controlObj;
+				break;
 
-            case 'radio':
-                $control = $this->targetObject->getControl($key);
+			case 'radio':
+				$control = $this->targetObject->getControl($key);
 
-                $controlObj = new \XoopsFormRadio($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                $controlObj->addOptionArray($control['options']);
+				$controlObj = new \XoopsFormRadio($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				$controlObj->addOptionArray($control['options']);
 
-                return $controlObj;
-                break;
+				return $controlObj;
+				break;
 
-            case 'label':
-                return new \XoopsFormLabel($this->targetObject->vars[$key]['form_caption'], $this->targetObject->getVar($key));
-                break;
+			case 'label':
+				return new \XoopsFormLabel($this->targetObject->vars[$key]['form_caption'], $this->targetObject->getVar($key));
+				break;
 
-            case 'textarea':
-                return $this->getTextArea($key);
+			case 'textarea':
+				return $this->getTextArea($key);
 
-            case 'theme':
-                return $this->getThemeSelect($key, $this->targetObject->vars[$key]);
+			case 'theme':
+				return $this->getThemeSelect($key, $this->targetObject->vars[$key]);
 
-            case 'theme_multi':
-                return $this->getThemeSelect($key, $this->targetObject->vars[$key], true);
-                break;
+			case 'theme_multi':
+				return $this->getThemeSelect($key, $this->targetObject->vars[$key], true);
+				break;
 
-            case 'timezone':
-                return new \XoopsFormSelectTimezone($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
-                break;
+			case 'timezone':
+				return new \XoopsFormSelectTimezone($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key));
+				break;
 
-            case 'group':
-                return new \XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
-                break;
+			case 'group':
+				return new \XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
+				break;
 
-            case 'group_multi':
-                return new \XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
-                break;
+			case 'group_multi':
+				return new \XoopsFormSelectGroup($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
+				break;
 
-            /*case 'user':
+			/*case 'user':
              return new \XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 1, false);
              break;*/
 
-            case 'user_multi':
-                return new \XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
-                break;
+			case 'user_multi':
+				return new \XoopsFormSelectUser($this->targetObject->vars[$key]['form_caption'], $key, false, $this->targetObject->getVar($key, 'e'), 5, true);
+				break;
 
-            case 'password':
-                return new \XoopsFormPassword($this->targetObject->vars[$key]['form_caption'], $key, 50, 255, $this->targetObject->getVar($key, 'e'));
-                break;
+			case 'password':
+				return new \XoopsFormPassword($this->targetObject->vars[$key]['form_caption'], $key, 50, 255, $this->targetObject->getVar($key, 'e'));
+				break;
 
-            case 'country':
-                return new \XoopsFormSelectCountry($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key, 'e'));
-                break;
+			case 'country':
+				return new \XoopsFormSelectCountry($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getVar($key, 'e'));
+				break;
 
-            case 'urllink':
+			case 'urllink':
 //                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformurllinkelement.php';
 
-                return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
-                break;
+				return new SmartFormUrlLinkElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getUrlLinkObj($key));
+				break;
 
-            case 'richfile':
+			case 'richfile':
 //                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformrichfileelement.php';
 
-                return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
-                break;
-            case 'section':
+				return new SmartFormRichFileElement($this->targetObject->vars[$key]['form_caption'], $key, $this->targetObject->getFileObj($key));
+				break;
+			case 'section':
 //                require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/smartformsection.php';
 
-                return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
-                break;
+				return new SmartFormSection($key, $this->targetObject->vars[$key]['form_caption']);
+				break;
 
-            default:
-                $classname = 'SmartForm' . ucfirst($controlName) . 'Element';
-                if (!class_exists($classname)) {
-                    if (file_exists(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php')) {
+			default:
+				$classname = 'SmartForm' . ucfirst($controlName) . 'Element';
+				if (!class_exists($classname)) {
+					if (file_exists(SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php')) {
 //                        require_once SMARTOBJECT_ROOT_PATH . 'class/form/elements/' . strtolower($classname) . '.php';
-                    } else {
-                        // perhaps this is a control created by the module
-                        $moduleName             = $this->targetObject->handler->_moduleName;
-                        $moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
-                        $classname              = ucfirst($moduleName) . ucfirst($controlName) . 'Element';
-                        $classFileName          = strtolower($classname) . '.php';
-
-                        if (file_exists($moduleFormElementsPath . $classFileName)) {
+					} else {
+						// perhaps this is a control created by the module
+						$moduleName             = $this->targetObject->handler->_moduleName;
+						$moduleFormElementsPath = $this->targetObject->handler->_modulePath . 'class/form/elements/';
+						$classname              = ucfirst($moduleName) . ucfirst($controlName) . 'Element';
+						$classFileName          = strtolower($classname) . '.php';
+
+						if (file_exists($moduleFormElementsPath . $classFileName)) {
 //                            require_once $moduleFormElementsPath . $classFileName;
-                        } else {
-                            trigger_error($classname . ' Not found', E_USER_WARNING);
-
-                            return new \XoopsFormLabel(); //Empty object
-                        }
-                    }
-                }
-
-                return new $classname($this->targetObject, $key);
-                break;
-        }
-    }
-
-    /**
-     * @param $key
-     * @return \XoopsFormDhtmlTextArea|\XoopsFormEditor|\XoopsFormTextArea|\XoopsFormTinymce|\XoopsFormTinymce4
-     */
-    public function getTextArea($key)
-    {
-        $var = $this->targetObject->vars[$key];
-
-        // if no control has been created, let's create a default one
-        if (!isset($this->targetObject->controls[$key])) {
-            $control = [
-                'name'        => 'textarea',
-                'itemHandler' => false,
-                'method'      => false,
-                'module'      => false,
-                'form_editor' => 'default'
-            ];
-        } else {
-            $control = $this->targetObject->controls[$key];
-        }
-        $xoops22 = Smartobject\Utility::isXoops22();
-
-        $form_editor = isset($control['form_editor']) ? $control['form_editor'] : 'textarea';
-        /**
-         * If the editor is 'default', retreive the default editor of this module
-         */
-        if ('default' === $form_editor) {
-            global $xoopsModuleConfig;
-            $form_editor = isset($xoopsModuleConfig['default_editor']) ? $xoopsModuleConfig['default_editor'] : 'textarea';
-        }
-
-        $caption = $var['form_caption'];
-        $name    = $key;
-
-        $value = $this->targetObject->getVar($key);
-
-        $value = $this->targetObject->getValueFor($key, true);
-
-        $editor_configs          = [];
-        $editor_configs['name']  = $name;
-        $editor_configs['value'] = $value;
-        if ('textarea' !== $form_editor) {
-            $editor_configs['rows'] = 35;
-            $editor_configs['cols'] = 60;
-        }
-
-        if (isset($control['rows'])) {
-            $editor_configs['rows'] = $control['rows'];
-        }
-        if (isset($control['cols'])) {
-            $editor_configs['cols'] = $control['cols'];
-        }
-
-        $editor_configs['width']  = '100%';
-        $editor_configs['height'] = '400px';
-
-        $dhtml            = true;
-        $xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
-
-        if (file_exists($xoopseditorclass)) {
-            require_once $xoopseditorclass;
-            $editor = new \XoopsFormEditor($caption, $form_editor, $editor_configs, $nohtml = false, $onfailure = 'textarea');
-        } else {
-            switch ($form_editor) {
-
-                case 'tiny':
-                    if (!$xoops22) {
-                        if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
-                            require_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php';
-                            $editor = new \XoopsFormTinymce([
-                                                                    'caption' => $caption,
-                                                                    'name'    => $name,
-                                                                    'value'   => $value,
-                                                                    'width'   => '100%',
-                                                                    'height'  => '300px'
-                                                                ], true);
-                        } else {
-                            if ($dhtml) {
-                                $editor = new \XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
-                            } else {
-                                $editor = new \XoopsFormTextArea($caption, $name, $value, 7, 60);
-                            }
-                        }
-                    } else {
-                        $editor = new \XoopsFormEditor($caption, 'tinyeditor', $editor_configs);
-                    }
-                    break;
-
-                case 'dhtmltextarea':
-                case 'dhtmltext':
-                    $editor = new \XoopsFormDhtmlTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), 20, 60);
-                    if ($var['form_dsc']) {
-                        $editor->setDescription($var['form_dsc']);
-                    }
-                    break;
+						} else {
+							trigger_error($classname . ' Not found', E_USER_WARNING);
+
+							return new \XoopsFormLabel(); //Empty object
+						}
+					}
+				}
+
+				return new $classname($this->targetObject, $key);
+				break;
+		}
+	}
+
+	/**
+	 * @param $key
+	 * @return \XoopsFormDhtmlTextArea|\XoopsFormEditor|\XoopsFormTextArea|\XoopsFormTinymce|\XoopsFormTinymce4
+	 */
+	public function getTextArea($key)
+	{
+		$var = $this->targetObject->vars[$key];
+
+		// if no control has been created, let's create a default one
+		if (!isset($this->targetObject->controls[$key])) {
+			$control = [
+				'name'        => 'textarea',
+				'itemHandler' => false,
+				'method'      => false,
+				'module'      => false,
+				'form_editor' => 'default'
+			];
+		} else {
+			$control = $this->targetObject->controls[$key];
+		}
+		$xoops22 = Smartobject\Utility::isXoops22();
+
+		$form_editor = isset($control['form_editor']) ? $control['form_editor'] : 'textarea';
+		/**
+		 * If the editor is 'default', retreive the default editor of this module
+		 */
+		if ('default' === $form_editor) {
+			global $xoopsModuleConfig;
+			$form_editor = isset($xoopsModuleConfig['default_editor']) ? $xoopsModuleConfig['default_editor'] : 'textarea';
+		}
+
+		$caption = $var['form_caption'];
+		$name    = $key;
+
+		$value = $this->targetObject->getVar($key);
+
+		$value = $this->targetObject->getValueFor($key, true);
+
+		$editor_configs          = [];
+		$editor_configs['name']  = $name;
+		$editor_configs['value'] = $value;
+		if ('textarea' !== $form_editor) {
+			$editor_configs['rows'] = 35;
+			$editor_configs['cols'] = 60;
+		}
+
+		if (isset($control['rows'])) {
+			$editor_configs['rows'] = $control['rows'];
+		}
+		if (isset($control['cols'])) {
+			$editor_configs['cols'] = $control['cols'];
+		}
+
+		$editor_configs['width']  = '100%';
+		$editor_configs['height'] = '400px';
+
+		$dhtml            = true;
+		$xoopseditorclass = XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php';
+
+		if (file_exists($xoopseditorclass)) {
+			require_once $xoopseditorclass;
+			$editor = new \XoopsFormEditor($caption, $form_editor, $editor_configs, $nohtml = false, $onfailure = 'textarea');
+		} else {
+			switch ($form_editor) {
+
+				case 'tiny':
+					if (!$xoops22) {
+						if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php')) {
+							require_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinytextarea.php';
+							$editor = new \XoopsFormTinymce([
+																	'caption' => $caption,
+																	'name'    => $name,
+																	'value'   => $value,
+																	'width'   => '100%',
+																	'height'  => '300px'
+																], true);
+						} else {
+							if ($dhtml) {
+								$editor = new \XoopsFormDhtmlTextArea($caption, $name, $value, 20, 60);
+							} else {
+								$editor = new \XoopsFormTextArea($caption, $name, $value, 7, 60);
+							}
+						}
+					} else {
+						$editor = new \XoopsFormEditor($caption, 'tinyeditor', $editor_configs);
+					}
+					break;
+
+				case 'dhtmltextarea':
+				case 'dhtmltext':
+					$editor = new \XoopsFormDhtmlTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), 20, 60);
+					if ($var['form_dsc']) {
+						$editor->setDescription($var['form_dsc']);
+					}
+					break;
 
 //                case 'inbetween':
 //                    if (!$xoops22) {
@@ -634,177 +634,177 @@ 
 //                    }
 //                    break;
 
-                default:
-                case 'textarea':
-                    $form_rows = isset($control['rows']) ? $control['rows'] : 5;
-                    $form_cols = isset($control['cols']) ? $control['cols'] : 60;
-
-                    $editor = new \XoopsFormTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), $form_rows, $form_cols);
-                    if ($var['form_dsc']) {
-                        $editor->setDescription($var['form_dsc']);
-                    }
-                    break;
-
-            }
-        }
-
-        return $editor;
-    }
-
-    /**
-     * @param                  $key
-     * @param                  $var
-     * @param  bool            $multiple
-     * @return \XoopsFormSelect
-     */
-    public function getThemeSelect($key, $var, $multiple = false)
-    {
-        $size         = $multiple ? 5 : 1;
-        $theme_select = new \XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
-
-        $handle  = opendir(XOOPS_THEME_PATH . '/');
-        $dirlist = [];
-        while (false !== ($file = readdir($handle))) {
-            if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match('/^[.]{1,2}$/', $file)
-                && 'cvs' !== strtolower($file)) {
-                $dirlist[$file] = $file;
-            }
-        }
-        closedir($handle);
-        if (!empty($dirlist)) {
-            asort($dirlist);
-            $theme_select->addOptionArray($dirlist);
-        }
-
-        return $theme_select;
-    }
-
-    /**
-     * @param $keyname
-     * @return bool
-     */
-    public function &getElementById($keyname)
-    {
-        foreach ($this->_elements as $eleObj) {
-            if ($eleObj->getName() == $keyname) {
-                $ret =& $eleObj;
-                break;
-            }
-        }
-
-        return isset($ret) ? $ret : false;
-    }
-
-    /**
-     * create HTML to output the form as a theme-enabled table with validation.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $required = $this->getRequired();
-        $ret      = "
+				default:
+				case 'textarea':
+					$form_rows = isset($control['rows']) ? $control['rows'] : 5;
+					$form_cols = isset($control['cols']) ? $control['cols'] : 60;
+
+					$editor = new \XoopsFormTextArea($var['form_caption'], $key, $this->targetObject->getVar($key, 'e'), $form_rows, $form_cols);
+					if ($var['form_dsc']) {
+						$editor->setDescription($var['form_dsc']);
+					}
+					break;
+
+			}
+		}
+
+		return $editor;
+	}
+
+	/**
+	 * @param                  $key
+	 * @param                  $var
+	 * @param  bool            $multiple
+	 * @return \XoopsFormSelect
+	 */
+	public function getThemeSelect($key, $var, $multiple = false)
+	{
+		$size         = $multiple ? 5 : 1;
+		$theme_select = new \XoopsFormSelect($var['form_caption'], $key, $this->targetObject->getVar($key), $size, $multiple);
+
+		$handle  = opendir(XOOPS_THEME_PATH . '/');
+		$dirlist = [];
+		while (false !== ($file = readdir($handle))) {
+			if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match('/^[.]{1,2}$/', $file)
+				&& 'cvs' !== strtolower($file)) {
+				$dirlist[$file] = $file;
+			}
+		}
+		closedir($handle);
+		if (!empty($dirlist)) {
+			asort($dirlist);
+			$theme_select->addOptionArray($dirlist);
+		}
+
+		return $theme_select;
+	}
+
+	/**
+	 * @param $keyname
+	 * @return bool
+	 */
+	public function &getElementById($keyname)
+	{
+		foreach ($this->_elements as $eleObj) {
+			if ($eleObj->getName() == $keyname) {
+				$ret =& $eleObj;
+				break;
+			}
+		}
+
+		return isset($ret) ? $ret : false;
+	}
+
+	/**
+	 * create HTML to output the form as a theme-enabled table with validation.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$required = $this->getRequired();
+		$ret      = "
             <form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "' onsubmit='return xoopsFormValidate_" . $this->getName() . "(this);'" . $this->getExtra() . ">
             <table width='100%' class='outer' cellspacing='1'>
             <tr><th colspan='2'>" . $this->getTitle() . '</th></tr>
         ';
-        $hidden   = '';
-        $class    = 'even';
-        foreach ($this->getElements() as $ele) {
-            if (!is_object($ele)) {
-                $ret .= $ele;
-            } elseif (!$ele->isHidden()) {
-                //$class = ( $class == 'even' ) ? 'odd': 'even';
-                $ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>" . $ele->getCaption();
-                if ('' !== $ele->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $ele->getDescription() . '</span>';
-                }
-                $ret .= "</td><td class='$class'>" . $ele->render() . "</td></tr>\n";
-            } else {
-                $hidden .= $ele->render();
-            }
-        }
-        $ret .= "</table>\n$hidden\n</form>\n";
-        $ret .= $this->renderValidationJS(true);
-
-        return $ret;
-    }
-
-    /**
-     * assign to smarty form template instead of displaying directly
-     *
-     * @param \XoopsTpl $tpl
-     *
-     * object
-     * @param bool      $smartyName
-     * @see     Smarty
-     */
-    public function assign(\XoopsTpl $tpl, $smartyName = false)
-    {
-        $i        = 0;
-        $elements = [];
-        foreach ($this->getElements() as $ele) {
-            $n                             = ('' !== $ele->getName()) ? $ele->getName() : $i;
-            $elements[$n]['name']          = $ele->getName();
-            $elements[$n]['caption']       = $ele->getCaption();
-            $elements[$n]['body']          = $ele->render();
-            $elements[$n]['hidden']        = $ele->isHidden();
-            $elements[$n]['section']       = strtolower(get_class($ele)) == strtolower('SmartFormSection');
-            $elements[$n]['section_close'] = $ele instanceof \XoopsModules\Smartobject\Form\Elements\SmartFormSectionClose;
-            $elements[$n]['hide']          = isset($this->targetObject->vars[$n]['hide']) ? $this->targetObject->vars[$n]['hide'] : false;
-            if ('' !== $ele->getDescription()) {
-                $elements[$n]['description'] = $ele->getDescription();
-            }
-            ++$i;
-        }
-        $js = $this->renderValidationJS();
-        if (!$smartyName) {
-            $smartyName = $this->getName();
-        }
-
-        $tpl->assign($smartyName, [
-            'title'      => $this->getTitle(),
-            'name'       => $this->getName(),
-            'action'     => $this->getAction(),
-            'method'     => $this->getMethod(),
-            'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '(this);"' . $this->getExtra(),
-            'javascript' => $js,
-            'elements'   => $elements
-        ]);
-    }
-
-    /**
-     * @param  bool $withtags
-     * @return string
-     */
-    public function renderValidationJS($withtags = true)
-    {
-        $js = '';
-        if ($withtags) {
-            $js .= "\n<!-- Start Form Validation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
-        }
-        $myts     = \MyTextSanitizer::getInstance();
-        $formname = $this->getName();
-        $js       .= "function xoopsFormValidate_{$formname}(myform) {";
-        // First, output code to check required elements
-        $elements = $this->getRequired();
-        foreach ($elements as $elt) {
-            $eltname    = $elt->getName();
-            $eltcaption = trim($elt->getCaption());
-            $eltmsg     = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg     = str_replace('"', '\"', stripslashes($eltmsg));
-            if ('xoopsformradio' === strtolower(get_class($elt))) {
-                $js .= 'var myOption = -1;';
-                $js .= "for (i=myform.{$eltname}.length-1; i > -1; i--) {
+		$hidden   = '';
+		$class    = 'even';
+		foreach ($this->getElements() as $ele) {
+			if (!is_object($ele)) {
+				$ret .= $ele;
+			} elseif (!$ele->isHidden()) {
+				//$class = ( $class == 'even' ) ? 'odd': 'even';
+				$ret .= "<tr id='" . $ele->getName() . "' valign='top' align='left'><td class='head'>" . $ele->getCaption();
+				if ('' !== $ele->getDescription()) {
+					$ret .= '<br><br><span style="font-weight: normal;">' . $ele->getDescription() . '</span>';
+				}
+				$ret .= "</td><td class='$class'>" . $ele->render() . "</td></tr>\n";
+			} else {
+				$hidden .= $ele->render();
+			}
+		}
+		$ret .= "</table>\n$hidden\n</form>\n";
+		$ret .= $this->renderValidationJS(true);
+
+		return $ret;
+	}
+
+	/**
+	 * assign to smarty form template instead of displaying directly
+	 *
+	 * @param \XoopsTpl $tpl
+	 *
+	 * object
+	 * @param bool      $smartyName
+	 * @see     Smarty
+	 */
+	public function assign(\XoopsTpl $tpl, $smartyName = false)
+	{
+		$i        = 0;
+		$elements = [];
+		foreach ($this->getElements() as $ele) {
+			$n                             = ('' !== $ele->getName()) ? $ele->getName() : $i;
+			$elements[$n]['name']          = $ele->getName();
+			$elements[$n]['caption']       = $ele->getCaption();
+			$elements[$n]['body']          = $ele->render();
+			$elements[$n]['hidden']        = $ele->isHidden();
+			$elements[$n]['section']       = strtolower(get_class($ele)) == strtolower('SmartFormSection');
+			$elements[$n]['section_close'] = $ele instanceof \XoopsModules\Smartobject\Form\Elements\SmartFormSectionClose;
+			$elements[$n]['hide']          = isset($this->targetObject->vars[$n]['hide']) ? $this->targetObject->vars[$n]['hide'] : false;
+			if ('' !== $ele->getDescription()) {
+				$elements[$n]['description'] = $ele->getDescription();
+			}
+			++$i;
+		}
+		$js = $this->renderValidationJS();
+		if (!$smartyName) {
+			$smartyName = $this->getName();
+		}
+
+		$tpl->assign($smartyName, [
+			'title'      => $this->getTitle(),
+			'name'       => $this->getName(),
+			'action'     => $this->getAction(),
+			'method'     => $this->getMethod(),
+			'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '(this);"' . $this->getExtra(),
+			'javascript' => $js,
+			'elements'   => $elements
+		]);
+	}
+
+	/**
+	 * @param  bool $withtags
+	 * @return string
+	 */
+	public function renderValidationJS($withtags = true)
+	{
+		$js = '';
+		if ($withtags) {
+			$js .= "\n<!-- Start Form Validation JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
+		}
+		$myts     = \MyTextSanitizer::getInstance();
+		$formname = $this->getName();
+		$js       .= "function xoopsFormValidate_{$formname}(myform) {";
+		// First, output code to check required elements
+		$elements = $this->getRequired();
+		foreach ($elements as $elt) {
+			$eltname    = $elt->getName();
+			$eltcaption = trim($elt->getCaption());
+			$eltmsg     = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg     = str_replace('"', '\"', stripslashes($eltmsg));
+			if ('xoopsformradio' === strtolower(get_class($elt))) {
+				$js .= 'var myOption = -1;';
+				$js .= "for (i=myform.{$eltname}.length-1; i > -1; i--) {
                     if (myform.{$eltname}[i].checked) {
                         myOption = i; i = -1;
                     }
                 }
                 if (myOption == -1) {
                     window.alert(\"{$eltmsg}\"); myform.{$eltname}[0].focus(); return false; }\n";
-            } elseif ('smartformselect_multielement' === strtolower(get_class($elt))) {
-                $js .= 'var hasSelections = false;';
-                $js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
+			} elseif ('smartformselect_multielement' === strtolower(get_class($elt))) {
+				$js .= 'var hasSelections = false;';
+				$js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
                     if (myform['{$eltname}[]'].options[i].selected) {
                         hasSelections = true;
                     }
@@ -812,12 +812,12 @@ 
                 }
                 if (hasSelections === false) {
                     window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'].options[0].focus(); return false; }\n";
-            } elseif ('xoopsformcheckbox' === strtolower(get_class($elt))
-                      || 'smartformcheckelement' === strtolower(get_class($elt))) {
-                $js .= 'var hasSelections = false;';
-                //sometimes, there is an implicit '[]', sometimes not
-                if (false === strpos($eltname, '[')) {
-                    $js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
+			} elseif ('xoopsformcheckbox' === strtolower(get_class($elt))
+					  || 'smartformcheckelement' === strtolower(get_class($elt))) {
+				$js .= 'var hasSelections = false;';
+				//sometimes, there is an implicit '[]', sometimes not
+				if (false === strpos($eltname, '[')) {
+					$js .= "for (var i = 0; i < myform['{$eltname}[]'].length; i++) {
                         if (myform['{$eltname}[]'][i].checked) {
                             hasSelections = true;
                         }
@@ -825,8 +825,8 @@ 
                     }
                     if (hasSelections === false) {
                         window.alert(\"{$eltmsg}\"); myform['{$eltname}[]'][0].focus(); return false; }\n";
-                } else {
-                    $js .= "for (var i = 0; i < myform['{$eltname}'].length; i++) {
+				} else {
+					$js .= "for (var i = 0; i < myform['{$eltname}'].length; i++) {
                         if (myform['{$eltname}'][i].checked) {
                             hasSelections = true;
                         }
@@ -834,25 +834,25 @@ 
                     }
                     if (hasSelections === false) {
                         window.alert(\"{$eltmsg}\"); myform['{$eltname}'][0].focus(); return false; }\n";
-                }
-            } else {
-                $js .= "if ( myform.{$eltname}.value == \"\" ) " . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
-            }
-        }
-        // Now, handle custom validation code
-        $elements =& $this->getElements(true);
-        foreach ($elements as $elt) {
-            if (method_exists($elt, 'renderValidationJS') && 'xoopsformcheckbox' !== strtolower(get_class($elt))) {
-                if ($eltjs = $elt->renderValidationJS()) {
-                    $js .= $eltjs . "\n";
-                }
-            }
-        }
-        $js .= "return true;\n}\n";
-        if ($withtags) {
-            $js .= "//--></script>\n<!-- 'End Form Validation JavaScript' //-->\n";
-        }
-
-        return $js;
-    }
+				}
+			} else {
+				$js .= "if ( myform.{$eltname}.value == \"\" ) " . "{ window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
+			}
+		}
+		// Now, handle custom validation code
+		$elements =& $this->getElements(true);
+		foreach ($elements as $elt) {
+			if (method_exists($elt, 'renderValidationJS') && 'xoopsformcheckbox' !== strtolower(get_class($elt))) {
+				if ($eltjs = $elt->renderValidationJS()) {
+					$js .= $eltjs . "\n";
+				}
+			}
+		}
+		$js .= "return true;\n}\n";
+		if ($withtags) {
+			$js .= "//--></script>\n<!-- 'End Form Validation JavaScript' //-->\n";
+		}
+
+		return $js;
+	}
 }

class/CurrencyHandler.php

Indentation +18 added lines, -18 removed lines

@@ -30,22 +30,22 @@
  */
 class ObjectCurrencyHandler extends Smartobject\PersistableObjectHandler
 {
-    /**
-     * SmartObjectCurrencyHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'currency', 'currencyid', 'name', '', 'smartobject');
-    }
-
-    /**
-     * @return array
-     */
-    public function getCurrencies()
-    {
-        $currenciesObj =& $this->getObjects(null, true);
-
-        return $currenciesObj;
-    }
+	/**
+	 * SmartObjectCurrencyHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'currency', 'currencyid', 'name', '', 'smartobject');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getCurrencies()
+	{
+		$currenciesObj =& $this->getObjects(null, true);
+
+		return $currenciesObj;
+	}
 }

class/TagHandler.php

Indentation +21 added lines, -21 removed lines

@@ -29,27 +29,27 @@
  */
 class TagHandler extends Smartobject\PersistableMlObjectHandler
 {
-    /**
-     * SmartobjectTagHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'tag', 'tagid', 'name', 'description', 'smartobject');
-    }
+	/**
+	 * SmartobjectTagHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'tag', 'tagid', 'name', 'description', 'smartobject');
+	}
 
-    /**
-     * @return mixed
-     */
-    public function getLanguages()
-    {
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $aLanguages     = XoopsLists::getLangList();
-        $ret['default'] = _CO_SOBJECT_ALL;
-        foreach ($aLanguages as $lang) {
-            $ret[$lang] = $lang;
-        }
+	/**
+	 * @return mixed
+	 */
+	public function getLanguages()
+	{
+		require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+		$aLanguages     = XoopsLists::getLangList();
+		$ret['default'] = _CO_SOBJECT_ALL;
+		foreach ($aLanguages as $lang) {
+			$ret[$lang] = $lang;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }