XoopsModules25x / myiframe

config/paths.php

Indentation +13 added lines, -13 removed lines

@@ -5,17 +5,17 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 return [
-    'name'          => \mb_strtoupper($moduleDirName) . ' PathConfigurator',
-    'dirname'       => $moduleDirName,
-    'admin'         => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-    'modPath'       => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-    'modUrl'        => XOOPS_URL . '/modules/' . $moduleDirName,
-    'uploadPath'    => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-    'uploadUrl'     => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-    'uploadFolders' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
+	'name'          => \mb_strtoupper($moduleDirName) . ' PathConfigurator',
+	'dirname'       => $moduleDirName,
+	'admin'         => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+	'modPath'       => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+	'modUrl'        => XOOPS_URL . '/modules/' . $moduleDirName,
+	'uploadPath'    => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+	'uploadUrl'     => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+	'uploadFolders' => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
 ];

config/imageconfig.php

Indentation +24 added lines, -24 removed lines

@@ -5,37 +5,37 @@
 
 // extra module configs
 $modversion['config'][] = [
-    'name'        => 'imageConfigs',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
-    'formtype'    => 'line_break',
-    'valuetype'   => 'textbox',
-    'default'     => 'head',
+	'name'        => 'imageConfigs',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
+	'formtype'    => 'line_break',
+	'valuetype'   => 'textbox',
+	'default'     => 'head',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'imageWidth',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 1200,
+	'name'        => 'imageWidth',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 1200,
 ]; // =1024/16
 
 $modversion['config'][] = [
-    'name'        => 'imageHeight',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 800,
+	'name'        => 'imageHeight',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 800,
 ]; // =768/16
 
 $modversion['config'][] = [
-    'name'        => 'imageUploadPath',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => 'uploads/' . $modversion['dirname'] . '/images',
+	'name'        => 'imageUploadPath',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => 'uploads/' . $modversion['dirname'] . '/images',
 ];

preloads/autoloader.php

Indentation +21 added lines, -21 removed lines

@@ -4,31 +4,31 @@
  * @see https://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(
-    static function ($class): void {
-        // project-specific namespace prefix
-        $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+	static function ($class): void {
+		// project-specific namespace prefix
+		$prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
 
-        // base directory for the namespace prefix
-        $baseDir = \dirname(__DIR__) . '/class/';
+		// base directory for the namespace prefix
+		$baseDir = \dirname(__DIR__) . '/class/';
 
-        // does the class use the namespace prefix?
-        $len = mb_strlen($prefix);
+		// does the class use the namespace prefix?
+		$len = mb_strlen($prefix);
 
-        if (0 !== strncmp($prefix, $class, $len)) {
-            return;
-        }
+		if (0 !== strncmp($prefix, $class, $len)) {
+			return;
+		}
 
-        // get the relative class name
-        $relativeClass = mb_substr($class, $len);
+		// get the relative class name
+		$relativeClass = mb_substr($class, $len);
 
-        // replace the namespace prefix with the base directory, replace namespace
-        // separators with directory separators in the relative class name, append
-        // with .php
-        $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+		// replace the namespace prefix with the base directory, replace namespace
+		// separators with directory separators in the relative class name, append
+		// with .php
+		$file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
 
-        // if the file exists, require it
-        if (is_file($file)) {
-            require_once $file;
-        }
-    }
+		// if the file exists, require it
+		if (is_file($file)) {
+			require_once $file;
+		}
+	}
 );

preloads/core.php

Indentation +8 added lines, -8 removed lines

@@ -20,12 +20,12 @@
  */
 class MyiframeCorePreload extends \XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args): void
-    {
-        require_once __DIR__ . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args): void
+	{
+		require_once __DIR__ . '/autoloader.php';
+	}
 }

include/config.php

Indentation +56 added lines, -56 removed lines

