txmodxoops / tdmcreate

testdata/mymodule2/config/config.php

Indentation +46 added lines, -46 removed lines

@@ -23,50 +23,50 @@
 $moduleDirName  = basename(dirname(__DIR__));
 $moduleDirNameUpper  = mb_strtoupper($moduleDirName);
 return (object)[
-	'name'           => mb_strtoupper($moduleDirName) . ' Module Configurator',
-	'paths'          => [
-		'dirname'    => $moduleDirName,
-		'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-		'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-		'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-		'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-		'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-	],
-	'uploadFolders'  => [
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
-	],
-	'copyBlankFiles'  => [
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
-	],
-	'copyTestFolders'  => [
-		XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-	],
-	'templateFolders'  => [
-		'/templates/',
-	],
-	'oldFiles'  => [
-	],
-	'oldFolders'  => [
-	],
-	'renameTables'  => [
-	],
-	'moduleStats'  => [
-	],
-	'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
+    'name'           => mb_strtoupper($moduleDirName) . ' Module Configurator',
+    'paths'          => [
+        'dirname'    => $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+    ],
+    'uploadFolders'  => [
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
+    ],
+    'copyBlankFiles'  => [
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
+    ],
+    'copyTestFolders'  => [
+        XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+    ],
+    'templateFolders'  => [
+        '/templates/',
+    ],
+    'oldFiles'  => [
+    ],
+    'oldFolders'  => [
+    ],
+    'renameTables'  => [
+    ],
+    'moduleStats'  => [
+    ],
+    'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
 ];

testdata/mymodule2/blocks/testfields.php

Indentation +28 added lines, -28 removed lines

@@ -41,42 +41,42 @@
     array_shift($options);
     array_shift($options);
     array_shift($options);
-	switch($typeBlock)
-	{
-		// For the block: testfields last
-		case 'last':
-			//$criteria->add(new \Criteria('tf_display', 1));
-			$criteria->setSort('tf_created');
-			$criteria->setOrder('DESC');
-		break;
-		// For the block: testfields new
-		case 'new':
-			//$criteria->add(new \Criteria('tf_display', 1));
-			$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
-			$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
-			$criteria->setSort('tf_created');
-			$criteria->setOrder('ASC');
-		break;
-		// For the block: testfields hits
-		case 'hits':
+    switch($typeBlock)
+    {
+        // For the block: testfields last
+        case 'last':
+            //$criteria->add(new \Criteria('tf_display', 1));
+            $criteria->setSort('tf_created');
+            $criteria->setOrder('DESC');
+        break;
+        // For the block: testfields new
+        case 'new':
+            //$criteria->add(new \Criteria('tf_display', 1));
+            $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
+            $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
+            $criteria->setSort('tf_created');
+            $criteria->setOrder('ASC');
+        break;
+        // For the block: testfields hits
+        case 'hits':
             $criteria->setSort('tf_hits');
             $criteria->setOrder('DESC');
         break;
-		// For the block: testfields top
-		case 'top':
+        // For the block: testfields top
+        case 'top':
             $criteria->setSort('tf_top');
             $criteria->setOrder('ASC');
         break;
-		// For the block: testfields random
-		case 'random':
-			//$criteria->add(new \Criteria('tf_display', 1));
-			$criteria->setSort('RAND()');
-		break;
-	}
+        // For the block: testfields random
+        case 'random':
+            //$criteria->add(new \Criteria('tf_display', 1));
+            $criteria->setSort('RAND()');
+        break;
+    }
     $criteria->setLimit($limit);
     $testfieldsAll = $testfieldsHandler->getAll($criteria);
-	unset($criteria);
-	if (count($testfieldsAll) > 0) {
+    unset($criteria);
+    if (count($testfieldsAll) > 0) {
         foreach(array_keys($testfieldsAll) as $i)
         {
         }

testdata/mymodule2/blocks/articles.php

Indentation +30 added lines, -30 removed lines

@@ -41,51 +41,51 @@
     array_shift($options);
     array_shift($options);
     array_shift($options);
-	switch($typeBlock)
-	{
-		// For the block: articles last
-		case 'last':
-			//$criteria->add(new \Criteria('art_display', 1));
-			$criteria->setSort('art_created');
-			$criteria->setOrder('DESC');
-		break;
-		// For the block: articles new
-		case 'new':
-			//$criteria->add(new \Criteria('art_display', 1));
-			$criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)), '>='));
-			$criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
-			$criteria->setSort('art_created');
-			$criteria->setOrder('ASC');
-		break;
-		// For the block: articles hits
-		case 'hits':
+    switch($typeBlock)
+    {
+        // For the block: articles last
+        case 'last':
+            //$criteria->add(new \Criteria('art_display', 1));
+            $criteria->setSort('art_created');
+            $criteria->setOrder('DESC');
+        break;
+        // For the block: articles new
+        case 'new':
+            //$criteria->add(new \Criteria('art_display', 1));
+            $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)), '>='));
+            $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
+            $criteria->setSort('art_created');
+            $criteria->setOrder('ASC');
+        break;
+        // For the block: articles hits
+        case 'hits':
             $criteria->setSort('art_hits');
             $criteria->setOrder('DESC');
         break;
-		// For the block: articles top
-		case 'top':
+        // For the block: articles top
+        case 'top':
             $criteria->setSort('art_top');
             $criteria->setOrder('ASC');
         break;
-		// For the block: articles random
-		case 'random':
-			//$criteria->add(new \Criteria('art_display', 1));
-			$criteria->setSort('RAND()');
-		break;
-	}
+        // For the block: articles random
+        case 'random':
+            //$criteria->add(new \Criteria('art_display', 1));
+            $criteria->setSort('RAND()');
+        break;
+    }
     $criteria->setLimit($limit);
     $articlesAll = $articlesHandler->getAll($criteria);
