XoopsModules25x / myiframe

xoops_version.php

Indentation +81 added lines, -81 removed lines

@@ -14,113 +14,113 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 $modversion = [
-    'version'             => '1.67.0',
-    'module_status'       => 'Beta 2',
-    'release_date'        => '2022/03/28',
-    'name'                => _MI_MYIFRAME_NAME,
-    'description'         => _MI_MYIFRAME_DESC,
-    'credits'             => '',
-    'author'              => 'Instant Zero - https://xoops.instant-zero.com',
-    'help'                => 'page=help',
-    'license'             => 'GPL see LICENSE',
-    'official'            => 0,
-    'image'               => 'assets/images/logoModule.png',
-    'dirname'             => basename(__DIR__),
-    'min_php'             => '7.4',
-    'min_db'              => ['mysql' => '5.5'],
-    'min_xoops'           => '2.5.10',
-    'min_admin'           => '1.2',
-    'module_website_url'  => 'www.xoops.org',
-    'module_website_name' => 'XOOPS',
-    'module_release'      => '03/28/2022',
-    'system_menu'         => 1,
-    //sql tables
-    'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
-    'tables'              => [
-        'myiframe',
-    ],
-    // Admin
-    'hasAdmin'            => 1,
-    'adminindex'          => 'admin/index.php',
-    'adminmenu'           => 'admin/menu.php',
-    // Menu
-    'hasMain'             => 1,
+	'version'             => '1.67.0',
+	'module_status'       => 'Beta 2',
+	'release_date'        => '2022/03/28',
+	'name'                => _MI_MYIFRAME_NAME,
+	'description'         => _MI_MYIFRAME_DESC,
+	'credits'             => '',
+	'author'              => 'Instant Zero - https://xoops.instant-zero.com',
+	'help'                => 'page=help',
+	'license'             => 'GPL see LICENSE',
+	'official'            => 0,
+	'image'               => 'assets/images/logoModule.png',
+	'dirname'             => basename(__DIR__),
+	'min_php'             => '7.4',
+	'min_db'              => ['mysql' => '5.5'],
+	'min_xoops'           => '2.5.10',
+	'min_admin'           => '1.2',
+	'module_website_url'  => 'www.xoops.org',
+	'module_website_name' => 'XOOPS',
+	'module_release'      => '03/28/2022',
+	'system_menu'         => 1,
+	//sql tables
+	'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
+	'tables'              => [
+		'myiframe',
+	],
+	// Admin
+	'hasAdmin'            => 1,
+	'adminindex'          => 'admin/index.php',
+	'adminmenu'           => 'admin/menu.php',
+	// Menu
+	'hasMain'             => 1,
 ];
 // ------------------- Help files ------------------- //
 $modversion['helpsection'] = [
-    ['name' => _MI_MYIFRAME_OVERVIEW, 'link' => 'page=help'],
-    ['name' => _MI_MYIFRAME_DISCLAIMER, 'link' => 'page=disclaimer'],
-    ['name' => _MI_MYIFRAME_LICENSE, 'link' => 'page=license'],
-    ['name' => _MI_MYIFRAME_SUPPORT, 'link' => 'page=support'],
+	['name' => _MI_MYIFRAME_OVERVIEW, 'link' => 'page=help'],
+	['name' => _MI_MYIFRAME_DISCLAIMER, 'link' => 'page=disclaimer'],
+	['name' => _MI_MYIFRAME_LICENSE, 'link' => 'page=license'],
+	['name' => _MI_MYIFRAME_SUPPORT, 'link' => 'page=support'],
 ];
 // ------------------- Templates ------------------- //
 $modversion['templates'] = [
-    ['file' => 'myiframe.tpl', 'description' => 'Default template'],
+	['file' => 'myiframe.tpl', 'description' => 'Default template'],
 ];
 
 //Blocks
 $modversion['blocks'][] = [
-    'file'        => 'myiframe_iframe.php',
-    'name'        => _MI_MYIFRAME_BNAME1,
-    'description' => 'Shows an iframe in a block',
-    'show_func'   => 'b_myiframe_iframe_show',
-    'edit_func'   => 'b_myiframe_iframe_edit',
-    'options'     => '0',
-    'template'    => 'myiframe_block_show.tpl',
+	'file'        => 'myiframe_iframe.php',
+	'name'        => _MI_MYIFRAME_BNAME1,
+	'description' => 'Shows an iframe in a block',
+	'show_func'   => 'b_myiframe_iframe_show',
+	'edit_func'   => 'b_myiframe_iframe_edit',
+	'options'     => '0',
+	'template'    => 'myiframe_block_show.tpl',
 ];
 global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
 if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
