XoopsModules25x / myiframe

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();

Spacing +40 added lines, -40 removed lines

@@ -10,25 +10,25 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+require_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
 
 // 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,10 +53,10 @@ 
  */
 function addEditForm($frameid, $Action, $FormTitle, $longdesc, $width, $height, $align, $frameborder, $marginwidth, $marginheight, $scrolling, $url, $LabelSubmitButton): void
 {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    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 = 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);
@@ -94,7 +94,7 @@ 
     $buttonTray->addElement($cancel_btn);
     $sform->addElement($buttonTray);
     $sform->display();
-    require_once __DIR__ . '/admin_footer.php';
+    require_once __DIR__.'/admin_footer.php';
 }
 
 // ******************************************************************************************************************************************
@@ -112,10 +112,10 @@ 
                 $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 "<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';
+                require_once __DIR__.'/admin_footer.php';
                 xoops_cp_footer();
                 exit();
             }
@@ -168,10 +168,10 @@ 
             $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 "<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';
+            require_once __DIR__.'/admin_footer.php';
             xoops_cp_footer();
             exit();
         }
@@ -181,7 +181,7 @@ 
             xoops_cp_header();
             $adminObject = Admin::getInstance();
             $adminObject->displayNavigation(basename(__FILE__));
-            echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
+            echo '<h4>'._AM_MYIFRAME_CONFIG.'</h4>';
             xoops_confirm(
                 [
                     'op'      => 'delete',
@@ -191,10 +191,10 @@ 
                 'manage.php',
                 _AM_MYIFRAME_RUSUREDEL
             );
-            require_once __DIR__ . '/admin_footer.php';
+            require_once __DIR__.'/admin_footer.php';
         } else {
             if (empty($_POST['frameid'])) {
-                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX . ' 3');
+                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX.' 3');
             }
             $frameid = Request::getInt('frameid', 0, 'POST');
             $critere = new \Criteria('frame_frameid', $frameid, '=');
@@ -210,10 +210,10 @@ 
                 $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 "<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';
+                require_once __DIR__.'/admin_footer.php';
                 xoops_cp_footer();
                 $adminObject = Admin::getInstance();
                 $adminObject->displayNavigation(basename(__FILE__));
@@ -233,7 +233,7 @@ 
             $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_ERROR_ADD_INDEX.' 5');
             }
             redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
         }
@@ -249,23 +249,23 @@ 
         xoops_cp_header();
         $adminObject = Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
-        echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br>\n";
+        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";
+        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';
+        $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>";
+                $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>';
+                    $liendesc = "<a href='".XOOPS_URL.'/modules/myiframe/index.php?iframeid='.$frame->getVar('frame_frameid')."'>".$frame->getVar('frame_description').'</a>';
                 }
                 echo "<tr class='"
                      . $class
@@ -285,9 +285,9 @@ 
                 $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 "<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';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }
 

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

Spacing +25 added lines, -25 removed lines

@@ -18,7 +18,7 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Myiframe;
 
-require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+require_once \dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -37,20 +37,20 @@ 
 //$categoryHandler     = new Myiframe\CategoryHandler($db);
 //$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);
+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);
 }
 
 $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;
@@ -88,6 +88,6 @@ 
     $pathModIcon32 = $helper->getModule()
                             ->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $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');
 }

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 
 /** @var Helper $helper */
 
-require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+require_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
 
 /**
  * @param $options
@@ -36,7 +36,7 @@ 
         'left',
         'rigth',
     ];
-    $tblscrolling  = [
+    $tblscrolling = [
         'yes',
         'no',
         'auto',
@@ -48,11 +48,11 @@ 
         $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['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['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling')-1];
         $block['url']          = $frame->getVar('frame_url');
     }
 
@@ -77,14 +77,14 @@ 
     $critere->setSort('frame_description');
     $frarray = $iframeHandler->getObjects($critere);
 
-    $form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
+    $form = ''._MB_MYIFRAME_IFRAME."&nbsp;<select name='options[0]'>";
     /** @var Myiframe $oneframe */
     foreach ($frarray as $oneframe) {
-        $form .= "<option value='" . $oneframe->getVar('frame_frameid') . "'";
+        $form .= "<option value='".$oneframe->getVar('frame_frameid')."'";
         if ($options[0] == $oneframe->getVar('frame_frameid')) {
             $form .= " selected='selected'";
         }
-        $form .= '>' . $oneframe->getVar('frame_description') . '</option>';
+        $form .= '>'.$oneframe->getVar('frame_description').'</option>';
     }
     $form .= "</select>\n";
 

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

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
  * Copyright (c) Hervé Thouzard of Instant Zero (https://www.instant-zero.com)
  * ****************************************************************************
  */
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 /**
  * Class MyiframeBaseHandler
@@ -36,7 +36,7 @@ 
     public function get($id)
     {
         $ret = null;
-        $sql = 'SELECT * FROM ' . $this->db->prefix('myiframe') . '  WHERE frame_frameid=' . (int)$id;
+        $sql = 'SELECT * FROM '.$this->db->prefix('myiframe').'  WHERE frame_frameid='.(int) $id;
         if (!$result = $this->db->query($sql)) {
             return $ret;
         }
@@ -158,11 +158,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('myiframe');
         if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -188,9 +188,9 @@ 
      */
     public function getCount(\CriteriaCompo $criteria = null): int
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('myiframe');
         if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -207,9 +207,9 @@ 
      */
     public function deleteAll(\CriteriaCompo $criteria = null): bool
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
+        $sql = 'DELETE FROM '.$this->db->prefix('myiframe');
         if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             return false;
@@ -223,7 +223,7 @@ 
      */
     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);
+        $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/Blocksadmin.php

Indentation +623 added lines, -623 removed lines