-	unset($criteria);
-	if (count($articlesAll) > 0) {
+    unset($criteria);
+    if (count($articlesAll) > 0) {
         foreach(array_keys($articlesAll) as $i)
         {
             $block[$i]['cat'] = $articlesAll[$i]->getVar('art_cat');
             $block[$i]['title'] = $myts->htmlSpecialChars($articlesAll[$i]->getVar('art_title'));
-		    $block[$i]['descr'] = strip_tags($articlesAll[$i]->getVar('art_descr'));
+            $block[$i]['descr'] = strip_tags($articlesAll[$i]->getVar('art_descr'));
             $block[$i]['img'] = $articlesAll[$i]->getVar('art_img');
             $block[$i]['file'] = $articlesAll[$i]->getVar('art_file');
             $block[$i]['created'] = formatTimeStamp($articlesAll[$i]->getVar('art_created'));
-		    $block[$i]['submitter'] = \XoopsUser::getUnameFromId($articlesAll[$i]->getVar('art_submitter'));
+            $block[$i]['submitter'] = \XoopsUser::getUnameFromId($articlesAll[$i]->getVar('art_submitter'));
         }
     }
     return $block;

testdata/mymodule2/class/Permissions.php

Indentation +21 added lines, -21 removed lines

@@ -32,25 +32,25 @@
  */
 class Permissions extends \XoopsObject
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * @static function &getInstance
-	 *
-	 * @param null
-	 */
-	public static function getInstance()
-	{
-		static $instance = false;
-		if (!$instance) {
-			$instance = new self();
-		}
-	}
+    /**
+     * Constructor 
+     *
+     * @param null
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @static function &getInstance
+     *
+     * @param null
+     */
+    public static function getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+    }
 }

testdata/mymodule2/class/Categories.php

Indentation +93 added lines, -93 removed lines

@@ -32,102 +32,102 @@
  */
 class Categories extends \XoopsObject
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null
-	 */
-	public function __construct()
-	{
-		$this->initVar('cat_id', XOBJ_DTYPE_INT);
-		$this->initVar('cat_name', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('cat_logo', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('cat_created', XOBJ_DTYPE_INT);
-		$this->initVar('cat_submitter', XOBJ_DTYPE_INT);
-	}
+    /**
+     * Constructor 
+     *
+     * @param null
+     */
+    public function __construct()
+    {
+        $this->initVar('cat_id', XOBJ_DTYPE_INT);
+        $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('cat_logo', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('cat_created', XOBJ_DTYPE_INT);
+        $this->initVar('cat_submitter', XOBJ_DTYPE_INT);
+    }
 
-	/**
-	 * @static function &getInstance
-	 *
-	 * @param null
-	 */
-	public static function getInstance()
-	{
-		static $instance = false;
-		if (!$instance) {
-			$instance = new self();
-		}
-	}
+    /**
+     * @static function &getInstance
+     *
+     * @param null
+     */
+    public static function getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+    }
 
-	/**
-	 * The new inserted $Id
-	 * @return inserted id
-	 */
-	public function getNewInsertedIdCategories()
-	{
-		$newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
-		return $newInsertedId;
-	}
+    /**
+     * The new inserted $Id
+     * @return inserted id
+     */
+    public function getNewInsertedIdCategories()
+    {
+        $newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
+        return $newInsertedId;
+    }
 
-	/**
-	 * @public function getForm
-	 * @param bool $action
-	 * @return XoopsThemeForm
-	 */
-	public function getFormCategories($action = false)
-	{
-		$helper = \XoopsModules\Mymodule2\Helper::getInstance();
-		if (false === $action) {
-			$action = $_SERVER['REQUEST_URI'];
-		}
-		// Title
-		$title = $this->isNew() ? sprintf(_AM_MYMODULE2_CATEGORY_ADD) : sprintf(_AM_MYMODULE2_CATEGORY_EDIT);
-		// Get Theme Form
-		xoops_load('XoopsFormLoader');
-		$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
-		$form->setExtra('enctype="multipart/form-data"');
-		// Form Text CatName
-		$form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
-		// Form Text Date Select CatCreated
-		$catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
-		$form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
-		// To Save
-		$form->addElement(new \XoopsFormHidden('op', 'save'));
-		$form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
-		return $form;
-	}
+    /**
+     * @public function getForm
+     * @param bool $action
+     * @return XoopsThemeForm
+     */
+    public function getFormCategories($action = false)
+    {
+        $helper = \XoopsModules\Mymodule2\Helper::getInstance();
+        if (false === $action) {
+            $action = $_SERVER['REQUEST_URI'];
+        }
+        // Title
+        $title = $this->isNew() ? sprintf(_AM_MYMODULE2_CATEGORY_ADD) : sprintf(_AM_MYMODULE2_CATEGORY_EDIT);
+        // Get Theme Form
+        xoops_load('XoopsFormLoader');
+        $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
+        $form->setExtra('enctype="multipart/form-data"');
+        // Form Text CatName
+        $form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
+        // Form Text Date Select CatCreated
+        $catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
+        $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
+        // To Save
+        $form->addElement(new \XoopsFormHidden('op', 'save'));
+        $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
+        return $form;
+    }
 
-	/**
-	 * Get Values
-	 * @param null $keys 
-	 * @param null $format 
-	 * @param null$maxDepth 
-	 * @return array
-	 */
-	public function getValuesCategories($keys = null, $format = null, $maxDepth = null)
-	{
-		$helper = \XoopsModules\Mymodule2\Helper::getInstance();
-		$ret = $this->getValues($keys, $format, $maxDepth);
-		$ret['id'] = $this->getVar('cat_id');
-		$ret['name'] = $this->getVar('cat_name');
-		$ret['logo'] = $this->getVar('cat_logo');
-		$ret['created'] = formatTimeStamp($this->getVar('cat_created'), 's');
-		$ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('cat_submitter'));
-		return $ret;
-	}
+    /**
+     * Get Values
+     * @param null $keys 
+     * @param null $format 
+     * @param null$maxDepth 
+     * @return array
+     */
+    public function getValuesCategories($keys = null, $format = null, $maxDepth = null)
+    {
+        $helper = \XoopsModules\Mymodule2\Helper::getInstance();
+        $ret = $this->getValues($keys, $format, $maxDepth);
+        $ret['id'] = $this->getVar('cat_id');
+        $ret['name'] = $this->getVar('cat_name');
+        $ret['logo'] = $this->getVar('cat_logo');
+        $ret['created'] = formatTimeStamp($this->getVar('cat_created'), 's');
+        $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('cat_submitter'));
+        return $ret;
+    }
 
-	/**
-	 * Returns an array representation of the object
-	 *
-	 * @return array
-	 */
-	public function toArrayCategories()
-	{
-		$ret = [];
-		$vars = $this->getVars();
-		foreach(array_keys($vars) as $var) {
-			$ret[$var] = $this->getVar('"{$var}"');
-		}
-		return $ret;
-	}
+    /**
+     * Returns an array representation of the object
+     *
+     * @return array
+     */
+    public function toArrayCategories()
+    {
+        $ret = [];
+        $vars = $this->getVars();
+        foreach(array_keys($vars) as $var) {
+            $ret[$var] = $this->getVar('"{$var}"');
+        }
+        return $ret;
+    }
 }

testdata/mymodule2/class/Testfields.php

Indentation +282 added lines, -282 removed lines

