Inspection of "Merge pull request #8 from mambax7/master" - XoopsModules25x/myiframe - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 757841...94ec22 )

by Goffy

created 2022-03-28 15:08 UTC

Status

Indentation +105 added lines, -105 removed lines patch added patch discarded remove patch

@@ -16,8 +16,8 @@  discard block
 block discarded – undo
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Myiframe\{
-    Common\Blocksadmin,
-    Helper
+	Common\Blocksadmin,
+	Helper
 };
 
 /** @var Admin $adminObject */
@@ -36,112 +36,112 @@  discard block
 block discarded – undo
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 
 if (!is_object($GLOBALS['xoopsUser']) || !is_object($xoopsModule)
-    || !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
+	|| !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
+	exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
 }
 if ($GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-
-    $op = Request::getCmd('op', 'list');
-    if (!empty($_POST)) {
-        $ok             = Request::getInt('ok', 0, 'POST');
-        $confirm_submit = Request::getCmd('confirm_submit', '', 'POST');
-        $submit         = Request::getString('submit', '', 'POST');
-        $bside          = Request::getString('bside', '0', 'POST');
-        $bweight        = Request::getString('bweight', '0', 'POST');
-        $bvisible       = Request::getString('bvisible', '0', 'POST');
-        $bmodule        = Request::getArray('bmodule', [], 'POST');
-        $btitle         = Request::getString('btitle', '', 'POST');
-        $bcachetime     = Request::getString('bcachetime', '0', 'POST');
-        $groups         = Request::getArray('groups', [], 'POST');
-        $options        = Request::getArray('options', [], 'POST');
-        $submitblock    = Request::getString('submitblock', '', 'POST');
-        $fct            = Request::getString('fct', '', 'POST');
-        $title          = Request::getString('title', '', 'POST');
-        $side           = Request::getString('side', '0', 'POST');
-        $weight         = Request::getString('weight', '0', 'POST');
-        $visible        = Request::getString('visible', '0', 'POST');
-    }
-
-    if ('list' === $op) {
-        //        xoops_cp_header();
-        $blocksadmin->listBlocks();
-        require_once __DIR__ . '/admin_footer.php';
-        exit();
-    }
-
-    if (\in_array($op, ['edit', 'edit_ok', 'delete', 'delete_ok', 'clone', 'clone_ok'])) {
-        $bid = Request::getInt('bid', 0);
-        $ok  = Request::getInt('ok', 0);
-
-        if ('clone' === $op) {
-            $blocksadmin->cloneBlock($bid);
-        }
-
-        if ('delete' === $op) {
-            if (1 === $ok) {
-                //            if (!$GLOBALS['xoopsSecurity']->check()) {
-                //                redirect_header($helper->url('admin/blocksadmin.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-                //            }
-                $blocksadmin->deleteBlock($bid);
-            } else {
-                //            xoops_cp_header();
-                xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-                xoops_cp_footer();
-            }
-        }
-
-        if ('edit' === $op) {
-            $blocksadmin->editBlock($bid);
-        }
-
-        if ('edit_ok' === $op) {
-            $blocksadmin->updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
-        }
-
-        if ('clone_ok' === $op) {
-            $blocksadmin->isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
-        }
-    }
-
-    if ('order' === $op) {
-        $bid = Request::getArray('bid', []);
-
-        $title      = Request::getArray('title', [], 'POST');
-        $side       = Request::getArray('side', [], 'POST');
-        $weight     = Request::getArray('weight', [], 'POST');
-        $visible    = Request::getArray('visible', [], 'POST');
-        $bcachetime = Request::getArray('bcachetime', [], 'POST');
-        $bmodule    = Request::getArray('bmodule', [], 'POST');//mb
-
-        $oldtitle      = Request::getArray('oldtitle', [], 'POST');
-        $oldside       = Request::getArray('oldside', [], 'POST');
-        $oldweight     = Request::getArray('oldweight', [], 'POST');
-        $oldvisible    = Request::getArray('oldvisible', [], 'POST');
-        $oldgroups     = Request::getArray('oldgroups', [], 'POST');
-        $oldbcachetime = Request::getArray('oldcachetime', [], 'POST');
-        $oldbmodule    = Request::getArray('oldbmodule', [], 'POST');//mb
-
-        $blocksadmin->orderBlock(
-            $bid,
-            $oldtitle,
-            $oldside,
-            $oldweight,
-            $oldvisible,
-            $oldgroups,
-            $oldbcachetime,
-            $oldbmodule,
-            $title,
-            $weight,
-            $visible,
-            $side,
-            $bcachetime,
-            $groups,
-            $bmodule
-        );
-    }
+	require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+
+	$op = Request::getCmd('op', 'list');
+	if (!empty($_POST)) {
+		$ok             = Request::getInt('ok', 0, 'POST');
+		$confirm_submit = Request::getCmd('confirm_submit', '', 'POST');
+		$submit         = Request::getString('submit', '', 'POST');
+		$bside          = Request::getString('bside', '0', 'POST');
+		$bweight        = Request::getString('bweight', '0', 'POST');
+		$bvisible       = Request::getString('bvisible', '0', 'POST');
+		$bmodule        = Request::getArray('bmodule', [], 'POST');
+		$btitle         = Request::getString('btitle', '', 'POST');
+		$bcachetime     = Request::getString('bcachetime', '0', 'POST');
+		$groups         = Request::getArray('groups', [], 'POST');
+		$options        = Request::getArray('options', [], 'POST');
+		$submitblock    = Request::getString('submitblock', '', 'POST');
+		$fct            = Request::getString('fct', '', 'POST');
+		$title          = Request::getString('title', '', 'POST');
+		$side           = Request::getString('side', '0', 'POST');
+		$weight         = Request::getString('weight', '0', 'POST');
+		$visible        = Request::getString('visible', '0', 'POST');
+	}
+
+	if ('list' === $op) {
+		//        xoops_cp_header();
+		$blocksadmin->listBlocks();
+		require_once __DIR__ . '/admin_footer.php';
+		exit();
+	}
+
+	if (\in_array($op, ['edit', 'edit_ok', 'delete', 'delete_ok', 'clone', 'clone_ok'])) {
+		$bid = Request::getInt('bid', 0);
+		$ok  = Request::getInt('ok', 0);
+
+		if ('clone' === $op) {
+			$blocksadmin->cloneBlock($bid);
+		}
+
+		if ('delete' === $op) {
+			if (1 === $ok) {
+				//            if (!$GLOBALS['xoopsSecurity']->check()) {
+				//                redirect_header($helper->url('admin/blocksadmin.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+				//            }
+				$blocksadmin->deleteBlock($bid);
+			} else {
+				//            xoops_cp_header();
+				xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+				xoops_cp_footer();
+			}
+		}
+
+		if ('edit' === $op) {
+			$blocksadmin->editBlock($bid);
+		}
+
+		if ('edit_ok' === $op) {
+			$blocksadmin->updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
+		}
+
+		if ('clone_ok' === $op) {
+			$blocksadmin->isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
+		}
+	}
+
+	if ('order' === $op) {
+		$bid = Request::getArray('bid', []);
+
+		$title      = Request::getArray('title', [], 'POST');
+		$side       = Request::getArray('side', [], 'POST');
+		$weight     = Request::getArray('weight', [], 'POST');
+		$visible    = Request::getArray('visible', [], 'POST');
+		$bcachetime = Request::getArray('bcachetime', [], 'POST');
+		$bmodule    = Request::getArray('bmodule', [], 'POST');//mb
+
+		$oldtitle      = Request::getArray('oldtitle', [], 'POST');
+		$oldside       = Request::getArray('oldside', [], 'POST');
+		$oldweight     = Request::getArray('oldweight', [], 'POST');
+		$oldvisible    = Request::getArray('oldvisible', [], 'POST');
+		$oldgroups     = Request::getArray('oldgroups', [], 'POST');
+		$oldbcachetime = Request::getArray('oldcachetime', [], 'POST');
+		$oldbmodule    = Request::getArray('oldbmodule', [], 'POST');//mb
+
+		$blocksadmin->orderBlock(
+			$bid,
+			$oldtitle,
+			$oldside,
+			$oldweight,
+			$oldvisible,
+			$oldgroups,
+			$oldbcachetime,
+			$oldbmodule,
+			$title,
+			$weight,
+			$visible,
+			$side,
+			$bcachetime,
+			$groups,
+			$bmodule
+		);
+	}
 } else {
-    echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
+	echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
 }
 
 require __DIR__ . '/admin_footer.php';