-    $i = 0;
-    require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
-    $myts = \MyTextSanitizer::getInstance();
-    if (myiframe_getmoduleoption('showinmenu')) {
-        $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' ORDER BY frame_description';
-        $result = $GLOBALS['xoopsDB']->query($sql);
-        while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            if ('' !== xoops_trim($myrow['frame_description'])) {
-                $modversion['sub'][$i]['name'] = htmlspecialchars($myrow['frame_description'], ENT_QUOTES | ENT_HTML5);
-                $modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
-                $i++;
-            }
-        }
-    }
+	$i = 0;
+	require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+	$myts = \MyTextSanitizer::getInstance();
+	if (myiframe_getmoduleoption('showinmenu')) {
+		$sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' ORDER BY frame_description';
+		$result = $GLOBALS['xoopsDB']->query($sql);
+		while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			if ('' !== xoops_trim($myrow['frame_description'])) {
+				$modversion['sub'][$i]['name'] = htmlspecialchars($myrow['frame_description'], ENT_QUOTES | ENT_HTML5);
+				$modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
+				$i++;
+			}
+		}
+	}
 }
 // Options
 $modversion['config'][] = [
-    'name'        => 'showinmenu',
-    'title'       => '_MI_MYIFRAME_OPT0',
-    'description' => '_MI_MYIFRAME_OPT0_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0,
+	'name'        => 'showinmenu',
+	'title'       => '_MI_MYIFRAME_OPT0',
+	'description' => '_MI_MYIFRAME_OPT0_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0,
 ];
 $modversion['config'][] = [
-    'name'        => 'showlist',
-    'title'       => '_MI_MYIFRAME_OPT1',
-    'description' => '_MI_MYIFRAME_OPT1_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1,
+	'name'        => 'showlist',
+	'title'       => '_MI_MYIFRAME_OPT1',
+	'description' => '_MI_MYIFRAME_OPT1_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1,
 ];
 
 // Make Sample button visible?
 $modversion['config'][] = [
-    'name'        => 'displaySampleButton',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1,
+	'name'        => 'displaySampleButton',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1,
 ];
 // Maintained by
 $modversion['config'][] = [
-    'name'        => 'maintainedby',
-    'title'       => '\_MI_MYMODULE_MAINTAINEDBY',
-    'description' => '\_MI_MYMODULE_MAINTAINEDBY_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => 'https://xoops.org/modules/newbb',
+	'name'        => 'maintainedby',
+	'title'       => '\_MI_MYMODULE_MAINTAINEDBY',
+	'description' => '\_MI_MYMODULE_MAINTAINEDBY_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => 'https://xoops.org/modules/newbb',
 ];
 
 // Search

admin/admin_header.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 use Xmf\Module\Admin;
 use XoopsModules\Myiframe\{
-    Helper
+	Helper
 };
 
 /** @var Admin $adminObject */

admin/manage.php

Indentation +234 added lines, -234 removed lines

@@ -15,20 +15,20 @@ 
 
 // Verify if the table is up to date
 if (!myiframe_FieldExists('frame_frameid', $GLOBALS['xoopsDB']->prefix('myiframe'))) {
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
-    header('Location : ' . XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
+	header('Location : ' . XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
 }
 
 $module_id = $xoopsModule->getVar('mid');
@@ -53,48 +53,48 @@ 
  */
 function addEditForm($frameid, $Action, $FormTitle, $longdesc, $width, $height, $align, $frameborder, $marginwidth, $marginheight, $scrolling, $url, $LabelSubmitButton): void
 {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-    global $xoopsModule;
+	require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+	global $xoopsModule;
 
-    $sform = new \XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php');
-    $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_DESC, 'longdesc', 50, 255, $longdesc), false);
-    $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_WIDTH, 'width', 10, 15, $width), false);
-    $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_HEIGHT, 'height', 10, 15, $height), false);
+	$sform = new \XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php');
+	$sform->addElement(new \XoopsFormText(_AM_MYIFRAME_DESC, 'longdesc', 50, 255, $longdesc), false);
+	$sform->addElement(new \XoopsFormText(_AM_MYIFRAME_WIDTH, 'width', 10, 15, $width), false);
+	$sform->addElement(new \XoopsFormText(_AM_MYIFRAME_HEIGHT, 'height', 10, 15, $height), false);
 
-    $selalign = new \XoopsFormSelect(_AM_MYIFRAME_ALIGN, 'align', $align);
-    $selalign->addOption(1, _AM_MYIFRAME_ALIGN_TOP);
-    $selalign->addOption(2, _AM_MYIFRAME_ALIGN_MIDDLE);
-    $selalign->addOption(3, _AM_MYIFRAME_ALIGN_BOTTOM);
-    $selalign->addOption(4, _AM_MYIFRAME_ALIGN_LEFT);
-    $selalign->addOption(5, _AM_MYIFRAME_ALIGN_RIGHT);
-    $selalign->setValue($align);
-    $sform->addElement($selalign);
+	$selalign = new \XoopsFormSelect(_AM_MYIFRAME_ALIGN, 'align', $align);
+	$selalign->addOption(1, _AM_MYIFRAME_ALIGN_TOP);
+	$selalign->addOption(2, _AM_MYIFRAME_ALIGN_MIDDLE);
+	$selalign->addOption(3, _AM_MYIFRAME_ALIGN_BOTTOM);
+	$selalign->addOption(4, _AM_MYIFRAME_ALIGN_LEFT);
+	$selalign->addOption(5, _AM_MYIFRAME_ALIGN_RIGHT);
+	$selalign->setValue($align);
+	$sform->addElement($selalign);
 