@@ -32,291 +32,291 @@
  */
 class Testfields extends \XoopsObject
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null
-	 */
-	public function __construct()
-	{
-		$this->initVar('tf_id', XOBJ_DTYPE_INT);
-		$this->initVar('tf_text', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_textarea', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_dhtml', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_checkbox', XOBJ_DTYPE_INT);
-		$this->initVar('tf_yesno', XOBJ_DTYPE_INT);
-		$this->initVar('tf_selectbox', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_user', XOBJ_DTYPE_INT);
-		$this->initVar('tf_color', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_imagelist', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_urlfile', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_uplimage', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_uplfile', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_textdateselect', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_selectfile', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('tf_status', XOBJ_DTYPE_INT);
-	}
+    /**
+     * Constructor 
+     *
+     * @param null
+     */
+    public function __construct()
+    {
+        $this->initVar('tf_id', XOBJ_DTYPE_INT);
+        $this->initVar('tf_text', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_textarea', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_dhtml', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_checkbox', XOBJ_DTYPE_INT);
+        $this->initVar('tf_yesno', XOBJ_DTYPE_INT);
+        $this->initVar('tf_selectbox', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_user', XOBJ_DTYPE_INT);
+        $this->initVar('tf_color', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_imagelist', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_urlfile', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_uplimage', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_uplfile', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_textdateselect', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_selectfile', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('tf_status', XOBJ_DTYPE_INT);
+    }
 
-	/**
-	 * @static function &getInstance
-	 *
-	 * @param null
-	 */
-	public static function getInstance()
-	{
-		static $instance = false;
-		if (!$instance) {
-			$instance = new self();
-		}
-	}
+    /**
+     * @static function &getInstance
+     *
+     * @param null
+     */
+    public static function getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+    }
 
-	/**
-	 * The new inserted $Id
-	 * @return inserted id
-	 */
-	public function getNewInsertedIdTestfields()
-	{
-		$newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
-		return $newInsertedId;
-	}
+    /**
+     * The new inserted $Id
+     * @return inserted id
+     */
+    public function getNewInsertedIdTestfields()
+    {
+        $newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
+        return $newInsertedId;
+    }
 
-	/**
-	 * @public function getForm
-	 * @param bool $action
-	 * @return XoopsThemeForm
-	 */
-	public function getFormTestfields($action = false)
-	{
-		$helper = \XoopsModules\Mymodule2\Helper::getInstance();
-		if (false === $action) {
-			$action = $_SERVER['REQUEST_URI'];
-		}
-		// Permissions for uploader
-		$grouppermHandler = xoops_getHandler('groupperm');
-		$groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
-		if ($GLOBALS['xoopsUser']) {
-			if (!$GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid())) {
-				$permissionUpload = $grouppermHandler->checkRight('upload_groups', 32, $groups, $GLOBALS['xoopsModule']->getVar('mid')) ? true : false;
-			} else {
-				$permissionUpload = true;
-			}
-		} else {
-			$permissionUpload = $grouppermHandler->checkRight('upload_groups', 32, $groups, $GLOBALS['xoopsModule']->getVar('mid')) ? true : false;
-		}
-		// Title
-		$title = $this->isNew() ? sprintf(_AM_MYMODULE2_TESTFIELD_ADD) : sprintf(_AM_MYMODULE2_TESTFIELD_EDIT);
-		// Get Theme Form
-		xoops_load('XoopsFormLoader');
-		$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
-		$form->setExtra('enctype="multipart/form-data"');
-		// Form Text TfText
-		$form->addElement(new \XoopsFormText( _AM_MYMODULE2_TESTFIELD_TEXT, 'tf_text', 50, 255, $this->getVar('tf_text') ));
-		// Form Text Area TfTextarea
-		$form->addElement(new \XoopsFormTextArea( _AM_MYMODULE2_TESTFIELD_TEXTAREA, 'tf_textarea', $this->getVar('tf_textarea'), 4, 47 ));
-		// Form editor TfDhtml
-		$editorConfigs = [];
-		$editorConfigs['name'] = 'tf_dhtml';
-		$editorConfigs['value'] = $this->getVar('tf_dhtml', 'e');
-		$editorConfigs['rows'] = 5;
-		$editorConfigs['cols'] = 40;
-		$editorConfigs['width'] = '100%';
-		$editorConfigs['height'] = '400px';
-		$editorConfigs['editor'] = $helper->getConfig('editor_dhtml');
-		$form->addElement(new \XoopsFormEditor( _AM_MYMODULE2_TESTFIELD_DHTML, 'tf_dhtml', $editorConfigs));
-		// Form Check Box TfCheckbox
-		$tfCheckbox = $this->isNew() ? 0 : $this->getVar('tf_checkbox');
-		$checkTfCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_TESTFIELD_CHECKBOX, 'tf_checkbox', $tfCheckbox);
-		$checkTfCheckbox->addOption(1, _AM_MYMODULE2_TESTFIELD_CHECKBOX);
-		$form->addElement($checkTfCheckbox);
-		// Form Radio Yes/No TfYesno
-		$tfYesno = $this->isNew() ? 0 : $this->getVar('tf_yesno');
-		$form->addElement(new \XoopsFormRadioYN( _AM_MYMODULE2_TESTFIELD_YESNO, 'tf_yesno', $tfYesno));
-		// Testfields handler
-		$testfieldsHandler = $helper->getHandler('testfields');
-		// Form Select Testfields
-		$tfSelectboxSelect = new \XoopsFormSelect( _AM_MYMODULE2_TESTFIELD_SELECTBOX, 'tf_selectbox', $this->getVar('tf_selectbox'));
-		$tfSelectboxSelect->addOption('Empty');
-		$tfSelectboxSelect->addOptionArray($testfieldsHandler->getList());
-		$form->addElement($tfSelectboxSelect);
-		// Form Select User TfUser
-		$form->addElement(new \XoopsFormSelectUser( _AM_MYMODULE2_TESTFIELD_USER, 'tf_user', false, $this->getVar('tf_user') ));
-		// Form Color Picker TfColor
-		$form->addElement(new \XoopsFormColorPicker( _AM_MYMODULE2_TESTFIELD_COLOR, 'tf_color', $this->getVar('tf_color') ), true);
-		// Form Frameworks Image Files TfImagelist
-		$getTfImagelist = $this->getVar('tf_imagelist');
-		$tfImagelist = $getTfImagelist ? $getTfImagelist : 'blank.gif';
-		$imageDirectory = '/Frameworks/moduleclasses/icons/32';
-		$imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_IMAGELIST, '<br>' );
-		$imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_IMAGELIST_UPLOADS, ".{$imageDirectory}/"), 'tf_imagelist', $tfImagelist, 5);
-		$imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory );
-		foreach($imageArray as $image1) {
-			$imageSelect->addOption("{$image1}", $image1);
-		}
-		$imageSelect->setExtra("onchange='showImgSelected(\"imglabel_tf_imagelist\", \"tf_imagelist\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'");
-		$imageTray->addElement($imageSelect, false);
-		$imageTray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL."/".$imageDirectory."/".$tfImagelist."' name='imglabel_tf_imagelist' id='imglabel_tf_imagelist' alt='' style='max-width:100px' />"));
-		// Form File
-		$fileSelectTray = new \XoopsFormElementTray('', '<br>' );
-		$fileSelectTray->addElement(new \XoopsFormFile( _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_imagelist', $helper->getConfig('maxsize_image') ));
-		$fileSelectTray->addElement(new \XoopsFormLabel(''));
-		$imageTray->addElement($fileSelectTray);
-		$form->addElement($imageTray);
-		// Form Url Text File TfUrlfile
-		$formUrlFile = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_URLFILE, '<br><br>' );
-		$formUrl = $this->isNew() ? '' : $this->getVar('tf_urlfile');
-		$formText = new \XoopsFormText( _AM_MYMODULE2_TESTFIELD_URLFILE_UPLOADS, 'tf_urlfile', 75, 255, $formUrl );
-		$formUrlFile->addElement($formText);
-		$formUrlFile->addElement(new \XoopsFormFile( _AM_MYMODULE2_FORM_UPLOAD, 'tf_urlfile', $helper->getConfig('maxsize_file') ));
-		$form->addElement($formUrlFile);
-		// Form Image TfUplimage
-		// Form Image TfUplimage: Select Uploaded Image 
-		$getTfUplimage = $this->getVar('tf_uplimage');
-		$tfUplimage = $getTfUplimage ? $getTfUplimage : 'blank.gif';
-		$imageDirectory = '/uploads/mymodule2/images/testfields';
-		$imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_UPLIMAGE, '<br>' );
-		$imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_UPLIMAGE_UPLOADS, ".{$imageDirectory}/"), 'tf_uplimage', $tfUplimage, 5);
-		$imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory );
-		foreach($imageArray as $image1) {
-			$imageSelect->addOption("{$image1}", $image1);
-		}
-		$imageSelect->setExtra("onchange='showImgSelected(\"imglabel_tf_uplimage\", \"tf_uplimage\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'");
-		$imageTray->addElement($imageSelect, false);
-		$imageTray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL."/".$imageDirectory."/".$tfUplimage."' name='imglabel_tf_uplimage' id='imglabel_tf_uplimage' alt='' style='max-width:100px' />"));
-		// Form Image TfUplimage: Upload new image
-		if ($permissionUpload) {
-			$maxsize = $helper->getConfig('maxsize_image');
-			$imageTray->addElement(new \XoopsFormFile( '<br>' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_uplimage', $maxsize ));
-			$imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' '  . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB));
-			$imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_WIDTH, $helper->getConfig('maxwidth_image') . ' px'));
-			$imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_HEIGHT, $helper->getConfig('maxheight_image') . ' px'));
-		} else {
-			$imageTray->addElement(new \XoopsFormHidden( 'tf_uplimage', $tfUplimage ));
-		}
-		$form->addElement($imageTray, );
-		// Form File TfUplfile
-		$tfUplfile = $this->isNew() ? '' : $this->getVar('tf_uplfile');
-		if ($permissionUpload) {
-			$fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_UPLFILE, '<br>' );
-			$fileDirectory = '/uploads/mymodule2/files/testfields';
-			if (!$this->isNew()) {
-				$fileUploadTray->addElement(new \XoopsFormLabel(sprintf(_AM_MYMODULE2_TESTFIELD_UPLFILE_UPLOADS, ".{$fileDirectory}/"), $tfUplfile));
-			}
-			$maxsize = $helper->getConfig('maxsize_file');
-			$fileUploadTray->addElement(new \XoopsFormFile( '', 'tf_uplfile', $maxsize ));
-			$fileUploadTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' '  . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB));
-			$form->addElement($fileUploadTray, );
-		} else {
-			$form->addElement(new \XoopsFormHidden( 'tf_uplfile', $tfUplfile ));
-		}
-		// Form Text Date Select TfTextdateselect
-		$tfTextdateselect = $this->isNew() ? 0 : $this->getVar('tf_textdateselect');
-		$form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_TESTFIELD_TEXTDATESELECT, 'tf_textdateselect', '', $tfTextdateselect ));
-		// Form File TfSelectfile
-		// Form File TfSelectfile: Select Uploaded File 
-		$getTfSelectfile = $this->getVar('tf_selectfile');
-		$tfSelectfile = $getTfSelectfile ? $getTfSelectfile : 'blank.gif';
-		$fileDirectory = '/uploads/mymodule2/files/testfields';
-		$fileTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_SELECTFILE, '<br>' );
-		$fileSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_SELECTFILE_UPLOADS, ".{$fileDirectory}/"), 'tf_selectfile', $tfSelectfile, 5);
-		$fileArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $fileDirectory );
-		foreach($fileArray as $file1) {
-			$fileSelect->addOption("{$file1}", $file1);
-		}
-		$fileTray->addElement($fileSelect, false);
-		// Form File TfSelectfile: Upload new file
-		if ($permissionUpload) {
-			$maxsize = $helper->getConfig('maxsize_file');
-			$fileTray->addElement(new \XoopsFormFile( '<br>' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_selectfile', $maxsize ));
-			$fileTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' '  . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB));
-		} else {
-			$fileTray->addElement(new \XoopsFormHidden( 'tf_selectfile', $tfSelectfile ));
-		}
-		$form->addElement($fileTray, );
-		// Form Select Testfields
-		$tfStatusSelect = new \XoopsFormSelect( _AM_MYMODULE2_TESTFIELD_STATUS, 'tf_status', $this->getVar('tf_status'));
-		$tfStatusSelect->addOption(Constants::STATUS_NONE, _AM_MYMODULE2_STATUS_NONE);
-		$tfStatusSelect->addOption(Constants::STATUS_OFFLINE, _AM_MYMODULE2_STATUS_OFFLINE);
-		$tfStatusSelect->addOption(Constants::STATUS_SUBMITTED, _AM_MYMODULE2_STATUS_SUBMITTED);
-		$tfStatusSelect->addOption(Constants::STATUS_APPROVED, _AM_MYMODULE2_STATUS_APPROVED);
-		$form->addElement($tfStatusSelect);
-		// Permissions
-		$memberHandler = xoops_getHandler('member');
-		$groupList = $memberHandler->getGroupList();
-		$grouppermHandler = xoops_getHandler('groupperm');
-		$fullList[] = array_keys($groupList);
-		if (!$this->isNew()) {
-			$groupsIdsApprove = $grouppermHandler->getGroupIds('mymodule2_approve_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid'));
-			$groupsIdsApprove[] = array_values($groupsIdsApprove);
-			$groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_testfields[]', $groupsIdsApprove);
-			$groupsIdsSubmit = $grouppermHandler->getGroupIds('mymodule2_submit_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid'));
-			$groupsIdsSubmit[] = array_values($groupsIdsSubmit);
-			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_testfields[]', $groupsIdsSubmit);
-			$groupsIdsView = $grouppermHandler->getGroupIds('mymodule2_view_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid'));
-			$groupsIdsView[] = array_values($groupsIdsView);
-			$groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_testfields[]', $groupsIdsView);
-		} else {
-			$groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_testfields[]', $fullList);
-			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_testfields[]', $fullList);
-			$groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_testfields[]', $fullList);
-		}
-		// To Approve
-		$groupsCanApproveCheckbox->addOptionArray($groupList);
-		$form->addElement($groupsCanApproveCheckbox);
-		// To Submit
-		$groupsCanSubmitCheckbox->addOptionArray($groupList);
-		$form->addElement($groupsCanSubmitCheckbox);
-		// To View
-		$groupsCanViewCheckbox->addOptionArray($groupList);
-		$form->addElement($groupsCanViewCheckbox);
-		// To Save
-		$form->addElement(new \XoopsFormHidden('op', 'save'));
-		$form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
-		return $form;
-	}
+    /**
+     * @public function getForm
+     * @param bool $action
+     * @return XoopsThemeForm
+     */
+    public function getFormTestfields($action = false)
+    {
+        $helper = \XoopsModules\Mymodule2\Helper::getInstance();
+        if (false === $action) {
+            $action = $_SERVER['REQUEST_URI'];
+        }
+        // Permissions for uploader
+        $grouppermHandler = xoops_getHandler('groupperm');
+        $groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS;
+        if ($GLOBALS['xoopsUser']) {
+            if (!$GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid())) {
+                $permissionUpload = $grouppermHandler->checkRight('upload_groups', 32, $groups, $GLOBALS['xoopsModule']->getVar('mid')) ? true : false;
+            } else {
+                $permissionUpload = true;
+            }
+        } else {
+            $permissionUpload = $grouppermHandler->checkRight('upload_groups', 32, $groups, $GLOBALS['xoopsModule']->getVar('mid')) ? true : false;
+        }
+        // Title
+        $title = $this->isNew() ? sprintf(_AM_MYMODULE2_TESTFIELD_ADD) : sprintf(_AM_MYMODULE2_TESTFIELD_EDIT);
+        // Get Theme Form
+        xoops_load('XoopsFormLoader');
+        $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
+        $form->setExtra('enctype="multipart/form-data"');
+        // Form Text TfText
+        $form->addElement(new \XoopsFormText( _AM_MYMODULE2_TESTFIELD_TEXT, 'tf_text', 50, 255, $this->getVar('tf_text') ));
+        // Form Text Area TfTextarea
+        $form->addElement(new \XoopsFormTextArea( _AM_MYMODULE2_TESTFIELD_TEXTAREA, 'tf_textarea', $this->getVar('tf_textarea'), 4, 47 ));
+        // Form editor TfDhtml
+        $editorConfigs = [];
+        $editorConfigs['name'] = 'tf_dhtml';
+        $editorConfigs['value'] = $this->getVar('tf_dhtml', 'e');
+        $editorConfigs['rows'] = 5;
+        $editorConfigs['cols'] = 40;
+        $editorConfigs['width'] = '100%';
+        $editorConfigs['height'] = '400px';
+        $editorConfigs['editor'] = $helper->getConfig('editor_dhtml');
+        $form->addElement(new \XoopsFormEditor( _AM_MYMODULE2_TESTFIELD_DHTML, 'tf_dhtml', $editorConfigs));
+        // Form Check Box TfCheckbox
+        $tfCheckbox = $this->isNew() ? 0 : $this->getVar('tf_checkbox');
+        $checkTfCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_TESTFIELD_CHECKBOX, 'tf_checkbox', $tfCheckbox);
+        $checkTfCheckbox->addOption(1, _AM_MYMODULE2_TESTFIELD_CHECKBOX);
+        $form->addElement($checkTfCheckbox);
+        // Form Radio Yes/No TfYesno
+        $tfYesno = $this->isNew() ? 0 : $this->getVar('tf_yesno');
+        $form->addElement(new \XoopsFormRadioYN( _AM_MYMODULE2_TESTFIELD_YESNO, 'tf_yesno', $tfYesno));
+        // Testfields handler
+        $testfieldsHandler = $helper->getHandler('testfields');
+        // Form Select Testfields
+        $tfSelectboxSelect = new \XoopsFormSelect( _AM_MYMODULE2_TESTFIELD_SELECTBOX, 'tf_selectbox', $this->getVar('tf_selectbox'));
+        $tfSelectboxSelect->addOption('Empty');
+        $tfSelectboxSelect->addOptionArray($testfieldsHandler->getList());
+        $form->addElement($tfSelectboxSelect);
+        // Form Select User TfUser
+        $form->addElement(new \XoopsFormSelectUser( _AM_MYMODULE2_TESTFIELD_USER, 'tf_user', false, $this->getVar('tf_user') ));
+        // Form Color Picker TfColor
+        $form->addElement(new \XoopsFormColorPicker( _AM_MYMODULE2_TESTFIELD_COLOR, 'tf_color', $this->getVar('tf_color') ), true);
+        // Form Frameworks Image Files TfImagelist
+        $getTfImagelist = $this->getVar('tf_imagelist');
+        $tfImagelist = $getTfImagelist ? $getTfImagelist : 'blank.gif';
+        $imageDirectory = '/Frameworks/moduleclasses/icons/32';
+        $imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_IMAGELIST, '<br>' );
+        $imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_IMAGELIST_UPLOADS, ".{$imageDirectory}/"), 'tf_imagelist', $tfImagelist, 5);
+        $imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory );
+        foreach($imageArray as $image1) {
+            $imageSelect->addOption("{$image1}", $image1);
+        }
+        $imageSelect->setExtra("onchange='showImgSelected(\"imglabel_tf_imagelist\", \"tf_imagelist\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'");
+        $imageTray->addElement($imageSelect, false);
+        $imageTray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL."/".$imageDirectory."/".$tfImagelist."' name='imglabel_tf_imagelist' id='imglabel_tf_imagelist' alt='' style='max-width:100px' />"));
+        // Form File
+        $fileSelectTray = new \XoopsFormElementTray('', '<br>' );
+        $fileSelectTray->addElement(new \XoopsFormFile( _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_imagelist', $helper->getConfig('maxsize_image') ));
+        $fileSelectTray->addElement(new \XoopsFormLabel(''));
+        $imageTray->addElement($fileSelectTray);
+        $form->addElement($imageTray);
+        // Form Url Text File TfUrlfile
+        $formUrlFile = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_URLFILE, '<br><br>' );
+        $formUrl = $this->isNew() ? '' : $this->getVar('tf_urlfile');
+        $formText = new \XoopsFormText( _AM_MYMODULE2_TESTFIELD_URLFILE_UPLOADS, 'tf_urlfile', 75, 255, $formUrl );
+        $formUrlFile->addElement($formText);
+        $formUrlFile->addElement(new \XoopsFormFile( _AM_MYMODULE2_FORM_UPLOAD, 'tf_urlfile', $helper->getConfig('maxsize_file') ));
+        $form->addElement($formUrlFile);
+        // Form Image TfUplimage
+        // Form Image TfUplimage: Select Uploaded Image 
+        $getTfUplimage = $this->getVar('tf_uplimage');
+        $tfUplimage = $getTfUplimage ? $getTfUplimage : 'blank.gif';
+        $imageDirectory = '/uploads/mymodule2/images/testfields';
+        $imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_UPLIMAGE, '<br>' );
+        $imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_UPLIMAGE_UPLOADS, ".{$imageDirectory}/"), 'tf_uplimage', $tfUplimage, 5);
+        $imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory );
+        foreach($imageArray as $image1) {
+            $imageSelect->addOption("{$image1}", $image1);
+        }
+        $imageSelect->setExtra("onchange='showImgSelected(\"imglabel_tf_uplimage\", \"tf_uplimage\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'");
+        $imageTray->addElement($imageSelect, false);
+        $imageTray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL."/".$imageDirectory."/".$tfUplimage."' name='imglabel_tf_uplimage' id='imglabel_tf_uplimage' alt='' style='max-width:100px' />"));
+        // Form Image TfUplimage: Upload new image
+        if ($permissionUpload) {
+            $maxsize = $helper->getConfig('maxsize_image');
+            $imageTray->addElement(new \XoopsFormFile( '<br>' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_uplimage', $maxsize ));
+            $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' '  . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB));
+            $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_WIDTH, $helper->getConfig('maxwidth_image') . ' px'));
+            $imageTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_IMG_HEIGHT, $helper->getConfig('maxheight_image') . ' px'));
+        } else {
+            $imageTray->addElement(new \XoopsFormHidden( 'tf_uplimage', $tfUplimage ));
+        }
+        $form->addElement($imageTray, );
+        // Form File TfUplfile
+        $tfUplfile = $this->isNew() ? '' : $this->getVar('tf_uplfile');
+        if ($permissionUpload) {
+            $fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_UPLFILE, '<br>' );
+            $fileDirectory = '/uploads/mymodule2/files/testfields';
+            if (!$this->isNew()) {
+                $fileUploadTray->addElement(new \XoopsFormLabel(sprintf(_AM_MYMODULE2_TESTFIELD_UPLFILE_UPLOADS, ".{$fileDirectory}/"), $tfUplfile));
+            }
+            $maxsize = $helper->getConfig('maxsize_file');
+            $fileUploadTray->addElement(new \XoopsFormFile( '', 'tf_uplfile', $maxsize ));
+            $fileUploadTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' '  . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB));
+            $form->addElement($fileUploadTray, );
+        } else {
+            $form->addElement(new \XoopsFormHidden( 'tf_uplfile', $tfUplfile ));
+        }
+        // Form Text Date Select TfTextdateselect
+        $tfTextdateselect = $this->isNew() ? 0 : $this->getVar('tf_textdateselect');
+        $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_TESTFIELD_TEXTDATESELECT, 'tf_textdateselect', '', $tfTextdateselect ));
+        // Form File TfSelectfile
+        // Form File TfSelectfile: Select Uploaded File 
+        $getTfSelectfile = $this->getVar('tf_selectfile');
+        $tfSelectfile = $getTfSelectfile ? $getTfSelectfile : 'blank.gif';
+        $fileDirectory = '/uploads/mymodule2/files/testfields';
+        $fileTray = new \XoopsFormElementTray(_AM_MYMODULE2_TESTFIELD_SELECTFILE, '<br>' );
+        $fileSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_TESTFIELD_SELECTFILE_UPLOADS, ".{$fileDirectory}/"), 'tf_selectfile', $tfSelectfile, 5);
+        $fileArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $fileDirectory );
+        foreach($fileArray as $file1) {
+            $fileSelect->addOption("{$file1}", $file1);
+        }
+        $fileTray->addElement($fileSelect, false);
+        // Form File TfSelectfile: Upload new file
+        if ($permissionUpload) {
+            $maxsize = $helper->getConfig('maxsize_file');
+            $fileTray->addElement(new \XoopsFormFile( '<br>' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'tf_selectfile', $maxsize ));
+            $fileTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' '  . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB));
+        } else {
+            $fileTray->addElement(new \XoopsFormHidden( 'tf_selectfile', $tfSelectfile ));
+        }
+        $form->addElement($fileTray, );
+        // Form Select Testfields
+        $tfStatusSelect = new \XoopsFormSelect( _AM_MYMODULE2_TESTFIELD_STATUS, 'tf_status', $this->getVar('tf_status'));
+        $tfStatusSelect->addOption(Constants::STATUS_NONE, _AM_MYMODULE2_STATUS_NONE);
+        $tfStatusSelect->addOption(Constants::STATUS_OFFLINE, _AM_MYMODULE2_STATUS_OFFLINE);
+        $tfStatusSelect->addOption(Constants::STATUS_SUBMITTED, _AM_MYMODULE2_STATUS_SUBMITTED);
+        $tfStatusSelect->addOption(Constants::STATUS_APPROVED, _AM_MYMODULE2_STATUS_APPROVED);
+        $form->addElement($tfStatusSelect);
+        // Permissions
+        $memberHandler = xoops_getHandler('member');
+        $groupList = $memberHandler->getGroupList();
+        $grouppermHandler = xoops_getHandler('groupperm');
+        $fullList[] = array_keys($groupList);
+        if (!$this->isNew()) {
+            $groupsIdsApprove = $grouppermHandler->getGroupIds('mymodule2_approve_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid'));
+            $groupsIdsApprove[] = array_values($groupsIdsApprove);
+            $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_testfields[]', $groupsIdsApprove);
+            $groupsIdsSubmit = $grouppermHandler->getGroupIds('mymodule2_submit_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid'));
+            $groupsIdsSubmit[] = array_values($groupsIdsSubmit);
+            $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_testfields[]', $groupsIdsSubmit);
+            $groupsIdsView = $grouppermHandler->getGroupIds('mymodule2_view_testfields', $this->getVar('tf_id'), $GLOBALS['xoopsModule']->getVar('mid'));
+            $groupsIdsView[] = array_values($groupsIdsView);
+            $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_testfields[]', $groupsIdsView);
+        } else {
+            $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_testfields[]', $fullList);
+            $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_testfields[]', $fullList);
+            $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_testfields[]', $fullList);
+        }
+        // To Approve
+        $groupsCanApproveCheckbox->addOptionArray($groupList);
+        $form->addElement($groupsCanApproveCheckbox);
+        // To Submit
+        $groupsCanSubmitCheckbox->addOptionArray($groupList);
+        $form->addElement($groupsCanSubmitCheckbox);
+        // To View
+        $groupsCanViewCheckbox->addOptionArray($groupList);
+        $form->addElement($groupsCanViewCheckbox);
+        // To Save
+        $form->addElement(new \XoopsFormHidden('op', 'save'));
+        $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
+        return $form;
+    }
 