Please login to merge, or discard this patch.

admin/index.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -18,10 +18,10 @@  discard block
 block discarded – undo
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Myiframe\{
-    Common,
-    Common\TestdataButtons,
-    Helper,
-    Utility
+	Common,
+	Common\TestdataButtons,
+	Helper,
+	Utility
 };
 
 require_once __DIR__ . '/admin_header.php';
@@ -32,17 +32,17 @@  discard block
 block discarded – undo
 $adminObject->displayNavigation(basename(__FILE__));
 //------------- Test Data Buttons ----------------------------
 if ($helper->getConfig('displaySampleButton')) {
-    TestdataButtons::loadButtonConfig($adminObject);
-    $adminObject->displayButton('left', '');
+	TestdataButtons::loadButtonConfig($adminObject);
+	$adminObject->displayButton('left', '');
 }
 $op = Request::getString('op', 0, 'GET');
 switch ($op) {
-    case 'hide_buttons':
-        TestdataButtons::hideButtons();
-        break;
-    case 'show_buttons':
-        TestdataButtons::showButtons();
-        break;
+	case 'hide_buttons':
+		TestdataButtons::hideButtons();
+		break;
+	case 'show_buttons':
+		TestdataButtons::showButtons();
+		break;
 }
 //------------- End Test Data Buttons ----------------------------
 

Please login to merge, or discard this patch.

admin/admin_footer.php 1 patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -18,10 +18,10 @@
 block discarded – undo
 $pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
 
 echo "<div class='adminfooter'>\n"
-     . "  <div style='text-align: center;'>\n"
-     . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-     . "  </div>\n"
-     . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
-     . '</div>';
+	 . "  <div style='text-align: center;'>\n"
+	 . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+	 . "  </div>\n"
+	 . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+	 . '</div>';
 
 xoops_cp_footer();

Please login to merge, or discard this patch.