-    $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_FRAMEBORDER, 'frameborder', 3, 3, $frameborder), false);
-    $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_MARGINWIDTH, 'marginwidth', 3, 3, $marginwidth), false);
-    $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_MARGINHEIGHT, 'marginheight', 3, 3, $marginheight), false);
+	$sform->addElement(new \XoopsFormText(_AM_MYIFRAME_FRAMEBORDER, 'frameborder', 3, 3, $frameborder), false);
+	$sform->addElement(new \XoopsFormText(_AM_MYIFRAME_MARGINWIDTH, 'marginwidth', 3, 3, $marginwidth), false);
+	$sform->addElement(new \XoopsFormText(_AM_MYIFRAME_MARGINHEIGHT, 'marginheight', 3, 3, $marginheight), false);
 
-    $selscroll = new \XoopsFormSelect(_AM_MYIFRAME_SCROLLING, 'scrolling', $scrolling);
-    $selscroll->addOption(1, _YES);
-    $selscroll->addOption(2, _NO);
-    $selscroll->addOption(3, _AM_MYIFRAME_AUTO);
-    $selscroll->setValue($scrolling);
-    $sform->addElement($selscroll);
+	$selscroll = new \XoopsFormSelect(_AM_MYIFRAME_SCROLLING, 'scrolling', $scrolling);
+	$selscroll->addOption(1, _YES);
+	$selscroll->addOption(2, _NO);
+	$selscroll->addOption(3, _AM_MYIFRAME_AUTO);
+	$selscroll->setValue($scrolling);
+	$sform->addElement($selscroll);
 
-    $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_URL, 'url', 50, 255, $url), true);
-    $sform->addElement(new \XoopsFormHidden('op', $Action), false);
-    if (!empty($frameid)) {
-        $sform->addElement(new \XoopsFormHidden('frameid', $frameid), false);
-    }
+	$sform->addElement(new \XoopsFormText(_AM_MYIFRAME_URL, 'url', 50, 255, $url), true);
+	$sform->addElement(new \XoopsFormHidden('op', $Action), false);
+	if (!empty($frameid)) {
+		$sform->addElement(new \XoopsFormHidden('frameid', $frameid), false);
+	}
 
-    $buttonTray = new \XoopsFormElementTray('', '');
-    $submit_btn = new \XoopsFormButton('', 'submit', $LabelSubmitButton, 'submit');
-    $buttonTray->addElement($submit_btn);
-    $cancel_btn = new \XoopsFormButton('', 'reset', _AM_MYIFRAME_RESETBUTTON, 'reset');
-    $buttonTray->addElement($cancel_btn);
-    $sform->addElement($buttonTray);
-    $sform->display();
-    require_once __DIR__ . '/admin_footer.php';
+	$buttonTray = new \XoopsFormElementTray('', '');
+	$submit_btn = new \XoopsFormButton('', 'submit', $LabelSubmitButton, 'submit');
+	$buttonTray->addElement($submit_btn);
+	$cancel_btn = new \XoopsFormButton('', 'reset', _AM_MYIFRAME_RESETBUTTON, 'reset');
+	$buttonTray->addElement($cancel_btn);
+	$sform->addElement($buttonTray);
+	$sform->display();
+	require_once __DIR__ . '/admin_footer.php';
 }
 
 // ******************************************************************************************************************************************