-	/**
-	 * Get Values
-	 * @param null $keys 
-	 * @param null $format 
-	 * @param null$maxDepth 
-	 * @return array
-	 */
-	public function getValuesTestfields($keys = null, $format = null, $maxDepth = null)
-	{
-		$helper = \XoopsModules\Mymodule2\Helper::getInstance();
-		$ret = $this->getValues($keys, $format, $maxDepth);
-		$ret['id'] = $this->getVar('tf_id');
-		$ret['text'] = $this->getVar('tf_text');
-		$ret['textarea'] = strip_tags($this->getVar('tf_textarea'));
-		$ret['dhtml'] = strip_tags($this->getVar('tf_dhtml'));
-		$ret['checkbox'] = $this->getVar('tf_checkbox');
-		$ret['yesno'] = $this->getVar('tf_yesno');
-		$ret['yesno_text'] = (int)$this->getVar('tf_yesno') > 0 ? _YES : _NO;
-		$ret['selectbox'] = $this->getVar('tf_selectbox');
-		$ret['user'] = \XoopsUser::getUnameFromId($this->getVar('tf_user'));
-		$ret['color'] = $this->getVar('tf_color');
-		$ret['imagelist'] = $this->getVar('tf_imagelist');
-		$ret['urlfile'] = $this->getVar('tf_urlfile');
-		$ret['uplimage'] = $this->getVar('tf_uplimage');
-		$ret['uplfile'] = $this->getVar('tf_uplfile');
-		$ret['textdateselect'] = formatTimeStamp($this->getVar('tf_textdateselect'), 's');
-		$ret['selectfile'] = $this->getVar('tf_selectfile');
-		$ret['status'] = $this->getVar('tf_status');
-		return $ret;
-	}
+    /**
+     * Get Values
+     * @param null $keys 
+     * @param null $format 
+     * @param null$maxDepth 
+     * @return array
+     */
+    public function getValuesTestfields($keys = null, $format = null, $maxDepth = null)
+    {
+        $helper = \XoopsModules\Mymodule2\Helper::getInstance();
+        $ret = $this->getValues($keys, $format, $maxDepth);
+        $ret['id'] = $this->getVar('tf_id');
+        $ret['text'] = $this->getVar('tf_text');
+        $ret['textarea'] = strip_tags($this->getVar('tf_textarea'));
+        $ret['dhtml'] = strip_tags($this->getVar('tf_dhtml'));
+        $ret['checkbox'] = $this->getVar('tf_checkbox');
+        $ret['yesno'] = $this->getVar('tf_yesno');
+        $ret['yesno_text'] = (int)$this->getVar('tf_yesno') > 0 ? _YES : _NO;
+        $ret['selectbox'] = $this->getVar('tf_selectbox');
+        $ret['user'] = \XoopsUser::getUnameFromId($this->getVar('tf_user'));
+        $ret['color'] = $this->getVar('tf_color');
+        $ret['imagelist'] = $this->getVar('tf_imagelist');
+        $ret['urlfile'] = $this->getVar('tf_urlfile');
+        $ret['uplimage'] = $this->getVar('tf_uplimage');
+        $ret['uplfile'] = $this->getVar('tf_uplfile');
+        $ret['textdateselect'] = formatTimeStamp($this->getVar('tf_textdateselect'), 's');
+        $ret['selectfile'] = $this->getVar('tf_selectfile');
+        $ret['status'] = $this->getVar('tf_status');
+        return $ret;
+    }
 
