txmodxoops / tdmcreate

testdata/mymodule2/class/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     {
         $ret = false;
 
-        $class = '\\XoopsModules\\' . ucfirst(mb_strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
+        $class = '\\XoopsModules\\'.ucfirst(mb_strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler';
         if (!class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }

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

Spacing +4 added lines, -4 removed lines

@@ -115,10 +115,10 @@
 	 */
 	private function getTestfieldsCriteria($crTestfields, $start, $limit, $sort, $order)
 	{
-		$crTestfields->setStart( $start );
-		$crTestfields->setLimit( $limit );
-		$crTestfields->setSort( $sort );
-		$crTestfields->setOrder( $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   => '',

Spacing +7 added lines, -7 removed lines

@@ -56,11 +56,11 @@ 
     {
         if ($considerHtml) {
             // if the plain text is shorter than the maximum length, return the whole text
-            if (mb_strlen(preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+            if (mb_strlen(preg_replace('/<.*?'.'>/', '', $text)) <= $length) {
                 return $text;
             }
             // splits all html-tags to scanable lines
-            preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
+            preg_match_all('/(<.+?'.'>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
             $total_length = mb_strlen($ending);
             $open_tags    = [];
             $truncate     = '';
@@ -78,7 +78,7 @@ 
                             unset($open_tags[$pos]);
                         }
                         // if tag is an opening tag
-                    } elseif (preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (preg_match('/^<\s*([^\s>!]+).*?'.'>$/s', $line_matchings[1], $tag_matchings)) {
                         // add tag to the beginning of $open_tags list
                         array_unshift($open_tags, mb_strtolower($tag_matchings[1]));
                     }
@@ -136,7 +136,7 @@ 
         if ($considerHtml) {
             // close all unclosed html-tags
             foreach ($open_tags as $tag) {
-                $truncate .= '</' . $tag . '>';
+                $truncate .= '</'.$tag.'>';
             }
         }
 
@@ -209,7 +209,7 @@ 
 //--></script>
 <!-- End Form Validation JavaScript //-->',
         ];
-        $paypalform   = [
+        $paypalform = [
             0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
             1 => '<input name="cmd" value="_s-xclick" type="hidden">',
             2 => '<input name="hosted_button_id" value="%s" type="hidden">',
@@ -222,11 +222,11 @@ 
                 case 2:
                     $donationform[$key] = sprintf(
                         $donationform[$key],
-                        $GLOBALS['xoopsConfig']['sitename'] . ' - ' . ('' != $GLOBALS['xoopsUser']->getVar('name') ? $GLOBALS['xoopsUser']->getVar('name') . ' [' . $GLOBALS['xoopsUser']->getVar('uname') . ']' : $GLOBALS['xoopsUser']->getVar('uname')),
+                        $GLOBALS['xoopsConfig']['sitename'].' - '.('' != $GLOBALS['xoopsUser']->getVar('name') ? $GLOBALS['xoopsUser']->getVar('name').' ['.$GLOBALS['xoopsUser']->getVar('uname').']' : $GLOBALS['xoopsUser']->getVar('uname')),
                         $GLOBALS['xoopsUser']->getVar('email'),
                         XOOPS_LICENSE_KEY,
                         mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')),
-                        mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')) . ' ' . $GLOBALS['xoopsModule']->getVar('name')
+                        mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')).' '.$GLOBALS['xoopsModule']->getVar('name')
                     );
                     break;
             }

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

testdata/mymodule2/class/Categorieshandler.php

Indentation +84 added lines, -84 removed lines

@@ -31,94 +31,94 @@
  */
 class CategoriesHandler extends \XoopsPersistableObjectHandler
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null|XoopsDatabase $db
-	 */
-	public function __construct(\XoopsDatabase $db)
-	{
-		parent::__construct($db, 'mymodule2_categories', Categories::class, 'cat_id', 'cat_name');
-	}
+    /**
+     * Constructor 
+     *
+     * @param null|XoopsDatabase $db
+     */
+    public function __construct(\XoopsDatabase $db)
+    {
+        parent::__construct($db, 'mymodule2_categories', Categories::class, 'cat_id', 'cat_name');
+    }
 
-	/**
-	 * @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 Categories in the database
-	 * @param int    $start 
-	 * @param int    $limit 
-	 * @param string $sort 
-	 * @param string $order 
-	 * @return int
-	 */
-	public function getCountCategories($start = 0, $limit = 0, $sort = 'cat_id ASC, cat_name', $order = 'ASC')
-	{
-		$crCountCategories = new \CriteriaCompo();
-		$crCountCategories = $this->getCategoriesCriteria($crCountCategories, $start, $limit, $sort, $order);
-		return parent::getCount($crCountCategories);
-	}
+    /**
+     * Get Count Categories in the database
+     * @param int    $start 
+     * @param int    $limit 
+     * @param string $sort 
+     * @param string $order 
+     * @return int
+     */
+    public function getCountCategories($start = 0, $limit = 0, $sort = 'cat_id ASC, cat_name', $order = 'ASC')
+    {
+        $crCountCategories = new \CriteriaCompo();
+        $crCountCategories = $this->getCategoriesCriteria($crCountCategories, $start, $limit, $sort, $order);
+        return parent::getCount($crCountCategories);
+    }
 
-	/**
-	 * Get All Categories in the database
-	 * @param int    $start 
-	 * @param int    $limit 
-	 * @param string $sort 
-	 * @param string $order 
-	 * @return array
-	 */
-	public function getAllCategories($start = 0, $limit = 0, $sort = 'cat_id ASC, cat_name', $order = 'ASC')
-	{
-		$crAllCategories = new \CriteriaCompo();
-		$crAllCategories = $this->getCategoriesCriteria($crAllCategories, $start, $limit, $sort, $order);
-		return parent::getAll($crAllCategories);
-	}
+    /**
+     * Get All Categories in the database
+     * @param int    $start 
+     * @param int    $limit 
+     * @param string $sort 
+     * @param string $order 
+     * @return array
+     */
+    public function getAllCategories($start = 0, $limit = 0, $sort = 'cat_id ASC, cat_name', $order = 'ASC')
+    {
+        $crAllCategories = new \CriteriaCompo();
+        $crAllCategories = $this->getCategoriesCriteria($crAllCategories, $start, $limit, $sort, $order);
+        return parent::getAll($crAllCategories);
+    }
 
-	/**
-	 * Get Criteria Categories
-	 * @param        $crCategories
-	 * @param int    $start 
-	 * @param int    $limit 
-	 * @param string $sort 
-	 * @param string $order 
-	 * @return int
-	 */
-	private function getCategoriesCriteria($crCategories, $start, $limit, $sort, $order)
-	{
-		$crCategories->setStart( $start );
-		$crCategories->setLimit( $limit );
-		$crCategories->setSort( $sort );
-		$crCategories->setOrder( $order );
-		return $crCategories;
-	}
+    /**
+     * Get Criteria Categories
+     * @param        $crCategories
+     * @param int    $start 
+     * @param int    $limit 
+     * @param string $sort 
+     * @param string $order 
+     * @return int
+     */
+    private function getCategoriesCriteria($crCategories, $start, $limit, $sort, $order)
+    {
+        $crCategories->setStart( $start );
+        $crCategories->setLimit( $limit );
+        $crCategories->setSort( $sort );
+        $crCategories->setOrder( $order );
+        return $crCategories;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -115,10 +115,10 @@
 	 */
 	private function getCategoriesCriteria($crCategories, $start, $limit, $sort, $order)
 	{
-		$crCategories->setStart( $start );
-		$crCategories->setLimit( $limit );
-		$crCategories->setSort( $sort );
-		$crCategories->setOrder( $order );
+		$crCategories->setStart($start);
+		$crCategories->setLimit($limit);
+		$crCategories->setSort($sort);
+		$crCategories->setOrder($order);
 		return $crCategories;
 	}
 }

testdata/mymodule2/class/Articles.php

Indentation +215 added lines, -215 removed lines

@@ -32,224 +32,224 @@
  */
 class Articles extends \XoopsObject
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null
-	 */
-	public function __construct()
-	{
-		$this->initVar('art_id', XOBJ_DTYPE_INT);
-		$this->initVar('art_cat', XOBJ_DTYPE_INT);
-		$this->initVar('art_title', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('art_descr', XOBJ_DTYPE_TXTAREA);
-		$this->initVar('art_img', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('art_status', XOBJ_DTYPE_INT);
-		$this->initVar('art_file', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('art_created', XOBJ_DTYPE_INT);
-		$this->initVar('art_submitter', XOBJ_DTYPE_INT);
-	}
+    /**
+     * Constructor 
+     *
+     * @param null
+     */
+    public function __construct()
+    {
+        $this->initVar('art_id', XOBJ_DTYPE_INT);
+        $this->initVar('art_cat', XOBJ_DTYPE_INT);
+        $this->initVar('art_title', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('art_descr', XOBJ_DTYPE_TXTAREA);
+        $this->initVar('art_img', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('art_status', XOBJ_DTYPE_INT);
+        $this->initVar('art_file', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('art_created', XOBJ_DTYPE_INT);
+        $this->initVar('art_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 getNewInsertedIdArticles()
-	{
-		$newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
-		return $newInsertedId;
-	}
+    /**
+     * The new inserted $Id
+     * @return inserted id
+     */
+    public function getNewInsertedIdArticles()
+    {
+        $newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
+        return $newInsertedId;
+    }
 
-	/**
-	 * @public function getForm
-	 * @param bool $action
-	 * @return XoopsThemeForm
-	 */
-	public function getFormArticles($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_ARTICLE_ADD) : sprintf(_AM_MYMODULE2_ARTICLE_EDIT);
-		// Get Theme Form
-		xoops_load('XoopsFormLoader');
-		$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
-		$form->setExtra('enctype="multipart/form-data"');
-		// Use tag module
-		$dirTag = is_dir(XOOPS_ROOT_PATH . '/modules/tag') ? true : false;
-		if (($helper->getConfig('usetag') == 1) && $dirTag) {
-			$tagId = $this->isNew() ? 0 : $this->getVar('art_id');
-			include_once XOOPS_ROOT_PATH . '/modules/tag/include/formtag.php';
-			$form->addElement(new \XoopsFormTag( 'tag', 60, 255, $tagId, 0 ), true);
-		}
-		// Form Table categories
-		$categoriesHandler = $helper->getHandler('categories');
-		$artCatSelect = new \XoopsFormSelect( _AM_MYMODULE2_ARTICLE_CAT, 'art_cat', $this->getVar('art_cat'));
-		$artCatSelect->addOptionArray($categoriesHandler->getList());
-		$form->addElement($artCatSelect, true);
-		// Form Text ArtTitle
-		$form->addElement(new \XoopsFormText( _AM_MYMODULE2_ARTICLE_TITLE, 'art_title', 50, 255, $this->getVar('art_title') ), true);
-		// Form editor ArtDescr
-		$editorConfigs = [];
-		$editorConfigs['name'] = 'art_descr';
-		$editorConfigs['value'] = $this->getVar('art_descr', 'e');
-		$editorConfigs['rows'] = 5;
-		$editorConfigs['cols'] = 40;
-		$editorConfigs['width'] = '100%';
-		$editorConfigs['height'] = '400px';
-		$editorConfigs['editor'] = $helper->getConfig('editor_descr');
-		$form->addElement(new \XoopsFormEditor( _AM_MYMODULE2_ARTICLE_DESCR, 'art_descr', $editorConfigs), true);
-		// Form Image ArtImg
-		// Form Image ArtImg: Select Uploaded Image 
-		$getArtImg = $this->getVar('art_img');
-		$artImg = $getArtImg ? $getArtImg : 'blank.gif';
-		$imageDirectory = '/uploads/mymodule2/images/articles';
-		$imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_IMG, '<br>' );
-		$imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_ARTICLE_IMG_UPLOADS, ".{$imageDirectory}/"), 'art_img', $artImg, 5);
-		$imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory );
-		foreach($imageArray as $image1) {
-			$imageSelect->addOption("{$image1}", $image1);
-		}
-		$imageSelect->setExtra("onchange='showImgSelected(\"imglabel_art_img\", \"art_img\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'");
-		$imageTray->addElement($imageSelect, false);
-		$imageTray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL."/".$imageDirectory."/".$artImg."' name='imglabel_art_img' id='imglabel_art_img' alt='' style='max-width:100px' />"));
-		// Form Image ArtImg: Upload new image
-		if ($permissionUpload) {
-			$maxsize = $helper->getConfig('maxsize_image');
-			$imageTray->addElement(new \XoopsFormFile( '<br>' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'art_img', $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( 'art_img', $artImg ));
-		}
-		$form->addElement($imageTray, );
-		// Form Select Articles
-		$artStatusSelect = new \XoopsFormSelect( _AM_MYMODULE2_ARTICLE_STATUS, 'art_status', $this->getVar('art_status'));
-		$artStatusSelect->addOption(Constants::STATUS_NONE, _AM_MYMODULE2_STATUS_NONE);
-		$artStatusSelect->addOption(Constants::STATUS_OFFLINE, _AM_MYMODULE2_STATUS_OFFLINE);
-		$artStatusSelect->addOption(Constants::STATUS_SUBMITTED, _AM_MYMODULE2_STATUS_SUBMITTED);
-		$artStatusSelect->addOption(Constants::STATUS_APPROVED, _AM_MYMODULE2_STATUS_APPROVED);
-		$form->addElement($artStatusSelect, true);
-		// Form File ArtFile
-		$artFile = $this->isNew() ? '' : $this->getVar('art_file');
-		if ($permissionUpload) {
-			$fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_FILE, '<br>' );
-			$fileDirectory = '/uploads/mymodule2/files/articles';
-			if (!$this->isNew()) {
-				$fileUploadTray->addElement(new \XoopsFormLabel(sprintf(_AM_MYMODULE2_ARTICLE_FILE_UPLOADS, ".{$fileDirectory}/"), $artFile));
-			}
-			$maxsize = $helper->getConfig('maxsize_file');
-			$fileUploadTray->addElement(new \XoopsFormFile( '', 'art_file', $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( 'art_file', $artFile ));
-		}
-		// Form Text Date Select ArtCreated
-		$artCreated = $this->isNew() ? 0 : $this->getVar('art_created');
-		$form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_ARTICLE_CREATED, 'art_created', '', $artCreated ));
-		// Form Select User ArtSubmitter
-		$form->addElement(new \XoopsFormSelectUser( _AM_MYMODULE2_ARTICLE_SUBMITTER, 'art_submitter', false, $this->getVar('art_submitter') ));
-		// Permissions
-		$memberHandler = xoops_getHandler('member');
-		$groupList = $memberHandler->getGroupList();
-		$grouppermHandler = xoops_getHandler('groupperm');
-		$fullList[] = array_keys($groupList);
-		if (!$this->isNew()) {
-			$groupsIdsApprove = $grouppermHandler->getGroupIds('mymodule2_approve_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
-			$groupsIdsApprove[] = array_values($groupsIdsApprove);
-			$groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $groupsIdsApprove);
-			$groupsIdsSubmit = $grouppermHandler->getGroupIds('mymodule2_submit_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
-			$groupsIdsSubmit[] = array_values($groupsIdsSubmit);
-			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $groupsIdsSubmit);
-			$groupsIdsView = $grouppermHandler->getGroupIds('mymodule2_view_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
-			$groupsIdsView[] = array_values($groupsIdsView);
-			$groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $groupsIdsView);
-		} else {
-			$groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $fullList);
-			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $fullList);
-			$groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $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 getFormArticles($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_ARTICLE_ADD) : sprintf(_AM_MYMODULE2_ARTICLE_EDIT);
+        // Get Theme Form
+        xoops_load('XoopsFormLoader');
+        $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
+        $form->setExtra('enctype="multipart/form-data"');
+        // Use tag module
+        $dirTag = is_dir(XOOPS_ROOT_PATH . '/modules/tag') ? true : false;
+        if (($helper->getConfig('usetag') == 1) && $dirTag) {
+            $tagId = $this->isNew() ? 0 : $this->getVar('art_id');
+            include_once XOOPS_ROOT_PATH . '/modules/tag/include/formtag.php';
+            $form->addElement(new \XoopsFormTag( 'tag', 60, 255, $tagId, 0 ), true);
+        }
+        // Form Table categories
+        $categoriesHandler = $helper->getHandler('categories');
+        $artCatSelect = new \XoopsFormSelect( _AM_MYMODULE2_ARTICLE_CAT, 'art_cat', $this->getVar('art_cat'));
+        $artCatSelect->addOptionArray($categoriesHandler->getList());
+        $form->addElement($artCatSelect, true);
+        // Form Text ArtTitle
+        $form->addElement(new \XoopsFormText( _AM_MYMODULE2_ARTICLE_TITLE, 'art_title', 50, 255, $this->getVar('art_title') ), true);
+        // Form editor ArtDescr
+        $editorConfigs = [];
+        $editorConfigs['name'] = 'art_descr';
+        $editorConfigs['value'] = $this->getVar('art_descr', 'e');
+        $editorConfigs['rows'] = 5;
+        $editorConfigs['cols'] = 40;
+        $editorConfigs['width'] = '100%';
+        $editorConfigs['height'] = '400px';
+        $editorConfigs['editor'] = $helper->getConfig('editor_descr');
+        $form->addElement(new \XoopsFormEditor( _AM_MYMODULE2_ARTICLE_DESCR, 'art_descr', $editorConfigs), true);
+        // Form Image ArtImg
+        // Form Image ArtImg: Select Uploaded Image 
+        $getArtImg = $this->getVar('art_img');
+        $artImg = $getArtImg ? $getArtImg : 'blank.gif';
+        $imageDirectory = '/uploads/mymodule2/images/articles';
+        $imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_IMG, '<br>' );
+        $imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_ARTICLE_IMG_UPLOADS, ".{$imageDirectory}/"), 'art_img', $artImg, 5);
+        $imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory );
+        foreach($imageArray as $image1) {
+            $imageSelect->addOption("{$image1}", $image1);
+        }
+        $imageSelect->setExtra("onchange='showImgSelected(\"imglabel_art_img\", \"art_img\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'");
+        $imageTray->addElement($imageSelect, false);
+        $imageTray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL."/".$imageDirectory."/".$artImg."' name='imglabel_art_img' id='imglabel_art_img' alt='' style='max-width:100px' />"));
+        // Form Image ArtImg: Upload new image
+        if ($permissionUpload) {
+            $maxsize = $helper->getConfig('maxsize_image');
+            $imageTray->addElement(new \XoopsFormFile( '<br>' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'art_img', $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( 'art_img', $artImg ));
+        }
+        $form->addElement($imageTray, );
+        // Form Select Articles
+        $artStatusSelect = new \XoopsFormSelect( _AM_MYMODULE2_ARTICLE_STATUS, 'art_status', $this->getVar('art_status'));
+        $artStatusSelect->addOption(Constants::STATUS_NONE, _AM_MYMODULE2_STATUS_NONE);
+        $artStatusSelect->addOption(Constants::STATUS_OFFLINE, _AM_MYMODULE2_STATUS_OFFLINE);
+        $artStatusSelect->addOption(Constants::STATUS_SUBMITTED, _AM_MYMODULE2_STATUS_SUBMITTED);
+        $artStatusSelect->addOption(Constants::STATUS_APPROVED, _AM_MYMODULE2_STATUS_APPROVED);
+        $form->addElement($artStatusSelect, true);
+        // Form File ArtFile
+        $artFile = $this->isNew() ? '' : $this->getVar('art_file');
+        if ($permissionUpload) {
+            $fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_FILE, '<br>' );
+            $fileDirectory = '/uploads/mymodule2/files/articles';
+            if (!$this->isNew()) {
+                $fileUploadTray->addElement(new \XoopsFormLabel(sprintf(_AM_MYMODULE2_ARTICLE_FILE_UPLOADS, ".{$fileDirectory}/"), $artFile));
+            }
+            $maxsize = $helper->getConfig('maxsize_file');
+            $fileUploadTray->addElement(new \XoopsFormFile( '', 'art_file', $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( 'art_file', $artFile ));
+        }
+        // Form Text Date Select ArtCreated
+        $artCreated = $this->isNew() ? 0 : $this->getVar('art_created');
+        $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_ARTICLE_CREATED, 'art_created', '', $artCreated ));
+        // Form Select User ArtSubmitter
+        $form->addElement(new \XoopsFormSelectUser( _AM_MYMODULE2_ARTICLE_SUBMITTER, 'art_submitter', false, $this->getVar('art_submitter') ));
+        // Permissions
+        $memberHandler = xoops_getHandler('member');
+        $groupList = $memberHandler->getGroupList();
+        $grouppermHandler = xoops_getHandler('groupperm');
+        $fullList[] = array_keys($groupList);
+        if (!$this->isNew()) {
+            $groupsIdsApprove = $grouppermHandler->getGroupIds('mymodule2_approve_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
+            $groupsIdsApprove[] = array_values($groupsIdsApprove);
+            $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $groupsIdsApprove);
+            $groupsIdsSubmit = $grouppermHandler->getGroupIds('mymodule2_submit_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
+            $groupsIdsSubmit[] = array_values($groupsIdsSubmit);
+            $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $groupsIdsSubmit);
+            $groupsIdsView = $grouppermHandler->getGroupIds('mymodule2_view_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
+            $groupsIdsView[] = array_values($groupsIdsView);
+            $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $groupsIdsView);
+        } else {
+            $groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $fullList);
+            $groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $fullList);
+            $groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $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 getValuesArticles($keys = null, $format = null, $maxDepth = null)
-	{
-		$helper = \XoopsModules\Mymodule2\Helper::getInstance();
-		$ret = $this->getValues($keys, $format, $maxDepth);
-		$ret['id'] = $this->getVar('art_id');
-		$categories = $helper->getHandler('categories');
-		$categoriesObj = $categories->get($this->getVar('art_cat'));
-		$ret['cat'] = $categoriesObj->getVar('cat_name');
-		$ret['title'] = $this->getVar('art_title');
-		$ret['descr'] = strip_tags($this->getVar('art_descr'));
-		$ret['img'] = $this->getVar('art_img');
-		$ret['status'] = $this->getVar('art_status');
-		$ret['file'] = $this->getVar('art_file');
-		$ret['created'] = formatTimeStamp($this->getVar('art_created'), 's');
-		$ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('art_submitter'));
-		return $ret;
-	}
+    /**
+     * Get Values
+     * @param null $keys 
+     * @param null $format 
+     * @param null$maxDepth 
+     * @return array
+     */
+    public function getValuesArticles($keys = null, $format = null, $maxDepth = null)
+    {
+        $helper = \XoopsModules\Mymodule2\Helper::getInstance();
+        $ret = $this->getValues($keys, $format, $maxDepth);
+        $ret['id'] = $this->getVar('art_id');
+        $categories = $helper->getHandler('categories');
+        $categoriesObj = $categories->get($this->getVar('art_cat'));
+        $ret['cat'] = $categoriesObj->getVar('cat_name');
+        $ret['title'] = $this->getVar('art_title');
+        $ret['descr'] = strip_tags($this->getVar('art_descr'));
+        $ret['img'] = $this->getVar('art_img');
+        $ret['status'] = $this->getVar('art_status');
+        $ret['file'] = $this->getVar('art_file');
+        $ret['created'] = formatTimeStamp($this->getVar('art_created'), 's');
+        $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('art_submitter'));
+        return $ret;
+    }
 