admin/menu.php 1 patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -21,45 +21,45 @@
 block discarded – undo
 $pathIcon32    = Admin::menuIconPath('');
 $pathModIcon32 = XOOPS_URL . '/modules/' . $moduleDirName . '/assets/images/icons/32/';
 if (is_object($helper->getModule())
-    && false !== $helper->getModule()
-                        ->getInfo('modicons32')) {
-    $pathModIcon32 = $helper->url(
-        $helper->getModule()
-               ->getInfo('modicons32')
-    );
+	&& false !== $helper->getModule()
+						->getInfo('modicons32')) {
+	$pathModIcon32 = $helper->url(
+		$helper->getModule()
+			   ->getInfo('modicons32')
+	);
 }
 
 $adminmenu[] = [
-    'title' => _MI_MYIFRAME_NAME,
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+	'title' => _MI_MYIFRAME_NAME,
+	'link'  => 'admin/index.php',
+	'icon'  => $pathIcon32 . '/home.png',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_MYIFRAME_ADMENU1,
-    'link'  => 'admin/manage.php',
-    'icon'  => $pathIcon32 . '/manage.png',
+	'title' => _MI_MYIFRAME_ADMENU1,
+	'link'  => 'admin/manage.php',
+	'icon'  => $pathIcon32 . '/manage.png',
 ];
 
 // Blocks Admin
 $adminmenu[] = [
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
-    'link'  => 'admin/blocksadmin.php',
-    'icon'  => $pathIcon32 . '/block.png',
+	'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
+	'link'  => 'admin/blocksadmin.php',
+	'icon'  => $pathIcon32 . '/block.png',
 ];
 
 if (is_object($helper->getModule()) && $helper->getConfig('displayDeveloperTools')) {
-    $adminmenu[] = [
-        'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
-        'link'  => 'admin/migrate.php',
-        'icon'  => $pathIcon32 . '/database_go.png',
-    ];
+	$adminmenu[] = [
+		'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
+		'link'  => 'admin/migrate.php',
+		'icon'  => $pathIcon32 . '/database_go.png',
+	];
 }
 
 // Category
 $adminmenu[] = [
-    'title' => _MI_MYIFRAME_ADMENU2,
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+	'title' => _MI_MYIFRAME_ADMENU2,
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . '/about.png',
 
 ];

Please login to merge, or discard this patch.

header.php 1 patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  */
 
 use XoopsModules\Myiframe\{
-    Helper
+	Helper
 };
 /** @var Helper $helper */
 
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
-    require $GLOBALS['xoops']->path('class/theme.php');
-    $GLOBALS['xoTheme'] = new \xos_opal_Theme();
+	require $GLOBALS['xoops']->path('class/theme.php');
+	$GLOBALS['xoTheme'] = new \xos_opal_Theme();
 }
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    require $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new XoopsTpl();
+	require $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new XoopsTpl();
 }
 

Please login to merge, or discard this patch.

config/config.php 1 patch

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

@@ -21,69 +21,69 @@
 block discarded – undo
 $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' => [
-        [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        ],
-        //            [
-        //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
-        //                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
-        //            ],
-    ],
+	'copyTestFolders' => [
+		[
+			XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
+			XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		],
+		//            [
+		//                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
+		//                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
+		//            ],
+	],
 
-    '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',
-    ],
+	'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',
+	],
 
-    'renameTables'  => [//         'XX_archive'     => 'ZZZZ_archive',
-    ],
-    'renameColumns' => [//        'extcal_event' => ['from' => 'event_etablissement', 'to' => 'event_location'],
-    ],
-    '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'>
+	'renameTables'  => [//         'XX_archive'     => 'ZZZZ_archive',
+	],
+	'renameColumns' => [//        'extcal_event' => ['from' => 'event_etablissement', 'to' => 'event_location'],
+	],
+	'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>",
 ];

Please login to merge, or discard this patch.

config/icons.php 1 patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -6,14 +6,14 @@
 block discarded – undo
 $moduleDirName = \basename(\dirname(__DIR__));
 
 return [
-    'name'    => \mb_strtoupper($moduleDirName) . ' IconConfigurator',
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . ' title=' . _EDIT . " align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt=" . _DELETE . ' title=' . _DELETE . " align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt=" . _CLONE . ' title=' . _CLONE . " align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt=" . _PREVIEW . ' title=' . _PREVIEW . " align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt=" . _PRINT . ' title=' . _PRINT . " align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt=" . _PDF . ' title=' . _PDF . " align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt=" . _ADD . ' title=' . _ADD . " align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt=" . 0 . ' title=' . _OFF . " align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt=" . 1 . ' title=' . _ON . " align='middle'>",
+	'name'    => \mb_strtoupper($moduleDirName) . ' IconConfigurator',
+	'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . ' title=' . _EDIT . " align='middle'>",
+	'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt=" . _DELETE . ' title=' . _DELETE . " align='middle'>",
+	'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt=" . _CLONE . ' title=' . _CLONE . " align='middle'>",
+	'preview' => "<img src='" . $pathIcon16 . "/view.png' alt=" . _PREVIEW . ' title=' . _PREVIEW . " align='middle'>",
+	'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt=" . _PRINT . ' title=' . _PRINT . " align='middle'>",
+	'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt=" . _PDF . ' title=' . _PDF . " align='middle'>",
+	'add'     => "<img src='" . $pathIcon16 . "/add.png' alt=" . _ADD . ' title=' . _ADD . " align='middle'>",
+	'0'       => "<img src='" . $pathIcon16 . "/0.png' alt=" . 0 . ' title=' . _OFF . " align='middle'>",
+	'1'       => "<img src='" . $pathIcon16 . "/1.png' alt=" . 1 . ' title=' . _ON . " align='middle'>",
 ];

