XoopsModules25x / myiframe

include/oninstall.php

Indentation +54 added lines, -54 removed lines

@@ -28,20 +28,20 @@ 
  */
 function xoops_module_pre_install_myiframe(\XoopsModule $module)
 {
-    require_once \dirname(__DIR__) . '/preloads/autoloader.php';
-    /** @var \Utility $utility */
-    $utility      = new Utility();
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
+	require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+	/** @var \Utility $utility */
+	$utility      = new Utility();
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
 
-    if (false !== $xoopsSuccess && false !== $phpSuccess) {
-        $moduleTables = &$module->getInfo('tables');
-        foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
-        }
-    }
+	if (false !== $xoopsSuccess && false !== $phpSuccess) {
+		$moduleTables = &$module->getInfo('tables');
+		foreach ($moduleTables as $table) {
+			$GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+		}
+	}
 
-    return $xoopsSuccess && $phpSuccess;
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -52,52 +52,52 @@ 
  */
 function xoops_module_install_myiframe(\XoopsModule $module)
 {
-    require \dirname(__DIR__, 3) . '/mainfile.php';
+	require \dirname(__DIR__, 3) . '/mainfile.php';
 
-    $moduleDirName = \basename(\dirname(__DIR__));
+	$moduleDirName = \basename(\dirname(__DIR__));
 
-    /** @var Myiframe\Helper $helper */
-    $helper = Myiframe\Helper::getInstance();
-    /** @var Myiframe\Utility $helper */
-    $utility = new Utility();
-    /** @var Myiframe\Common\Configurator $helper */
-    $configurator = new Myiframe\Common\Configurator();
-    // Load language files
-    $helper->loadLanguage('admin');
-    $helper->loadLanguage('modinfo');
+	/** @var Myiframe\Helper $helper */
+	$helper = Myiframe\Helper::getInstance();
+	/** @var Myiframe\Utility $helper */
+	$utility = new Utility();
+	/** @var Myiframe\Common\Configurator $helper */
+	$configurator = new Myiframe\Common\Configurator();
+	// Load language files
+	$helper->loadLanguage('admin');
+	$helper->loadLanguage('modinfo');
 
-    // default Permission Settings ----------------------
-    global $xoopsModule;
-    $moduleId = $xoopsModule->getVar('mid');
-    // $moduleId2        = $helper->getModule()->mid();
-    /** @var \XoopsGroupPermHandler $grouppermHandler */
-    $grouppermHandler = xoops_getHandler('groupperm');
-    // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+	// default Permission Settings ----------------------
+	global $xoopsModule;
+	$moduleId = $xoopsModule->getVar('mid');
+	// $moduleId2        = $helper->getModule()->mid();
+	/** @var \XoopsGroupPermHandler $grouppermHandler */
+	$grouppermHandler = xoops_getHandler('groupperm');
+	// access rights ------------------------------------------
+	$grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
-    //  ---  CREATE FOLDERS ---------------
-    if (count($configurator->uploadFolders) > 0) {
-        //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-        foreach (array_keys($configurator->uploadFolders) as $i) {
-            $utility::createFolder($configurator->uploadFolders[$i]);
-        }
-    }
+	//  ---  CREATE FOLDERS ---------------
+	if (count($configurator->uploadFolders) > 0) {
+		//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+		foreach (array_keys($configurator->uploadFolders) as $i) {
+			$utility::createFolder($configurator->uploadFolders[$i]);
+		}
+	}
 
-    //  ---  COPY blank.png FILES ---------------
-    if (count($configurator->copyBlankFiles) > 0) {
-        $file = \dirname(__DIR__) . '/assets/images/blank.png';
-        foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
-            $utility::copyFile($file, $dest);
-        }
-    }
-    //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
-    $GLOBALS['xoopsDB']->queryF($sql);
+	//  ---  COPY blank.png FILES ---------------
+	if (count($configurator->copyBlankFiles) > 0) {
+		$file = \dirname(__DIR__) . '/assets/images/blank.png';
+		foreach (array_keys($configurator->copyBlankFiles) as $i) {
+			$dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+			$utility::copyFile($file, $dest);
+		}
+	}
+	//delete .html entries from the tpl table
+	$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+	$GLOBALS['xoopsDB']->queryF($sql);
 
-    return true;
+	return true;
 }

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
  */
 function xoops_module_pre_install_myiframe(\XoopsModule $module)
 {
-    require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+    require_once \dirname(__DIR__).'/preloads/autoloader.php';
     /** @var \Utility $utility */
     $utility      = new Utility();
     $xoopsSuccess = $utility::checkVerXoops($module);
@@ -37,7 +37,7 @@ 
     if (false !== $xoopsSuccess && false !== $phpSuccess) {
         $moduleTables = &$module->getInfo('tables');
         foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
         }
     }
 