-	/**
-	 * Returns an array representation of the object
-	 *
-	 * @return array
-	 */
-	public function toArrayArticles()
-	{
-		$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 toArrayArticles()
+    {
+        $ret = [];
+        $vars = $this->getVars();
+        foreach(array_keys($vars) as $var) {
+            $ret[$var] = $this->getVar('"{$var}"');
+        }
+        return $ret;
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -103,19 +103,19 @@ 
 		$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
 		$form->setExtra('enctype="multipart/form-data"');
 		// Use tag module
-		$dirTag = is_dir(XOOPS_ROOT_PATH . '/modules/tag') ? true : false;
+		$dirTag = is_dir(XOOPS_ROOT_PATH.'/modules/tag') ? true : false;
 		if (($helper->getConfig('usetag') == 1) && $dirTag) {
 			$tagId = $this->isNew() ? 0 : $this->getVar('art_id');
-			include_once XOOPS_ROOT_PATH . '/modules/tag/include/formtag.php';
-			$form->addElement(new \XoopsFormTag( 'tag', 60, 255, $tagId, 0 ), true);
+			include_once XOOPS_ROOT_PATH.'/modules/tag/include/formtag.php';
+			$form->addElement(new \XoopsFormTag('tag', 60, 255, $tagId, 0), true);
 		}
 		// Form Table categories
 		$categoriesHandler = $helper->getHandler('categories');
-		$artCatSelect = new \XoopsFormSelect( _AM_MYMODULE2_ARTICLE_CAT, 'art_cat', $this->getVar('art_cat'));
+		$artCatSelect = new \XoopsFormSelect(_AM_MYMODULE2_ARTICLE_CAT, 'art_cat', $this->getVar('art_cat'));
 		$artCatSelect->addOptionArray($categoriesHandler->getList());
 		$form->addElement($artCatSelect, true);
 		// Form Text ArtTitle
-		$form->addElement(new \XoopsFormText( _AM_MYMODULE2_ARTICLE_TITLE, 'art_title', 50, 255, $this->getVar('art_title') ), true);
+		$form->addElement(new \XoopsFormText(_AM_MYMODULE2_ARTICLE_TITLE, 'art_title', 50, 255, $this->getVar('art_title')), true);
 		// Form editor ArtDescr
 		$editorConfigs = [];
 		$editorConfigs['name'] = 'art_descr';
@@ -125,16 +125,16 @@ 
 		$editorConfigs['width'] = '100%';
 		$editorConfigs['height'] = '400px';
 		$editorConfigs['editor'] = $helper->getConfig('editor_descr');
-		$form->addElement(new \XoopsFormEditor( _AM_MYMODULE2_ARTICLE_DESCR, 'art_descr', $editorConfigs), true);
+		$form->addElement(new \XoopsFormEditor(_AM_MYMODULE2_ARTICLE_DESCR, 'art_descr', $editorConfigs), true);
 		// Form Image ArtImg
 		// Form Image ArtImg: Select Uploaded Image 
 		$getArtImg = $this->getVar('art_img');
 		$artImg = $getArtImg ? $getArtImg : 'blank.gif';
 		$imageDirectory = '/uploads/mymodule2/images/articles';
-		$imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_IMG, '<br>' );
-		$imageSelect = new \XoopsFormSelect( sprintf(_AM_MYMODULE2_ARTICLE_IMG_UPLOADS, ".{$imageDirectory}/"), 'art_img', $artImg, 5);
-		$imageArray = \XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . $imageDirectory );
-		foreach($imageArray as $image1) {
+		$imageTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_IMG, '<br>');
+		$imageSelect = new \XoopsFormSelect(sprintf(_AM_MYMODULE2_ARTICLE_IMG_UPLOADS, ".{$imageDirectory}/"), 'art_img', $artImg, 5);
+		$imageArray = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH.$imageDirectory);
+		foreach ($imageArray as $image1) {
 			$imageSelect->addOption("{$image1}", $image1);
 		}
 		$imageSelect->setExtra("onchange='showImgSelected(\"imglabel_art_img\", \"art_img\", \"".$imageDirectory."\", \"\", \"".XOOPS_URL."\")'");