Please login to merge, or discard this patch.

config/paths.php 1 patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -5,17 +5,17 @@
 block discarded – undo
 $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'
+	],
 ];

Please login to merge, or discard this patch.

config/imageconfig.php 1 patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -5,37 +5,37 @@
 block discarded – undo
 
 // 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',
 ];

Please login to merge, or discard this patch.

		@@ -16,8 +16,8 @@ discard block
		block discarded – undo
16	16	use Xmf\Module\Admin;
17	17	use Xmf\Request;
18	18	use XoopsModules\Myiframe\{
19		- Common\Blocksadmin,
20		- Helper
	19	+ Common\Blocksadmin,
	20	+ Helper
21	21	};
22	22
23	23	/** @var Admin $adminObject */
		@@ -36,112 +36,112 @@ discard block
		block discarded – undo
36	36	$xoopsModule = XoopsModule::getByDirname($moduleDirName);
37	37
38	38	if (!is_object($GLOBALS['xoopsUser']) \|\| !is_object($xoopsModule)
39		- \|\| !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
40		- exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
	39	+ \|\| !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
	40	+ exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
41	41	}
42	42	if ($GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
43		- require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
44		-
45		- $op = Request::getCmd('op', 'list');
46		- if (!empty($_POST)) {
47		- $ok = Request::getInt('ok', 0, 'POST');
48		- $confirm_submit = Request::getCmd('confirm_submit', '', 'POST');
49		- $submit = Request::getString('submit', '', 'POST');
50		- $bside = Request::getString('bside', '0', 'POST');
51		- $bweight = Request::getString('bweight', '0', 'POST');
52		- $bvisible = Request::getString('bvisible', '0', 'POST');
53		- $bmodule = Request::getArray('bmodule', [], 'POST');
54		- $btitle = Request::getString('btitle', '', 'POST');
55		- $bcachetime = Request::getString('bcachetime', '0', 'POST');
56		- $groups = Request::getArray('groups', [], 'POST');
57		- $options = Request::getArray('options', [], 'POST');
58		- $submitblock = Request::getString('submitblock', '', 'POST');
59		- $fct = Request::getString('fct', '', 'POST');
60		- $title = Request::getString('title', '', 'POST');
61		- $side = Request::getString('side', '0', 'POST');
62		- $weight = Request::getString('weight', '0', 'POST');
63		- $visible = Request::getString('visible', '0', 'POST');
64		- }
65		-
66		- if ('list' === $op) {
67		- // xoops_cp_header();
68		- $blocksadmin->listBlocks();
69		- require_once __DIR__ . '/admin_footer.php';
70		- exit();
71		- }
72		-
73		- if (\in_array($op, ['edit', 'edit_ok', 'delete', 'delete_ok', 'clone', 'clone_ok'])) {
74		- $bid = Request::getInt('bid', 0);
75		- $ok = Request::getInt('ok', 0);
76		-
77		- if ('clone' === $op) {
78		- $blocksadmin->cloneBlock($bid);
79		- }
80		-
81		- if ('delete' === $op) {
82		- if (1 === $ok) {
83		- // if (!$GLOBALS['xoopsSecurity']->check()) {
84		- // redirect_header($helper->url('admin/blocksadmin.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
85		- // }
86		- $blocksadmin->deleteBlock($bid);
87		- } else {
88		- // xoops_cp_header();
89		- xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
90		- xoops_cp_footer();
91		- }
92		- }
93		-
94		- if ('edit' === $op) {
95		- $blocksadmin->editBlock($bid);
96		- }
97		-
98		- if ('edit_ok' === $op) {
99		- $blocksadmin->updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
100		- }
101		-
102		- if ('clone_ok' === $op) {
103		- $blocksadmin->isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
104		- }
105		- }
106		-
107		- if ('order' === $op) {
108		- $bid = Request::getArray('bid', []);
109		-
110		- $title = Request::getArray('title', [], 'POST');
111		- $side = Request::getArray('side', [], 'POST');
112		- $weight = Request::getArray('weight', [], 'POST');
113		- $visible = Request::getArray('visible', [], 'POST');
114		- $bcachetime = Request::getArray('bcachetime', [], 'POST');
115		- $bmodule = Request::getArray('bmodule', [], 'POST');//mb
116		-
117		- $oldtitle = Request::getArray('oldtitle', [], 'POST');
118		- $oldside = Request::getArray('oldside', [], 'POST');
119		- $oldweight = Request::getArray('oldweight', [], 'POST');
120		- $oldvisible = Request::getArray('oldvisible', [], 'POST');
121		- $oldgroups = Request::getArray('oldgroups', [], 'POST');
122		- $oldbcachetime = Request::getArray('oldcachetime', [], 'POST');
123		- $oldbmodule = Request::getArray('oldbmodule', [], 'POST');//mb
124		-
125		- $blocksadmin->orderBlock(
126		- $bid,
127		- $oldtitle,
128		- $oldside,
129		- $oldweight,
130		- $oldvisible,
131		- $oldgroups,
132		- $oldbcachetime,
133		- $oldbmodule,
134		- $title,
135		- $weight,
136		- $visible,
137		- $side,
138		- $bcachetime,
139		- $groups,
140		- $bmodule
141		- );
142		- }
	43	+ require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
	44	+
	45	+ $op = Request::getCmd('op', 'list');
	46	+ if (!empty($_POST)) {
	47	+ $ok = Request::getInt('ok', 0, 'POST');
	48	+ $confirm_submit = Request::getCmd('confirm_submit', '', 'POST');
	49	+ $submit = Request::getString('submit', '', 'POST');
	50	+ $bside = Request::getString('bside', '0', 'POST');
	51	+ $bweight = Request::getString('bweight', '0', 'POST');
	52	+ $bvisible = Request::getString('bvisible', '0', 'POST');
	53	+ $bmodule = Request::getArray('bmodule', [], 'POST');
	54	+ $btitle = Request::getString('btitle', '', 'POST');
	55	+ $bcachetime = Request::getString('bcachetime', '0', 'POST');
	56	+ $groups = Request::getArray('groups', [], 'POST');
	57	+ $options = Request::getArray('options', [], 'POST');
	58	+ $submitblock = Request::getString('submitblock', '', 'POST');
	59	+ $fct = Request::getString('fct', '', 'POST');
	60	+ $title = Request::getString('title', '', 'POST');
	61	+ $side = Request::getString('side', '0', 'POST');
	62	+ $weight = Request::getString('weight', '0', 'POST');
	63	+ $visible = Request::getString('visible', '0', 'POST');
	64	+ }
	65	+
	66	+ if ('list' === $op) {
	67	+ // xoops_cp_header();
	68	+ $blocksadmin->listBlocks();
	69	+ require_once __DIR__ . '/admin_footer.php';
	70	+ exit();
	71	+ }
	72	+
	73	+ if (\in_array($op, ['edit', 'edit_ok', 'delete', 'delete_ok', 'clone', 'clone_ok'])) {
	74	+ $bid = Request::getInt('bid', 0);
	75	+ $ok = Request::getInt('ok', 0);
	76	+
	77	+ if ('clone' === $op) {
	78	+ $blocksadmin->cloneBlock($bid);
	79	+ }
	80	+
	81	+ if ('delete' === $op) {
	82	+ if (1 === $ok) {
	83	+ // if (!$GLOBALS['xoopsSecurity']->check()) {
	84	+ // redirect_header($helper->url('admin/blocksadmin.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
	85	+ // }
	86	+ $blocksadmin->deleteBlock($bid);
	87	+ } else {
	88	+ // xoops_cp_header();
	89	+ xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
	90	+ xoops_cp_footer();
	91	+ }
	92	+ }
	93	+
	94	+ if ('edit' === $op) {
	95	+ $blocksadmin->editBlock($bid);
	96	+ }
	97	+
	98	+ if ('edit_ok' === $op) {
	99	+ $blocksadmin->updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
	100	+ }
	101	+
	102	+ if ('clone_ok' === $op) {
	103	+ $blocksadmin->isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
	104	+ }
	105	+ }
	106	+
	107	+ if ('order' === $op) {
	108	+ $bid = Request::getArray('bid', []);
	109	+
	110	+ $title = Request::getArray('title', [], 'POST');
	111	+ $side = Request::getArray('side', [], 'POST');
	112	+ $weight = Request::getArray('weight', [], 'POST');
	113	+ $visible = Request::getArray('visible', [], 'POST');
	114	+ $bcachetime = Request::getArray('bcachetime', [], 'POST');
	115	+ $bmodule = Request::getArray('bmodule', [], 'POST');//mb
	116	+
	117	+ $oldtitle = Request::getArray('oldtitle', [], 'POST');
	118	+ $oldside = Request::getArray('oldside', [], 'POST');
	119	+ $oldweight = Request::getArray('oldweight', [], 'POST');
	120	+ $oldvisible = Request::getArray('oldvisible', [], 'POST');
	121	+ $oldgroups = Request::getArray('oldgroups', [], 'POST');
	122	+ $oldbcachetime = Request::getArray('oldcachetime', [], 'POST');
	123	+ $oldbmodule = Request::getArray('oldbmodule', [], 'POST');//mb
	124	+
	125	+ $blocksadmin->orderBlock(
	126	+ $bid,
	127	+ $oldtitle,
	128	+ $oldside,
	129	+ $oldweight,
	130	+ $oldvisible,
	131	+ $oldgroups,
	132	+ $oldbcachetime,
	133	+ $oldbmodule,
	134	+ $title,
	135	+ $weight,
	136	+ $visible,
	137	+ $side,
	138	+ $bcachetime,
	139	+ $groups,
	140	+ $bmodule
	141	+ );
	142	+ }
143	143	} else {
144		- echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
	144	+ echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
145	145	}
146	146
147	147	require __DIR__ . '/admin_footer.php';

		@@ -18,10 +18,10 @@ discard block
		block discarded – undo