@@ -104,191 +104,191 @@ 
 $op = Request::getCmd('op', '');
 
 switch ($op) {
-    case 'verifybeforeedit':
-        if (Request::hasVar('submit', 'POST') && '' !== $_POST['submit']) {
-            if ('' === $_POST['longdesc']) {
-                xoops_cp_header();
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 1';
-                echo '</td></tr></table>';
-                require_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                exit();
-            }
+	case 'verifybeforeedit':
+		if (Request::hasVar('submit', 'POST') && '' !== $_POST['submit']) {
+			if ('' === $_POST['longdesc']) {
+				xoops_cp_header();
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+				echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+				echo '<tr><td class="odd">';
+				echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+				echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 1';
+				echo '</td></tr></table>';
+				require_once __DIR__ . '/admin_footer.php';
+				xoops_cp_footer();
+				exit();
+			}
 
-            $frameid = $_POST['frameid'];
-            $frame   = $iframeHandler->get($frameid);
-            $frame->unsetNew();
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-        }
-        break;
-    case 'edit':
-        xoops_cp_header();
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        if (Request::hasVar('frameid', 'GET')) {
-            $frameid = Request::getInt('frameid', 0, 'GET');
-            $frame   = $iframeHandler->get($frameid);
-            addEditForm(
-                $frameid,
-                'verifybeforeedit',
-                _AM_MYIFRAME_CONFIG,
-                $frame->getVar('frame_description', 'e'),
-                $frame->getVar('frame_width', 'e'),
-                $frame->getVar('frame_height', 'e'),
-                $frame->getVar('frame_align', 'e'),
-                $frame->getVar('frame_frameborder', 'e'),
-                $frame->getVar('frame_marginwidth', 'e'),
-                $frame->getVar('frame_marginheight', 'e'),
-                $frame->getVar('frame_scrolling', 'e'),
-                $frame->getVar('frame_url', 'e'),
-                _AM_MYIFRAME_UPDATE
-            );
-        } else {
-            xoops_cp_header();
-            $adminObject = Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-            echo '<tr><td class="odd">';
-            echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-            echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 2';
-            echo "</td></tr></table>\n";
-            require_once __DIR__ . '/admin_footer.php';
-            xoops_cp_footer();
-            exit();
-        }
-        break;
-    case 'delete':
-        if (!isset($_POST['ok'])) {
-            xoops_cp_header();
-            $adminObject = Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
-            xoops_confirm(
-                [
-                    'op'      => 'delete',
-                    'frameid' => Request::getInt('frameid', 0, 'GET'),
-                    'ok'      => 1,
-                ],
-                'manage.php',
-                _AM_MYIFRAME_RUSUREDEL
-            );
-            require_once __DIR__ . '/admin_footer.php';
-        } else {
-            if (empty($_POST['frameid'])) {
-                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX . ' 3');
-            }
-            $frameid = Request::getInt('frameid', 0, 'POST');
-            $critere = new \Criteria('frame_frameid', $frameid, '=');
-            $iframeHandler->deleteAll($critere);
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-        }
-        break;
-    case 'verifytoadd':
-        if (Request::hasVar('submit', 'POST') && '' !== $_POST['submit']) {
-            if ('' === $_POST['url']) {
-                xoops_cp_header();
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 4';
-                echo "</td></tr></table>\n";
-                require_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                exit();
-            }
-            $frame = $iframeHandler->create(true);
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_created', time());
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX . ' 5');
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
-        }
-        break;
-    case 'addframe':
-        xoops_cp_header();
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        addEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
-        break;
-    case 'default':
-    default:
-        xoops_cp_header();
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br>\n";
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-        echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>" . _AM_MYIFRAME_ACTION . "</th></tr>\n";
-        $critere = new \Criteria('1', '1', '=');
-        $critere->setSort('frame_description');
-        $frarray = $iframeHandler->getObjects($critere);
-        $class   = 'even';
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
-        if (count($frarray) > 0) {
-            /** @var Myiframe $frame */
-            foreach ($frarray as $frame) {
-                $action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
-                $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
-                if ('' === xoops_trim($frame->getVar('frame_description'))) {
-                    $liendesc = $frame->getVar('frame_url');
-                } else {
-                    $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
-                }
-                echo "<tr class='"
-                     . $class
-                     . "'><td align='center'>"
-                     . $frame->getVar('frame_frameid')
-                     . "</td><td align='center'>"
-                     . $liendesc
-                     . "</td><td align='center'>"
-                     . formatTimestamp($frame->getVar('frame_created'))
-                     . "</td><td align='center'>"
-                     . $frame->getVar('frame_hits')
-                     . "</td><td align='center'>"
-                     . $action_edit
-                     . '&nbsp;-&nbsp;'
-                     . $action_delete
-                     . "</td></tr>\n";
-                $class = ('even' === $class) ? 'odd' : 'even';
-            }
-        }
-        echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD . "'></td></tr>";
-        echo '</table>';
-        require_once __DIR__ . '/admin_footer.php';
-        break;
+			$frameid = $_POST['frameid'];
+			$frame   = $iframeHandler->get($frameid);
+			$frame->unsetNew();
+			$frame->setVar('frame_description', $_POST['longdesc']);
+			$frame->setVar('frame_width', $_POST['width']);
+			$frame->setVar('frame_height', $_POST['height']);
+			$frame->setVar('frame_align', $_POST['align']);
+			$frame->setVar('frame_frameborder', $_POST['frameborder']);
+			$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+			$frame->setVar('frame_marginheight', $_POST['marginheight']);
+			$frame->setVar('frame_scrolling', $_POST['scrolling']);
+			$frame->setVar('frame_url', $_POST['url']);
+			$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+			$res = $iframeHandler->insert($frame);
+			if (!$res) {
+				redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
+			}
+			redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+		}
+		break;
+	case 'edit':
+		xoops_cp_header();
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		if (Request::hasVar('frameid', 'GET')) {
+			$frameid = Request::getInt('frameid', 0, 'GET');
+			$frame   = $iframeHandler->get($frameid);
+			addEditForm(
+				$frameid,
+				'verifybeforeedit',
+				_AM_MYIFRAME_CONFIG,
+				$frame->getVar('frame_description', 'e'),
+				$frame->getVar('frame_width', 'e'),
+				$frame->getVar('frame_height', 'e'),
+				$frame->getVar('frame_align', 'e'),
+				$frame->getVar('frame_frameborder', 'e'),
+				$frame->getVar('frame_marginwidth', 'e'),
+				$frame->getVar('frame_marginheight', 'e'),
+				$frame->getVar('frame_scrolling', 'e'),
+				$frame->getVar('frame_url', 'e'),
+				_AM_MYIFRAME_UPDATE
+			);
+		} else {
+			xoops_cp_header();
+			$adminObject = Admin::getInstance();
+			$adminObject->displayNavigation(basename(__FILE__));
+			echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+			echo '<tr><td class="odd">';
+			echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+			echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 2';
+			echo "</td></tr></table>\n";
+			require_once __DIR__ . '/admin_footer.php';
+			xoops_cp_footer();
+			exit();
+		}
+		break;
+	case 'delete':
+		if (!isset($_POST['ok'])) {
+			xoops_cp_header();
+			$adminObject = Admin::getInstance();
+			$adminObject->displayNavigation(basename(__FILE__));
+			echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
+			xoops_confirm(
+				[
+					'op'      => 'delete',
+					'frameid' => Request::getInt('frameid', 0, 'GET'),
+					'ok'      => 1,
+				],
+				'manage.php',
+				_AM_MYIFRAME_RUSUREDEL
+			);
+			require_once __DIR__ . '/admin_footer.php';
+		} else {
+			if (empty($_POST['frameid'])) {
+				redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX . ' 3');
+			}
+			$frameid = Request::getInt('frameid', 0, 'POST');
+			$critere = new \Criteria('frame_frameid', $frameid, '=');
+			$iframeHandler->deleteAll($critere);
+			redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+		}
+		break;
+	case 'verifytoadd':
+		if (Request::hasVar('submit', 'POST') && '' !== $_POST['submit']) {
+			if ('' === $_POST['url']) {
+				xoops_cp_header();
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+				echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+				echo '<tr><td class="odd">';
+				echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+				echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 4';
+				echo "</td></tr></table>\n";
+				require_once __DIR__ . '/admin_footer.php';
+				xoops_cp_footer();
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+				exit();
+			}
+			$frame = $iframeHandler->create(true);
+			$frame->setVar('frame_description', $_POST['longdesc']);
+			$frame->setVar('frame_width', $_POST['width']);
+			$frame->setVar('frame_height', $_POST['height']);
+			$frame->setVar('frame_align', $_POST['align']);
+			$frame->setVar('frame_frameborder', $_POST['frameborder']);
+			$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+			$frame->setVar('frame_marginheight', $_POST['marginheight']);
+			$frame->setVar('frame_scrolling', $_POST['scrolling']);
+			$frame->setVar('frame_url', $_POST['url']);
+			$frame->setVar('frame_created', time());
+			$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+			$res = $iframeHandler->insert($frame);
+			if (!$res) {
+				redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX . ' 5');
+			}
+			redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
+		}
+		break;
+	case 'addframe':
+		xoops_cp_header();
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		addEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
+		break;
+	case 'default':
+	default:
+		xoops_cp_header();
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br>\n";
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+		echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>" . _AM_MYIFRAME_ACTION . "</th></tr>\n";
+		$critere = new \Criteria('1', '1', '=');
+		$critere->setSort('frame_description');
+		$frarray = $iframeHandler->getObjects($critere);
+		$class   = 'even';
+		$baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
+		if (count($frarray) > 0) {
+			/** @var Myiframe $frame */
+			foreach ($frarray as $frame) {
+				$action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
+				$action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
+				if ('' === xoops_trim($frame->getVar('frame_description'))) {
+					$liendesc = $frame->getVar('frame_url');
+				} else {
+					$liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+				}
+				echo "<tr class='"
+					 . $class
+					 . "'><td align='center'>"
+					 . $frame->getVar('frame_frameid')
+					 . "</td><td align='center'>"
+					 . $liendesc
+					 . "</td><td align='center'>"
+					 . formatTimestamp($frame->getVar('frame_created'))
+					 . "</td><td align='center'>"
+					 . $frame->getVar('frame_hits')
+					 . "</td><td align='center'>"
+					 . $action_edit
+					 . '&nbsp;-&nbsp;'
+					 . $action_delete
+					 . "</td></tr>\n";
+				$class = ('even' === $class) ? 'odd' : 'even';
+			}
+		}
+		echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD . "'></td></tr>";
+		echo '</table>';
+		require_once __DIR__ . '/admin_footer.php';
+		break;
 }
 
 xoops_cp_footer();

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