@@ -21,63 +21,63 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 return (object)[
-    'name'           => $moduleDirNameUpper . ' Module Configurator',
-    'paths'          => [
-        'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-    ],
-    'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
-    'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
+	'name'           => $moduleDirNameUpper . ' Module Configurator',
+	'paths'          => [
+		'dirname'    => $moduleDirName,
+		'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+		'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+		'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
+		'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+	],
+	'uploadFolders'  => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
+	'copyBlankFiles' => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
 
-    'copyTestFolders' => [
-        //[
-        //    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
-        //    XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-        //]
-    ],
+	'copyTestFolders' => [
+		//[
+		//    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
+		//    XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+		//]
+	],
 
-    'templateFolders' => [
-        '/templates/',
-        '/templates/blocks/',
-        '/templates/admin/',
-    ],
-    'oldFiles'        => [
-        '/class/request.php',
-        '/class/registry.php',
-        '/class/utilities.php',
-        '/class/util.php',
-        // '/include/constants.php',
-        // '/include/functions.php',
-        '/ajaxrating.txt',
-    ],
-    'oldFolders'      => [
-        '/images',
-        '/css',
-        '/js',
-        '/tcpdf',
-        '/images',
-    ],
-    'renameTables'    => [//         'XX_archive'     => 'ZZZZ_archive',
-    ],
-    'moduleStats'     => [
-        //            'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
-        //            'totalitems'      => $helper->getHandler('Item')->getItemsCount(),
-        //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
-    ],
-    'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+	'templateFolders' => [
+		'/templates/',
+		'/templates/blocks/',
+		'/templates/admin/',
+	],
+	'oldFiles'        => [
+		'/class/request.php',
+		'/class/registry.php',
+		'/class/utilities.php',
+		'/class/util.php',
+		// '/include/constants.php',
+		// '/include/functions.php',
+		'/ajaxrating.txt',
+	],
+	'oldFolders'      => [
+		'/images',
+		'/css',
+		'/js',
+		'/tcpdf',
+		'/images',
+	],
+	'renameTables'    => [//         'XX_archive'     => 'ZZZZ_archive',
+	],
+	'moduleStats'     => [
+		//            'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
+		//            'totalitems'      => $helper->getHandler('Item')->getItemsCount(),
+		//            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
+	],
+	'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
                      <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
 ];

include/common.php

Indentation +28 added lines, -28 removed lines

@@ -38,19 +38,19 @@ 
 //$downloadHandler     = new Myiframe\DownloadHandler($db);
 
 if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+	define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
+	define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
+	define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
+	define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
+	define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
+	define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -59,15 +59,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+	'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
+	'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
+	'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
+	'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
+	'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
+	'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
+	'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
+	'0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
+	'1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
 ];
 
 $debug = false;