@@ -26,72 +26,72 @@ 
  */
 class Blocksadmin
 {
-    /**
-     * @var \XoopsMySQLDatabase|null
-     */
-    public $db;
-    /**
-     * @var \Xmf\Module\Helper
-     */
-    public $helper;
-    /**
-     * @var string
-     */
-    public $moduleDirName;
-    /**
-     * @var string
-     */
-    public $moduleDirNameUpper;
-
-    /**
-     * Blocksadmin constructor.
-     */
-    public function __construct(?\XoopsDatabase $db, \Xmf\Module\Helper $helper)
-    {
-        if (null === $db) {
-            $db = \XoopsDatabaseFactory::getDatabaseConnection();
-        }
-        $this->db                 = $db;
-        $this->helper             = $helper;
-        $this->moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $this->moduleDirNameUpper = \mb_strtoupper($this->moduleDirName);
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-        \xoops_loadLanguage('common', $this->moduleDirName);
-        //        \xoops_loadLanguage('blocksadmin', $this->moduleDirName);
-    }
-
-    /**
-     * @return void
-     */
-    public function listBlocks(): void
-    {
-        global $xoopsModule, $pathIcon16;
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        //        xoops_loadLanguage('admin', 'system');
-        //        xoops_loadLanguage('admin/blocksadmin', 'system');
-        //        xoops_loadLanguage('admin/groups', 'system');
-        //        xoops_loadLanguage('common', $moduleDirName);
-        //        xoops_loadLanguage('blocks', $moduleDirName);
-
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = \xoops_getHandler('module');
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = \xoops_getHandler('member');
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = \xoops_getHandler('groupperm');
-        $groups           = $memberHandler->getGroups();
-        $criteria         = new \CriteriaCompo(new \Criteria('hasmain', '1'));
-        $criteria->add(new \Criteria('isactive', '1'));
-        $moduleList     = $moduleHandler->getList($criteria);
-        $moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
-        $moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
-        \ksort($moduleList);
-        echo "<h4 style='text-align:left;'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
-        echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
-        echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-        echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
+	/**
+	 * @var \XoopsMySQLDatabase|null
+	 */
+	public $db;
+	/**
+	 * @var \Xmf\Module\Helper
+	 */
+	public $helper;
+	/**
+	 * @var string
+	 */
+	public $moduleDirName;
+	/**
+	 * @var string
+	 */
+	public $moduleDirNameUpper;
+
+	/**
+	 * Blocksadmin constructor.
+	 */
+	public function __construct(?\XoopsDatabase $db, \Xmf\Module\Helper $helper)
+	{
+		if (null === $db) {
+			$db = \XoopsDatabaseFactory::getDatabaseConnection();
+		}
+		$this->db                 = $db;
+		$this->helper             = $helper;
+		$this->moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$this->moduleDirNameUpper = \mb_strtoupper($this->moduleDirName);
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+		\xoops_loadLanguage('common', $this->moduleDirName);
+		//        \xoops_loadLanguage('blocksadmin', $this->moduleDirName);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function listBlocks(): void
+	{
+		global $xoopsModule, $pathIcon16;
+		require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+		//        xoops_loadLanguage('admin', 'system');
+		//        xoops_loadLanguage('admin/blocksadmin', 'system');
+		//        xoops_loadLanguage('admin/groups', 'system');
+		//        xoops_loadLanguage('common', $moduleDirName);
+		//        xoops_loadLanguage('blocks', $moduleDirName);
+
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = \xoops_getHandler('module');
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = \xoops_getHandler('member');
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = \xoops_getHandler('groupperm');
+		$groups           = $memberHandler->getGroups();
+		$criteria         = new \CriteriaCompo(new \Criteria('hasmain', '1'));
+		$criteria->add(new \Criteria('isactive', '1'));
+		$moduleList     = $moduleHandler->getList($criteria);
+		$moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
+		$moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
+		\ksort($moduleList);
+		echo "<h4 style='text-align:left;'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
+		echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
+		echo $GLOBALS['xoopsSecurity']->getTokenHTML();
+		echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'><th align='center'>" . \_AM_SYSTEM_BLOCKS_TITLE . "</th><th align='center' nowrap='nowrap'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'SIDE') . '<br>' . \_LEFT . '-' . \_CENTER . '-' . \_RIGHT . "</th>
         <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT') . "</th>
         <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE') . "</th><th align='center'>" . \_AM_SYSTEM_BLOCKS_VISIBLEIN . "</th>
@@ -99,82 +99,82 @@ 
         <th align='center'>" . \_AM_SYSTEM_BLOCKS_BCACHETIME . "</th>
         <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'ACTION') . '</th>
         </tr>';
-        $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
-        $blockCount = \count($blockArray);
-        $class      = 'even';
-        $cachetimes = [
-            0       => \_NOCACHE,
-            30      => \sprintf(\_SECONDS, 30),
-            60      => \_MINUTE,
-            300     => \sprintf(\_MINUTES, 5),
-            1800    => \sprintf(\_MINUTES, 30),
-            3600    => \_HOUR,
-            18000   => \sprintf(\_HOURS, 5),
-            86400   => \_DAY,
-            259200  => \sprintf(\_DAYS, 3),
-            604800  => \_WEEK,
-            2592000 => \_MONTH,
-        ];
-        foreach ($blockArray as $i) {
-            $groupsPermissions = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
-            $sql               = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
-            $result            = $this->db->query($sql);
-            $modules           = [];
-            if (!$result instanceof \mysqli_result) {
-                \trigger_error("Query Failed! SQL: $sql Error: " . $this->db->error(), \E_USER_ERROR);
-            }
-            while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
-            }
-
-            $cachetimeOptions = '';
-            foreach ($cachetimes as $cachetime => $cachetimeName) {
-                if ($i->getVar('bcachetime') == $cachetime) {
-                    $cachetimeOptions .= "<option value='$cachetime' selected='selected'>$cachetimeName</option>\n";
-                } else {
-                    $cachetimeOptions .= "<option value='$cachetime'>$cachetimeName</option>\n";
-                }
-            }
-
-            $ssel7 = '';
-            $ssel6 = $ssel7;
-            $ssel5 = $ssel6;
-            $ssel4 = $ssel5;
-            $ssel3 = $ssel4;
-            $ssel2 = $ssel3;
-            $ssel1 = $ssel2;
-            $ssel0 = $ssel1;
-            $sel1  = $ssel0;
-            $sel0  = $sel1;
-            if (1 === $i->getVar('visible')) {
-                $sel1 = ' checked';
-            } else {
-                $sel0 = ' checked';
-            }
-            if (\XOOPS_SIDEBLOCK_LEFT === $i->getVar('side')) {
-                $ssel0 = ' checked';
-            } elseif (\XOOPS_SIDEBLOCK_RIGHT === $i->getVar('side')) {
-                $ssel1 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_LEFT === $i->getVar('side')) {
-                $ssel2 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_RIGHT === $i->getVar('side')) {
-                $ssel4 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_CENTER === $i->getVar('side')) {
-                $ssel3 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOMLEFT === $i->getVar('side')) {
-                $ssel5 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOMRIGHT === $i->getVar('side')) {
-                $ssel6 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOM === $i->getVar('side')) {
-                $ssel7 = ' checked';
-            }
-            if ('' === $i->getVar('title')) {
-                $title = '&nbsp;';
-            } else {
-                $title = $i->getVar('title');
-            }
-            $name = $i->getVar('name');
-            echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar('bid') . "]' value='" . $title . "'></td>
+		$blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
+		$blockCount = \count($blockArray);
+		$class      = 'even';
+		$cachetimes = [
+			0       => \_NOCACHE,
+			30      => \sprintf(\_SECONDS, 30),
+			60      => \_MINUTE,
+			300     => \sprintf(\_MINUTES, 5),
+			1800    => \sprintf(\_MINUTES, 30),
+			3600    => \_HOUR,
+			18000   => \sprintf(\_HOURS, 5),
+			86400   => \_DAY,
+			259200  => \sprintf(\_DAYS, 3),
+			604800  => \_WEEK,
+			2592000 => \_MONTH,
+		];
+		foreach ($blockArray as $i) {
+			$groupsPermissions = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
+			$sql               = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
+			$result            = $this->db->query($sql);
+			$modules           = [];
+			if (!$result instanceof \mysqli_result) {
+				\trigger_error("Query Failed! SQL: $sql Error: " . $this->db->error(), \E_USER_ERROR);
+			}
+			while (false !== ($row = $this->db->fetchArray($result))) {
+				$modules[] = (int)$row['module_id'];
+			}
+
+			$cachetimeOptions = '';
+			foreach ($cachetimes as $cachetime => $cachetimeName) {
+				if ($i->getVar('bcachetime') == $cachetime) {
+					$cachetimeOptions .= "<option value='$cachetime' selected='selected'>$cachetimeName</option>\n";
+				} else {
+					$cachetimeOptions .= "<option value='$cachetime'>$cachetimeName</option>\n";
+				}
+			}
+
+			$ssel7 = '';
+			$ssel6 = $ssel7;
+			$ssel5 = $ssel6;
+			$ssel4 = $ssel5;
+			$ssel3 = $ssel4;
+			$ssel2 = $ssel3;
+			$ssel1 = $ssel2;
+			$ssel0 = $ssel1;
+			$sel1  = $ssel0;
+			$sel0  = $sel1;
+			if (1 === $i->getVar('visible')) {
+				$sel1 = ' checked';
+			} else {
+				$sel0 = ' checked';
+			}
+			if (\XOOPS_SIDEBLOCK_LEFT === $i->getVar('side')) {
+				$ssel0 = ' checked';
+			} elseif (\XOOPS_SIDEBLOCK_RIGHT === $i->getVar('side')) {
+				$ssel1 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_LEFT === $i->getVar('side')) {
+				$ssel2 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_RIGHT === $i->getVar('side')) {
+				$ssel4 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_CENTER === $i->getVar('side')) {
+				$ssel3 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_BOTTOMLEFT === $i->getVar('side')) {
+				$ssel5 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_BOTTOMRIGHT === $i->getVar('side')) {
+				$ssel6 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_BOTTOM === $i->getVar('side')) {
+				$ssel7 = ' checked';
+			}
+			if ('' === $i->getVar('title')) {
+				$title = '&nbsp;';
+			} else {
+				$title = $i->getVar('title');
+			}
+			$name = $i->getVar('name');
+			echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar('bid') . "]' value='" . $title . "'></td>
             <td class='$class' align='center' nowrap='nowrap'><div align='center' >
                     <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_LEFT . "'$ssel2>
                     <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_CENTER . "'$ssel3>
@@ -193,39 +193,39 @@ 
                 <td class='$class' align='center'><input type='text' name='weight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "' size='5' maxlength='5'></td>
                 <td class='$class' align='center' nowrap><input type='radio' name='visible[" . $i->getVar('bid') . "]' value='1'$sel1>" . \_YES . "&nbsp;<input type='radio' name='visible[" . $i->getVar('bid') . "]' value='0'$sel0>" . \_NO . '</td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
-            foreach ($moduleList as $k => $v) {
-                echo "<option value='$k'" . (\in_array($k, $modules) ? " selected='selected'" : '') . ">$v</option>";
-            }
-            echo '</select></td>';
+			echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+			foreach ($moduleList as $k => $v) {
+				echo "<option value='$k'" . (\in_array($k, $modules) ? " selected='selected'" : '') . ">$v</option>";
+			}
+			echo '</select></td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
-            foreach ($groups as $grp) {
-                echo "<option value='" . $grp->getVar('groupid') . "' " . (\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
-            }
-            echo '</select></td>';
+			echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+			foreach ($groups as $grp) {
+				echo "<option value='" . $grp->getVar('groupid') . "' " . (\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
+			}
+			echo '</select></td>';
 
-            // Cache lifetime
-            echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetimeOptions . '</select>
+			// Cache lifetime
+			echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetimeOptions . '</select>
                                     </td>';
 
-            // Actions
+			// Actions
 
-            echo "<td class='$class' align='center'>
+			echo "<td class='$class' align='center'>
                 <a href='blocksadmin.php?op=edit&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/edit.png' . " alt='" . \_EDIT . "' title='" . \_EDIT . "'></a> 
                 <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/editcopy.png' . " alt='" . \_CLONE . "' title='" . \_CLONE . "'></a>";
-            //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
-            //                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
-            //                     </a>";
-            //            }
-
-            //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
-            if (!\in_array($i->getVar('block_type'), ['M', 'S'])) {
-                echo "&nbsp;
+			//            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
+			//                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
+			//                     </a>";
+			//            }
+
+			//            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
+			if (!\in_array($i->getVar('block_type'), ['M', 'S'])) {
+				echo "&nbsp;
                 <a href='blocksadmin.php?op=delete&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . \_DELETE . "' title='" . \_DELETE . "'>
                      </a>";
-            }
-            echo "
+			}
+			echo "
             <input type='hidden' name='oldtitle[" . $i->getVar('bid') . "]' value='" . $i->getVar('title') . "'>
             <input type='hidden' name='oldside[" . $i->getVar('bid') . "]' value='" . $i->getVar('side') . "'>
             <input type='hidden' name='oldweight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "'>
@@ -235,461 +235,461 @@ 
             <input type='hidden' name='bid[" . $i->getVar('bid') . "]' value='" . $i->getVar('bid') . "'>
             </td></tr>
             ";
-            $class = ('even' === $class) ? 'odd' : 'even';
-        }
-        echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' name='submit' value='" . \_SUBMIT . "'></td></tr></table></form><br><br>";
-    }
-
-    /**
-     * @param int $bid
-     * @return void
-     */
-    public function deleteBlock(int $bid): void
-    {
-        //        \xoops_cp_header();
-
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-
-        $myblock = new \XoopsBlock($bid);
-
-        $sql = \sprintf('DELETE FROM %s WHERE bid = %u', $this->db->prefix('newblocks'), $bid);
-        $this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
-        $sql = \sprintf('DELETE FROM %s WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
-        $this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
-
-        $this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
-    }
-
-    /**
-     * @param int $bid
-     * @return void
-     */
-    public function cloneBlock(int $bid): void
-    {
-        //require __DIR__ . '/admin_header.php';
-        //        \xoops_cp_header();
-
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-
-        $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
-        $result  = $this->db->query($sql);
-        $modules = [];
-        if ($result instanceof \mysqli_result) {
-            while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
-            }
-        }
-        $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
-        $block    = [
-            'title'      => $myblock->getVar('title') . ' Clone',
-            'form_title' => \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
-            'name'       => $myblock->getVar('name'),
-            'side'       => $myblock->getVar('side'),
-            'weight'     => $myblock->getVar('weight'),
-            'visible'    => $myblock->getVar('visible'),
-            'content'    => $myblock->getVar('content', 'N'),
-            'modules'    => $modules,
-            'is_custom'  => $isCustom,
-            'ctype'      => $myblock->getVar('c_type'),
-            'bcachetime' => $myblock->getVar('bcachetime'),
-            'op'         => 'clone_ok',
-            'bid'        => $myblock->getVar('bid'),
-            'edit_form'  => $myblock->getOptions(),
-            'template'   => $myblock->getVar('template'),
-            'options'    => $myblock->getVar('options'),
-        ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
-        //        $form = new Blockform();
-        //        $form->render();
-
-        echo $this->render($block);
-        //        xoops_cp_footer();
-        //        require_once __DIR__ . '/admin_footer.php';
-        //        exit();
-    }
-
-    /**
-     * @param int        $bid
-     * @param string     $bside
-     * @param string     $bweight
-     * @param string     $bvisible
-     * @param string     $bcachetime
-     * @param array|null $bmodule
-     * @param array|null $options
-     * @param array|null $groups
-     * @return void
-     */
-    public function isBlockCloned(int $bid, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
-    {
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-
-        $block = new \XoopsBlock($bid);
-        $clone = $block->xoopsClone();
-        if (empty($bmodule)) {
-            //            \xoops_cp_header();
-            \xoops_error(\sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
-            \xoops_cp_footer();
-            exit();
-        }
-        $clone->setVar('side', $bside);
-        $clone->setVar('weight', $bweight);
-        $clone->setVar('visible', $bvisible);
-        //$clone->setVar('content', $_POST['bcontent']);
-        $clone->setVar('title', Request::getString('btitle', '', 'POST'));
-        $clone->setVar('bcachetime', $bcachetime);
-        if (\is_array($options) && (\count($options) > 0)) {
-            $options = \implode('|', $options);
-            $clone->setVar('options', $options);
-        }
-        $clone->setVar('bid', 0);
-        if (\in_array($block->getVar('block_type'), ['C', 'E'])) {
-            $clone->setVar('block_type', 'E');
-        } else {
-            $clone->setVar('block_type', 'D');
-        }
-        //        $newid = $clone->store(); //see https://github.com/XOOPS/XoopsCore25/issues/1105
-        if ($clone->store()) {
-            $newid = $clone->id();  //get the id of the cloned block
-        }
-        if (!$newid) {
-            //            \xoops_cp_header();
-            $clone->getHtmlErrors();
-            \xoops_cp_footer();
-            exit();
-        }
-        if ('' !== $clone->getVar('template')) {
-            /** @var \XoopsTplfileHandler $tplfileHandler */
-            $tplfileHandler = \xoops_getHandler('tplfile');
-            $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string)$bid);
-            if (\count($btemplate) > 0) {
-                $tplclone = $btemplate[0]->xoopsClone();
-                $tplclone->setVar('tpl_id', 0);
-                $tplclone->setVar('tpl_refid', $newid);
-                $tplfileHandler->insert($tplclone);
-            }
-        }
-
-        foreach ($bmodule as $bmid) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
-            $this->db->query($sql);
-        }
-        //$groups = &$GLOBALS['xoopsUser']->getGroups();
-        foreach ($groups as $iValue) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
-            $this->db->query($sql);
-        }
-        $this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
-    }
-
-    /**
-     * @param string     $bid
-     * @param string     $title
-     * @param string     $weight
-     * @param string     $visible
-     * @param string     $side
-     * @param string     $bcachetime
-     * @param array|null $bmodule
-     * @return void
-     */
-    public function setOrder(string $bid, string $title, string $weight, string $visible, string $side, string $bcachetime, ?array $bmodule = null): void
-    {
-        $myblock = new \XoopsBlock($bid);
-        $myblock->setVar('title', $title);
-        $myblock->setVar('weight', $weight);
-        $myblock->setVar('visible', $visible);
-        $myblock->setVar('side', $side);
-        $myblock->setVar('bcachetime', $bcachetime);
-        $myblock->store();
-        //        /** @var \XoopsBlockHandler $blockHandler */
-        //        $blockHandler = \xoops_getHandler('block');
-        //        return $blockHandler->insert($myblock);
-    }
-
-    /**
-     * @param int $bid
-     * @return void
-     */
-    public function editBlock(int $bid): void
-    {
-        //        require_once \dirname(__DIR__,2) . '/admin/admin_header.php';
-        //        \xoops_cp_header();
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-        //        mpu_adm_menu();
-        $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
-        $result  = $this->db->query($sql);
-        $modules = [];
-        if ($result instanceof \mysqli_result) {
-            while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
-            }
-        }
-        $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
-        $block    = [
-            'title'      => $myblock->getVar('title'),
-            'form_title' => \_AM_SYSTEM_BLOCKS_EDITBLOCK,
-            //        'name'       => $myblock->getVar('name'),
-            'side'       => $myblock->getVar('side'),
-            'weight'     => $myblock->getVar('weight'),
-            'visible'    => $myblock->getVar('visible'),
-            'content'    => $myblock->getVar('content', 'N'),
-            'modules'    => $modules,
-            'is_custom'  => $isCustom,
-            'ctype'      => $myblock->getVar('c_type'),
-            'bcachetime' => $myblock->getVar('bcachetime'),
-            'op'         => 'edit_ok',
-            'bid'        => $myblock->getVar('bid'),
-            'edit_form'  => $myblock->getOptions(),
-            'template'   => $myblock->getVar('template'),
-            'options'    => $myblock->getVar('options'),
-        ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
-
-        echo $this->render($block);
-    }
-
-    /**
-     * @param int        $bid
-     * @param string     $btitle
-     * @param string     $bside
-     * @param string     $bweight
-     * @param string     $bvisible
-     * @param string     $bcachetime
-     * @param array|null $bmodule
-     * @param array|null $options
-     * @param array|null $groups
-     * @return void
-     */
-    public function updateBlock(int $bid, string $btitle, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
-    {
-        $myblock = new \XoopsBlock($bid);
-        $myblock->setVar('title', $btitle);
-        $myblock->setVar('weight', $bweight);
-        $myblock->setVar('visible', $bvisible);
-        $myblock->setVar('side', $bside);
-        $myblock->setVar('bcachetime', $bcachetime);
-        //update block options
-        if (isset($options)) {
-            $optionsCount = \count($options);
-            if ($optionsCount > 0) {
-                //Convert array values to comma-separated
-                foreach ($options as $i => $iValue) {
-                    if (\is_array($iValue)) {
-                        $options[$i] = \implode(',', $iValue);
-                    }
-                }
-                $options = \implode('|', $options);
-                $myblock->setVar('options', $options);
-            }
-        }
-        $myblock->store();
-        //        /** @var \XoopsBlockHandler $blockHandler */
-        //        $blockHandler = \xoops_getHandler('block');
-        //        $blockHandler->insert($myblock);
-
-        if (!empty($bmodule) && \count($bmodule) > 0) {
-            $sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
-            $this->db->query($sql);
-            if (\in_array(0, $bmodule)) {
-                $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, 0);
-                $this->db->query($sql);
-            } else {
-                foreach ($bmodule as $bmid) {
-                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int)$bmid);
-                    $this->db->query($sql);
-                }
-            }
-        }
-        $sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid);
-        $this->db->query($sql);
-        if (!empty($groups)) {
-            foreach ($groups as $grp) {
-                $sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid);
-                $this->db->query($sql);
-            }
-        }
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
-    }
-
-    /**
-     * @param array $bid
-     * @param array $oldtitle
-     * @param array $oldside
-     * @param array $oldweight
-     * @param array $oldvisible
-     * @param array $oldgroups
-     * @param array $oldbcachetime
-     * @param array $oldbmodule
-     * @param array $title
-     * @param array $weight
-     * @param array $visible
-     * @param array $side
-     * @param array $bcachetime
-     * @param array $groups
-     * @param array $bmodule
-     * @return void
-     */
-    public function orderBlock(
-        array $bid, array $oldtitle, array $oldside, array $oldweight, array $oldvisible, array $oldgroups, array $oldbcachetime, array $oldbmodule, array $title, array $weight, array $visible, array $side, array $bcachetime, array $groups, array $bmodule
-    ): void {
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            \redirect_header($_SERVER['SCRIPT_NAME'], 3, \implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        foreach (\array_keys($bid) as $i) {
-            if ($oldtitle[$i] !== $title[$i]
-                || $oldweight[$i] !== $weight[$i]
-                || $oldvisible[$i] !== $visible[$i]
-                || $oldside[$i] !== $side[$i]
-                || $oldbcachetime[$i] !== $bcachetime[$i]
-                || $oldbmodule[$i] !== $bmodule[$i]) {
-                $this->setOrder($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bcachetime[$i], $bmodule[$i]);
-            }
-            if (!empty($bmodule[$i]) && \count($bmodule[$i]) > 0) {
-                $sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid[$i]);
-                $this->db->query($sql);
-                if (\in_array(0, $bmodule[$i], true)) {
-                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], 0);
-                    $this->db->query($sql);
-                } else {
-                    foreach ($bmodule[$i] as $bmid) {
-                        $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int)$bmid);
-                        $this->db->query($sql);
-                    }
-                }
-            }
-            $sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid[$i]);
-            $this->db->query($sql);
-            if (!empty($groups[$i])) {
-                foreach ($groups[$i] as $grp) {
-                    $sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid[$i]);
-                    $this->db->query($sql);
-                }
-            }
-        }
-
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
-    }
-
-    /**
-     * @param array|null $block
-     * @return void
-     */
-    public function render(?array $block = null): void
-    {
-        \xoops_load('XoopsFormLoader');
-        \xoops_loadLanguage('common', $this->moduleDirNameUpper);
-
-        $form = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
-        if (isset($block['name'])) {
-            $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_NAME, $block['name']));
-        }
-        $sideSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
-        $sideSelect->addOptionArray([
-                                        0 => \_AM_SYSTEM_BLOCKS_SBLEFT,
-                                        1 => \_AM_SYSTEM_BLOCKS_SBRIGHT,
-                                        3 => \_AM_SYSTEM_BLOCKS_CBLEFT,
-                                        4 => \_AM_SYSTEM_BLOCKS_CBRIGHT,
-                                        5 => \_AM_SYSTEM_BLOCKS_CBCENTER,
-                                        7 => \_AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
-                                        8 => \_AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
-                                        9 => \_AM_SYSTEM_BLOCKS_CBBOTTOM,
-                                    ]);
-        $form->addElement($sideSelect);
-        $form->addElement(new \XoopsFormText(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-        $form->addElement(new \XoopsFormRadioYN(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-        $modSelect = new \XoopsFormSelect(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = \xoops_getHandler('module');
-        $criteria      = new \CriteriaCompo(new \Criteria('hasmain', '1'));
-        $criteria->add(new \Criteria('isactive', '1'));
-        $moduleList     = $moduleHandler->getList($criteria);
-        $moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
-        $moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
-        \ksort($moduleList);
-        $modSelect->addOptionArray($moduleList);
-        $form->addElement($modSelect);
-        $form->addElement(new \XoopsFormText(\_AM_SYSTEM_BLOCKS_TITLE, 'btitle', 50, 255, $block['title']), false);
-        if ($block['is_custom']) {
-            $textarea = new \XoopsFormDhtmlTextArea(\_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-            $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . \_AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . \sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
-            $form->addElement($textarea, true);
-            $ctypeSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
-            $ctypeSelect->addOptionArray([
-                                             'H' => \_AM_SYSTEM_BLOCKS_HTML,
-                                             'P' => \_AM_SYSTEM_BLOCKS_PHP,
-                                             'S' => \_AM_SYSTEM_BLOCKS_AFWSMILE,
-                                             'T' => \_AM_SYSTEM_BLOCKS_AFNOSMILE,
-                                         ]);
-            $form->addElement($ctypeSelect);
-        } else {
-            if ('' !== $block['template']) {
-                /** @var \XoopsTplfileHandler $tplfileHandler */
-                $tplfileHandler = \xoops_getHandler('tplfile');
-                $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
-                if (\count($btemplate) > 0) {
-                    $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
-                } else {
-                    $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
-                    if (\count($btemplate2) > 0) {
-                        $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
-                    }
-                }
-            }
-            if (false !== $block['edit_form']) {
-                $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_OPTIONS, $block['edit_form']));
-            }
-        }
-        $cache_select = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
-        $cache_select->addOptionArray([
-                                          0       => \_NOCACHE,
-                                          30      => \sprintf(\_SECONDS, 30),
-                                          60      => \_MINUTE,
-                                          300     => \sprintf(\_MINUTES, 5),
-                                          1800    => \sprintf(\_MINUTES, 30),
-                                          3600    => \_HOUR,
-                                          18000   => \sprintf(\_HOURS, 5),
-                                          86400   => \_DAY,
-                                          259200  => \sprintf(\_DAYS, 3),
-                                          604800  => \_WEEK,
-                                          2592000 => \_MONTH,
-                                      ]);
-        $form->addElement($cache_select);
-
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = \xoops_getHandler('groupperm');
-        $groups           = $grouppermHandler->getGroupIds('block_read', $block['bid']);
-
-        $form->addElement(new \XoopsFormSelectGroup(\_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
-
-        if (isset($block['bid'])) {
-            $form->addElement(new \XoopsFormHidden('bid', $block['bid']));
-        }
-        $form->addElement(new \XoopsFormHidden('op', $block['op']));
-        $form->addElement(new \XoopsFormHidden('fct', 'blocksadmin'));
-        $buttonTray = new \XoopsFormElementTray('', '&nbsp;');
-        if ($block['is_custom']) {
-            $buttonTray->addElement(new \XoopsFormButton('', 'previewblock', \_PREVIEW, 'submit'));
-        }
-
-        //Submit buttons
-        $buttonTray   = new \XoopsFormElementTray('', '');
-        $submitButton = new \XoopsFormButton('', 'submitblock', \_SUBMIT, 'submit');
-        $buttonTray->addElement($submitButton);
-
-        $cancelButton = new \XoopsFormButton('', '', \_CANCEL, 'button');
-        $cancelButton->setExtra('onclick="history.go(-1)"');
-        $buttonTray->addElement($cancelButton);
-
-        $form->addElement($buttonTray);
-        $form->display();
-    }
+			$class = ('even' === $class) ? 'odd' : 'even';
+		}
+		echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' name='submit' value='" . \_SUBMIT . "'></td></tr></table></form><br><br>";
+	}
+
+	/**
+	 * @param int $bid
+	 * @return void
+	 */
+	public function deleteBlock(int $bid): void
+	{
+		//        \xoops_cp_header();
+
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+
+		$myblock = new \XoopsBlock($bid);
+
+		$sql = \sprintf('DELETE FROM %s WHERE bid = %u', $this->db->prefix('newblocks'), $bid);
+		$this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
+		$sql = \sprintf('DELETE FROM %s WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
+		$this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
+
+		$this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
+	}
+
+	/**
+	 * @param int $bid
+	 * @return void
+	 */
+	public function cloneBlock(int $bid): void
+	{
+		//require __DIR__ . '/admin_header.php';
+		//        \xoops_cp_header();
+
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+
+		$myblock = new \XoopsBlock($bid);
+		$sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+		$result  = $this->db->query($sql);
+		$modules = [];
+		if ($result instanceof \mysqli_result) {
+			while (false !== ($row = $this->db->fetchArray($result))) {
+				$modules[] = (int)$row['module_id'];
+			}
+		}
+		$isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
+		$block    = [
+			'title'      => $myblock->getVar('title') . ' Clone',
+			'form_title' => \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
+			'name'       => $myblock->getVar('name'),
+			'side'       => $myblock->getVar('side'),
+			'weight'     => $myblock->getVar('weight'),
+			'visible'    => $myblock->getVar('visible'),
+			'content'    => $myblock->getVar('content', 'N'),
+			'modules'    => $modules,
+			'is_custom'  => $isCustom,
+			'ctype'      => $myblock->getVar('c_type'),
+			'bcachetime' => $myblock->getVar('bcachetime'),
+			'op'         => 'clone_ok',
+			'bid'        => $myblock->getVar('bid'),
+			'edit_form'  => $myblock->getOptions(),
+			'template'   => $myblock->getVar('template'),
+			'options'    => $myblock->getVar('options'),
+		];
+		echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
+		//        $form = new Blockform();
+		//        $form->render();
+
+		echo $this->render($block);
+		//        xoops_cp_footer();
+		//        require_once __DIR__ . '/admin_footer.php';
+		//        exit();
+	}
+
+	/**
+	 * @param int        $bid
+	 * @param string     $bside
+	 * @param string     $bweight
+	 * @param string     $bvisible
+	 * @param string     $bcachetime
+	 * @param array|null $bmodule
+	 * @param array|null $options
+	 * @param array|null $groups
+	 * @return void
+	 */
+	public function isBlockCloned(int $bid, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
+	{
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+
+		$block = new \XoopsBlock($bid);
+		$clone = $block->xoopsClone();
+		if (empty($bmodule)) {
+			//            \xoops_cp_header();
+			\xoops_error(\sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+			\xoops_cp_footer();
+			exit();
+		}
+		$clone->setVar('side', $bside);
+		$clone->setVar('weight', $bweight);
+		$clone->setVar('visible', $bvisible);
+		//$clone->setVar('content', $_POST['bcontent']);
+		$clone->setVar('title', Request::getString('btitle', '', 'POST'));
+		$clone->setVar('bcachetime', $bcachetime);
+		if (\is_array($options) && (\count($options) > 0)) {
+			$options = \implode('|', $options);
+			$clone->setVar('options', $options);
+		}
+		$clone->setVar('bid', 0);
+		if (\in_array($block->getVar('block_type'), ['C', 'E'])) {
+			$clone->setVar('block_type', 'E');
+		} else {
+			$clone->setVar('block_type', 'D');
+		}
+		//        $newid = $clone->store(); //see https://github.com/XOOPS/XoopsCore25/issues/1105
+		if ($clone->store()) {
+			$newid = $clone->id();  //get the id of the cloned block
+		}
+		if (!$newid) {
+			//            \xoops_cp_header();
+			$clone->getHtmlErrors();
+			\xoops_cp_footer();
+			exit();
+		}
+		if ('' !== $clone->getVar('template')) {
+			/** @var \XoopsTplfileHandler $tplfileHandler */
+			$tplfileHandler = \xoops_getHandler('tplfile');
+			$btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string)$bid);
+			if (\count($btemplate) > 0) {
+				$tplclone = $btemplate[0]->xoopsClone();
+				$tplclone->setVar('tpl_id', 0);
+				$tplclone->setVar('tpl_refid', $newid);
+				$tplfileHandler->insert($tplclone);
+			}
+		}
+
+		foreach ($bmodule as $bmid) {
+			$sql = 'INSERT INTO ' . $this->db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
+			$this->db->query($sql);
+		}
+		//$groups = &$GLOBALS['xoopsUser']->getGroups();
+		foreach ($groups as $iValue) {
+			$sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
+			$this->db->query($sql);
+		}
+		$this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
+	}
+
+	/**
+	 * @param string     $bid
+	 * @param string     $title
+	 * @param string     $weight
+	 * @param string     $visible
+	 * @param string     $side
+	 * @param string     $bcachetime
+	 * @param array|null $bmodule
+	 * @return void
+	 */
+	public function setOrder(string $bid, string $title, string $weight, string $visible, string $side, string $bcachetime, ?array $bmodule = null): void
+	{
+		$myblock = new \XoopsBlock($bid);
+		$myblock->setVar('title', $title);
+		$myblock->setVar('weight', $weight);
+		$myblock->setVar('visible', $visible);
+		$myblock->setVar('side', $side);
+		$myblock->setVar('bcachetime', $bcachetime);
+		$myblock->store();
+		//        /** @var \XoopsBlockHandler $blockHandler */
+		//        $blockHandler = \xoops_getHandler('block');
+		//        return $blockHandler->insert($myblock);
+	}
+
+	/**
+	 * @param int $bid
+	 * @return void
+	 */
+	public function editBlock(int $bid): void
+	{
+		//        require_once \dirname(__DIR__,2) . '/admin/admin_header.php';
+		//        \xoops_cp_header();
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+		//        mpu_adm_menu();
+		$myblock = new \XoopsBlock($bid);
+		$sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+		$result  = $this->db->query($sql);
+		$modules = [];
+		if ($result instanceof \mysqli_result) {
+			while (false !== ($row = $this->db->fetchArray($result))) {
+				$modules[] = (int)$row['module_id'];
+			}
+		}
+		$isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
+		$block    = [
+			'title'      => $myblock->getVar('title'),
+			'form_title' => \_AM_SYSTEM_BLOCKS_EDITBLOCK,
+			//        'name'       => $myblock->getVar('name'),
+			'side'       => $myblock->getVar('side'),
+			'weight'     => $myblock->getVar('weight'),
+			'visible'    => $myblock->getVar('visible'),
+			'content'    => $myblock->getVar('content', 'N'),
+			'modules'    => $modules,
+			'is_custom'  => $isCustom,
+			'ctype'      => $myblock->getVar('c_type'),
+			'bcachetime' => $myblock->getVar('bcachetime'),
+			'op'         => 'edit_ok',
+			'bid'        => $myblock->getVar('bid'),
+			'edit_form'  => $myblock->getOptions(),
+			'template'   => $myblock->getVar('template'),
+			'options'    => $myblock->getVar('options'),
+		];
+		echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
+
+		echo $this->render($block);
+	}
+
+	/**
+	 * @param int        $bid
+	 * @param string     $btitle
+	 * @param string     $bside
+	 * @param string     $bweight
+	 * @param string     $bvisible
+	 * @param string     $bcachetime
+	 * @param array|null $bmodule
+	 * @param array|null $options
+	 * @param array|null $groups
+	 * @return void
+	 */
+	public function updateBlock(int $bid, string $btitle, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
+	{
+		$myblock = new \XoopsBlock($bid);
+		$myblock->setVar('title', $btitle);
+		$myblock->setVar('weight', $bweight);
+		$myblock->setVar('visible', $bvisible);
+		$myblock->setVar('side', $bside);
+		$myblock->setVar('bcachetime', $bcachetime);
+		//update block options
+		if (isset($options)) {
+			$optionsCount = \count($options);
+			if ($optionsCount > 0) {
+				//Convert array values to comma-separated
+				foreach ($options as $i => $iValue) {
+					if (\is_array($iValue)) {
+						$options[$i] = \implode(',', $iValue);
+					}
+				}
+				$options = \implode('|', $options);
+				$myblock->setVar('options', $options);
+			}
+		}
+		$myblock->store();
+		//        /** @var \XoopsBlockHandler $blockHandler */
+		//        $blockHandler = \xoops_getHandler('block');
+		//        $blockHandler->insert($myblock);
+
+		if (!empty($bmodule) && \count($bmodule) > 0) {
+			$sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
+			$this->db->query($sql);
+			if (\in_array(0, $bmodule)) {
+				$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, 0);
+				$this->db->query($sql);
+			} else {
+				foreach ($bmodule as $bmid) {
+					$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int)$bmid);
+					$this->db->query($sql);
+				}
+			}
+		}
+		$sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid);
+		$this->db->query($sql);
+		if (!empty($groups)) {
+			foreach ($groups as $grp) {
+				$sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid);
+				$this->db->query($sql);
+			}
+		}
+		$this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+	}
+
+	/**
+	 * @param array $bid
+	 * @param array $oldtitle
+	 * @param array $oldside
+	 * @param array $oldweight
+	 * @param array $oldvisible
+	 * @param array $oldgroups
+	 * @param array $oldbcachetime
+	 * @param array $oldbmodule
+	 * @param array $title
+	 * @param array $weight
+	 * @param array $visible
+	 * @param array $side
+	 * @param array $bcachetime
+	 * @param array $groups
+	 * @param array $bmodule
+	 * @return void
+	 */
+	public function orderBlock(
+		array $bid, array $oldtitle, array $oldside, array $oldweight, array $oldvisible, array $oldgroups, array $oldbcachetime, array $oldbmodule, array $title, array $weight, array $visible, array $side, array $bcachetime, array $groups, array $bmodule
+	): void {
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			\redirect_header($_SERVER['SCRIPT_NAME'], 3, \implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+		foreach (\array_keys($bid) as $i) {
+			if ($oldtitle[$i] !== $title[$i]
+				|| $oldweight[$i] !== $weight[$i]
+				|| $oldvisible[$i] !== $visible[$i]
+				|| $oldside[$i] !== $side[$i]
+				|| $oldbcachetime[$i] !== $bcachetime[$i]
+				|| $oldbmodule[$i] !== $bmodule[$i]) {
+				$this->setOrder($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bcachetime[$i], $bmodule[$i]);
+			}
+			if (!empty($bmodule[$i]) && \count($bmodule[$i]) > 0) {
+				$sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid[$i]);
+				$this->db->query($sql);
+				if (\in_array(0, $bmodule[$i], true)) {
+					$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], 0);
+					$this->db->query($sql);
+				} else {
+					foreach ($bmodule[$i] as $bmid) {
+						$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int)$bmid);
+						$this->db->query($sql);
+					}
+				}
+			}
+			$sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid[$i]);
+			$this->db->query($sql);
+			if (!empty($groups[$i])) {
+				foreach ($groups[$i] as $grp) {
+					$sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid[$i]);
+					$this->db->query($sql);
+				}
+			}
+		}
+
+		$this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+	}
+
+	/**
+	 * @param array|null $block
+	 * @return void
+	 */
+	public function render(?array $block = null): void
+	{
+		\xoops_load('XoopsFormLoader');
+		\xoops_loadLanguage('common', $this->moduleDirNameUpper);
+
+		$form = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
+		if (isset($block['name'])) {
+			$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_NAME, $block['name']));
+		}
+		$sideSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
+		$sideSelect->addOptionArray([
+										0 => \_AM_SYSTEM_BLOCKS_SBLEFT,
+										1 => \_AM_SYSTEM_BLOCKS_SBRIGHT,
+										3 => \_AM_SYSTEM_BLOCKS_CBLEFT,
+										4 => \_AM_SYSTEM_BLOCKS_CBRIGHT,
+										5 => \_AM_SYSTEM_BLOCKS_CBCENTER,
+										7 => \_AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
+										8 => \_AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
+										9 => \_AM_SYSTEM_BLOCKS_CBBOTTOM,
+									]);
+		$form->addElement($sideSelect);
+		$form->addElement(new \XoopsFormText(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+		$form->addElement(new \XoopsFormRadioYN(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
+		$modSelect = new \XoopsFormSelect(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = \xoops_getHandler('module');
+		$criteria      = new \CriteriaCompo(new \Criteria('hasmain', '1'));
+		$criteria->add(new \Criteria('isactive', '1'));
+		$moduleList     = $moduleHandler->getList($criteria);
+		$moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
+		$moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
+		\ksort($moduleList);
+		$modSelect->addOptionArray($moduleList);
+		$form->addElement($modSelect);
+		$form->addElement(new \XoopsFormText(\_AM_SYSTEM_BLOCKS_TITLE, 'btitle', 50, 255, $block['title']), false);
+		if ($block['is_custom']) {
+			$textarea = new \XoopsFormDhtmlTextArea(\_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
+			$textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . \_AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . \sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
+			$form->addElement($textarea, true);
+			$ctypeSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
+			$ctypeSelect->addOptionArray([
+											 'H' => \_AM_SYSTEM_BLOCKS_HTML,
+											 'P' => \_AM_SYSTEM_BLOCKS_PHP,
+											 'S' => \_AM_SYSTEM_BLOCKS_AFWSMILE,
+											 'T' => \_AM_SYSTEM_BLOCKS_AFNOSMILE,
+										 ]);
+			$form->addElement($ctypeSelect);
+		} else {
+			if ('' !== $block['template']) {
+				/** @var \XoopsTplfileHandler $tplfileHandler */
+				$tplfileHandler = \xoops_getHandler('tplfile');
+				$btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
+				if (\count($btemplate) > 0) {
+					$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+				} else {
+					$btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
+					if (\count($btemplate2) > 0) {
+						$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+					}
+				}
+			}
+			if (false !== $block['edit_form']) {
+				$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_OPTIONS, $block['edit_form']));
+			}
+		}
+		$cache_select = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
+		$cache_select->addOptionArray([
+										  0       => \_NOCACHE,
+										  30      => \sprintf(\_SECONDS, 30),
+										  60      => \_MINUTE,
+										  300     => \sprintf(\_MINUTES, 5),
+										  1800    => \sprintf(\_MINUTES, 30),
+										  3600    => \_HOUR,
+										  18000   => \sprintf(\_HOURS, 5),
+										  86400   => \_DAY,
+										  259200  => \sprintf(\_DAYS, 3),
+										  604800  => \_WEEK,
+										  2592000 => \_MONTH,
+									  ]);
+		$form->addElement($cache_select);
+
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = \xoops_getHandler('groupperm');
+		$groups           = $grouppermHandler->getGroupIds('block_read', $block['bid']);
+
+		$form->addElement(new \XoopsFormSelectGroup(\_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
+
+		if (isset($block['bid'])) {
+			$form->addElement(new \XoopsFormHidden('bid', $block['bid']));
+		}
+		$form->addElement(new \XoopsFormHidden('op', $block['op']));
+		$form->addElement(new \XoopsFormHidden('fct', 'blocksadmin'));
+		$buttonTray = new \XoopsFormElementTray('', '&nbsp;');
+		if ($block['is_custom']) {
+			$buttonTray->addElement(new \XoopsFormButton('', 'previewblock', \_PREVIEW, 'submit'));
+		}
+
+		//Submit buttons
+		$buttonTray   = new \XoopsFormElementTray('', '');
+		$submitButton = new \XoopsFormButton('', 'submitblock', \_SUBMIT, 'submit');
+		$buttonTray->addElement($submitButton);
+
+		$cancelButton = new \XoopsFormButton('', '', \_CANCEL, 'button');
+		$cancelButton->setExtra('onclick="history.go(-1)"');
+		$buttonTray->addElement($cancelButton);
+
+		$form->addElement($buttonTray);
+		$form->display();
+	}
 }

Spacing +61 added lines, -61 removed lines

@@ -68,7 +68,7 @@ 
     public function listBlocks(): void
     {
         global $xoopsModule, $pathIcon16;
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
         //        xoops_loadLanguage('admin', 'system');
         //        xoops_loadLanguage('admin/blocksadmin', 'system');
         //        xoops_loadLanguage('admin/groups', 'system');
@@ -88,16 +88,16 @@ 
         $moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
         $moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
         \ksort($moduleList);
-        echo "<h4 style='text-align:left;'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
-        echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
+        echo "<h4 style='text-align:left;'>".\constant('CO_'.$this->moduleDirNameUpper.'_'.'BADMIN').'</h4>';
+        echo "<form action='".$_SERVER['SCRIPT_NAME']."' name='blockadmin' method='post'>";
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
         echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
-        <tr valign='middle'><th align='center'>" . \_AM_SYSTEM_BLOCKS_TITLE . "</th><th align='center' nowrap='nowrap'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'SIDE') . '<br>' . \_LEFT . '-' . \_CENTER . '-' . \_RIGHT . "</th>
-        <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT') . "</th>
-        <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE') . "</th><th align='center'>" . \_AM_SYSTEM_BLOCKS_VISIBLEIN . "</th>
-        <th align='center'>" . \_AM_SYSTEM_ADGS . "</th>
-        <th align='center'>" . \_AM_SYSTEM_BLOCKS_BCACHETIME . "</th>
-        <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'ACTION') . '</th>
+        <tr valign='middle'><th align='center'>" . \_AM_SYSTEM_BLOCKS_TITLE."</th><th align='center' nowrap='nowrap'>".\constant('CO_'.$this->moduleDirNameUpper.'_'.'SIDE').'<br>'.\_LEFT.'-'.\_CENTER.'-'.\_RIGHT."</th>
+        <th align='center'>" . \constant('CO_'.$this->moduleDirNameUpper.'_'.'WEIGHT')."</th>
+        <th align='center'>" . \constant('CO_'.$this->moduleDirNameUpper.'_'.'VISIBLE')."</th><th align='center'>".\_AM_SYSTEM_BLOCKS_VISIBLEIN."</th>
+        <th align='center'>" . \_AM_SYSTEM_ADGS."</th>
+        <th align='center'>" . \_AM_SYSTEM_BLOCKS_BCACHETIME."</th>
+        <th align='center'>" . \constant('CO_'.$this->moduleDirNameUpper.'_'.'ACTION').'</th>
         </tr>';
         $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
         $blockCount = \count($blockArray);
@@ -117,14 +117,14 @@ 
         ];
         foreach ($blockArray as $i) {
             $groupsPermissions = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
-            $sql               = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
+            $sql               = 'SELECT module_id FROM '.$this->db->prefix('block_module_link').' WHERE block_id='.$i->getVar('bid');
             $result            = $this->db->query($sql);
             $modules           = [];
             if (!$result instanceof \mysqli_result) {
-                \trigger_error("Query Failed! SQL: $sql Error: " . $this->db->error(), \E_USER_ERROR);
+                \trigger_error("Query Failed! SQL: $sql Error: ".$this->db->error(), \E_USER_ERROR);
             }
             while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
 
             $cachetimeOptions = '';
@@ -174,46 +174,46 @@ 
                 $title = $i->getVar('title');
             }
             $name = $i->getVar('name');
-            echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar('bid') . "]' value='" . $title . "'></td>
+            echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[".$i->getVar('bid')."]' value='".$title."'></td>
             <td class='$class' align='center' nowrap='nowrap'><div align='center' >
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_LEFT . "'$ssel2>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_CENTER . "'$ssel3>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_RIGHT . "'$ssel4>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_LEFT."'$ssel2>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_CENTER."'$ssel3>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_RIGHT."'$ssel4>
                     </div>
                     <div>
-                        <span style='float:right;'><input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_SIDEBLOCK_RIGHT . "'$ssel1></span>
-                    <div align='left'><input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_SIDEBLOCK_LEFT . "'$ssel0></div>
+                        <span style='float:right;'><input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_SIDEBLOCK_RIGHT."'$ssel1></span>
+                    <div align='left'><input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_SIDEBLOCK_LEFT."'$ssel0></div>
                     </div>
                     <div align='center'>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_BOTTOMLEFT . "'$ssel5>
-                        <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_BOTTOM . "'$ssel7>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_BOTTOMRIGHT . "'$ssel6>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_BOTTOMLEFT."'$ssel5>
+                        <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_BOTTOM."'$ssel7>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_BOTTOMRIGHT."'$ssel6>
                     </div>
                 </td>
-                <td class='$class' align='center'><input type='text' name='weight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "' size='5' maxlength='5'></td>
-                <td class='$class' align='center' nowrap><input type='radio' name='visible[" . $i->getVar('bid') . "]' value='1'$sel1>" . \_YES . "&nbsp;<input type='radio' name='visible[" . $i->getVar('bid') . "]' value='0'$sel0>" . \_NO . '</td>';
+                <td class='$class' align='center'><input type='text' name='weight[".$i->getVar('bid')."]' value='".$i->getVar('weight')."' size='5' maxlength='5'></td>
+                <td class='$class' align='center' nowrap><input type='radio' name='visible[".$i->getVar('bid')."]' value='1'$sel1>".\_YES."&nbsp;<input type='radio' name='visible[".$i->getVar('bid')."]' value='0'$sel0>".\_NO.'</td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='bmodule[".$i->getVar('bid')."][]' id='bmodule[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($moduleList as $k => $v) {
-                echo "<option value='$k'" . (\in_array($k, $modules) ? " selected='selected'" : '') . ">$v</option>";
+                echo "<option value='$k'".(\in_array($k, $modules) ? " selected='selected'" : '').">$v</option>";
             }
             echo '</select></td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='groups[".$i->getVar('bid')."][]' id='groups[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($groups as $grp) {
-                echo "<option value='" . $grp->getVar('groupid') . "' " . (\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
+                echo "<option value='".$grp->getVar('groupid')."' ".(\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '').'>'.$grp->getVar('name').'</option>';
             }
             echo '</select></td>';
 
             // Cache lifetime
-            echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetimeOptions . '</select>
+            echo '<td class="'.$class.'" align="center"> <select name="bcachetime['.$i->getVar('bid').']" size="1">'.$cachetimeOptions.'</select>
                                     </td>';
 
             // Actions
 
             echo "<td class='$class' align='center'>
-                <a href='blocksadmin.php?op=edit&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/edit.png' . " alt='" . \_EDIT . "' title='" . \_EDIT . "'></a> 
-                <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/editcopy.png' . " alt='" . \_CLONE . "' title='" . \_CLONE . "'></a>";
+                <a href='blocksadmin.php?op=edit&amp;bid=".$i->getVar('bid')."'><img src=".$pathIcon16.'/edit.png'." alt='".\_EDIT."' title='".\_EDIT."'></a> 
+                <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid')."'><img src=".$pathIcon16.'/editcopy.png'." alt='".\_CLONE."' title='".\_CLONE."'></a>";
             //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
             //                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
             //                     </a>";
@@ -222,22 +222,22 @@ 
             //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
             if (!\in_array($i->getVar('block_type'), ['M', 'S'])) {
                 echo "&nbsp;
-                <a href='blocksadmin.php?op=delete&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . \_DELETE . "' title='" . \_DELETE . "'>
+                <a href='blocksadmin.php?op=delete&amp;bid=" . $i->getVar('bid')."'><img src=".$pathIcon16.'/delete.png'." alt='".\_DELETE."' title='".\_DELETE."'>
                      </a>";
             }
             echo "
-            <input type='hidden' name='oldtitle[" . $i->getVar('bid') . "]' value='" . $i->getVar('title') . "'>
-            <input type='hidden' name='oldside[" . $i->getVar('bid') . "]' value='" . $i->getVar('side') . "'>
-            <input type='hidden' name='oldweight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "'>
-            <input type='hidden' name='oldvisible[" . $i->getVar('bid') . "]' value='" . $i->getVar('visible') . "'>
-            <input type='hidden' name='oldgroups[" . $i->getVar('groups') . "]' value='" . $i->getVar('groups') . "'>
-            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid') . "]' value='" . $i->getVar('bcachetime') . "'>
-            <input type='hidden' name='bid[" . $i->getVar('bid') . "]' value='" . $i->getVar('bid') . "'>
+            <input type='hidden' name='oldtitle[" . $i->getVar('bid')."]' value='".$i->getVar('title')."'>
+            <input type='hidden' name='oldside[" . $i->getVar('bid')."]' value='".$i->getVar('side')."'>
+            <input type='hidden' name='oldweight[" . $i->getVar('bid')."]' value='".$i->getVar('weight')."'>
+            <input type='hidden' name='oldvisible[" . $i->getVar('bid')."]' value='".$i->getVar('visible')."'>
+            <input type='hidden' name='oldgroups[" . $i->getVar('groups')."]' value='".$i->getVar('groups')."'>
+            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid')."]' value='".$i->getVar('bcachetime')."'>
+            <input type='hidden' name='bid[" . $i->getVar('bid')."]' value='".$i->getVar('bid')."'>
             </td></tr>
             ";
             $class = ('even' === $class) ? 'odd' : 'even';
         }
-        echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' name='submit' value='" . \_SUBMIT . "'></td></tr></table></form><br><br>";
+        echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>".$GLOBALS['xoopsSecurity']->getTokenHTML()."<input type='submit' name='submit' value='".\_SUBMIT."'></td></tr></table></form><br><br>";
     }
 
     /**
@@ -276,18 +276,18 @@ 
         \xoops_loadLanguage('admin/groups', 'system');
 
         $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+        $sql     = 'SELECT module_id FROM '.$this->db->prefix('block_module_link').' WHERE block_id='.$bid;
         $result  = $this->db->query($sql);
         $modules = [];
         if ($result instanceof \mysqli_result) {
             while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
         }
         $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
         $block    = [
-            'title'      => $myblock->getVar('title') . ' Clone',
-            'form_title' => \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
+            'title'      => $myblock->getVar('title').' Clone',
+            'form_title' => \constant('CO_'.$this->moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK'),
             'name'       => $myblock->getVar('name'),
             'side'       => $myblock->getVar('side'),
             'weight'     => $myblock->getVar('weight'),
@@ -303,7 +303,7 @@ 
             'template'   => $myblock->getVar('template'),
             'options'    => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
+        echo '<a href="blocksadmin.php">'.\constant('CO_'.$this->moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.\_AM_SYSTEM_BLOCKS_CLONEBLOCK.'<br><br>';
         //        $form = new Blockform();
         //        $form->render();
 
@@ -356,7 +356,7 @@ 
         }
         //        $newid = $clone->store(); //see https://github.com/XOOPS/XoopsCore25/issues/1105
         if ($clone->store()) {
-            $newid = $clone->id();  //get the id of the cloned block
+            $newid = $clone->id(); //get the id of the cloned block
         }
         if (!$newid) {
             //            \xoops_cp_header();
@@ -367,7 +367,7 @@ 
         if ('' !== $clone->getVar('template')) {
             /** @var \XoopsTplfileHandler $tplfileHandler */
             $tplfileHandler = \xoops_getHandler('tplfile');
-            $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string)$bid);
+            $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string) $bid);
             if (\count($btemplate) > 0) {
                 $tplclone = $btemplate[0]->xoopsClone();
                 $tplclone->setVar('tpl_id', 0);
@@ -377,12 +377,12 @@ 
         }
 
         foreach ($bmodule as $bmid) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