-	/**
-	 * Returns an array representation of the object
-	 *
-	 * @return array
-	 */
-	public function toArrayTestfields()
-	{
-		$ret = [];
-		$vars = $this->getVars();
-		foreach(array_keys($vars) as $var) {
-			$ret[$var] = $this->getVar('"{$var}"');
-		}
-		return $ret;
-	}
+    /**
+     * Returns an array representation of the object
+     *
+     * @return array
+     */
+    public function toArrayTestfields()
+    {
+        $ret = [];
+        $vars = $this->getVars();
+        foreach(array_keys($vars) as $var) {
+            $ret[$var] = $this->getVar('"{$var}"');
+        }
+        return $ret;
+    }
 }

testdata/mymodule2/class/Testfieldshandler.php

Indentation +84 added lines, -84 removed lines

@@ -31,94 +31,94 @@
  */
 class TestfieldsHandler extends \XoopsPersistableObjectHandler
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null|XoopsDatabase $db
-	 */
-	public function __construct(\XoopsDatabase $db)
-	{
-		parent::__construct($db, 'mymodule2_testfields', Testfields::class, 'tf_id', 'tf_text');
-	}
+    /**
+     * Constructor 
+     *
+     * @param null|XoopsDatabase $db
+     */
+    public function __construct(\XoopsDatabase $db)
+    {
+        parent::__construct($db, 'mymodule2_testfields', Testfields::class, 'tf_id', 'tf_text');
+    }
 