18	18	use Xmf\Module\Admin;
19	19	use Xmf\Request;
20	20	use XoopsModules\Myiframe\{
21		- Common,
22		- Common\TestdataButtons,
23		- Helper,
24		- Utility
	21	+ Common,
	22	+ Common\TestdataButtons,
	23	+ Helper,
	24	+ Utility
25	25	};
26	26
27	27	require_once __DIR__ . '/admin_header.php';
		@@ -32,17 +32,17 @@ discard block
		block discarded – undo
32	32	$adminObject->displayNavigation(basename(__FILE__));
33	33	//------------- Test Data Buttons ----------------------------
34	34	if ($helper->getConfig('displaySampleButton')) {
35		- TestdataButtons::loadButtonConfig($adminObject);
36		- $adminObject->displayButton('left', '');
	35	+ TestdataButtons::loadButtonConfig($adminObject);
	36	+ $adminObject->displayButton('left', '');
37	37	}
38	38	$op = Request::getString('op', 0, 'GET');
39	39	switch ($op) {
40		- case 'hide_buttons':
41		- TestdataButtons::hideButtons();
42		- break;
43		- case 'show_buttons':
44		- TestdataButtons::showButtons();
45		- break;
	40	+ case 'hide_buttons':
	41	+ TestdataButtons::hideButtons();
	42	+ break;
	43	+ case 'show_buttons':
	44	+ TestdataButtons::showButtons();
	45	+ break;
46	46	}
47	47	//------------- End Test Data Buttons ----------------------------
48	48

		@@ -18,10 +18,10 @@
		block discarded – undo