+            $sql = 'INSERT INTO '.$this->db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
             $this->db->query($sql);
         }
         //$groups = &$GLOBALS['xoopsUser']->getGroups();
         foreach ($groups as $iValue) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
+            $sql = 'INSERT INTO '.$this->db->prefix('group_permission').' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ('.$iValue.', '.$newid.", 1, 'block_read')";
             $this->db->query($sql);
         }
         $this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
@@ -425,12 +425,12 @@ 
         \xoops_loadLanguage('admin/groups', 'system');
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+        $sql     = 'SELECT module_id FROM '.$this->db->prefix('block_module_link').' WHERE block_id='.$bid;
         $result  = $this->db->query($sql);
         $modules = [];
         if ($result instanceof \mysqli_result) {
             while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
         }
         $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
@@ -452,7 +452,7 @@ 
             'template'   => $myblock->getVar('template'),
             'options'    => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
+        echo '<a href="blocksadmin.php">'.\constant('CO_'.$this->moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.\_AM_SYSTEM_BLOCKS_EDITBLOCK.'<br><br>';
 
         echo $this->render($block);
     }
@@ -504,7 +504,7 @@ 
                 $this->db->query($sql);
             } else {
                 foreach ($bmodule as $bmid) {
-                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int)$bmid);
+                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int) $bmid);
                     $this->db->query($sql);
                 }
             }