@@ -52,7 +52,7 @@ 
  */
 function xoops_module_install_myiframe(\XoopsModule $module)
 {
-    require \dirname(__DIR__, 3) . '/mainfile.php';
+    require \dirname(__DIR__, 3).'/mainfile.php';
 
     $moduleDirName = \basename(\dirname(__DIR__));
 
@@ -73,11 +73,11 @@ 
     /** @var \XoopsGroupPermHandler $grouppermHandler */
     $grouppermHandler = xoops_getHandler('groupperm');
     // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     //  ---  CREATE FOLDERS ---------------
     if (count($configurator->uploadFolders) > 0) {
@@ -89,14 +89,14 @@ 
 
     //  ---  COPY blank.png FILES ---------------
     if (count($configurator->copyBlankFiles) > 0) {
-        $file = \dirname(__DIR__) . '/assets/images/blank.png';
+        $file = \dirname(__DIR__).'/assets/images/blank.png';
         foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';
             $utility::copyFile($file, $dest);
         }
     }
     //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+    $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
     $GLOBALS['xoopsDB']->queryF($sql);
 
     return true;

include/onuninstall.php

Indentation +26 added lines, -26 removed lines

@@ -20,8 +20,8 @@ 
  */
 function xoops_module_pre_uninstall_myiframe(\XoopsModule $module)
 {
-    // Do some synchronization
-    return true;
+	// Do some synchronization
+	return true;
 }
 
 /**
@@ -32,32 +32,32 @@ 
  */
 function xoops_module_uninstall_myiframe(\XoopsModule $module)
 {
-    //    return true;
+	//    return true;
 
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    /** @var Myiframe\Helper $helper */
-    $helper = Myiframe\Helper::getInstance();
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	/** @var Myiframe\Helper $helper */
+	$helper = Myiframe\Helper::getInstance();
 
-    /** @var Myiframe\Utility $utility */
-    $utility = new Utility();
+	/** @var Myiframe\Utility $utility */
+	$utility = new Utility();
 
-    $success = true;
-    $helper->loadLanguage('admin');
+	$success = true;
+	$helper->loadLanguage('admin');
 
-    // Rename uploads folder to BAK and add date to name
-    $uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
-    $dirInfo = new \SplFileInfo($uploadDirectory);
-    if ($dirInfo->isDir()) {
-        // The directory exists so rename it
-        $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $uploadDirectory));
-            $success = false;
-        }
-    }
-    unset($dirInfo);
-    /*
+	// Rename uploads folder to BAK and add date to name
+	$uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
+	$dirInfo = new \SplFileInfo($uploadDirectory);
+	if ($dirInfo->isDir()) {
+		// The directory exists so rename it
+		$date = date('Y-m-d');
+		if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $uploadDirectory));
+			$success = false;
+		}
+	}
+	unset($dirInfo);
+	/*
     //------------ START ----------------
     //------------------------------------------------------------------
     // Remove xsitemap.xml from XOOPS root folder if it exists
@@ -71,6 +71,6 @@ 
 //    return $success && $delOk; // use this if you're using this routine
 */
 
-    return $success;
-    //------------ END  ----------------
+	return $success;
+	//------------ END  ----------------
 }

Spacing +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
     if ($dirInfo->isDir()) {
         // The directory exists so rename it
         $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $uploadDirectory));
+        if (!rename($uploadDirectory, $uploadDirectory."_bak_$date")) {
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $uploadDirectory));
             $success = false;
         }
     }

class/Utility.php

Indentation +1 added lines, -1 removed lines

@@ -30,5 +30,5 @@
  */
 class Utility extends Common\SysUtility
 {
-    //--------------- Custom module methods -----------------------------
+	//--------------- Custom module methods -----------------------------
 }