18	18	$pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
19	19
20	20	echo "<div class='adminfooter'>\n"
21		- . " <div style='text-align: center;'>\n"
22		- . " <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
23		- . " </div>\n"
24		- . ' ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
25		- . '</div>';
	21	+ . " <div style='text-align: center;'>\n"
	22	+ . " <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
	23	+ . " </div>\n"
	24	+ . ' ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
	25	+ . '</div>';
26	26
27	27	xoops_cp_footer();

		@@ -21,45 +21,45 @@
		block discarded – undo
21	21	$pathIcon32 = Admin::menuIconPath('');
22	22	$pathModIcon32 = XOOPS_URL . '/modules/' . $moduleDirName . '/assets/images/icons/32/';
23	23	if (is_object($helper->getModule())
24		- && false !== $helper->getModule()
25		- ->getInfo('modicons32')) {
26		- $pathModIcon32 = $helper->url(
27		- $helper->getModule()
28		- ->getInfo('modicons32')
29		- );
	24	+ && false !== $helper->getModule()
	25	+ ->getInfo('modicons32')) {
	26	+ $pathModIcon32 = $helper->url(
	27	+ $helper->getModule()
	28	+ ->getInfo('modicons32')
	29	+ );
30	30	}
31	31
32	32	$adminmenu[] = [
33		- 'title' => _MI_MYIFRAME_NAME,
34		- 'link' => 'admin/index.php',
35		- 'icon' => $pathIcon32 . '/home.png',
	33	+ 'title' => _MI_MYIFRAME_NAME,
	34	+ 'link' => 'admin/index.php',
	35	+ 'icon' => $pathIcon32 . '/home.png',
36	36	];
37	37
38	38	$adminmenu[] = [
39		- 'title' => _MI_MYIFRAME_ADMENU1,
40		- 'link' => 'admin/manage.php',
41		- 'icon' => $pathIcon32 . '/manage.png',
	39	+ 'title' => _MI_MYIFRAME_ADMENU1,
	40	+ 'link' => 'admin/manage.php',
	41	+ 'icon' => $pathIcon32 . '/manage.png',
42	42	];
43	43
44	44	// Blocks Admin
45	45	$adminmenu[] = [
46		- 'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
47		- 'link' => 'admin/blocksadmin.php',
48		- 'icon' => $pathIcon32 . '/block.png',
	46	+ 'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
	47	+ 'link' => 'admin/blocksadmin.php',
	48	+ 'icon' => $pathIcon32 . '/block.png',
49	49	];
50	50
51	51	if (is_object($helper->getModule()) && $helper->getConfig('displayDeveloperTools')) {
52		- $adminmenu[] = [
53		- 'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
54		- 'link' => 'admin/migrate.php',
55		- 'icon' => $pathIcon32 . '/database_go.png',
56		- ];
	52	+ $adminmenu[] = [
	53	+ 'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
	54	+ 'link' => 'admin/migrate.php',
	55	+ 'icon' => $pathIcon32 . '/database_go.png',
	56	+ ];
57	57	}
58	58
59	59	// Category
60	60	$adminmenu[] = [
61		- 'title' => _MI_MYIFRAME_ADMENU2,
62		- 'link' => 'admin/about.php',
63		- 'icon' => $pathIcon32 . '/about.png',
	61	+ 'title' => _MI_MYIFRAME_ADMENU2,
	62	+ 'link' => 'admin/about.php',
	63	+ 'icon' => $pathIcon32 . '/about.png',
64	64
65	65	];

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	*/
20	20
21	21	use XoopsModules\Myiframe\{
22		- Helper
	22	+ Helper
23	23	};
24	24	/** @var Helper $helper */
25	25
		@@ -37,12 +37,12 @@ discard block
		block discarded – undo