@@ -517,7 +517,7 @@ 
                 $this->db->query($sql);
             }
         }
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_'.$this->moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
 
     /**
@@ -561,7 +561,7 @@ 
                     $this->db->query($sql);
                 } else {
                     foreach ($bmodule[$i] as $bmid) {
-                        $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int)$bmid);
+                        $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int) $bmid);
                         $this->db->query($sql);
                     }
                 }
@@ -576,7 +576,7 @@ 
             }
         }
 
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_'.$this->moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
 
     /**
@@ -604,9 +604,9 @@ 
                                         9 => \_AM_SYSTEM_BLOCKS_CBBOTTOM,
                                     ]);
         $form->addElement($sideSelect);
-        $form->addElement(new \XoopsFormText(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-        $form->addElement(new \XoopsFormRadioYN(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-        $modSelect = new \XoopsFormSelect(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+        $form->addElement(new \XoopsFormText(\constant('CO_'.$this->moduleDirNameUpper.'_'.'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+        $form->addElement(new \XoopsFormRadioYN(\constant('CO_'.$this->moduleDirNameUpper.'_'.'VISIBLE'), 'bvisible', $block['visible']));
+        $modSelect = new \XoopsFormSelect(\constant('CO_'.$this->moduleDirNameUpper.'_'.'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
         /** @var \XoopsModuleHandler $moduleHandler */
         $moduleHandler = \xoops_getHandler('module');
         $criteria      = new \CriteriaCompo(new \Criteria('hasmain', '1'));