-	/**
-	 * @param bool $isNew
-	 *
-	 * @return object
-	 */
-	public function create($isNew = true)
-	{
-		return parent::create($isNew);
-	}
+    /**
+     * @param bool $isNew
+     *
+     * @return object
+     */
+    public function create($isNew = true)
+    {
+        return parent::create($isNew);
+    }
 
-	/**
-	 * retrieve a field
-	 *
-	 * @param int $i field id
-	 * @param null fields
-	 * @return mixed reference to the {@link Get} object
-	 */
-	public function get($i = null, $fields = null)
-	{
-		return parent::get($i, $fields);
-	}
+    /**
+     * retrieve a field
+     *
+     * @param int $i field id
+     * @param null fields
+     * @return mixed reference to the {@link Get} object
+     */
+    public function get($i = null, $fields = null)
+    {
+        return parent::get($i, $fields);
+    }
 
-	/**
-	 * get inserted id
-	 *
-	 * @param null
-	 * @return integer reference to the {@link Get} object
-	 */
-	public function getInsertId()
-	{
-		return $this->db->getInsertId();
-	}
+    /**
+     * get inserted id
+     *
+     * @param null
+     * @return integer reference to the {@link Get} object
+     */
+    public function getInsertId()
+    {
+        return $this->db->getInsertId();
+    }
 