37	37	$myts = \MyTextSanitizer::getInstance();
38	38
39	39	if (!isset($GLOBALS['xoTheme']) \|\| !is_object($GLOBALS['xoTheme'])) {
40		- require $GLOBALS['xoops']->path('class/theme.php');
41		- $GLOBALS['xoTheme'] = new \xos_opal_Theme();
	40	+ require $GLOBALS['xoops']->path('class/theme.php');
	41	+ $GLOBALS['xoTheme'] = new \xos_opal_Theme();
42	42	}
43	43
44	44	if (!isset($GLOBALS['xoopsTpl']) \|\| !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
45		- require $GLOBALS['xoops']->path('class/template.php');
46		- $xoopsTpl = new XoopsTpl();
	45	+ require $GLOBALS['xoops']->path('class/template.php');
	46	+ $xoopsTpl = new XoopsTpl();
47	47	}
48	48

		@@ -21,69 +21,69 @@
		block discarded – undo
21	21	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
22	22
23	23	return (object)[
24		- 'name' => $moduleDirNameUpper . ' Module Configurator',
25		- 'paths' => [
26		- 'dirname' => $moduleDirName,
27		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
28		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
29		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
30		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
31		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
32		- ],
33		- 'uploadFolders' => [
34		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
35		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
36		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
37		- //XOOPS_UPLOAD_PATH . '/flags'
38		- ],
39		- 'copyBlankFiles' => [
40		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
41		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
42		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
43		- //XOOPS_UPLOAD_PATH . '/flags'
44		- ],
	24	+ 'name' => $moduleDirNameUpper . ' Module Configurator',
	25	+ 'paths' => [
	26	+ 'dirname' => $moduleDirName,
	27	+ 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
	28	+ 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
	29	+ 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
	30	+ 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	31	+ 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	32	+ ],
	33	+ 'uploadFolders' => [
	34	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	35	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
	36	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	37	+ //XOOPS_UPLOAD_PATH . '/flags'
	38	+ ],
	39	+ 'copyBlankFiles' => [
	40	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	41	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
	42	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	43	+ //XOOPS_UPLOAD_PATH . '/flags'
	44	+ ],
45	45
46		- 'copyTestFolders' => [
47		- [
48		- XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
49		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
50		- ],
51		- // [
52		- // XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
53		- // XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
54		- // ],
55		- ],
	46	+ 'copyTestFolders' => [
	47	+ [
	48	+ XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
	49	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	50	+ ],
	51	+ // [
	52	+ // XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
	53	+ // XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
	54	+ // ],
	55	+ ],
56	56
57		- 'templateFolders' => [
58		- '/templates/',
59		- // '/templates/blocks/',
60		- // '/templates/admin/'
61		- ],
62		- 'oldFiles' => [
63		- '/class/request.php',
64		- '/class/registry.php',
65		- '/class/utilities.php',
66		- '/class/util.php',
67		- // '/include/constants.php',
68		- // '/include/functions.php',
69		- '/ajaxrating.txt',
70		- ],
71		- 'oldFolders' => [
72		- '/images',
73		- '/css',
74		- '/js',
75		- '/tcpdf',
76		- ],
	57	+ 'templateFolders' => [
	58	+ '/templates/',
	59	+ // '/templates/blocks/',
	60	+ // '/templates/admin/'
	61	+ ],
	62	+ 'oldFiles' => [
	63	+ '/class/request.php',
	64	+ '/class/registry.php',
	65	+ '/class/utilities.php',
	66	+ '/class/util.php',
	67	+ // '/include/constants.php',
	68	+ // '/include/functions.php',
	69	+ '/ajaxrating.txt',
	70	+ ],
	71	+ 'oldFolders' => [
	72	+ '/images',
	73	+ '/css',
	74	+ '/js',
	75	+ '/tcpdf',
	76	+ ],
77	77
78		- 'renameTables' => [// 'XX_archive' => 'ZZZZ_archive',
79		- ],
80		- 'renameColumns' => [// 'extcal_event' => ['from' => 'event_etablissement', 'to' => 'event_location'],
81		- ],
82		- 'moduleStats' => [
83		- // 'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
84		- // 'totalitems' => $helper->getHandler('Item')->getItemsCount(),
85		- // 'totalsubmitted' => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
86		- ],
87		- 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
	78	+ 'renameTables' => [// 'XX_archive' => 'ZZZZ_archive',
	79	+ ],
	80	+ 'renameColumns' => [// 'extcal_event' => ['from' => 'event_etablissement', 'to' => 'event_location'],
	81	+ ],
	82	+ 'moduleStats' => [
	83	+ // 'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
	84	+ // 'totalitems' => $helper->getHandler('Item')->getItemsCount(),
	85	+ // 'totalsubmitted' => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
	86	+ ],
	87	+ 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
88	88	<img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
89	89	];

		@@ -6,14 +6,14 @@
		block discarded – undo