@@ -620,7 +620,7 @@ 
         $form->addElement(new \XoopsFormText(\_AM_SYSTEM_BLOCKS_TITLE, 'btitle', 50, 255, $block['title']), false);
         if ($block['is_custom']) {
             $textarea = new \XoopsFormDhtmlTextArea(\_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-            $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . \_AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . \sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
+            $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">'.\_AM_SYSTEM_BLOCKS_USEFULTAGS.'</span><br><span style="font-size:x-small;font-weight:normal;">'.\sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>');
             $form->addElement($textarea, true);
             $ctypeSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
             $ctypeSelect->addOptionArray([
@@ -636,11 +636,11 @@ 
                 $tplfileHandler = \xoops_getHandler('tplfile');
                 $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
                 if (\count($btemplate) > 0) {
-                    $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                    $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate[0]->getVar('tpl_id').'">'.\_AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
                 } else {
                     $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
                     if (\count($btemplate2) > 0) {
-                        $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                        $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate2[0]->getVar('tpl_id').'" target="_blank">'.\_AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
                     }
                 }
             }

class/Common/VersionChecks.php

Indentation +115 added lines, -115 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -40,13 +40,13 @@ 
         //check for minimum XOOPS version
         $currentVer = mb_substr(\XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (\version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -77,7 +77,7 @@ 
 
         if (false !== $reqVer && '' !== $reqVer) {
             if (\version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }
@@ -96,7 +96,7 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
         $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
+        $repository         = 'XoopsModules25x/'.$moduleDirName;
         //        $repository         = 'XoopsModules25x/publisher'; //for testing only
         $ret             = null;
         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
@@ -110,14 +110,14 @@ 
                 if (false === $curlReturn) {
                     \trigger_error(\curl_error($curlHandle));
                 } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+                    \trigger_error('Repository Not Found: '.$infoReleasesUrl);
                 } else {
                     $file              = json_decode($curlReturn, false);
                     $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default);
                     $latestVersion     = $file[0]->tag_name;
                     $prerelease        = $file[0]->prerelease;
                     if ('master' !== $latestVersionLink) {
-                        $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
+                        $update = \constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
                     }
                     //"PHP-standardized" version
                     $latestVersion = \mb_strtolower($latestVersion);
@@ -126,7 +126,7 @@ 
                         $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
                     }
                     $moduleVersion = ($helper->getModule()
-                                             ->getInfo('version') . '_' . $helper->getModule()
+                                             ->getInfo('version').'_'.$helper->getModule()
                                                                                  ->getInfo('module_status'));
                     //"PHP-standardized" version
                     $moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion));

class/Common/SysUtility.php

Indentation +213 added lines, -213 removed lines

@@ -30,217 +30,217 @@
  */
 class SysUtility
 {
-    use VersionChecks;
-
-    //checkVerXoops, checkVerPhp Traits
-
-    use ServerStats;
-
-    // getServerStats Trait
-
-    use FilesManagement;
-
-    // Files Management Trait
-
-    /**
-     * truncateHtml can truncate a string up to a number of characters while preserving whole words and HTML tags
-     * www.gsdesign.ro/blog/cut-html-string-without-breaking-the-tags
-     * www.cakephp.org
-     *
-     * @param string $text         String to truncate.
-     * @param int    $length       Length of returned string, including ellipsis.
-     * @param string $ending       Ending to be appended to the trimmed string.
-     * @param bool   $exact        If false, $text will not be cut mid-word
-     * @param bool   $considerHtml If true, HTML tags would be handled correctly
-     *
-     * @return string Trimmed string.
-     */
-    public static function truncateHtml($text, $length = 100, $ending = '...', $exact = false, $considerHtml = true): string
-    {
-        if ($considerHtml) {
-            // if the plain text is shorter than the maximum length, return the whole text
-            if (mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
-                return $text;
-            }
-            // splits all html-tags to scanable lines
-            \preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
-            $total_length = mb_strlen($ending);
-            $open_tags    = [];
-            $truncate     = '';
-            foreach ($lines as $line_matchings) {
-                // if there is any html-tag in this line, handle it and add it (uncounted) to the output
-                if (!empty($line_matchings[1])) {
-                    // if it's an "empty element" with or without xhtml-conform closing slash
-                    if (\preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
-                        // do nothing
-                        // if tag is a closing tag
-                    } elseif (\preg_match('/^<\s*\/(\S+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
-                        // delete tag from $open_tags list
-                        $pos = \array_search($tag_matchings[1], $open_tags, true);
-                        if (false !== $pos) {
-                            unset($open_tags[$pos]);
-                        }
-                        // if tag is an opening tag
-                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
-                        // add tag to the beginning of $open_tags list
-                        \array_unshift($open_tags, \mb_strtolower($tag_matchings[1]));
-                    }
-                    // add html-tag to $truncate'd text
-                    $truncate .= $line_matchings[1];
-                }
-                // calculate the length of the plain text part of the line; handle entities as one character
-                $content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
-                if ($total_length + $content_length > $length) {
-                    // the number of characters which are left
-                    $left            = $length - $total_length;
-                    $entities_length = 0;
-                    // search for html entities
-                    if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
-                        // calculate the real length of all entities in the legal range
-                        foreach ($entities[0] as $entity) {
-                            if ($left >= $entity[1] + 1 - $entities_length) {
-                                $left--;
-                                $entities_length += mb_strlen($entity[0]);
-                            } else {
-                                // no more characters left
-                                break;
-                            }
-                        }
-                    }
-                    $truncate .= mb_substr($line_matchings[2], 0, $left + $entities_length);
-                    // maximum lenght is reached, so get off the loop
-                    break;
-                }
-                $truncate     .= $line_matchings[2];
-                $total_length += $content_length;
-
-                // if the maximum length is reached, get off the loop
-                if ($total_length >= $length) {
-                    break;
-                }
-            }
-        } else {
-            if (mb_strlen($text) <= $length) {
-                return $text;
-            }
-            $truncate = mb_substr($text, 0, $length - mb_strlen($ending));
-        }
-        // if the words shouldn't be cut in the middle...
-        if (!$exact) {
-            // ...search the last occurance of a space...
-            $spacepos = mb_strrpos($truncate, ' ');
-            if (isset($spacepos)) {
-                // ...and cut the text in this position
-                $truncate = mb_substr($truncate, 0, $spacepos);
-            }
-        }
-        // add the defined ending to the text
-        $truncate .= $ending;
-        if ($considerHtml) {
-            // close all unclosed html-tags
-            foreach ($open_tags as $tag) {
-                $truncate .= '</' . $tag . '>';
-            }
-        }
-
-        return $truncate;
-    }
-
-    /**
-     * @param \Xmf\Module\Helper $helper
-     * @param array|null         $options
-     * @return \XoopsFormDhtmlTextArea|\XoopsFormEditor
-     */
-    public static function getEditor($helper = null, $options = null)
-    {
-        /** @var Helper $helper */
-        if (null === $options) {
-            $options           = [];
-            $options['name']   = 'Editor';
-            $options['value']  = 'Editor';
-            $options['rows']   = 10;
-            $options['cols']   = '100%';
-            $options['width']  = '100%';
-            $options['height'] = '400px';
-        }
-
-        if (null === $helper) {
-            $helper = Helper::getInstance();
-        }
-
-        $isAdmin = $helper->isUserAdmin();
-
-        if (\class_exists('XoopsFormEditor')) {
-            if ($isAdmin) {
-                $descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorAdmin'), $options, $nohtml = false, $onfailure = 'textarea');
-            } else {
-                $descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorUser'), $options, $nohtml = false, $onfailure = 'textarea');
-            }
-        } else {
-            $descEditor = new \XoopsFormDhtmlTextArea(\ucfirst($options['name']), $options['name'], $options['value'], '100%', '100%');
-        }
-
-        //        $form->addElement($descEditor);
-
-        return $descEditor;
-    }
-
-    /**
-     * @param string $fieldname
-     * @param string $table
-     * @return bool
-     */
-    public static function fieldExists(string $fieldname, string $table): bool
-    {
-        global $xoopsDB;
-        $result = $xoopsDB->queryF("SHOW COLUMNS FROM   $table LIKE '$fieldname'");
-
-        return ($xoopsDB->getRowsNum($result) > 0);
-    }
-
-    /**
-     * @param array|string $tableName
-     * @param int          $id_field
-     * @param int          $id
-     *
-     * @return mixed
-     */
-    public static function cloneRecord($tableName, $id_field, $id)
-    {
-        $new_id = false;
-        $table  = $GLOBALS['xoopsDB']->prefix($tableName);
-        // copy content of the record you wish to clone
-        $sql    = "SELECT * FROM $table WHERE $idField='" . $id . "' ";
-        $result = $GLOBALS['xoopsDB']->query($sql);
-        if ($result instanceof \mysqli_result) {
-            $tempTable = $GLOBALS['xoopsDB']->fetchArray($result, \MYSQLI_ASSOC);
-        }
-        if (!$tempTable) {
-            \trigger_error($GLOBALS['xoopsDB']->error());
-        }
-        // set the auto-incremented id's value to blank.
-        unset($tempTable[$id_field]);
-        // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", $tempTable) . "')";
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
-        if (!$result) {
-            \trigger_error($GLOBALS['xoopsDB']->error());
-        }
-        // Return the new id
-        $new_id = $GLOBALS['xoopsDB']->getInsertId();
-
-        return $new_id;
-    }
-
-    /**
-     * @param string $tablename
-     *
-     * @return bool
-     */
-    public static function tableExists($tablename): bool
-    {
-        $result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
-
-        return $GLOBALS['xoopsDB']->getRowsNum($result) > 0;
-    }
+	use VersionChecks;
+
+	//checkVerXoops, checkVerPhp Traits
+
+	use ServerStats;
+
+	// getServerStats Trait
+
+	use FilesManagement;
+
+	// Files Management Trait
+
+	/**
+	 * truncateHtml can truncate a string up to a number of characters while preserving whole words and HTML tags
+	 * www.gsdesign.ro/blog/cut-html-string-without-breaking-the-tags
+	 * www.cakephp.org
+	 *
+	 * @param string $text         String to truncate.
+	 * @param int    $length       Length of returned string, including ellipsis.
+	 * @param string $ending       Ending to be appended to the trimmed string.
+	 * @param bool   $exact        If false, $text will not be cut mid-word
+	 * @param bool   $considerHtml If true, HTML tags would be handled correctly
+	 *
+	 * @return string Trimmed string.
+	 */
+	public static function truncateHtml($text, $length = 100, $ending = '...', $exact = false, $considerHtml = true): string
+	{
+		if ($considerHtml) {
+			// if the plain text is shorter than the maximum length, return the whole text
+			if (mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+				return $text;
+			}
+			// splits all html-tags to scanable lines
+			\preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
+			$total_length = mb_strlen($ending);
+			$open_tags    = [];
+			$truncate     = '';
+			foreach ($lines as $line_matchings) {
+				// if there is any html-tag in this line, handle it and add it (uncounted) to the output
+				if (!empty($line_matchings[1])) {
+					// if it's an "empty element" with or without xhtml-conform closing slash
+					if (\preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
+						// do nothing
+						// if tag is a closing tag
+					} elseif (\preg_match('/^<\s*\/(\S+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
+						// delete tag from $open_tags list
+						$pos = \array_search($tag_matchings[1], $open_tags, true);
+						if (false !== $pos) {
+							unset($open_tags[$pos]);
+						}
+						// if tag is an opening tag
+					} elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+						// add tag to the beginning of $open_tags list
+						\array_unshift($open_tags, \mb_strtolower($tag_matchings[1]));
+					}
+					// add html-tag to $truncate'd text
+					$truncate .= $line_matchings[1];
+				}
+				// calculate the length of the plain text part of the line; handle entities as one character
+				$content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
+				if ($total_length + $content_length > $length) {
+					// the number of characters which are left
+					$left            = $length - $total_length;
+					$entities_length = 0;
+					// search for html entities
+					if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
+						// calculate the real length of all entities in the legal range
+						foreach ($entities[0] as $entity) {
+							if ($left >= $entity[1] + 1 - $entities_length) {
+								$left--;
+								$entities_length += mb_strlen($entity[0]);
+							} else {
+								// no more characters left
+								break;
+							}
+						}
+					}
+					$truncate .= mb_substr($line_matchings[2], 0, $left + $entities_length);
+					// maximum lenght is reached, so get off the loop
+					break;
+				}
+				$truncate     .= $line_matchings[2];
+				$total_length += $content_length;
+
+				// if the maximum length is reached, get off the loop
+				if ($total_length >= $length) {
+					break;
+				}
+			}
+		} else {
+			if (mb_strlen($text) <= $length) {
+				return $text;
+			}
+			$truncate = mb_substr($text, 0, $length - mb_strlen($ending));
+		}
+		// if the words shouldn't be cut in the middle...
+		if (!$exact) {
+			// ...search the last occurance of a space...
+			$spacepos = mb_strrpos($truncate, ' ');
+			if (isset($spacepos)) {
+				// ...and cut the text in this position
+				$truncate = mb_substr($truncate, 0, $spacepos);
+			}
+		}
+		// add the defined ending to the text
+		$truncate .= $ending;
+		if ($considerHtml) {
+			// close all unclosed html-tags
+			foreach ($open_tags as $tag) {
+				$truncate .= '</' . $tag . '>';
+			}
+		}
+
+		return $truncate;
+	}
+
+	/**
+	 * @param \Xmf\Module\Helper $helper
+	 * @param array|null         $options
+	 * @return \XoopsFormDhtmlTextArea|\XoopsFormEditor
+	 */
+	public static function getEditor($helper = null, $options = null)
+	{
+		/** @var Helper $helper */
+		if (null === $options) {
+			$options           = [];
+			$options['name']   = 'Editor';
+			$options['value']  = 'Editor';
+			$options['rows']   = 10;
+			$options['cols']   = '100%';
+			$options['width']  = '100%';
+			$options['height'] = '400px';
+		}
+
+		if (null === $helper) {
+			$helper = Helper::getInstance();
+		}
+
+		$isAdmin = $helper->isUserAdmin();
+
+		if (\class_exists('XoopsFormEditor')) {
+			if ($isAdmin) {
+				$descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorAdmin'), $options, $nohtml = false, $onfailure = 'textarea');
+			} else {
+				$descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorUser'), $options, $nohtml = false, $onfailure = 'textarea');
+			}
+		} else {
+			$descEditor = new \XoopsFormDhtmlTextArea(\ucfirst($options['name']), $options['name'], $options['value'], '100%', '100%');
+		}
+
+		//        $form->addElement($descEditor);
+
+		return $descEditor;
+	}
+
+	/**
+	 * @param string $fieldname
+	 * @param string $table
+	 * @return bool
+	 */
+	public static function fieldExists(string $fieldname, string $table): bool
+	{
+		global $xoopsDB;
+		$result = $xoopsDB->queryF("SHOW COLUMNS FROM   $table LIKE '$fieldname'");
+
+		return ($xoopsDB->getRowsNum($result) > 0);
+	}
+
+	/**
+	 * @param array|string $tableName
+	 * @param int          $id_field
+	 * @param int          $id
+	 *
+	 * @return mixed
+	 */
+	public static function cloneRecord($tableName, $id_field, $id)
+	{
+		$new_id = false;
+		$table  = $GLOBALS['xoopsDB']->prefix($tableName);
+		// copy content of the record you wish to clone
+		$sql    = "SELECT * FROM $table WHERE $idField='" . $id . "' ";
+		$result = $GLOBALS['xoopsDB']->query($sql);
+		if ($result instanceof \mysqli_result) {
+			$tempTable = $GLOBALS['xoopsDB']->fetchArray($result, \MYSQLI_ASSOC);
+		}
+		if (!$tempTable) {
+			\trigger_error($GLOBALS['xoopsDB']->error());
+		}
+		// set the auto-incremented id's value to blank.
+		unset($tempTable[$id_field]);
+		// insert cloned copy of the original  record
+		$sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", $tempTable) . "')";
+		$result = $GLOBALS['xoopsDB']->queryF($sql);
+		if (!$result) {
+			\trigger_error($GLOBALS['xoopsDB']->error());
+		}
+		// Return the new id
+		$new_id = $GLOBALS['xoopsDB']->getInsertId();
+
+		return $new_id;
+	}
+
+	/**
+	 * @param string $tablename
+	 *
+	 * @return bool
+	 */
+	public static function tableExists($tablename): bool
+	{
+		$result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
+
+		return $GLOBALS['xoopsDB']->getRowsNum($result) > 0;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -59,11 +59,11 @@ 
     {
         if ($considerHtml) {
             // if the plain text is shorter than the maximum length, return the whole text
-            if (mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+            if (mb_strlen(\preg_replace('/<.*?'.'>/', '', $text)) <= $length) {
                 return $text;
             }
             // splits all html-tags to scanable lines
-            \preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
+            \preg_match_all('/(<.+?'.'>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
             $total_length = mb_strlen($ending);
             $open_tags    = [];
             $truncate     = '';
@@ -81,7 +81,7 @@ 
                             unset($open_tags[$pos]);
                         }
                         // if tag is an opening tag
-                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?'.'>$/s', $line_matchings[1], $tag_matchings)) {
                         // add tag to the beginning of $open_tags list
                         \array_unshift($open_tags, \mb_strtolower($tag_matchings[1]));
                     }
@@ -90,15 +90,15 @@ 
                 }
                 // calculate the length of the plain text part of the line; handle entities as one character
                 $content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
-                if ($total_length + $content_length > $length) {
+                if ($total_length+$content_length > $length) {
                     // the number of characters which are left
-                    $left            = $length - $total_length;
+                    $left            = $length-$total_length;
                     $entities_length = 0;
                     // search for html entities
                     if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
                         // calculate the real length of all entities in the legal range
                         foreach ($entities[0] as $entity) {
-                            if ($left >= $entity[1] + 1 - $entities_length) {
+                            if ($left >= $entity[1]+1-$entities_length) {
                                 $left--;
                                 $entities_length += mb_strlen($entity[0]);
                             } else {
@@ -107,7 +107,7 @@ 
                             }
                         }
                     }
-                    $truncate .= mb_substr($line_matchings[2], 0, $left + $entities_length);
+                    $truncate .= mb_substr($line_matchings[2], 0, $left+$entities_length);
                     // maximum lenght is reached, so get off the loop
                     break;
                 }
@@ -123,7 +123,7 @@ 
             if (mb_strlen($text) <= $length) {
                 return $text;
             }
-            $truncate = mb_substr($text, 0, $length - mb_strlen($ending));
+            $truncate = mb_substr($text, 0, $length-mb_strlen($ending));
         }
         // if the words shouldn't be cut in the middle...
         if (!$exact) {
@@ -139,7 +139,7 @@ 
         if ($considerHtml) {
             // close all unclosed html-tags
             foreach ($open_tags as $tag) {
-                $truncate .= '</' . $tag . '>';
+                $truncate .= '</'.$tag.'>';
             }
         }
 
@@ -210,7 +210,7 @@ 
         $new_id = false;
         $table  = $GLOBALS['xoopsDB']->prefix($tableName);
         // copy content of the record you wish to clone
-        $sql    = "SELECT * FROM $table WHERE $idField='" . $id . "' ";
+        $sql    = "SELECT * FROM $table WHERE $idField='".$id."' ";
         $result = $GLOBALS['xoopsDB']->query($sql);
         if ($result instanceof \mysqli_result) {
             $tempTable = $GLOBALS['xoopsDB']->fetchArray($result, \MYSQLI_ASSOC);
@@ -221,7 +221,7 @@ 
         // set the auto-incremented id's value to blank.
         unset($tempTable[$id_field]);
         // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", $tempTable) . "')";
+        $sql    = "INSERT INTO $table (".\implode(', ', \array_keys($tempTable)).") VALUES ('".\implode("', '", $tempTable)."')";
         $result = $GLOBALS['xoopsDB']->queryF($sql);
         if (!$result) {
             \trigger_error($GLOBALS['xoopsDB']->error());

testdata/index.php

Indentation +167 added lines, -167 removed lines

@@ -21,9 +21,9 @@ 
 use Xmf\Request;
 use Xmf\Yaml;
 use XoopsModules\Myiframe\{
-    Helper,
-    Common\Configurator,
-    Utility
+	Helper,
+	Common\Configurator,
+	Utility
 };
 
 /** @var Helper $helper */
@@ -43,33 +43,33 @@ 
 $helper->loadLanguage('common');
 
 switch ($op) {
-    case 'load':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                \redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            loadSampleData();
-        } else {
-            xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM')), \constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-            xoops_cp_footer();
-        }
-        break;
-    case 'save':
-        saveSampleData();
-        break;
-    case 'clear':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            clearSampleData();
-        } else {
-            xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-            xoops_cp_footer();
-        }
-        break;
+	case 'load':
+		if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				\redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			loadSampleData();
+		} else {
+			xoops_cp_header();
+			xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM')), \constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+			xoops_cp_footer();
+		}
+		break;
+	case 'save':
+		saveSampleData();
+		break;
+	case 'clear':
+		if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			clearSampleData();
+		} else {
+			xoops_cp_header();
+			xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+			xoops_cp_footer();
+		}
+		break;
 }
 
 // XMF TableLoad for SAMPLE data
@@ -79,47 +79,47 @@ 
  */
 function loadSampleData()
 {
-    global $xoopsConfig;
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    $utility      = new Utility();
-    $configurator = new Configurator();
-
-    $tables = \Xmf\Module\Helper::getHelper($moduleDirName)
-                                ->getModule()
-                                ->getInfo('tables');
-
-    $language = 'english/';
-    if (\is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
-    }
-
-    // load module tables
-    foreach ($tables as $table) {
-        $tabledata = Yaml::readWrapped($language . $table . '.yml');
-        TableLoad::truncateTable($table);
-        TableLoad::loadTableFromArray($table, $tabledata);
-    }
-
-    // load permissions
-    $table     = 'group_permission';
-    $tabledata = Yaml::readWrapped($language . $table . '.yml');
-    $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)
-                                   ->getModule()
-                                   ->getVar('mid');
-    loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
-
-    //  ---  COPY test folder files ---------------
-    if (\is_array($configurator->copyTestFolders) && \count($configurator->copyTestFolders) > 0) {
-        //        $file =  dirname(__DIR__) . '/testdata/images/';
-        foreach (\array_keys($configurator->copyTestFolders) as $i) {
-            $src  = $configurator->copyTestFolders[$i][0];
-            $dest = $configurator->copyTestFolders[$i][1];
-            $utility::rcopy($src, $dest);
-        }
-    }
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
+	global $xoopsConfig;
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	$utility      = new Utility();
+	$configurator = new Configurator();
+
+	$tables = \Xmf\Module\Helper::getHelper($moduleDirName)
+								->getModule()
+								->getInfo('tables');
+
+	$language = 'english/';
+	if (\is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
+		$language = $xoopsConfig['language'] . '/';
+	}
+
+	// load module tables
+	foreach ($tables as $table) {
+		$tabledata = Yaml::readWrapped($language . $table . '.yml');
+		TableLoad::truncateTable($table);
+		TableLoad::loadTableFromArray($table, $tabledata);
+	}
+
+	// load permissions
+	$table     = 'group_permission';
+	$tabledata = Yaml::readWrapped($language . $table . '.yml');
+	$mid       = \Xmf\Module\Helper::getHelper($moduleDirName)
+								   ->getModule()
+								   ->getVar('mid');
+	loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
+
+	//  ---  COPY test folder files ---------------
+	if (\is_array($configurator->copyTestFolders) && \count($configurator->copyTestFolders) > 0) {
+		//        $file =  dirname(__DIR__) . '/testdata/images/';
+		foreach (\array_keys($configurator->copyTestFolders) as $i) {
+			$src  = $configurator->copyTestFolders[$i][0];
+			$dest = $configurator->copyTestFolders[$i][1];
+			$utility::rcopy($src, $dest);
+		}
+	}
+	\redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -127,38 +127,38 @@ 
  */
 function saveSampleData()
 {
-    global $xoopsConfig;
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
-    $tables             = $helper->getModule()
-                                 ->getInfo('tables');
-
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!\file_exists($languageFolder . '/')) {
-        Utility::createFolder($languageFolder . '/');
-    }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
-    Utility::createFolder($exportFolder);
-
-    // save module tables
-    foreach ($tables as $table) {
-        TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
-    }
-
-    // save permissions
-    $criteria = new \CriteriaCompo();
-    $criteria->add(
-        new \Criteria(
-            'gperm_modid', $helper->getModule()
-                                  ->getVar('mid')
-        )
-    );
-    $skipColumns[] = 'gperm_id';
-    TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
-    unset($criteria);
-
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
+	global $xoopsConfig;
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
+	$tables             = $helper->getModule()
+								 ->getInfo('tables');
+
+	$languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
+	if (!\file_exists($languageFolder . '/')) {
+		Utility::createFolder($languageFolder . '/');
+	}
+	$exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+	Utility::createFolder($exportFolder);
+
+	// save module tables
+	foreach ($tables as $table) {
+		TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+	}
+
+	// save permissions
+	$criteria = new \CriteriaCompo();
+	$criteria->add(
+		new \Criteria(
+			'gperm_modid', $helper->getModule()
+								  ->getVar('mid')
+		)
+	);
+	$skipColumns[] = 'gperm_id';
+	TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+	unset($criteria);
+
+	\redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -166,18 +166,18 @@ 
  */
 function exportSchema()
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    try {
-        // TODO set exportSchema
-        //        $migrate = new Migrate($moduleDirName);
-        //        $migrate->saveCurrentSchema();
-        //
-        //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
-    } catch (\Throwable $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
-    }
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	try {
+		// TODO set exportSchema
+		//        $migrate = new Migrate($moduleDirName);
+		//        $migrate->saveCurrentSchema();
+		//
+		//        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
+	} catch (\Throwable $e) {
+		exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+	}
 }
 
 /**
@@ -194,46 +194,46 @@ 
  */
 function loadTableFromArrayWithReplace($table, $data, $search, $replace)
 {
-    /** @var \XoopsMySQLDatabase $db */
-    $db = \XoopsDatabaseFactory::getDatabaseConnection();
-
-    $prefixedTable = $db->prefix($table);
-    $count         = 0;
-
-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
-
-    $result = $db->queryF($sql);
-
-    if ($result) {
-        foreach ($data as $row) {
-            $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
-            $valueClause = ' VALUES (';
-            $first       = true;
-            foreach ($row as $column => $value) {
-                if ($first) {
-                    $first = false;
-                } else {
-                    $insertInto  .= ', ';
-                    $valueClause .= ', ';
-                }
-
-                $insertInto .= $column;
-                if ($search === $column) {
-                    $valueClause .= $db->quote($replace);
-                } else {
-                    $valueClause .= $db->quote($value);
-                }
-            }
-
-            $sql = $insertInto . ') ' . $valueClause . ')';
-
-            $result = $db->queryF($sql);
-            if (false !== $result) {
-                ++$count;
-            }
-        }
-    }
-    return $count;
+	/** @var \XoopsMySQLDatabase $db */
+	$db = \XoopsDatabaseFactory::getDatabaseConnection();
+
+	$prefixedTable = $db->prefix($table);
+	$count         = 0;
+
+	$sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+
+	$result = $db->queryF($sql);
+
+	if ($result) {
+		foreach ($data as $row) {
+			$insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
+			$valueClause = ' VALUES (';
+			$first       = true;
+			foreach ($row as $column => $value) {
+				if ($first) {
+					$first = false;
+				} else {
+					$insertInto  .= ', ';
+					$valueClause .= ', ';
+				}
+
+				$insertInto .= $column;
+				if ($search === $column) {
+					$valueClause .= $db->quote($replace);
+				} else {
+					$valueClause .= $db->quote($value);
+				}
+			}
+
+			$sql = $insertInto . ') ' . $valueClause . ')';
+
+			$result = $db->queryF($sql);
+			if (false !== $result) {
+				++$count;
+			}
+		}
+	}
+	return $count;
 }
 
 /**
@@ -241,16 +241,16 @@ 
  */
 function clearSampleData()
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
-    // Load language files
-    $helper->loadLanguage('common');
-    $tables = $helper->getModule()
-                     ->getInfo('tables');
-    // truncate module tables
-    foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::truncateTable($table);
-    }
-    redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
+	// Load language files
+	$helper->loadLanguage('common');
+	$tables = $helper->getModule()
+					 ->getInfo('tables');
+	// truncate module tables
+	foreach ($tables as $table) {
+		\Xmf\Database\TableLoad::truncateTable($table);
+	}
+	redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
 }