class/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     {
         $ret = false;
 
-        $class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
+        $class = __NAMESPACE__.'\\'.\ucfirst($name).'Handler';
         if (!\class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }

Indentation +51 added lines, -51 removed lines

@@ -23,62 +23,62 @@
  */
 class Helper extends \Xmf\Module\Helper
 {
-    public $debug;
+	public $debug;
 
-    /**
-     * @param bool $debug
-     */
-    public function __construct($debug = false)
-    {
-        $this->debug   = $debug;
-        $moduleDirName = \basename(\dirname(__DIR__));
-        parent::__construct($moduleDirName);
-    }
+	/**
+	 * @param bool $debug
+	 */
+	public function __construct($debug = false)
+	{
+		$this->debug   = $debug;
+		$moduleDirName = \basename(\dirname(__DIR__));
+		parent::__construct($moduleDirName);
+	}
 
-    /**
-     * @param bool $debug
-     *
-     * @return \XoopsModules\Myiframe\Helper
-     */
-    public static function getInstance(bool $debug = false): self
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($debug);
-        }
+	/**
+	 * @param bool $debug
+	 *
+	 * @return \XoopsModules\Myiframe\Helper
+	 */
+	public static function getInstance(bool $debug = false): self
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($debug);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @return string
-     */
-    public function getDirname()
-    {
-        return $this->dirname;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDirname()
+	{
+		return $this->dirname;
+	}
 
-    /**
-     * Get an Object Handler
-     *
-     * @param string $name name of handler to load
-     *
-     * @return bool|\XoopsObjectHandler|\XoopsPersistableObjectHandler
-     */
-    public function getHandler($name)
-    {
-        $ret = false;
+	/**
+	 * Get an Object Handler
+	 *
+	 * @param string $name name of handler to load
+	 *
+	 * @return bool|\XoopsObjectHandler|\XoopsPersistableObjectHandler
+	 */
+	public function getHandler($name)
+	{
+		$ret = false;
 
-        $class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
-        if (!\class_exists($class)) {
-            throw new \RuntimeException("Class '$class' not found");
-        }
-        /** @var \XoopsMySQLDatabase $db */
-        $db     = \XoopsDatabaseFactory::getDatabaseConnection();
-        $helper = self::getInstance();
-        $ret    = new $class($db, $helper);
-        $this->addLog("Getting handler '{$name}'");
+		$class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
+		if (!\class_exists($class)) {
+			throw new \RuntimeException("Class '$class' not found");
+		}
+		/** @var \XoopsMySQLDatabase $db */
+		$db     = \XoopsDatabaseFactory::getDatabaseConnection();
+		$helper = self::getInstance();
+		$ret    = new $class($db, $helper);
+		$this->addLog("Getting handler '{$name}'");
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

class/Common/Breadcrumb.php

Indentation +27 added lines, -27 removed lines

@@ -25,39 +25,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');
 
@@ -76,5 +76,5 @@ 
 
         return $html;
         */
-    }
+	}
 }

class/Common/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -40,13 +40,13 @@ 
         //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
+            $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;
@@ -77,7 +77,7 @@ 
 
         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,7 +96,7 @@ 
         $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";
@@ -110,14 +110,14 @@ 
                 if (false === $curlReturn) {
                     \trigger_error(\curl_error($curlHandle));
                 } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+                    \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;
+                        $update = \constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
                     }
                     //"PHP-standardized" version
                     $latestVersion = \mb_strtolower($latestVersion);
@@ -125,7 +125,7 @@ 
                         $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

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

class/Common/TestdataButtons.php

Spacing +7 added lines, -7 removed lines

@@ -62,13 +62,13 @@ 
 
         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'];
         }
     }
@@ -80,7 +80,7 @@ 
      */
     public static function hideButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = 0;
         Yaml::save($app, $yamlFile);
@@ -94,7 +94,7 @@ 
      */
     public static function showButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = 1;
         Yaml::save($app, $yamlFile);

Indentation +61 added lines, -61 removed lines

@@ -23,12 +23,12 @@ 
  */
 
 use Xmf\{
-    Module\Admin,
-    Request,
-    Yaml
+	Module\Admin,
+	Request,
+	Yaml
 };
 use XoopsModules\Myiframe\{
-    Helper
+	Helper
 };
 
 /** @var Helper $helper */
@@ -40,65 +40,65 @@ 
  */
 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');
-        /** @var array $config */
-        $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');
+		/** @var array $config */
+		$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'] = 0;
-        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'] = 0;
+		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'] = 1;
-        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'] = 1;
+		Yaml::save($app, $yamlFile);
+		\redirect_header('index.php', 0, '');
+	}
 }

class/Common/ServerStats.php

Indentation +53 added lines, -53 removed lines

@@ -19,60 +19,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats()
-    {
-        //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()
+	{
+		//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 +12 added lines, -12 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>';
+                $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/FilesManagement.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,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>';
@@ -57,14 +57,14 @@ 
         $dir = \opendir($src);
         //        @mkdir($dst);
         if (!@\mkdir($dst) && !\is_dir($dst)) {
-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
+            throw new \RuntimeException('The directory '.$dst.' could not be created.');
         }
         while (false !== ($file = \readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (\is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (\is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
+                    \copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -154,7 +154,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
     }
@@ -188,14 +188,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
     }
@@ -232,9 +232,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());
             }
         }
 

Indentation +222 added lines, -222 removed lines

@@ -19,226 +19,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)
-    {
-        // 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)
-    {
-        // 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)
-    {
-        // 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)
-    {
-        // 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)
+	{
+		// 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)
+	{
+		// 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)
+	{
+		// 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)
+	{
+		// 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;
+	}
 }