@@ -76,16 +76,16 @@ 
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $GLOBALS['xoopsTpl'] = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
 $GLOBALS['xoopsTpl']->assign('mod_url', $helper->url());
 // Local icons path
 if (is_object($helper->getModule())) {
-    $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
-    $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
+	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
+	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
-    $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

include/onupdate.php

Indentation +102 added lines, -102 removed lines

@@ -19,8 +19,8 @@ 
 use XoopsModules\Myiframe;
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
-    || !$GLOBALS['xoopsUser']->isAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+	|| !$GLOBALS['xoopsUser']->isAdmin()) {
+	exit('Restricted access' . PHP_EOL);
 }
 
 /**
@@ -31,16 +31,16 @@ 
  */
 function xoops_module_pre_update_myiframe(\XoopsModule $module)
 {
-    $moduleDirName = \basename(\dirname(__DIR__));
-    /** @var Myiframe\Helper $helper */
-    /** @var Myiframe\Utility $utility */
-    $helper  = Myiframe\Helper::getInstance();
-    $utility = new Myiframe\Utility();
+	$moduleDirName = \basename(\dirname(__DIR__));
+	/** @var Myiframe\Helper $helper */
+	/** @var Myiframe\Utility $utility */
+	$helper  = Myiframe\Helper::getInstance();
+	$utility = new Myiframe\Utility();
 
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
 
-    return $xoopsSuccess && $phpSuccess;
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -52,96 +52,96 @@ 
  */
 function xoops_module_update_myiframe(\XoopsModule $module, $previousVersion = null)
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    /** @var Myiframe\Helper $helper */ /** @var Myiframe\Utility $utility */
-    /** @var Myiframe\Common\Configurator $configurator */
-    $helper       = Myiframe\Helper::getInstance();
-    $utility      = new Myiframe\Utility();
-    $configurator = new Myiframe\Common\Configurator();
-
-    if ($previousVersion < 240) {
-        //rename column EXAMPLE
-        $tables     = new Tables();
-        $table      = 'myiframex_categories';
-        $column     = 'ordre';
-        $newName    = 'order';
-        $attributes = "INT(5) NOT NULL DEFAULT '0'";
-        if ($tables->useTable($table)) {
-            $tables->alterColumn($table, $column, $attributes, $newName);
-            if (!$tables->executeQueue()) {
-                echo '<br>' . _AM_MYIFRAME_UPGRADEFAILED0 . ' ' . $tables->getLastError();
-            }
-        }
-
-        //delete old HTML templates
-        if (count($configurator->templateFolders) > 0) {
-            foreach ($configurator->templateFolders as $folder) {
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
-                if (is_dir($templateFolder)) {
-                    $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
-                    foreach ($templateList as $k => $v) {
-                        $fileInfo = new \SplFileInfo($templateFolder . $v);
-                        if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
-                            if (is_file($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        //  ---  DELETE OLD FILES ---------------
-        if (count($configurator->oldFiles) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->oldFiles) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
-                if (is_file($tempFile)) {
-                    unlink($tempFile);
-                }
-            }
-        }
-
-        //  ---  DELETE OLD FOLDERS ---------------
-        xoops_load('XoopsFile');
-        if (count($configurator->oldFolders) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->oldFolders) as $i) {
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
-                /** @var XoopsObjectHandler $folderHandler */
-                $folderHandler = XoopsFile::getHandler('folder', $tempFolder);
-                $folderHandler->delete($tempFolder);
-            }
-        }
-
-        //  ---  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` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
-        $GLOBALS['xoopsDB']->queryF($sql);
-
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-
-        return $grouppermHandler->deleteByModule($module->getVar('mid'), 'item_read');
-    }
-
-    return true;
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	/** @var Myiframe\Helper $helper */ /** @var Myiframe\Utility $utility */
+	/** @var Myiframe\Common\Configurator $configurator */
+	$helper       = Myiframe\Helper::getInstance();
+	$utility      = new Myiframe\Utility();
+	$configurator = new Myiframe\Common\Configurator();
+
+	if ($previousVersion < 240) {
+		//rename column EXAMPLE
+		$tables     = new Tables();
+		$table      = 'myiframex_categories';
+		$column     = 'ordre';
+		$newName    = 'order';
+		$attributes = "INT(5) NOT NULL DEFAULT '0'";
+		if ($tables->useTable($table)) {
+			$tables->alterColumn($table, $column, $attributes, $newName);
+			if (!$tables->executeQueue()) {
+				echo '<br>' . _AM_MYIFRAME_UPGRADEFAILED0 . ' ' . $tables->getLastError();
+			}
+		}
+
+		//delete old HTML templates
+		if (count($configurator->templateFolders) > 0) {
+			foreach ($configurator->templateFolders as $folder) {
+				$templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
+				if (is_dir($templateFolder)) {
+					$templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
+					foreach ($templateList as $k => $v) {
+						$fileInfo = new \SplFileInfo($templateFolder . $v);
+						if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
+							if (is_file($templateFolder . $v)) {
+								unlink($templateFolder . $v);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		//  ---  DELETE OLD FILES ---------------
+		if (count($configurator->oldFiles) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->oldFiles) as $i) {
+				$tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
+				if (is_file($tempFile)) {
+					unlink($tempFile);
+				}
+			}
+		}
+
+		//  ---  DELETE OLD FOLDERS ---------------
+		xoops_load('XoopsFile');
+		if (count($configurator->oldFolders) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->oldFolders) as $i) {
+				$tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
+				/** @var XoopsObjectHandler $folderHandler */
+				$folderHandler = XoopsFile::getHandler('folder', $tempFolder);
+				$folderHandler->delete($tempFolder);
+			}
+		}
+
+		//  ---  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` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
+		$GLOBALS['xoopsDB']->queryF($sql);
+
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+
+		return $grouppermHandler->deleteByModule($module->getVar('mid'), 'item_read');
+	}
+
+	return true;
 }

include/functions.php

Indentation +44 added lines, -44 removed lines

@@ -21,33 +21,33 @@ 
  */
 function myiframe_getmoduleoption($option, $repmodule = 'myiframe')
 {
-    global $xoopsModuleConfig, $xoopsModule;
-    static $tbloptions = [];
-    if (is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
-        return $tbloptions[$option];
-    }
+	global $xoopsModuleConfig, $xoopsModule;
+	static $tbloptions = [];
+	if (is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
+		return $tbloptions[$option];
+	}
 
-    $retval = false;
-    if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
-        if (isset($xoopsModuleConfig[$option])) {
-            $retval = $xoopsModuleConfig[$option];
-        }
-    } else {
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $module        = $moduleHandler->getByDirname($repmodule);
-        /** @var \XoopsConfigHandler $configHandler */
-        $configHandler = xoops_getHandler('config');
-        if ($module) {
-            $moduleConfig = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
-            if (isset($moduleConfig[$option])) {
-                $retval = $moduleConfig[$option];
-            }
-        }
-    }
-    $tbloptions[$option] = $retval;
+	$retval = false;
+	if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
+		if (isset($xoopsModuleConfig[$option])) {
+			$retval = $xoopsModuleConfig[$option];
+		}
+	} else {
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$module        = $moduleHandler->getByDirname($repmodule);
+		/** @var \XoopsConfigHandler $configHandler */
+		$configHandler = xoops_getHandler('config');
+		if ($module) {
+			$moduleConfig = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
+			if (isset($moduleConfig[$option])) {
+				$retval = $moduleConfig[$option];
+			}
+		}
+	}
+	$tbloptions[$option] = $retval;
 
-    return $retval;
+	return $retval;
 }
 
 /**
@@ -61,9 +61,9 @@ 
  */
 function myiframe_FieldExists($fieldname, $table)
 {
-    $result = $GLOBALS['xoopsDB']->queryF("SHOW COLUMNS FROM    $table LIKE '$fieldname'");
+	$result = $GLOBALS['xoopsDB']->queryF("SHOW COLUMNS FROM    $table LIKE '$fieldname'");
 
-    return ($GLOBALS['xoopsDB']->getRowsNum($result) > 0);
+	return ($GLOBALS['xoopsDB']->getRowsNum($result) > 0);
 }
 
 /**
@@ -78,21 +78,21 @@ 
  */
 function myiframe_set_metas($page_title = '', $meta_description = '', $meta_keywords = ''): void
 {
-    global $xoTheme, $xoTheme, $xoopsTpl;
-    $xoopsTpl->assign('xoops_pagetitle', $page_title);
-    if (isset($xoTheme) && is_object($xoTheme)) {
-        if (!empty($meta_keywords)) {
-            $xoTheme->addMeta('meta', 'keywords', $meta_keywords);
-        }
-        if (!empty($meta_description)) {
-            $xoTheme->addMeta('meta', 'description', $meta_description);
-        }
-    } elseif (isset($xoopsTpl) && is_object($xoopsTpl)) {    // Compatibility for old Xoops versions
-        if (!empty($meta_keywords)) {
-            $xoopsTpl->assign('xoops_meta_keywords', $meta_keywords);
-        }
-        if (!empty($meta_description)) {
-            $xoopsTpl->assign('xoops_meta_description', $meta_description);
-        }
-    }
+	global $xoTheme, $xoTheme, $xoopsTpl;
+	$xoopsTpl->assign('xoops_pagetitle', $page_title);
+	if (isset($xoTheme) && is_object($xoTheme)) {
+		if (!empty($meta_keywords)) {
+			$xoTheme->addMeta('meta', 'keywords', $meta_keywords);
+		}
+		if (!empty($meta_description)) {
+			$xoTheme->addMeta('meta', 'description', $meta_description);
+		}
+	} elseif (isset($xoopsTpl) && is_object($xoopsTpl)) {    // Compatibility for old Xoops versions
+		if (!empty($meta_keywords)) {
+			$xoopsTpl->assign('xoops_meta_keywords', $meta_keywords);
+		}
+		if (!empty($meta_description)) {
+			$xoopsTpl->assign('xoops_meta_description', $meta_description);
+		}
+	}
 }

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