Spacing +21 added lines, -21 removed lines

@@ -30,8 +30,8 @@ 
 /** @var Utility $utility */
 /** @var Configurator $configurator */
 
-require_once dirname(__DIR__, 3) . '/include/cp_header.php';
-require \dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__, 3).'/include/cp_header.php';
+require \dirname(__DIR__).'/preloads/autoloader.php';
 
 $op = Request::getCmd('op', '');
 
@@ -51,7 +51,7 @@ 
             loadSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM')), \constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', \sprintf(\constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_CONFIRM')), \constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -66,7 +66,7 @@ 
             clearSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA')), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -91,20 +91,20 @@ 
                                 ->getInfo('tables');
 
     $language = 'english/';
-    if (\is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
+    if (\is_dir(__DIR__.'/'.$xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'].'/';
     }
 
     // load module tables
     foreach ($tables as $table) {
-        $tabledata = Yaml::readWrapped($language . $table . '.yml');
+        $tabledata = Yaml::readWrapped($language.$table.'.yml');
         TableLoad::truncateTable($table);
         TableLoad::loadTableFromArray($table, $tabledata);
     }
 
     // load permissions
     $table     = 'group_permission';
-    $tabledata = Yaml::readWrapped($language . $table . '.yml');
+    $tabledata = Yaml::readWrapped($language.$table.'.yml');
     $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)
                                    ->getModule()
                                    ->getVar('mid');
@@ -119,7 +119,7 @@ 
             $utility::rcopy($src, $dest);
         }
     }
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -134,16 +134,16 @@ 
     $tables             = $helper->getModule()
                                  ->getInfo('tables');
 
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!\file_exists($languageFolder . '/')) {
-        Utility::createFolder($languageFolder . '/');
+    $languageFolder = __DIR__.'/'.$xoopsConfig['language'];
+    if (!\file_exists($languageFolder.'/')) {
+        Utility::createFolder($languageFolder.'/');
     }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+    $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/';
     Utility::createFolder($exportFolder);
 
     // save module tables
     foreach ($tables as $table) {
-        TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+        TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml');
     }
 
     // save permissions
@@ -155,10 +155,10 @@ 
         )
     );
     $skipColumns[] = 'gperm_id';
-    TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+    TableLoad::saveTableToYamlFile('group_permission', $exportFolder.'group_permission.yml', $criteria, $skipColumns);
     unset($criteria);
 
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -176,7 +176,7 @@ 
         //
         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
     } catch (\Throwable $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));
     }
 }
 
@@ -200,13 +200,13 @@ 
     $prefixedTable = $db->prefix($table);
     $count         = 0;
 
-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+    $sql = 'DELETE FROM '.$prefixedTable.' WHERE `'.$search.'`='.$db->quote($replace);
 
     $result = $db->queryF($sql);
 
     if ($result) {
         foreach ($data as $row) {
-            $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
+            $insertInto  = 'INSERT INTO '.$prefixedTable.' (';
             $valueClause = ' VALUES (';
             $first       = true;
             foreach ($row as $column => $value) {
@@ -225,7 +225,7 @@ 
                 }
             }
 
-            $sql = $insertInto . ') ' . $valueClause . ')';
+            $sql = $insertInto.') '.$valueClause.')';
 
             $result = $db->queryF($sql);
             if (false !== $result) {
@@ -252,5 +252,5 @@ 
     foreach ($tables as $table) {
         \Xmf\Database\TableLoad::truncateTable($table);
     }
-    redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
+    redirect_header($helper->url('admin/index.php'), 1, constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_OK'));
 }