include/common.php

Indentation +30 added lines, -30 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,18 +76,18 @@ 
 $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);
 }

blocks/myiframe_iframe.php

Indentation +60 added lines, -60 removed lines

@@ -9,8 +9,8 @@ 
 
 use XoopsModules\Newbb;
 use XoopsModules\Myiframe\{
-    Constants,
-    Helper
+	Constants,
+	Helper
 };
 
 /** @var Helper $helper */
@@ -23,40 +23,40 @@ 
  */
 function b_myiframe_iframe_show($options)
 {
-    if (!class_exists(Helper::class)) {
-        return false;
-    }
-    $frame         = null;
-    $helper        = Helper::getInstance();
-    $block         = [];
-    $tblalign      = [
-        'top',
-        'middle',
-        'bottom',
-        'left',
-        'rigth',
-    ];
-    $tblscrolling  = [
-        'yes',
-        'no',
-        'auto',
-    ];
-    $iframeHandler = $helper->getHandler('MyiframeBase');
-    $frame         = $iframeHandler->get($options[0]);
+	if (!class_exists(Helper::class)) {
+		return false;
+	}
+	$frame         = null;
+	$helper        = Helper::getInstance();
+	$block         = [];
+	$tblalign      = [
+		'top',
+		'middle',
+		'bottom',
+		'left',
+		'rigth',
+	];
+	$tblscrolling  = [
+		'yes',
+		'no',
+		'auto',
+	];
+	$iframeHandler = $helper->getHandler('MyiframeBase');
+	$frame         = $iframeHandler->get($options[0]);
 
-    if (is_object($frame)) {
-        $block['longdesc']     = $frame->getVar('frame_description');
-        $block['width']        = $frame->getVar('frame_width');
-        $block['height']       = $frame->getVar('frame_height');
-        $block['align']        = $tblalign[$frame->getVar('frame_align') - 1];
-        $block['frameborder']  = $frame->getVar('frame_frameborder');
-        $block['marginwidth']  = $frame->getVar('frame_marginwidth');
-        $block['marginheight'] = $frame->getVar('frame_marginheight');
-        $block['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling') - 1];
-        $block['url']          = $frame->getVar('frame_url');
-    }
+	if (is_object($frame)) {
+		$block['longdesc']     = $frame->getVar('frame_description');
+		$block['width']        = $frame->getVar('frame_width');
+		$block['height']       = $frame->getVar('frame_height');
+		$block['align']        = $tblalign[$frame->getVar('frame_align') - 1];
+		$block['frameborder']  = $frame->getVar('frame_frameborder');
+		$block['marginwidth']  = $frame->getVar('frame_marginwidth');
+		$block['marginheight'] = $frame->getVar('frame_marginheight');
+		$block['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling') - 1];
+		$block['url']          = $frame->getVar('frame_url');
+	}
 
-    return $block;
+	return $block;
 }
 
 /**
@@ -65,30 +65,30 @@ 
  */
 function b_myiframe_iframe_edit($options)
 {
-    if (!class_exists(Helper::class)) {
-        return false;
-    }
-    $helper = Helper::getInstance();
+	if (!class_exists(Helper::class)) {
+		return false;
+	}
+	$helper = Helper::getInstance();
 
-    /** @var \MyiframeBaseHandler $iframeHandler */
-    $iframeHandler = $helper->getHandler('MyiframeBase');
-    $frarray       = [];
-    $critere       = new \Criteria('1', '1', '=');
-    $critere->setSort('frame_description');
-    $frarray = $iframeHandler->getObjects($critere);
+	/** @var \MyiframeBaseHandler $iframeHandler */
+	$iframeHandler = $helper->getHandler('MyiframeBase');
+	$frarray       = [];
+	$critere       = new \Criteria('1', '1', '=');
+	$critere->setSort('frame_description');
+	$frarray = $iframeHandler->getObjects($critere);
 
-    $form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
-    /** @var Myiframe $oneframe */
-    foreach ($frarray as $oneframe) {
-        $form .= "<option value='" . $oneframe->getVar('frame_frameid') . "'";
-        if ($options[0] == $oneframe->getVar('frame_frameid')) {
-            $form .= " selected='selected'";
-        }
-        $form .= '>' . $oneframe->getVar('frame_description') . '</option>';
-    }
-    $form .= "</select>\n";
+	$form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
+	/** @var Myiframe $oneframe */
+	foreach ($frarray as $oneframe) {
+		$form .= "<option value='" . $oneframe->getVar('frame_frameid') . "'";
+		if ($options[0] == $oneframe->getVar('frame_frameid')) {
+			$form .= " selected='selected'";
+		}
+		$form .= '>' . $oneframe->getVar('frame_description') . '</option>';
+	}
+	$form .= "</select>\n";
 
-    return $form;
+	return $form;
 }
 
 /**
@@ -96,10 +96,10 @@ 
  */
 function b_myiframe_iframe_onthefly($options): void
 {
-    $options = explode('|', $options);
-    $block   = b_myiframe_iframe_show($options);
+	$options = explode('|', $options);
+	$block   = b_myiframe_iframe_show($options);
 
-    $tpl = new \XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:myiframe_block_show.tpl');
+	$tpl = new \XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:myiframe_block_show.tpl');
 }

class/MyiframeBaseHandler.php

Indentation +211 added lines, -211 removed lines

@@ -15,215 +15,215 @@
  */
 class MyiframeBaseHandler extends \XoopsObjectHandler
 {
-    /**
-     * @param bool $isNew
-     * @return \XoopsModules\Myiframe\MyiframeBase
-     */
-    public function create($isNew = true)
-    {
-        $object = new MyiframeBase();
-        if ($isNew) {
-            $object->setNew();
-        }
-
-        return $object;
-    }
-
-    /**
-     * @param int $id
-     * @return \XoopsModules\Myiframe\MyiframeBase|null
-     */
-    public function get($id)
-    {
-        $ret = null;
-        $sql = 'SELECT * FROM ' . $this->db->prefix('myiframe') . '  WHERE frame_frameid=' . (int)$id;
-        if (!$result = $this->db->query($sql)) {
-            return $ret;
-        }
-        $numrows = $this->db->getRowsNum($result);
-        if (1 == $numrows) {
-            $object = new MyiframeBase();
-            $object->assignVars($this->db->fetchArray($result));
-
-            return $object;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param bool $force
-     * @return bool
-     */
-    public function insert(\XoopsObject $object, $force = false)
-    {
-        if (!$object instanceof MyiframeBase) {
-            return false;
-        }
-        if (!$object->isDirty()) {
-            return true;
-        }
-        if (!$object->cleanVars()) {
-            foreach ($object->getErrors() as $oneerror) {
-                \trigger_error($oneerror);
-            }
-
-            return false;
-        }
-        foreach ($object->cleanVars as $k => $v) {
-            ${$k} = $v;
-        }
-
-        if ($object->isNew()) {
-            $format = 'INSERT INTO %s (frame_created, frame_uid, frame_description, frame_width, frame_height, frame_align, frame_frameborder, frame_marginwidth, frame_marginheight, frame_scrolling, frame_hits, frame_url) VALUES (%u, %u, %s, %s, %s, %d, %d, %d, %d, %d, %u, %s)';
-            $sql    = \sprintf(
-                $format,
-                $this->db->prefix('myiframe'),
-                $frame_created,
-                $frame_uid,
-                $this->db->quoteString($frame_description),
-                $this->db->quoteString($frame_width),
-                $this->db->quoteString($frame_height),
-                $frame_align,
-                $frame_frameborder,
-                $frame_marginwidth,
-                $frame_marginheight,
-                $frame_scrolling,
-                $frame_hits,
-                $this->db->quoteString($frame_url)
-            );
-            $force  = true;
-        } else {
-            $format = 'UPDATE %s SET frame_description=%s, frame_width=%s, frame_height=%s, frame_align="%d", frame_frameborder="%d", frame_marginwidth="%d", frame_marginheight="%d", frame_scrolling="%d", frame_hits="%u", frame_url=%s WHERE frame_frameid=%u';
-            $sql    = \sprintf(
-                $format,
-                $this->db->prefix('myiframe'),
-                $this->db->quoteString($frame_description),
-                $this->db->quoteString($frame_width),
-                $this->db->quoteString($frame_height),
-                $frame_align,
-                $frame_frameborder,
-                $frame_marginwidth,
-                $frame_marginheight,
-                $frame_scrolling,
-                $frame_hits,
-                $this->db->quoteString($frame_url),
-                $frame_frameid
-            );
-        }
-        if (false !== $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-        if (empty($frame_frameid)) {
-            $frame_frameid = $this->db->getInsertId();
-        }
-        $object->assignVar('frame_frameid', $frame_frameid);
-
-        return $frame_frameid;
-    }
-
-    /**
-     * @param bool $force
-     * @return bool
-     */
-    public function delete(\XoopsObject $object, $force = false)
-    {
-        if (!$object instanceof MyiframeBase) {
-            return false;
-        }
-        $sql = \sprintf('DELETE FROM %s WHERE frame_frameid = "%u"', $this->db->prefix('myiframe'), $object->getVar('frame_frameid'));
-        if (false !== $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param \Criteria|null $criteria
-     * @param bool           $id_as_key
-     * @return array
-     */
-    public function &getObjects(\Criteria $criteria = null, $id_as_key = false): array
-    {
-        $ret   = [];
-        $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
-        if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $result = $this->db->query($sql, $limit, $start);
-        /** @var array $myrow */
-        if ($result instanceof \mysqli_result) {
-            while (false !== ($myrow = $this->db->fetchArray($result))) {
-                if (!$id_as_key) {
-                    $ret[] = new MyiframeBase($myrow);
-                } else {
-                    $ret[$myrow['frame_frameid']] = new MyiframeBase($myrow);
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param \CriteriaCompo|null $criteria
-     * @return int
-     */
-    public function getCount(\CriteriaCompo $criteria = null): int
-    {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
-        if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        [$count] = $this->db->fetchRow($result);
-
-        return $count;
-    }
-
-    /**
-     * @param \CriteriaCompo|null $criteria
-     * @return bool
-     */
-    public function deleteAll(\CriteriaCompo $criteria = null): bool
-    {
-        $sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
-        if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param $frame_id
-     */
-    public function updatehits($frame_id): void
-    {
-        $sql = \sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid="%u"', $this->db->prefix('myiframe'), (int)$frame_id);
-        $this->db->queryF($sql);
-    }
+	/**
+	 * @param bool $isNew
+	 * @return \XoopsModules\Myiframe\MyiframeBase
+	 */
+	public function create($isNew = true)
+	{
+		$object = new MyiframeBase();
+		if ($isNew) {
+			$object->setNew();
+		}
+
+		return $object;
+	}
+
+	/**
+	 * @param int $id
+	 * @return \XoopsModules\Myiframe\MyiframeBase|null
+	 */
+	public function get($id)
+	{
+		$ret = null;
+		$sql = 'SELECT * FROM ' . $this->db->prefix('myiframe') . '  WHERE frame_frameid=' . (int)$id;
+		if (!$result = $this->db->query($sql)) {
+			return $ret;
+		}
+		$numrows = $this->db->getRowsNum($result);
+		if (1 == $numrows) {
+			$object = new MyiframeBase();
+			$object->assignVars($this->db->fetchArray($result));
+
+			return $object;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param bool $force
+	 * @return bool
+	 */
+	public function insert(\XoopsObject $object, $force = false)
+	{
+		if (!$object instanceof MyiframeBase) {
+			return false;
+		}
+		if (!$object->isDirty()) {
+			return true;
+		}
+		if (!$object->cleanVars()) {
+			foreach ($object->getErrors() as $oneerror) {
+				\trigger_error($oneerror);
+			}
+
+			return false;
+		}
+		foreach ($object->cleanVars as $k => $v) {
+			${$k} = $v;
+		}
+
+		if ($object->isNew()) {
+			$format = 'INSERT INTO %s (frame_created, frame_uid, frame_description, frame_width, frame_height, frame_align, frame_frameborder, frame_marginwidth, frame_marginheight, frame_scrolling, frame_hits, frame_url) VALUES (%u, %u, %s, %s, %s, %d, %d, %d, %d, %d, %u, %s)';
+			$sql    = \sprintf(
+				$format,
+				$this->db->prefix('myiframe'),
+				$frame_created,
+				$frame_uid,
+				$this->db->quoteString($frame_description),
+				$this->db->quoteString($frame_width),
+				$this->db->quoteString($frame_height),
+				$frame_align,
+				$frame_frameborder,
+				$frame_marginwidth,
+				$frame_marginheight,
+				$frame_scrolling,
+				$frame_hits,
+				$this->db->quoteString($frame_url)
+			);
+			$force  = true;
+		} else {
+			$format = 'UPDATE %s SET frame_description=%s, frame_width=%s, frame_height=%s, frame_align="%d", frame_frameborder="%d", frame_marginwidth="%d", frame_marginheight="%d", frame_scrolling="%d", frame_hits="%u", frame_url=%s WHERE frame_frameid=%u';
+			$sql    = \sprintf(
+				$format,
+				$this->db->prefix('myiframe'),
+				$this->db->quoteString($frame_description),
+				$this->db->quoteString($frame_width),
+				$this->db->quoteString($frame_height),
+				$frame_align,
+				$frame_frameborder,
+				$frame_marginwidth,
+				$frame_marginheight,
+				$frame_scrolling,
+				$frame_hits,
+				$this->db->quoteString($frame_url),
+				$frame_frameid
+			);
+		}
+		if (false !== $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+		if (empty($frame_frameid)) {
+			$frame_frameid = $this->db->getInsertId();
+		}
+		$object->assignVar('frame_frameid', $frame_frameid);
+
+		return $frame_frameid;
+	}
+
+	/**
+	 * @param bool $force
+	 * @return bool
+	 */
+	public function delete(\XoopsObject $object, $force = false)
+	{
+		if (!$object instanceof MyiframeBase) {
+			return false;
+		}
+		$sql = \sprintf('DELETE FROM %s WHERE frame_frameid = "%u"', $this->db->prefix('myiframe'), $object->getVar('frame_frameid'));
+		if (false !== $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param \Criteria|null $criteria
+	 * @param bool           $id_as_key
+	 * @return array
+	 */
+	public function &getObjects(\Criteria $criteria = null, $id_as_key = false): array
+	{
+		$ret   = [];
+		$limit = $start = 0;
+		$sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
+		if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ('' !== $criteria->getSort()) {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$result = $this->db->query($sql, $limit, $start);
+		/** @var array $myrow */
+		if ($result instanceof \mysqli_result) {
+			while (false !== ($myrow = $this->db->fetchArray($result))) {
+				if (!$id_as_key) {
+					$ret[] = new MyiframeBase($myrow);
+				} else {
+					$ret[$myrow['frame_frameid']] = new MyiframeBase($myrow);
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param \CriteriaCompo|null $criteria
+	 * @return int
+	 */
+	public function getCount(\CriteriaCompo $criteria = null): int
+	{
+		$sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
+		if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		[$count] = $this->db->fetchRow($result);
+
+		return $count;
+	}
+
+	/**
+	 * @param \CriteriaCompo|null $criteria
+	 * @return bool
+	 */
+	public function deleteAll(\CriteriaCompo $criteria = null): bool
+	{
+		$sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
+		if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $frame_id
+	 */
+	public function updatehits($frame_id): void
+	{
+		$sql = \sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid="%u"', $this->db->prefix('myiframe'), (int)$frame_id);
+		$this->db->queryF($sql);
+	}
 }

class/Constants.php

Indentation +19 added lines, -19 removed lines

@@ -27,26 +27,26 @@
  */
 final class Constants
 {
-    /**#@+
+	/**#@+
      * Constant definition
      */
 
-    public const DISALLOW = 0;
-    /**
-     * no delay XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_NONE = 0;
-    /**
-     * short XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_SHORT = 1;
-    /**
-     * medium XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_MEDIUM = 3;
-    /**
-     * long XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_LONG = 7;
-    /**#@-*/
+	public const DISALLOW = 0;
+	/**
+	 * no delay XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_NONE = 0;
+	/**
+	 * short XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_SHORT = 1;
+	/**
+	 * medium XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_MEDIUM = 3;
+	/**
+	 * long XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_LONG = 7;
+	/**#@-*/
 }

class/Common/FilesManagement.php

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