@@ -143,16 +143,16 @@ 
 		// Form Image ArtImg: Upload new image
 		if ($permissionUpload) {
 			$maxsize = $helper->getConfig('maxsize_image');
-			$imageTray->addElement(new \XoopsFormFile( '<br>' . _AM_MYMODULE2_FORM_UPLOAD_NEW, 'art_img', $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'));
+			$imageTray->addElement(new \XoopsFormFile('<br>'._AM_MYMODULE2_FORM_UPLOAD_NEW, 'art_img', $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( 'art_img', $artImg ));
+			$imageTray->addElement(new \XoopsFormHidden('art_img', $artImg));
 		}
-		$form->addElement($imageTray, );
+		$form->addElement($imageTray,);
 		// Form Select Articles
-		$artStatusSelect = new \XoopsFormSelect( _AM_MYMODULE2_ARTICLE_STATUS, 'art_status', $this->getVar('art_status'));
+		$artStatusSelect = new \XoopsFormSelect(_AM_MYMODULE2_ARTICLE_STATUS, 'art_status', $this->getVar('art_status'));
 		$artStatusSelect->addOption(Constants::STATUS_NONE, _AM_MYMODULE2_STATUS_NONE);
 		$artStatusSelect->addOption(Constants::STATUS_OFFLINE, _AM_MYMODULE2_STATUS_OFFLINE);
 		$artStatusSelect->addOption(Constants::STATUS_SUBMITTED, _AM_MYMODULE2_STATUS_SUBMITTED);
@@ -161,23 +161,23 @@ 
 		// Form File ArtFile
 		$artFile = $this->isNew() ? '' : $this->getVar('art_file');
 		if ($permissionUpload) {
-			$fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_FILE, '<br>' );
+			$fileUploadTray = new \XoopsFormElementTray(_AM_MYMODULE2_ARTICLE_FILE, '<br>');
 			$fileDirectory = '/uploads/mymodule2/files/articles';
 			if (!$this->isNew()) {
 				$fileUploadTray->addElement(new \XoopsFormLabel(sprintf(_AM_MYMODULE2_ARTICLE_FILE_UPLOADS, ".{$fileDirectory}/"), $artFile));
 			}
 			$maxsize = $helper->getConfig('maxsize_file');
-			$fileUploadTray->addElement(new \XoopsFormFile( '', 'art_file', $maxsize ));
-			$fileUploadTray->addElement(new \XoopsFormLabel(_AM_MYMODULE2_FORM_UPLOAD_SIZE, ($maxsize / 1048576) . ' '  . _AM_MYMODULE2_FORM_UPLOAD_SIZE_MB));
-			$form->addElement($fileUploadTray, );
+			$fileUploadTray->addElement(new \XoopsFormFile('', 'art_file', $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( 'art_file', $artFile ));
+			$form->addElement(new \XoopsFormHidden('art_file', $artFile));
 		}
 		// Form Text Date Select ArtCreated
 		$artCreated = $this->isNew() ? 0 : $this->getVar('art_created');
-		$form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_ARTICLE_CREATED, 'art_created', '', $artCreated ));
+		$form->addElement(new \XoopsFormTextDateSelect(_AM_MYMODULE2_ARTICLE_CREATED, 'art_created', '', $artCreated));
 		// Form Select User ArtSubmitter
-		$form->addElement(new \XoopsFormSelectUser( _AM_MYMODULE2_ARTICLE_SUBMITTER, 'art_submitter', false, $this->getVar('art_submitter') ));
+		$form->addElement(new \XoopsFormSelectUser(_AM_MYMODULE2_ARTICLE_SUBMITTER, 'art_submitter', false, $this->getVar('art_submitter')));
 		// Permissions
 		$memberHandler = xoops_getHandler('member');
 		$groupList = $memberHandler->getGroupList();
@@ -186,17 +186,17 @@ 
 		if (!$this->isNew()) {
 			$groupsIdsApprove = $grouppermHandler->getGroupIds('mymodule2_approve_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
 			$groupsIdsApprove[] = array_values($groupsIdsApprove);
-			$groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $groupsIdsApprove);
+			$groupsCanApproveCheckbox = new \XoopsFormCheckBox(_AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $groupsIdsApprove);
 			$groupsIdsSubmit = $grouppermHandler->getGroupIds('mymodule2_submit_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
 			$groupsIdsSubmit[] = array_values($groupsIdsSubmit);
-			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $groupsIdsSubmit);
+			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox(_AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $groupsIdsSubmit);
 			$groupsIdsView = $grouppermHandler->getGroupIds('mymodule2_view_articles', $this->getVar('art_id'), $GLOBALS['xoopsModule']->getVar('mid'));
 			$groupsIdsView[] = array_values($groupsIdsView);
-			$groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $groupsIdsView);
+			$groupsCanViewCheckbox = new \XoopsFormCheckBox(_AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $groupsIdsView);
 		} else {
-			$groupsCanApproveCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $fullList);
-			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $fullList);
-			$groupsCanViewCheckbox = new \XoopsFormCheckBox( _AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $fullList);
+			$groupsCanApproveCheckbox = new \XoopsFormCheckBox(_AM_MYMODULE2_PERMISSIONS_APPROVE, 'groups_approve_articles[]', $fullList);
+			$groupsCanSubmitCheckbox = new \XoopsFormCheckBox(_AM_MYMODULE2_PERMISSIONS_SUBMIT, 'groups_submit_articles[]', $fullList);
+			$groupsCanViewCheckbox = new \XoopsFormCheckBox(_AM_MYMODULE2_PERMISSIONS_VIEW, 'groups_view_articles[]', $fullList);
 		}
 		// To Approve
 		$groupsCanApproveCheckbox->addOptionArray($groupList);
@@ -247,7 +247,7 @@ 
 	{
 		$ret = [];
 		$vars = $this->getVars();
-		foreach(array_keys($vars) as $var) {
+		foreach (array_keys($vars) as $var) {
 			$ret[$var] = $this->getVar('"{$var}"');
 		}
 		return $ret;

testdata/mymodule2/class/Common/Configurator.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         //        require dirname(dirname(__DIR__)) . '/config/config.php';
         //        $config = getConfig();
 
-        $config = include dirname(dirname(__DIR__)) . '/config/config.php';
+        $config = include dirname(dirname(__DIR__)).'/config/config.php';
 
         $this->name            = $config->name;
         $this->paths           = $config->paths;

testdata/mymodule2/class/Common/FilesManagement.php

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 }
 
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
             }
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), '<br>';
@@ -61,14 +61,14 @@ 
         $dir = opendir($src);
         //        @mkdir($dst);
         if (!@mkdir($dst) && !is_dir($dst)) {
-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
+            throw new \RuntimeException('The directory '.$dst.' could not be created.');
         }
         while (false !== ($file = readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -207,7 +207,7 @@ 
                 self::rrmdir($fObj->getPathname());
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -240,14 +240,14 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
                 //                rmdir($fObj->getPath()); // now delete the directory
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -283,9 +283,9 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             }
         }
 