6	6	$moduleDirName = \basename(\dirname(__DIR__));
7	7
8	8	return [
9		- 'name' => \mb_strtoupper($moduleDirName) . ' IconConfigurator',
10		- 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . ' title=' . _EDIT . " align='middle'>",
11		- 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt=" . _DELETE . ' title=' . _DELETE . " align='middle'>",
12		- 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt=" . _CLONE . ' title=' . _CLONE . " align='middle'>",
13		- 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt=" . _PREVIEW . ' title=' . _PREVIEW . " align='middle'>",
14		- 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt=" . _PRINT . ' title=' . _PRINT . " align='middle'>",
15		- 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt=" . _PDF . ' title=' . _PDF . " align='middle'>",
16		- 'add' => "<img src='" . $pathIcon16 . "/add.png' alt=" . _ADD . ' title=' . _ADD . " align='middle'>",
17		- '0' => "<img src='" . $pathIcon16 . "/0.png' alt=" . 0 . ' title=' . _OFF . " align='middle'>",
18		- '1' => "<img src='" . $pathIcon16 . "/1.png' alt=" . 1 . ' title=' . _ON . " align='middle'>",
	9	+ 'name' => \mb_strtoupper($moduleDirName) . ' IconConfigurator',
	10	+ 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . ' title=' . _EDIT . " align='middle'>",
	11	+ 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt=" . _DELETE . ' title=' . _DELETE . " align='middle'>",
	12	+ 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt=" . _CLONE . ' title=' . _CLONE . " align='middle'>",
	13	+ 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt=" . _PREVIEW . ' title=' . _PREVIEW . " align='middle'>",
	14	+ 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt=" . _PRINT . ' title=' . _PRINT . " align='middle'>",
	15	+ 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt=" . _PDF . ' title=' . _PDF . " align='middle'>",
	16	+ 'add' => "<img src='" . $pathIcon16 . "/add.png' alt=" . _ADD . ' title=' . _ADD . " align='middle'>",
	17	+ '0' => "<img src='" . $pathIcon16 . "/0.png' alt=" . 0 . ' title=' . _OFF . " align='middle'>",
	18	+ '1' => "<img src='" . $pathIcon16 . "/1.png' alt=" . 1 . ' title=' . _ON . " align='middle'>",
19	19	];

		@@ -5,17 +5,17 @@
		block discarded – undo
5	5	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
6	6
7	7	return [
8		- 'name' => \mb_strtoupper($moduleDirName) . ' PathConfigurator',
9		- 'dirname' => $moduleDirName,
10		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
11		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
12		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
13		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
14		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
15		- 'uploadFolders' => [
16		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
17		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
18		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
19		- //XOOPS_UPLOAD_PATH . '/flags'
20		- ],
	8	+ 'name' => \mb_strtoupper($moduleDirName) . ' PathConfigurator',
	9	+ 'dirname' => $moduleDirName,
	10	+ 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
	11	+ 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
	12	+ 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
	13	+ 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	14	+ 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	15	+ 'uploadFolders' => [
	16	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	17	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
	18	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	19	+ //XOOPS_UPLOAD_PATH . '/flags'
	20	+ ],
21	21	];

		@@ -5,37 +5,37 @@
		block discarded – undo
5	5
6	6	// extra module configs
7	7	$modversion['config'][] = [
8		- 'name' => 'imageConfigs',
9		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
10		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
11		- 'formtype' => 'line_break',
12		- 'valuetype' => 'textbox',
13		- 'default' => 'head',
	8	+ 'name' => 'imageConfigs',
	9	+ 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
	10	+ 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
	11	+ 'formtype' => 'line_break',
	12	+ 'valuetype' => 'textbox',
	13	+ 'default' => 'head',
14	14	];
15	15
16	16	$modversion['config'][] = [
17		- 'name' => 'imageWidth',
18		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
19		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
20		- 'formtype' => 'textbox',
21		- 'valuetype' => 'int',
22		- 'default' => 1200,
	17	+ 'name' => 'imageWidth',
	18	+ 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
	19	+ 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
	20	+ 'formtype' => 'textbox',
	21	+ 'valuetype' => 'int',
	22	+ 'default' => 1200,
23	23	]; // =1024/16
24	24
25	25	$modversion['config'][] = [
26		- 'name' => 'imageHeight',
27		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
28		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
29		- 'formtype' => 'textbox',
30		- 'valuetype' => 'int',
31		- 'default' => 800,
	26	+ 'name' => 'imageHeight',
	27	+ 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
	28	+ 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
	29	+ 'formtype' => 'textbox',
	30	+ 'valuetype' => 'int',
	31	+ 'default' => 800,
32	32	]; // =768/16
33	33
34	34	$modversion['config'][] = [
35		- 'name' => 'imageUploadPath',
36		- 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
37		- 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
38		- 'formtype' => 'textbox',
39		- 'valuetype' => 'text',
40		- 'default' => 'uploads/' . $modversion['dirname'] . '/images',
	35	+ 'name' => 'imageUploadPath',
	36	+ 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
	37	+ 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
	38	+ 'formtype' => 'textbox',
	39	+ 'valuetype' => 'text',
	40	+ 'default' => 'uploads/' . $modversion['dirname'] . '/images',
41	41	];

XoopsModules25x / myiframe

Push — master ( 757841...94ec22 )

Status

Category

Indentation +105 added lines, -105 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch