XoopsModules25x / songlist

class/Albums.php

Indentation +150 added lines, -150 removed lines

@@ -11,154 +11,154 @@
  */
 class Albums extends \XoopsObject
 {
-    /**
-     * Albums constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('abid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('aids', \XOBJ_DTYPE_ARRAY, [], false);
-        $this->initVar('sids', \XOBJ_DTYPE_ARRAY, [], false);
-        $this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('image', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('path', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-        $this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
-    }
-
-    /**
-     * @param bool $as_array
-     * @return array|string
-     */
-    public function getForm($as_array = false)
-    {
-        return FormController::getFormAlbums($this, $as_array);
-    }
-
-    /**
-     * @param bool $extra
-     * @return array
-     */
-    public function toArray($extra = true): array
-    {
-        $ret  = parent::toArray();
-        $form = $this->getForm(true);
-        foreach ($form as $key => $element) {
-            $ret['form'][$key] = $element->render();
-        }
-        foreach (['created', 'updated'] as $key) {
-            if ($this->getVar($key) > 0) {
-                $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
-                $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
-            }
-        }
-        $ret['picture'] = $this->getImage('image', false);
-        $ret['rank']    = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
-        $ret['url']     = $this->getURL(true);
-
-        if (!$extra) {
-            return $ret;
-        }
-
-        if (0 != $this->getVar('cid')) {
-            $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
-            $category        = $categoryHandler->get($this->getVar('cid'));
-            if (\is_object($category)) {
-                $ret['category'] = $category->toArray(false);
-            }
-        }
-
-        if (0 != \count($this->getVar('aids'))) {
-            $artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
-            foreach ($this->getVar('aids') as $aid) {
-                $artist = $artistsHandler->get($aid);
-                if (\is_object($artist)) {
-                    $ret['artists_array'][$aid] = $artist->toArray(false);
-                }
-            }
-        }
-
-        if (0 != \count($this->getVar('sids'))) {
-            $songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
-            $criteria     = new \Criteria('sid', '(' . \implode(',', $this->getVar('sids')) . ')', 'IN');
-            $criteria->setSort('traxid');
-            $criteria->setOrder('ASC');
-            foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
-                if (\is_object($song)) {
-                    $ret['songs_array'][$sid] = $song->toArray(false);
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param string $field
-     * @param bool   $local
-     * @return bool|string
-     */
-    public function getImage($field = 'image', $local = false)
-    {
-        if ('' == $this->getVar($field)) {
-            return false;
-        }
-        if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
-            return false;
-        }
-        if (!$local) {
-            return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
-        }
-
-        return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
-    }
-
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            if (0 != $id) {
-                $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
-                $artist        = $artistHandler->get($id);
-                if (\is_object($artist) && !$artist->isNew()) {
-                    return XOOPS_URL
-                           . '/'
-                           . $GLOBALS['songlistModuleConfig']['baseofurl']
-                           . '/albums/'
-                           . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('title')))
-                           . '/'
-                           . $start
-                           . '-'
-                           . $id
-                           . '-'
-                           . $op
-                           . '-'
-                           . $fct
-                           . '-'
-                           . $gid
-                           . '-'
-                           . $cid
-                           . '/'
-                           . \urlencode($value)
-                           . $GLOBALS['songlistModuleConfig']['endofurl'];
-                }
-
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-            }
-
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/albums.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
-    }
+	/**
+	 * Albums constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('abid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('aids', \XOBJ_DTYPE_ARRAY, [], false);
+		$this->initVar('sids', \XOBJ_DTYPE_ARRAY, [], false);
+		$this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('image', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('path', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+		$this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
+	}
+
+	/**
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public function getForm($as_array = false)
+	{
+		return FormController::getFormAlbums($this, $as_array);
+	}
+
+	/**
+	 * @param bool $extra
+	 * @return array
+	 */
+	public function toArray($extra = true): array
+	{
+		$ret  = parent::toArray();
+		$form = $this->getForm(true);
+		foreach ($form as $key => $element) {
+			$ret['form'][$key] = $element->render();
+		}
+		foreach (['created', 'updated'] as $key) {
+			if ($this->getVar($key) > 0) {
+				$ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
+				$ret[$key]         = \date(_DATESTRING, $this->getVar($key));
+			}
+		}
+		$ret['picture'] = $this->getImage('image', false);
+		$ret['rank']    = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+		$ret['url']     = $this->getURL(true);
+
+		if (!$extra) {
+			return $ret;
+		}
+
+		if (0 != $this->getVar('cid')) {
+			$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
+			$category        = $categoryHandler->get($this->getVar('cid'));
+			if (\is_object($category)) {
+				$ret['category'] = $category->toArray(false);
+			}
+		}
+
+		if (0 != \count($this->getVar('aids'))) {
+			$artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
+			foreach ($this->getVar('aids') as $aid) {
+				$artist = $artistsHandler->get($aid);
+				if (\is_object($artist)) {
+					$ret['artists_array'][$aid] = $artist->toArray(false);
+				}
+			}
+		}
+
+		if (0 != \count($this->getVar('sids'))) {
+			$songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
+			$criteria     = new \Criteria('sid', '(' . \implode(',', $this->getVar('sids')) . ')', 'IN');
+			$criteria->setSort('traxid');
+			$criteria->setOrder('ASC');
+			foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
+				if (\is_object($song)) {
+					$ret['songs_array'][$sid] = $song->toArray(false);
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param string $field
+	 * @param bool   $local
+	 * @return bool|string
+	 */
+	public function getImage($field = 'image', $local = false)
+	{
+		if ('' == $this->getVar($field)) {
+			return false;
+		}
+		if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
+			return false;
+		}
+		if (!$local) {
+			return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
+		}
+
+		return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if (0 != $id) {
+				$artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
+				$artist        = $artistHandler->get($id);
+				if (\is_object($artist) && !$artist->isNew()) {
+					return XOOPS_URL
+						   . '/'
+						   . $GLOBALS['songlistModuleConfig']['baseofurl']
+						   . '/albums/'
+						   . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('title')))
+						   . '/'
+						   . $start
+						   . '-'
+						   . $id
+						   . '-'
+						   . $op
+						   . '-'
+						   . $fct
+						   . '-'
+						   . $gid
+						   . '-'
+						   . $cid
+						   . '/'
+						   . \urlencode($value)
+						   . $GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+
+				return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/albums.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace XoopsModules\Songlist;
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -54,20 +54,20 @@ 
             $ret['form'][$key] = $element->render();
         }
         foreach (['created', 'updated'] as $key) {
-            if ($this->getVar($key) > 0) {
+            if ($this->getVar($key)>0) {
                 $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
                 $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
             }
         }
         $ret['picture'] = $this->getImage('image', false);
-        $ret['rank']    = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+        $ret['rank']    = \number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2).\_MI_SONGLIST_OFTEN;
         $ret['url']     = $this->getURL(true);
 
         if (!$extra) {
             return $ret;
         }
 
-        if (0 != $this->getVar('cid')) {
+        if (0!=$this->getVar('cid')) {
             $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
             $category        = $categoryHandler->get($this->getVar('cid'));
             if (\is_object($category)) {
@@ -75,7 +75,7 @@ 
             }
         }
 
-        if (0 != \count($this->getVar('aids'))) {
+        if (0!=\count($this->getVar('aids'))) {
             $artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
             foreach ($this->getVar('aids') as $aid) {
                 $artist = $artistsHandler->get($aid);
@@ -85,9 +85,9 @@ 
             }
         }
 
-        if (0 != \count($this->getVar('sids'))) {
+        if (0!=\count($this->getVar('sids'))) {
             $songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
-            $criteria     = new \Criteria('sid', '(' . \implode(',', $this->getVar('sids')) . ')', 'IN');
+            $criteria     = new \Criteria('sid', '('.\implode(',', $this->getVar('sids')).')', 'IN');
             $criteria->setSort('traxid');
             $criteria->setOrder('ASC');
             foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
@@ -107,17 +107,17 @@ 
      */
     public function getImage($field = 'image', $local = false)
     {
-        if ('' == $this->getVar($field)) {
+        if (''==$this->getVar($field)) {
             return false;
         }
-        if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
+        if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field)))) {
             return false;
         }
         if (!$local) {
-            return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
+            return XOOPS_URL.'/'.\str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
         }
 
-        return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
+        return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
     }
 
     /**
@@ -127,7 +127,7 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            if (0 != $id) {
+            if (0!=$id) {
                 $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
                 $artist        = $artistHandler->get($id);
                 if (\is_object($artist) && !$artist->isNew()) {
@@ -153,12 +153,12 @@ 
                            . $GLOBALS['songlistModuleConfig']['endofurl'];
                 }
 
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+                return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
             }
 
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/albums.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
+        return XOOPS_URL.'/modules/songlist/albums.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
     }
 }

class/common/Migrate.php

Indentation +92 added lines, -92 removed lines

@@ -25,49 +25,49 @@ 
  */
 class Migrate extends \Xmf\Database\Migrate
 {
-    private $moduleDirName;
-    private $renameColumns;
-    private $renameTables;
+	private $moduleDirName;
+	private $renameColumns;
+	private $renameTables;
 
-    /**
-     * Migrate constructor.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct()
-    {
-        $class = __NAMESPACE__ . '\\' . 'Configurator';
-        if (!\class_exists($class)) {
-            throw new \RuntimeException("Class '$class' not found");
-        }
-        $configurator       = new $class();
-        $this->renameTables = $configurator->renameTables;
-        $this->renameColumns = $configurator->renameColumns;
+	/**
+	 * Migrate constructor.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct()
+	{
+		$class = __NAMESPACE__ . '\\' . 'Configurator';
+		if (!\class_exists($class)) {
+			throw new \RuntimeException("Class '$class' not found");
+		}
+		$configurator       = new $class();
+		$this->renameTables = $configurator->renameTables;
+		$this->renameColumns = $configurator->renameColumns;
 
-        $this->moduleDirName = \basename(\dirname(__DIR__, 2));
-        parent::__construct($this->moduleDirName);
-    }
+		$this->moduleDirName = \basename(\dirname(__DIR__, 2));
+		parent::__construct($this->moduleDirName);
+	}
 
-    /**
-     * change table prefix if needed
-     */
-    private function changePrefix()
-    {
+	/**
+	 * change table prefix if needed
+	 */
+	private function changePrefix()
+	{
 //        foreach ($this->renameTables as $oldName => $newName) {
 //            if ($this->tableHandler->useTable($oldName) && !$this->tableHandler->useTable($newName)) {
 //                $this->tableHandler->renameTable($oldName, $newName);
 //            }
 //        }
-    }
+	}
 
-    /**
-     * Change integer IPv4 column to varchar IPv6 capable
-     *
-     * @param string $tableName  table to convert
-     * @param string $columnName column with IP address
-     */
-    private function convertIPAddresses($tableName, $columnName)
-    {
+	/**
+	 * Change integer IPv4 column to varchar IPv6 capable
+	 *
+	 * @param string $tableName  table to convert
+	 * @param string $columnName column with IP address
+	 */
+	private function convertIPAddresses($tableName, $columnName)
+	{
 //        if ($this->tableHandler->useTable($tableName)) {
 //            $attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
 //            if (false !== \mb_strpos($attributes, ' int(')) {
@@ -79,14 +79,14 @@ 
 //                $this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
 //            }
 //        }
-    }
+	}
 
-    /**
-     * @deprecated (just as an example here)
-     * Move do* columns from newbb_posts to newbb_posts_text table
-     */
-    private function moveDoColumns()
-    {
+	/**
+	 * @deprecated (just as an example here)
+	 * Move do* columns from newbb_posts to newbb_posts_text table
+	 */
+	private function moveDoColumns()
+	{
 //        $tableName    = 'newbb_posts_text';
 //        $srcTableName = 'newbb_posts';
 //        if ($this->tableHandler->useTable($tableName)
@@ -100,62 +100,62 @@ 
 //                $this->tableHandler->addToQueue($sql);
 //            }
 //        }
-    }
+	}
 
-    /**
-     * rename table if needed
-     */
-    private function renameTable()
-    {
-        foreach ($this->renameTables as $oldName => $newName) {
-            if ($this->tableHandler->useTable($oldName) && !$this->tableHandler->useTable($newName)) {
-                $this->tableHandler->renameTable($oldName, $newName);
-            }
-        }
-    }
+	/**
+	 * rename table if needed
+	 */
+	private function renameTable()
+	{
+		foreach ($this->renameTables as $oldName => $newName) {
+			if ($this->tableHandler->useTable($oldName) && !$this->tableHandler->useTable($newName)) {
+				$this->tableHandler->renameTable($oldName, $newName);
+			}
+		}
+	}
 
 
-    /**
-     * rename columns if needed
-     */
-    private function renameColumns()
-    {
-        foreach ($this->renameColumns as $tableName) {
-            if ($this->tableHandler->useTable($tableName)) {
-                $oldName = $tableName['from'];
-                $newName = $tableName['to'];
-                $attributes = $this->tableHandler->getColumnAttributes($tableName, $oldName);
-                if (false !== \strpos($attributes, ' int(')) {
-                    $this->tableHandler->alterColumn($tableName, $oldName, $attributes, $newName);
-                }
-            }
-        }
-    }
+	/**
+	 * rename columns if needed
+	 */
+	private function renameColumns()
+	{
+		foreach ($this->renameColumns as $tableName) {
+			if ($this->tableHandler->useTable($tableName)) {
+				$oldName = $tableName['from'];
+				$newName = $tableName['to'];
+				$attributes = $this->tableHandler->getColumnAttributes($tableName, $oldName);
+				if (false !== \strpos($attributes, ' int(')) {
+					$this->tableHandler->alterColumn($tableName, $oldName, $attributes, $newName);
+				}
+			}
+		}
+	}
 
-    /**
-     * Perform any upfront actions before synchronizing the schema
-     *
-     * Some typical uses include
-     *   table and column renames
-     *   data conversions
-     */
-    protected function preSyncActions()
-    {
-        // change 'bb' table prefix to 'newbb'
-        $this->changePrefix();
-        // columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
-        $this->moveDoColumns();
-        // Convert IP address columns from int to readable varchar(45) for IPv6
+	/**
+	 * Perform any upfront actions before synchronizing the schema
+	 *
+	 * Some typical uses include
+	 *   table and column renames
+	 *   data conversions
+	 */
+	protected function preSyncActions()
+	{
+		// change 'bb' table prefix to 'newbb'
+		$this->changePrefix();
+		// columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
+		$this->moveDoColumns();
+		// Convert IP address columns from int to readable varchar(45) for IPv6
 //        $this->convertIPAddresses('newbb_posts', 'poster_ip');
 //        $this->convertIPAddresses('newbb_report', 'reporter_ip');
 
-        // rename table
-        if ($this->renameTables && \is_array($this->renameTables)) {
-            $this->renameTable();
-        }
-        // rename column
-        if ($this->renameColumns && \is_array($this->renameColumns)) {
-            $this->renameColumns();
-        }
-    }
+		// rename table
+		if ($this->renameTables && \is_array($this->renameTables)) {
+			$this->renameTable();
+		}
+		// rename column
+		if ($this->renameColumns && \is_array($this->renameColumns)) {
+			$this->renameColumns();
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __construct()
     {
-        $class = __NAMESPACE__ . '\\' . 'Configurator';
+        $class = __NAMESPACE__.'\\'.'Configurator';
         if (!\class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }
@@ -125,7 +125,7 @@ 
                 $oldName = $tableName['from'];
                 $newName = $tableName['to'];
                 $attributes = $this->tableHandler->getColumnAttributes($tableName, $oldName);
-                if (false !== \strpos($attributes, ' int(')) {
+                if (false!==\strpos($attributes, ' int(')) {
                     $this->tableHandler->alterColumn($tableName, $oldName, $attributes, $newName);
                 }
             }

class/common/Cloner.php

Indentation +86 added lines, -86 removed lines

@@ -9,101 +9,101 @@
  */
 class Cloner
 {
-    // recursive cloning script
-    /**
-     * @param $path
-     */
-    public static function cloneFileFolder($path)
-    {
-        global $patKeys;
-        global $patValues;
+	// recursive cloning script
+	/**
+	 * @param $path
+	 */
+	public static function cloneFileFolder($path)
+	{
+		global $patKeys;
+		global $patValues;
 
-        $newPath = \str_replace($patKeys[0], $patValues[0], $path);
+		$newPath = \str_replace($patKeys[0], $patValues[0], $path);
 
-        if (\is_dir($path)) {
-            // create new dir
-            if (!\mkdir($newPath) && !\is_dir($newPath)) {
-                throw new \RuntimeException(\sprintf('Directory "%s" was not created', $newPath));
-            }
+		if (\is_dir($path)) {
+			// create new dir
+			if (!\mkdir($newPath) && !\is_dir($newPath)) {
+				throw new \RuntimeException(\sprintf('Directory "%s" was not created', $newPath));
+			}
 
-            // check all files in dir, and process it
-            $handle = \opendir($path);
-            if (false !== $handle) {
-                while (false !== ($file = \readdir($handle))) {
-                    if (0 !== \mb_strpos($file, '.')) {
-                        self::cloneFileFolder("{$path}/{$file}");
-                    }
-                }
-                \closedir($handle);
-            }
-        } else {
-            $noChangeExtensions = ['jpeg', 'jpg', 'gif', 'png', 'zip', 'ttf'];
-            if (\in_array(\mb_strtolower((string)\pathinfo($path, \PATHINFO_EXTENSION)), $noChangeExtensions, true)) {
-                // image
-                \copy($path, $newPath);
-            } else {
-                // file, read it
-                $content = file_get_contents($path);
-                $content = \str_replace($patKeys, $patValues, $content);
-                file_put_contents($newPath, $content);
-            }
-        }
-    }
+			// check all files in dir, and process it
+			$handle = \opendir($path);
+			if (false !== $handle) {
+				while (false !== ($file = \readdir($handle))) {
+					if (0 !== \mb_strpos($file, '.')) {
+						self::cloneFileFolder("{$path}/{$file}");
+					}
+				}
+				\closedir($handle);
+			}
+		} else {
+			$noChangeExtensions = ['jpeg', 'jpg', 'gif', 'png', 'zip', 'ttf'];
+			if (\in_array(\mb_strtolower((string)\pathinfo($path, \PATHINFO_EXTENSION)), $noChangeExtensions, true)) {
+				// image
+				\copy($path, $newPath);
+			} else {
+				// file, read it
+				$content = file_get_contents($path);
+				$content = \str_replace($patKeys, $patValues, $content);
+				file_put_contents($newPath, $content);
+			}
+		}
+	}
 
-    /**
-     * @param $dirname
-     *
-     * @return bool
-     */
-    public static function createLogo($dirname): bool
-    {
-        if (!\extension_loaded('gd')) {
-            return false;
-        }
-        $requiredFunctions = [
-            'imagecreatefrompng',
-            'imagecolorallocate',
-            'imagefilledrectangle',
-            'imagepng',
-            'imagedestroy',
-            'imagefttext',
-            'imagealphablending',
-            'imagesavealpha',
-        ];
-        foreach ($requiredFunctions as $func) {
-            if (!\function_exists($func)) {
-                return false;
-            }
-        }
-        //            unset($func);
+	/**
+	 * @param $dirname
+	 *
+	 * @return bool
+	 */
+	public static function createLogo($dirname): bool
+	{
+		if (!\extension_loaded('gd')) {
+			return false;
+		}
+		$requiredFunctions = [
+			'imagecreatefrompng',
+			'imagecolorallocate',
+			'imagefilledrectangle',
+			'imagepng',
+			'imagedestroy',
+			'imagefttext',
+			'imagealphablending',
+			'imagesavealpha',
+		];
+		foreach ($requiredFunctions as $func) {
+			if (!\function_exists($func)) {
+				return false;
+			}
+		}
+		//            unset($func);
 
-        if (!\file_exists($imageBase = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/logoModule.png'))
-            || !\file_exists($font = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/VeraBd.ttf'))) {
-            return false;
-        }
+		if (!\file_exists($imageBase = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/logoModule.png'))
+			|| !\file_exists($font = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/VeraBd.ttf'))) {
+			return false;
+		}
 
-        $imageModule = \imagecreatefrompng($imageBase);
-        // save existing alpha channel
-        imagealphablending($imageModule, false);
-        imagesavealpha($imageModule, true);
+		$imageModule = \imagecreatefrompng($imageBase);
+		// save existing alpha channel
+		imagealphablending($imageModule, false);
+		imagesavealpha($imageModule, true);
 
-        //Erase old text
-        $greyColor = \imagecolorallocate($imageModule, 237, 237, 237);
-        \imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
+		//Erase old text
+		$greyColor = \imagecolorallocate($imageModule, 237, 237, 237);
+		\imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
 
-        // Write text
-        $textColor     = \imagecolorallocate($imageModule, 0, 0, 0);
-        $spaceToBorder = (int)((80 - \mb_strlen($dirname) * 6.5) / 2);
-        \imagefttext($imageModule, 8.5, 0, $spaceToBorder, 45, $textColor, $font, \ucfirst($dirname), []);
+		// Write text
+		$textColor     = \imagecolorallocate($imageModule, 0, 0, 0);
+		$spaceToBorder = (int)((80 - \mb_strlen($dirname) * 6.5) / 2);
+		\imagefttext($imageModule, 8.5, 0, $spaceToBorder, 45, $textColor, $font, \ucfirst($dirname), []);
 
-        // Set transparency color
-        //$white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
-        //imagefill($imageModule, 0, 0, $white);
-        //imagecolortransparent($imageModule, $white);
+		// Set transparency color
+		//$white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
+		//imagefill($imageModule, 0, 0, $white);
+		//imagecolortransparent($imageModule, $white);
 
-        \imagepng($imageModule, $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/logoModule.png'));
-        \imagedestroy($imageModule);
+		\imagepng($imageModule, $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/logoModule.png'));
+		\imagedestroy($imageModule);
 
-        return true;
-    }
+		return true;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -28,9 +28,9 @@ 
 
             // check all files in dir, and process it
             $handle = \opendir($path);
-            if (false !== $handle) {
-                while (false !== ($file = \readdir($handle))) {
-                    if (0 !== \mb_strpos($file, '.')) {
+            if (false!==$handle) {
+                while (false!==($file = \readdir($handle))) {
+                    if (0!==\mb_strpos($file, '.')) {
                         self::cloneFileFolder("{$path}/{$file}");
                     }
                 }
@@ -38,7 +38,7 @@ 
             }
         } else {
             $noChangeExtensions = ['jpeg', 'jpg', 'gif', 'png', 'zip', 'ttf'];
-            if (\in_array(\mb_strtolower((string)\pathinfo($path, \PATHINFO_EXTENSION)), $noChangeExtensions, true)) {
+            if (\in_array(\mb_strtolower((string) \pathinfo($path, \PATHINFO_EXTENSION)), $noChangeExtensions, true)) {
                 // image
                 \copy($path, $newPath);
             } else {
@@ -77,8 +77,8 @@ 
         }
         //            unset($func);
 
-        if (!\file_exists($imageBase = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/logoModule.png'))
-            || !\file_exists($font = $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/VeraBd.ttf'))) {
+        if (!\file_exists($imageBase = $GLOBALS['xoops']->path('modules/'.$dirname.'/assets/images/logoModule.png'))
+            || !\file_exists($font = $GLOBALS['xoops']->path('modules/'.$dirname.'/assets/images/VeraBd.ttf'))) {
             return false;
         }
 
@@ -93,7 +93,7 @@ 
 
         // Write text
         $textColor     = \imagecolorallocate($imageModule, 0, 0, 0);
-        $spaceToBorder = (int)((80 - \mb_strlen($dirname) * 6.5) / 2);
+        $spaceToBorder = (int) ((80-\mb_strlen($dirname)*6.5)/2);
         \imagefttext($imageModule, 8.5, 0, $spaceToBorder, 45, $textColor, $font, \ucfirst($dirname), []);
 
         // Set transparency color
@@ -101,7 +101,7 @@ 
         //imagefill($imageModule, 0, 0, $white);
         //imagecolortransparent($imageModule, $white);
 
-        \imagepng($imageModule, $GLOBALS['xoops']->path('modules/' . $dirname . '/assets/images/logoModule.png'));
+        \imagepng($imageModule, $GLOBALS['xoops']->path('modules/'.$dirname.'/assets/images/logoModule.png'));
         \imagedestroy($imageModule);
 
         return true;

class/common/FilesManagement.php

Indentation +222 added lines, -222 removed lines

@@ -24,226 +24,226 @@
  */
 trait FilesManagement
 {
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     */
-    public static function createFolder($folder): void
-    {
-        try {
-            if (!\is_dir($folder)) {
-                if (!\is_dir($folder) && !\mkdir($folder) && !\is_dir($folder)) {
-                    throw new RuntimeException(\sprintf('Unable to create the %s directory', $folder));
-                }
-
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-            }
-        } catch (\Throwable $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
-
-    /**
-     * @param string $file
-     * @param string $folder
-     * @return bool
-     */
-    public static function copyFile(string $file, string $folder): bool
-    {
-        return \copy($file, $folder);
-    }
-
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst): void
-    {
-        $dir = \opendir($src);
-        //        @mkdir($dst);
-        if (!@\mkdir($dst) && !\is_dir($dst)) {
-            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);
-                } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
-                }
-            }
-        }
-        \closedir($dir);
-    }
-
-    /**
-     * Remove files and (sub)directories
-     *
-     * @param string $src source directory to delete
-     *
-     * @return bool true on success
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     */
-    public static function deleteDirectory($src): bool
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        $success = true;
-        // remove old files
-        $dirInfo = new SplFileInfo($src);
-        // validate is a directory
-        if ($dirInfo->isDir()) {
-            $fileList = \array_diff(\scandir($src, \SCANDIR_SORT_NONE), ['..', '.']);
-            foreach ($fileList as $k => $v) {
-                $fileInfo = new SplFileInfo("{$src}/{$v}");
-                if ($fileInfo->isDir()) {
-                    // recursively handle subdirectories
-                    if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
-                        break;
-                    }
-                } elseif (!($success = \unlink($fileInfo->getRealPath()))) {
-                    break;
-                }
-            }
-            // now delete this (sub)directory if all the files are gone
-            if ($success) {
-                $success = \rmdir($dirInfo->getRealPath());
-            }
-        } else {
-            // input is not a valid directory
-            $success = false;
-        }
-
-        return $success;
-    }
-
-    /**
-     * Recursively remove directory
-     *
-     * @todo currently won't remove directories with hidden files, should it?
-     *
-     * @param string $src directory to remove (delete)
-     *
-     * @return bool true on success
-     */
-    public static function rrmdir($src): bool
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!\is_dir($src)) {
-            return false;
-        }
-
-        $success = true;
-
-        // Open the source directory to read in files
-        $iterator = new DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                $filename = $fObj->getPathname();
-                $fObj     = null; // clear this iterator object to close the file
-                if (!\unlink($filename)) {
-                    return false; // couldn't delete the file
-                }
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rrmdir($fObj->getPathname());
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-
-        return \rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively move files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @return bool true on success
-     */
-    public static function rmove($src, $dest): bool
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!\is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!\is_dir($dest) && !\mkdir($dest) && !\is_dir($dest)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                \rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-                //                rmdir($fObj->getPath()); // now delete the directory
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-
-        return \rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively copy directories and files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @return bool true on success
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     */
-    public static function rcopy($src, $dest): bool
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!\is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!\is_dir($dest) && !\mkdir($dest) && !\is_dir($dest)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                \copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            }
-        }
-
-        return true;
-    }
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 */
+	public static function createFolder($folder): void
+	{
+		try {
+			if (!\is_dir($folder)) {
+				if (!\is_dir($folder) && !\mkdir($folder) && !\is_dir($folder)) {
+					throw new RuntimeException(\sprintf('Unable to create the %s directory', $folder));
+				}
+
+				file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+			}
+		} catch (\Throwable $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
+
+	/**
+	 * @param string $file
+	 * @param string $folder
+	 * @return bool
+	 */
+	public static function copyFile(string $file, string $folder): bool
+	{
+		return \copy($file, $folder);
+	}
+
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst): void
+	{
+		$dir = \opendir($src);
+		//        @mkdir($dst);
+		if (!@\mkdir($dst) && !\is_dir($dst)) {
+			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);
+				} else {
+					\copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		\closedir($dir);
+	}
+
+	/**
+	 * Remove files and (sub)directories
+	 *
+	 * @param string $src source directory to delete
+	 *
+	 * @return bool true on success
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 */
+	public static function deleteDirectory($src): bool
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		$success = true;
+		// remove old files
+		$dirInfo = new SplFileInfo($src);
+		// validate is a directory
+		if ($dirInfo->isDir()) {
+			$fileList = \array_diff(\scandir($src, \SCANDIR_SORT_NONE), ['..', '.']);
+			foreach ($fileList as $k => $v) {
+				$fileInfo = new SplFileInfo("{$src}/{$v}");
+				if ($fileInfo->isDir()) {
+					// recursively handle subdirectories
+					if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
+						break;
+					}
+				} elseif (!($success = \unlink($fileInfo->getRealPath()))) {
+					break;
+				}
+			}
+			// now delete this (sub)directory if all the files are gone
+			if ($success) {
+				$success = \rmdir($dirInfo->getRealPath());
+			}
+		} else {
+			// input is not a valid directory
+			$success = false;
+		}
+
+		return $success;
+	}
+
+	/**
+	 * Recursively remove directory
+	 *
+	 * @todo currently won't remove directories with hidden files, should it?
+	 *
+	 * @param string $src directory to remove (delete)
+	 *
+	 * @return bool true on success
+	 */
+	public static function rrmdir($src): bool
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!\is_dir($src)) {
+			return false;
+		}
+
+		$success = true;
+
+		// Open the source directory to read in files
+		$iterator = new DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				$filename = $fObj->getPathname();
+				$fObj     = null; // clear this iterator object to close the file
+				if (!\unlink($filename)) {
+					return false; // couldn't delete the file
+				}
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rrmdir($fObj->getPathname());
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+
+		return \rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively move files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @return bool true on success
+	 */
+	public static function rmove($src, $dest): bool
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!\is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!\is_dir($dest) && !\mkdir($dest) && !\is_dir($dest)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				\rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+				//                rmdir($fObj->getPath()); // now delete the directory
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+
+		return \rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively copy directories and files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @return bool true on success
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 */
+	public static function rcopy($src, $dest): bool
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!\is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!\is_dir($dest) && !\mkdir($dest) && !\is_dir($dest)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				\copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			}
+		}
+
+		return true;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -37,7 +37,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 (\Throwable $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -63,14 +63,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);
+        while (false!==($file = \readdir($dir))) {
+            if (('.'!==$file) && ('..'!==$file)) {
+                if (\is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
+                    \copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -160,7 +160,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
     }
@@ -194,14 +194,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
     }
@@ -238,9 +238,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());
             }
         }
 

class/common/ServerStats.php

Indentation +53 added lines, -53 removed lines

@@ -19,60 +19,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats(): string
-    {
-        //mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        \xoops_loadLanguage('common', $moduleDirName);
-        $html = '';
-        //        $sql   = 'SELECT metavalue';
-        //        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
-        //        $sql   .= " WHERE metakey='version' LIMIT 1";
-        //        $query = $GLOBALS['xoopsDB']->query($sql);
-        //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . \constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
-        $html .= "<div style='padding: 8px;'>\n";
-        //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
-        //        $html .= "<br>\n";
-        //        $html .= "<br>\n";
-        $html .= '<div>' . \constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
-        $html .= "<ul>\n";
+	/**
+	 * serverStats()
+	 *
+	 * @return string
+	 */
+	public static function getServerStats(): string
+	{
+		//mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
+		$html = '';
+		//        $sql   = 'SELECT metavalue';
+		//        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
+		//        $sql   .= " WHERE metakey='version' LIMIT 1";
+		//        $query = $GLOBALS['xoopsDB']->query($sql);
+		//        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
+		$html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . \constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+		$html .= "<div style='padding: 8px;'>\n";
+		//        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
+		//        $html .= "<br>\n";
+		//        $html .= "<br>\n";
+		$html .= '<div>' . \constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+		$html .= "<ul>\n";
 
-        $gdlib = \function_exists('gd_info') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . \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>';
-            }
-        }
-        //
-        //    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
-        //
-        //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
-        //
-        $downloads = \ini_get('file_uploads') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+		$gdlib = \function_exists('gd_info') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . \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>';
+			}
+		}
+		//
+		//    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
+		//
+		//    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
+		//
+		$downloads = \ini_get('file_uploads') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
+		$html      .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
 
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . \ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . \ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . \ini_get('memory_limit') . "</span></b>\n";
-        $html .= "</ul>\n";
-        $html .= "<ul>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
-        $html .= "</ul>\n";
-        $html .= "<br>\n";
-        $html .= \constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
-        $html .= '</div>';
-        $html .= '</fieldset><br>';
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . \ini_get('upload_max_filesize') . "</span></b>\n";
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . \ini_get('post_max_size') . "</span></b>\n";
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . \ini_get('memory_limit') . "</span></b>\n";
+		$html .= "</ul>\n";
+		$html .= "<ul>\n";
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+		$html .= "</ul>\n";
+		$html .= "<br>\n";
+		$html .= \constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+		$html .= '</div>';
+		$html .= '</fieldset><br>';
 
-        return $html;
-    }
+		return $html;
+	}
 }

Spacing +13 added lines, -13 removed lines

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

class/common/TestdataButtons.php

Indentation +56 added lines, -56 removed lines

@@ -29,64 +29,64 @@
  */
 class TestdataButtons
 {
-    /** Button status constants */
-    private const SHOW_BUTTONS = 1;
-    private const HIDE_BUTTONS = 0;
+	/** Button status constants */
+	private const SHOW_BUTTONS = 1;
+	private const HIDE_BUTTONS = 0;
 
-    /**
-     * Load the test button configuration
-     *
-     * @param \Xmf\Module\Admin $adminObject
-     *
-     * @return void
-     */
-    public static function loadButtonConfig($adminObject): void
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        $helper              = Helper::getInstance();
-        $yamlFile            = $helper->path('/config/admin.yml');
-        $config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
-        $displaySampleButton = $config['displaySampleButton'];
+	/**
+	 * Load the test button configuration
+	 *
+	 * @param \Xmf\Module\Admin $adminObject
+	 *
+	 * @return void
+	 */
+	public static function loadButtonConfig($adminObject): void
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		$helper              = Helper::getInstance();
+		$yamlFile            = $helper->path('/config/admin.yml');
+		$config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
+		$displaySampleButton = $config['displaySampleButton'];
 
-        if (self::SHOW_BUTTONS == $displaySampleButton) {
-            \xoops_loadLanguage('admin/modulesadmin', 'system');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
-            //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
-        } else {
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
-            // $displaySampleButton = $config['displaySampleButton'];
-        }
-    }
+		if (self::SHOW_BUTTONS == $displaySampleButton) {
+			\xoops_loadLanguage('admin/modulesadmin', 'system');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
+			//    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+		} else {
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+			// $displaySampleButton = $config['displaySampleButton'];
+		}
+	}
 
-    /**
-     * Hide the test buttons
-     *
-     * @return void
-     */
-    public static function hideButtons(): void
-    {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
-        $app                        = [];
-        $app['displaySampleButton'] = self::HIDE_BUTTONS;
-        Yaml::save($app, $yamlFile);
-        \redirect_header('index.php', 0, '');
-    }
+	/**
+	 * Hide the test buttons
+	 *
+	 * @return void
+	 */
+	public static function hideButtons(): void
+	{
+		$yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+		$app                        = [];
+		$app['displaySampleButton'] = self::HIDE_BUTTONS;
+		Yaml::save($app, $yamlFile);
+		\redirect_header('index.php', 0, '');
+	}
 
-    /**
-     * Show the test buttons
-     *
-     * @return void
-     */
-    public static function showButtons(): void
-    {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
-        $app                        = [];
-        $app['displaySampleButton'] = self::SHOW_BUTTONS;
-        Yaml::save($app, $yamlFile);
-        \redirect_header('index.php', 0, '');
-    }
+	/**
+	 * Show the test buttons
+	 *
+	 * @return void
+	 */
+	public static function showButtons(): void
+	{
+		$yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+		$app                        = [];
+		$app['displaySampleButton'] = self::SHOW_BUTTONS;
+		Yaml::save($app, $yamlFile);
+		\redirect_header('index.php', 0, '');
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -49,15 +49,15 @@ 
         $config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
         $displaySampleButton = $config['displaySampleButton'];
 
-        if (self::SHOW_BUTTONS == $displaySampleButton) {
+        if (self::SHOW_BUTTONS==$displaySampleButton) {
             \xoops_loadLanguage('admin/modulesadmin', 'system');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
             //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
         } else {
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
             // $displaySampleButton = $config['displaySampleButton'];
         }
     }
@@ -69,7 +69,7 @@ 
      */
     public static function hideButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = self::HIDE_BUTTONS;
         Yaml::save($app, $yamlFile);
@@ -83,7 +83,7 @@ 
      */
     public static function showButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = self::SHOW_BUTTONS;
         Yaml::save($app, $yamlFile);

class/common/VersionChecks.php

Indentation +113 added lines, -113 removed lines

@@ -19,127 +19,127 @@
  */
 trait VersionChecks
 {
-    /**
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule|null $module
-     *
-     * @param null|string       $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null): bool
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        \xoops_loadLanguage('admin', $moduleDirName);
-        \xoops_loadLanguage('common', $moduleDirName);
+	/**
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule|null $module
+	 *
+	 * @param null|string       $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null): bool
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		\xoops_loadLanguage('admin', $moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
 
-        //check for minimum XOOPS version
-        $currentVer = mb_substr(\XOOPS_VERSION, 6); // get the numeric part of string
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $success = true;
+		//check for minimum XOOPS version
+		$currentVer = mb_substr(\XOOPS_VERSION, 6); // get the numeric part of string
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$success = true;
 
-        if (\version_compare($currentVer, $requiredVer, '<')) {
-            $success = false;
-            $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
-        }
+		if (\version_compare($currentVer, $requiredVer, '<')) {
+			$success = false;
+			$module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule|bool|null $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module = null): bool
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        \xoops_loadLanguage('admin', $moduleDirName);
-        \xoops_loadLanguage('common', $moduleDirName);
+	/**
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule|bool|null $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module = null): bool
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		\xoops_loadLanguage('admin', $moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
 
-        // check for minimum PHP version
-        $success = true;
+		// check for minimum PHP version
+		$success = true;
 
-        $verNum = \PHP_VERSION;
-        $reqVer = &$module->getInfo('min_php');
+		$verNum = \PHP_VERSION;
+		$reqVer = &$module->getInfo('min_php');
 
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (\version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
-                $success = false;
-            }
-        }
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (\version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     * compares current module version with the latest GitHub release
-     * @static
-     *
-     * @return string|array info about the latest module version, if newer
-     */
-    public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
-        //        $repository         = 'XoopsModules25x/publisher'; //for testing only
-        $ret             = null;
-        $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
-        if ('github' === $source) {
-            if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
-                \curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
-                \curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
-                \curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
-                \curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
-                $curlReturn = \curl_exec($curlHandle);
-                if (false === $curlReturn) {
-                    \trigger_error(\curl_error($curlHandle));
-                } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
-                } else {
-                    $file              = json_decode($curlReturn, false);
-                    $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default);
-                    $latestVersion     = $file[0]->tag_name;
-                    $prerelease        = $file[0]->prerelease;
-                    if ('master' !== $latestVersionLink) {
-                        $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
-                    }
-                    //"PHP-standardized" version
-                    $latestVersion = \mb_strtolower($latestVersion);
-                    if (false !== mb_strpos($latestVersion, 'final')) {
-                        $latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));
-                        $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
-                    }
-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
-                    //"PHP-standardized" version
-                    $moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion));
-                    //                    $moduleVersion = '1.0'; //for testing only
-                    //                    $moduleDirName = 'publisher'; //for testing only
-                    if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) {
-                        $ret   = [];
-                        $ret[] = $update;
-                        $ret[] = $latestVersionLink;
-                    }
-                }
-                \curl_close($curlHandle);
-            }
-        }
+	/**
+	 * compares current module version with the latest GitHub release
+	 * @static
+	 *
+	 * @return string|array info about the latest module version, if newer
+	 */
+	public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		$update             = '';
+		$repository         = 'XoopsModules25x/' . $moduleDirName;
+		//        $repository         = 'XoopsModules25x/publisher'; //for testing only
+		$ret             = null;
+		$infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
+		if ('github' === $source) {
+			if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
+				\curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
+				\curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
+				\curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
+				\curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
+				$curlReturn = \curl_exec($curlHandle);
+				if (false === $curlReturn) {
+					\trigger_error(\curl_error($curlHandle));
+				} elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
+					\trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+				} else {
+					$file              = json_decode($curlReturn, false);
+					$latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default);
+					$latestVersion     = $file[0]->tag_name;
+					$prerelease        = $file[0]->prerelease;
+					if ('master' !== $latestVersionLink) {
+						$update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
+					}
+					//"PHP-standardized" version
+					$latestVersion = \mb_strtolower($latestVersion);
+					if (false !== mb_strpos($latestVersion, 'final')) {
+						$latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));
+						$latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
+					}
+					$moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
+					//"PHP-standardized" version
+					$moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion));
+					//                    $moduleVersion = '1.0'; //for testing only
+					//                    $moduleDirName = 'publisher'; //for testing only
+					if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) {
+						$ret   = [];
+						$ret[] = $update;
+						$ret[] = $latestVersionLink;
+					}
+				}
+				\curl_close($curlHandle);
+			}
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -31,7 +31,7 @@ 
     {
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
+        if (null===$module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
         \xoops_loadLanguage('admin', $moduleDirName);
@@ -39,14 +39,14 @@ 
 
         //check for minimum XOOPS version
         $currentVer = mb_substr(\XOOPS_VERSION, 6); // get the numeric part of string
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+        if (null===$requiredVer) {
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (\version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -63,7 +63,7 @@ 
     {
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
+        if (null===$module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
         \xoops_loadLanguage('admin', $moduleDirName);
@@ -75,9 +75,9 @@ 
         $verNum = \PHP_VERSION;
         $reqVer = &$module->getInfo('min_php');
 
-        if (false !== $reqVer && '' !== $reqVer) {
+        if (false!==$reqVer && ''!==$reqVer) {
             if (\version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }
@@ -96,36 +96,36 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
         $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
+        $repository         = 'XoopsModules25x/'.$moduleDirName;
         //        $repository         = 'XoopsModules25x/publisher'; //for testing only
         $ret             = null;
         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
-        if ('github' === $source) {
-            if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
+        if ('github'===$source) {
+            if (\function_exists('curl_init') && false!==($curlHandle = \curl_init())) {
                 \curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
                 \curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
                 \curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
                 \curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
                 $curlReturn = \curl_exec($curlHandle);
-                if (false === $curlReturn) {
+                if (false===$curlReturn) {
                     \trigger_error(\curl_error($curlHandle));
-                } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+                } elseif (false!==\mb_strpos($curlReturn, 'Not Found')) {
+                    \trigger_error('Repository Not Found: '.$infoReleasesUrl);
                 } else {
                     $file              = json_decode($curlReturn, false);
                     $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default);
                     $latestVersion     = $file[0]->tag_name;
                     $prerelease        = $file[0]->prerelease;
-                    if ('master' !== $latestVersionLink) {
-                        $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
+                    if ('master'!==$latestVersionLink) {
+                        $update = \constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
                     }
                     //"PHP-standardized" version
                     $latestVersion = \mb_strtolower($latestVersion);
-                    if (false !== mb_strpos($latestVersion, 'final')) {
+                    if (false!==mb_strpos($latestVersion, 'final')) {
                         $latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));
                         $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
                     }
-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
+                    $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));
                     //"PHP-standardized" version
                     $moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion));
                     //                    $moduleVersion = '1.0'; //for testing only

class/common/Configurator.php

Indentation +34 added lines, -34 removed lines

@@ -24,41 +24,41 @@
  */
 class Configurator
 {
-    public $name;
-    public $paths           = [];
-    public $uploadFolders   = [];
-    public $copyBlankFiles  = [];
-    public $copyTestFolders = [];
-    public $templateFolders = [];
-    public $oldFiles        = [];
-    public $oldFolders      = [];
-    public $renameTables    = [];
-    public $renameColumns   = [];
-    public $moduleStats     = [];
-    public $modCopyright;
-    public $icons;
+	public $name;
+	public $paths           = [];
+	public $uploadFolders   = [];
+	public $copyBlankFiles  = [];
+	public $copyTestFolders = [];
+	public $templateFolders = [];
+	public $oldFiles        = [];
+	public $oldFolders      = [];
+	public $renameTables    = [];
+	public $renameColumns   = [];
+	public $moduleStats     = [];
+	public $modCopyright;
+	public $icons;
 
-    /**
-     * Configurator constructor.
-     */
-    public function __construct()
-    {
-        $config = require \dirname(__DIR__, 2) . '/config/config.php';
+	/**
+	 * Configurator constructor.
+	 */
+	public function __construct()
+	{
+		$config = require \dirname(__DIR__, 2) . '/config/config.php';
 
-        $this->name            = $config->name;
-        $this->paths           = $config->paths;
-        $this->uploadFolders   = $config->uploadFolders;
-        $this->copyBlankFiles  = $config->copyBlankFiles;
-        $this->copyTestFolders = $config->copyTestFolders;
-        $this->templateFolders = $config->templateFolders;
-        $this->oldFiles        = $config->oldFiles;
-        $this->oldFolders      = $config->oldFolders;
-        $this->renameTables    = $config->renameTables;
-        $this->renameColumns   = $config->renameColumns;
-        $this->moduleStats     = $config->moduleStats;
-        $this->modCopyright    = $config->modCopyright;
+		$this->name            = $config->name;
+		$this->paths           = $config->paths;
+		$this->uploadFolders   = $config->uploadFolders;
+		$this->copyBlankFiles  = $config->copyBlankFiles;
+		$this->copyTestFolders = $config->copyTestFolders;
+		$this->templateFolders = $config->templateFolders;
+		$this->oldFiles        = $config->oldFiles;
+		$this->oldFolders      = $config->oldFolders;
+		$this->renameTables    = $config->renameTables;
+		$this->renameColumns   = $config->renameColumns;
+		$this->moduleStats     = $config->moduleStats;
+		$this->modCopyright    = $config->modCopyright;
 
-        $this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
-        $this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
-    }
+		$this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
+		$this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function __construct()
     {
-        $config = require \dirname(__DIR__, 2) . '/config/config.php';
+        $config = require \dirname(__DIR__, 2).'/config/config.php';
 
         $this->name            = $config->name;
         $this->paths           = $config->paths;
@@ -58,7 +58,7 @@ 
         $this->moduleStats     = $config->moduleStats;
         $this->modCopyright    = $config->modCopyright;
 
-        $this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
-        $this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
+        $this->icons = require \dirname(__DIR__, 2).'/config/icons.php';
+        $this->paths = require \dirname(__DIR__, 2).'/config/paths.php';
     }
 }

class/common/Breadcrumb.php

Indentation +27 added lines, -27 removed lines

@@ -32,39 +32,39 @@ 
  */
 class Breadcrumb
 {
-    public  $dirname;
-    private $bread = [];
+	public  $dirname;
+	private $bread = [];
 
-    public function __construct()
-    {
-        $this->dirname = \basename(\dirname(__DIR__, 2));
-    }
+	public function __construct()
+	{
+		$this->dirname = \basename(\dirname(__DIR__, 2));
+	}
 
-    /**
-     * Add link to breadcrumb
-     *
-     * @param string $title
-     * @param string $link
-     */
-    public function addLink($title = '', $link = ''): void
-    {
-        $this->bread[] = [
-            'link'  => $link,
-            'title' => $title,
-        ];
-    }
+	/**
+	 * Add link to breadcrumb
+	 *
+	 * @param string $title
+	 * @param string $link
+	 */
+	public function addLink($title = '', $link = ''): void
+	{
+		$this->bread[] = [
+			'link'  => $link,
+			'title' => $title,
+		];
+	}
 
-    /**
-     * Render BreadCrumb
-     */
-    public function render(): void
-    {
-        /*
+	/**
+	 * Render BreadCrumb
+	 */
+	public function render(): void
+	{
+		/*
         TODO if you want to use the render code below,
         1) create ./templates/chess_common_breadcrumb.tpl)
         2) add declaration to  xoops_version.php
         */
-        /*
+		/*
         if (!isset($GLOBALS['xoTheme']) || !\is_object($GLOBALS['xoTheme'])) {
             require $GLOBALS['xoops']->path('class/theme.php');
 
@@ -83,5 +83,5 @@ 
 
         return $html;
         */
-    }
+	}
 }