-	/**
-	 * Get Count Testfields in the database
-	 * @param int    $start 
-	 * @param int    $limit 
-	 * @param string $sort 
-	 * @param string $order 
-	 * @return int
-	 */
-	public function getCountTestfields($start = 0, $limit = 0, $sort = 'tf_id ASC, tf_text', $order = 'ASC')
-	{
-		$crCountTestfields = new \CriteriaCompo();
-		$crCountTestfields = $this->getTestfieldsCriteria($crCountTestfields, $start, $limit, $sort, $order);
-		return parent::getCount($crCountTestfields);
-	}
+    /**
+     * Get Count Testfields in the database
+     * @param int    $start 
+     * @param int    $limit 
+     * @param string $sort 
+     * @param string $order 
+     * @return int
+     */
+    public function getCountTestfields($start = 0, $limit = 0, $sort = 'tf_id ASC, tf_text', $order = 'ASC')
+    {
+        $crCountTestfields = new \CriteriaCompo();
+        $crCountTestfields = $this->getTestfieldsCriteria($crCountTestfields, $start, $limit, $sort, $order);
+        return parent::getCount($crCountTestfields);
+    }
 
-	/**
-	 * Get All Testfields in the database
-	 * @param int    $start 
-	 * @param int    $limit 
-	 * @param string $sort 
-	 * @param string $order 
-	 * @return array
-	 */
-	public function getAllTestfields($start = 0, $limit = 0, $sort = 'tf_id ASC, tf_text', $order = 'ASC')
-	{
-		$crAllTestfields = new \CriteriaCompo();
-		$crAllTestfields = $this->getTestfieldsCriteria($crAllTestfields, $start, $limit, $sort, $order);
-		return parent::getAll($crAllTestfields);
-	}
+    /**
+     * Get All Testfields in the database
+     * @param int    $start 
+     * @param int    $limit 
+     * @param string $sort 
+     * @param string $order 
+     * @return array
+     */
+    public function getAllTestfields($start = 0, $limit = 0, $sort = 'tf_id ASC, tf_text', $order = 'ASC')
+    {
+        $crAllTestfields = new \CriteriaCompo();
+        $crAllTestfields = $this->getTestfieldsCriteria($crAllTestfields, $start, $limit, $sort, $order);
+        return parent::getAll($crAllTestfields);
+    }
 