testdata/mymodule2/class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -36,19 +36,19 @@ 
         //        $query = $GLOBALS['xoopsDB']->query($sql);
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
         $html .= '<fieldset>';
-        $html .= "<legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . '</legend>';
+        $html .= "<legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO').'</legend>';
         $html .= "<div style='padding: 8px;'>";
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>";
         //        $html .= "<br>";
         //        $html .= "<br>";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . '</div>';
+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI').'</div>';
         $html .= '<ul>';
 
-        $gdlib = function_exists('gd_info') ? '<span style="color: #008000;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: #ff0000;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $gdlib = function_exists('gd_info') ? '<span style="color: #008000;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: #ff0000;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
         if (function_exists('gd_info')) {
             if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
 
@@ -58,18 +58,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: #008000;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: #ff0000;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
 
-        $downloads = ini_get('file_uploads') ? '<span style="color: #008000;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: #ff0000;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $downloads = ini_get('file_uploads') ? '<span style="color: #008000;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: #ff0000;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
 
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: #0000ff;">' . ini_get('upload_max_filesize') . '</span></b>';
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: #0000ff;">' . ini_get('post_max_size') . '</span></b>';
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: #0000ff;">' . ini_get('memory_limit') . '</span></b>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: #0000ff;">'.ini_get('upload_max_filesize').'</span></b>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: #0000ff;">'.ini_get('post_max_size').'</span></b>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: #0000ff;">'.ini_get('memory_limit').'</span></b>';
         $html .= '</ul>';
         $html .= '<ul>';
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . '</b>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH.'</b>';
         $html .= '</ul>';
         $html .= '<br>';
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . '';
+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC').'';
         $html .= '</div>';
         $html .= '</fieldset><br>';