-	/**
-	 * Get Criteria Testfields
-	 * @param        $crTestfields
-	 * @param int    $start 
-	 * @param int    $limit 
-	 * @param string $sort 
-	 * @param string $order 
-	 * @return int
-	 */
-	private function getTestfieldsCriteria($crTestfields, $start, $limit, $sort, $order)
-	{
-		$crTestfields->setStart( $start );
-		$crTestfields->setLimit( $limit );
-		$crTestfields->setSort( $sort );
-		$crTestfields->setOrder( $order );
-		return $crTestfields;
-	}
+    /**
+     * Get Criteria Testfields
+     * @param        $crTestfields
+     * @param int    $start 
+     * @param int    $limit 
+     * @param string $sort 
+     * @param string $order 
+     * @return int
+     */
+    private function getTestfieldsCriteria($crTestfields, $start, $limit, $sort, $order)
+    {
+        $crTestfields->setStart( $start );
+        $crTestfields->setLimit( $limit );
+        $crTestfields->setSort( $sort );
+        $crTestfields->setOrder( $order );
+        return $crTestfields;
+    }
 }

testdata/mymodule2/class/Utility.php

Indentation +8 added lines, -8 removed lines

@@ -189,14 +189,14 @@
         $donationform = [
             0   => '<form name="donation" id="donation" action="http://www.txmodxoops.org/modules/xdonations/" method="post" onsubmit="return xoopsFormValidate_donation();">',
             1   => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'
-                   . _AM_MYMODULE2_ABOUT_MAKE_DONATION
-                   . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'
-                   . _AM_MYMODULE2_DONATION_AMOUNT
-                   . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'
-                   . _SUBMIT
-                   . '" title="'
-                   . _SUBMIT
-                   . '" type="submit"></td></tr></tbody></table>',
+                    . _AM_MYMODULE2_ABOUT_MAKE_DONATION
+                    . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'
+                    . _AM_MYMODULE2_DONATION_AMOUNT
+                    . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'
+                    . _SUBMIT
+                    . '" title="'
+                    . _SUBMIT
+                    . '" type="submit"></td></tr></tbody></table>',
             2   => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="EUR" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"></form>',
             'D' => '',
             3   => '',

testdata/mymodule2/class/Constants.php

Indentation +10 added lines, -10 removed lines

@@ -29,16 +29,16 @@
  */
 class Constants
 {
-	// Constants for status
-	const STATUS_NONE      = 0;
-	const STATUS_OFFLINE   = 1;
-	const STATUS_SUBMITTED = 2;
-	const STATUS_APPROVED  = 3;
+    // Constants for status
+    const STATUS_NONE      = 0;
+    const STATUS_OFFLINE   = 1;
+    const STATUS_SUBMITTED = 2;
+    const STATUS_APPROVED  = 3;
 
-	// Constants for permissions
-	const PERM_GLOBAL_NONE    = 0;
-	const PERM_GLOBAL_VIEW    = 1;
-	const PERM_GLOBAL_SUBMIT  = 2;
-	const PERM_GLOBAL_APPROVE = 3;
+    // Constants for permissions
+    const PERM_GLOBAL_NONE    = 0;
+    const PERM_GLOBAL_VIEW    = 1;
+    const PERM_GLOBAL_SUBMIT  = 2;
+    const PERM_GLOBAL_APPROVE = 3;
 
 }