XoopsModules25x / songlist

class/Common/Blocksadmin.php

Indentation +637 added lines, -637 removed lines

@@ -25,260 +25,260 @@ 
  */
 class Blocksadmin
 {
-    /**
-     * @var \XoopsMySQLDatabase|null
-     */
-    public $db;
-    public $helper;
-    public $moduleDirName;
-    public $moduleDirNameUpper;
-
-    /**
-     * Blocksadmin constructor.
-     */
-    public function __construct(?\XoopsDatabase $db, 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);
-    }
-
-    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 "
+	/**
+	 * @var \XoopsMySQLDatabase|null
+	 */
+	public $db;
+	public $helper;
+	public $moduleDirName;
+	public $moduleDirNameUpper;
+
+	/**
+	 * Blocksadmin constructor.
+	 */
+	public function __construct(?\XoopsDatabase $db, 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);
+	}
+
+	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'>
+		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>
+			 . \_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);
-        $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'>
+		$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>
+				 . $i->getVar('bid')
+				 . "]' value='"
+				 . \XOOPS_CENTERBLOCK_LEFT
+				 . "'$ssel2>
                         <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . \XOOPS_CENTERBLOCK_CENTER
-                 . "'$ssel3>
+				 . $i->getVar('bid')
+				 . "]' value='"
+				 . \XOOPS_CENTERBLOCK_CENTER
+				 . "'$ssel3>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . \XOOPS_CENTERBLOCK_RIGHT
-                 . "'$ssel4>
+				 . $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>
+				 . $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>
+				 . $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>
+				 . $i->getVar('bid')
+				 . "]' value='"
+				 . \XOOPS_CENTERBLOCK_BOTTOMLEFT
+				 . "'$ssel5>
                         <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . \XOOPS_CENTERBLOCK_BOTTOM
-                 . "'$ssel7>
+				 . $i->getVar('bid')
+				 . "]' value='"
+				 . \XOOPS_CENTERBLOCK_BOTTOM
+				 . "'$ssel7>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . \XOOPS_CENTERBLOCK_BOTTOMRIGHT
-                 . "'$ssel6>
+				 . $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>';
-
-            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, true) ? " 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, true) ? " 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>
+				 . $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, true) ? " 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, true) ? " 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>
                                     </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'], true)) {
-                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'], true)) {
+				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') . "'>
@@ -288,418 +288,418 @@ 
             <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'>
+			$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>";
-    }
-
-    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);
-    }
-
-    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'], true);
-        $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 null|array|string $options
-     */
-    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'], true)) {
-            $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);
-    }
-
-    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);
-    }
-
-    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'], true);
-        $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);
-    }
-
-    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) && \is_array($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, true)) {
-                $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'));
-    }
-
-    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'));
-    }
-
-    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();
-    }
+	}
+
+	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);
+	}
+
+	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'], true);
+		$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 null|array|string $options
+	 */
+	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'], true)) {
+			$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);
+	}
+
+	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);
+	}
+
+	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'], true);
+		$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);
+	}
+
+	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) && \is_array($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, true)) {
+				$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'));
+	}
+
+	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'));
+	}
+
+	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 +81 added lines, -81 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function __construct(?\XoopsDatabase $db, Helper $helper)
     {
-        if (null === $db) {
+        if (null===$db) {
             $db = \XoopsDatabaseFactory::getDatabaseConnection();
         }
         $this->db                 = $db;
@@ -55,7 +55,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');
@@ -76,14 +76,14 @@ 
         $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'>";
+        <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')
+             . \constant('CO_'.$this->moduleDirNameUpper.'_'.'SIDE')
              . '<br>'
              . _LEFT
              . '-'
@@ -92,10 +92,10 @@ 
              . _RIGHT
              . "</th><th align='center'>"
              . \constant(
-                 'CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT'
+                 'CO_'.$this->moduleDirNameUpper.'_'.'WEIGHT'
              )
              . "</th><th align='center'>"
-             . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE')
+             . \constant('CO_'.$this->moduleDirNameUpper.'_'.'VISIBLE')
              . "</th><th align='center'>"
              . \_AM_SYSTEM_BLOCKS_VISIBLEIN
              . "</th><th align='center'>"
@@ -103,7 +103,7 @@ 
              . "</th><th align='center'>"
              . \_AM_SYSTEM_BLOCKS_BCACHETIME
              . "</th><th align='center'>"
-             . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'ACTION')
+             . \constant('CO_'.$this->moduleDirNameUpper.'_'.'ACTION')
              . '</th></tr>
         ';
         $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
@@ -124,19 +124,19 @@ 
         ];
         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'];
+            while (false!==($row = $this->db->fetchArray($result))) {
+                $modules[] = (int) $row['module_id'];
             }
 
             $cachetimeOptions = '';
             foreach ($cachetimes as $cachetime => $cachetimeName) {
-                if ($i->getVar('bcachetime') == $cachetime) {
+                if ($i->getVar('bcachetime')==$cachetime) {
                     $cachetimeOptions .= "<option value='$cachetime' selected='selected'>$cachetimeName</option>\n";
                 } else {
                     $cachetimeOptions .= "<option value='$cachetime'>$cachetimeName</option>\n";
@@ -153,29 +153,29 @@ 
             $ssel0 = $ssel1;
             $sel1  = $ssel0;
             $sel0  = $sel1;
-            if (1 === $i->getVar('visible')) {
+            if (1===$i->getVar('visible')) {
                 $sel1 = ' checked';
             } else {
                 $sel0 = ' checked';
             }
-            if (\XOOPS_SIDEBLOCK_LEFT === $i->getVar('side')) {
+            if (\XOOPS_SIDEBLOCK_LEFT===$i->getVar('side')) {
                 $ssel0 = ' checked';
-            } elseif (\XOOPS_SIDEBLOCK_RIGHT === $i->getVar('side')) {
+            } elseif (\XOOPS_SIDEBLOCK_RIGHT===$i->getVar('side')) {
                 $ssel1 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_LEFT === $i->getVar('side')) {
+            } elseif (\XOOPS_CENTERBLOCK_LEFT===$i->getVar('side')) {
                 $ssel2 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_RIGHT === $i->getVar('side')) {
+            } elseif (\XOOPS_CENTERBLOCK_RIGHT===$i->getVar('side')) {
                 $ssel4 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_CENTER === $i->getVar('side')) {
+            } elseif (\XOOPS_CENTERBLOCK_CENTER===$i->getVar('side')) {
                 $ssel3 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOMLEFT === $i->getVar('side')) {
+            } elseif (\XOOPS_CENTERBLOCK_BOTTOMLEFT===$i->getVar('side')) {
                 $ssel5 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOMRIGHT === $i->getVar('side')) {
+            } elseif (\XOOPS_CENTERBLOCK_BOTTOMRIGHT===$i->getVar('side')) {
                 $ssel6 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOM === $i->getVar('side')) {
+            } elseif (\XOOPS_CENTERBLOCK_BOTTOM===$i->getVar('side')) {
                 $ssel7 = ' checked';
             }
-            if ('' === $i->getVar('title')) {
+            if (''===$i->getVar('title')) {
                 $title = '&nbsp;';
             } else {
                 $title = $i->getVar('title');
@@ -246,27 +246,27 @@ 
                  . _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, true) ? " selected='selected'" : '') . ">$v</option>";
+                echo "<option value='$k'".(\in_array($k, $modules, true) ? " 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, true) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
+                echo "<option value='".$grp->getVar('groupid')."' ".(\in_array($grp->getVar('groupid'), $groupsPermissions, true) ? " 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>";
@@ -275,25 +275,25 @@ 
             //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
             if (!\in_array($i->getVar('block_type'), ['M', 'S'], true)) {
                 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';
+            $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 . "'>
+        " . $GLOBALS['xoopsSecurity']->getTokenHTML()."
+        <input type='submit' name='submit' value='" . _SUBMIT."'>
         </td></tr></table>
         </form>
         <br><br>";
@@ -328,18 +328,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'];
+            while (false!==($row = $this->db->fetchArray($result))) {
+                $modules[] = (int) $row['module_id'];
             }
         }
         $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E'], true);
         $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'),
@@ -355,7 +355,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();
 
@@ -388,7 +388,7 @@ 
         //$clone->setVar('content', $_POST['bcontent']);
         $clone->setVar('title', Request::getString('btitle', '', 'POST'));
         $clone->setVar('bcachetime', $bcachetime);
-        if (\is_array($options) && (\count($options) > 0)) {
+        if (\is_array($options) && (\count($options)>0)) {
             $options = \implode('|', $options);
             $clone->setVar('options', $options);
         }
@@ -400,7 +400,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();
@@ -408,11 +408,11 @@ 
             \xoops_cp_footer();
             exit();
         }
-        if ('' !== $clone->getVar('template')) {
+        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) {
+            $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);
@@ -421,12 +421,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);
@@ -455,12 +455,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'];
+            while (false!==($row = $this->db->fetchArray($result))) {
+                $modules[] = (int) $row['module_id'];
             }
         }
         $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E'], true);
@@ -482,7 +482,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);
     }
@@ -498,7 +498,7 @@ 
         //update block options
         if (isset($options) && \is_array($options)) {
             $optionsCount = \count($options);
-            if ($optionsCount > 0) {
+            if ($optionsCount>0) {
                 //Convert array values to comma-separated
                 foreach ($options as $i => $iValue) {
                     if (\is_array($iValue)) {
@@ -514,7 +514,7 @@ 
         //        $blockHandler = \xoops_getHandler('block');
         //        $blockHandler->insert($myblock);
 
-        if (!empty($bmodule) && \count($bmodule) > 0) {
+        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, true)) {
@@ -522,7 +522,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);
                 }
             }
@@ -535,7 +535,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'));
     }
 
     public function orderBlock(
@@ -559,15 +559,15 @@ 
             \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]) {
+            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) {
+            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)) {
@@ -575,7 +575,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);
                     }
                 }
@@ -590,7 +590,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'));
     }
 
     public function render(?array $block = null): void
@@ -614,9 +614,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));
@@ -630,7 +630,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([
@@ -641,20 +641,20 @@ 
                                          ]);
             $form->addElement($ctypeSelect);
         } else {
-            if ('' !== $block['template']) {
+            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>'));
+                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 (\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']) {
+            if (false!==$block['edit_form']) {
                 $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_OPTIONS, $block['edit_form']));
             }
         }

class/Common/VersionChecks.php

Indentation +113 added lines, -113 removed lines

@@ -19,127 +19,127 @@
  */
 trait VersionChecks
 {
-    /**
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule|null $module
-     *
-     * @param null|string       $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null): 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 +17 added lines, -17 removed lines

@@ -31,7 +31,7 @@ 
     {
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
+        if (null===$module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
         \xoops_loadLanguage('admin', $moduleDirName);
@@ -39,14 +39,14 @@ 
 
         //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
+        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));
+            $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -63,7 +63,7 @@ 
     {
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
+        if (null===$module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
         \xoops_loadLanguage('admin', $moduleDirName);
@@ -75,9 +75,9 @@ 
         $verNum = \PHP_VERSION;
         $reqVer = &$module->getInfo('min_php');
 
-        if (false !== $reqVer && '' !== $reqVer) {
+        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,36 +96,36 @@ 
         $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";
-        if ('github' === $source) {
-            if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
+        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) {
+                if (false===$curlReturn) {
                     \trigger_error(\curl_error($curlHandle));
-                } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+                } 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;
+                    if ('master'!==$latestVersionLink) {
+                        $update = \constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
                     }
                     //"PHP-standardized" version
                     $latestVersion = \mb_strtolower($latestVersion);
-                    if (false !== mb_strpos($latestVersion, 'final')) {
+                    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'));
+                    $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

class/Common/TestdataButtons.php

Indentation +56 added lines, -56 removed lines

@@ -29,64 +29,64 @@
  */
 class TestdataButtons
 {
-    /** Button status constants */
-    private const SHOW_BUTTONS = 1;
-    private const HIDE_BUTTONS = 0;
+	/** Button status constants */
+	private const SHOW_BUTTONS = 1;
+	private const HIDE_BUTTONS = 0;
 
-    /**
-     * Load the test button configuration
-     *
-     * @param \Xmf\Module\Admin $adminObject
-     *
-     * @return void
-     */
-    public static function loadButtonConfig($adminObject): void
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        $helper              = Helper::getInstance();
-        $yamlFile            = $helper->path('/config/admin.yml');
-        $config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
-        $displaySampleButton = $config['displaySampleButton'];
+	/**
+	 * Load the test button configuration
+	 *
+	 * @param \Xmf\Module\Admin $adminObject
+	 *
+	 * @return void
+	 */
+	public static function loadButtonConfig($adminObject): void
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		$helper              = Helper::getInstance();
+		$yamlFile            = $helper->path('/config/admin.yml');
+		$config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
+		$displaySampleButton = $config['displaySampleButton'];
 
-        if (self::SHOW_BUTTONS == $displaySampleButton) {
-            \xoops_loadLanguage('admin/modulesadmin', 'system');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
-            //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
-        } else {
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
-            // $displaySampleButton = $config['displaySampleButton'];
-        }
-    }
+		if (self::SHOW_BUTTONS == $displaySampleButton) {
+			\xoops_loadLanguage('admin/modulesadmin', 'system');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
+			//    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+		} else {
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+			// $displaySampleButton = $config['displaySampleButton'];
+		}
+	}
 
-    /**
-     * Hide the test buttons
-     *
-     * @return void
-     */
-    public static function hideButtons(): void
-    {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
-        $app                        = [];
-        $app['displaySampleButton'] = self::HIDE_BUTTONS;
-        Yaml::save($app, $yamlFile);
-        \redirect_header('index.php', 0, '');
-    }
+	/**
+	 * Hide the test buttons
+	 *
+	 * @return void
+	 */
+	public static function hideButtons(): void
+	{
+		$yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+		$app                        = [];
+		$app['displaySampleButton'] = self::HIDE_BUTTONS;
+		Yaml::save($app, $yamlFile);
+		\redirect_header('index.php', 0, '');
+	}
 
-    /**
-     * Show the test buttons
-     *
-     * @return void
-     */
-    public static function showButtons(): void
-    {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
-        $app                        = [];
-        $app['displaySampleButton'] = self::SHOW_BUTTONS;
-        Yaml::save($app, $yamlFile);
-        \redirect_header('index.php', 0, '');
-    }
+	/**
+	 * Show the test buttons
+	 *
+	 * @return void
+	 */
+	public static function showButtons(): void
+	{
+		$yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+		$app                        = [];
+		$app['displaySampleButton'] = self::SHOW_BUTTONS;
+		Yaml::save($app, $yamlFile);
+		\redirect_header('index.php', 0, '');
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -49,15 +49,15 @@ 
         $config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
         $displaySampleButton = $config['displaySampleButton'];
 
-        if (self::SHOW_BUTTONS == $displaySampleButton) {
+        if (self::SHOW_BUTTONS==$displaySampleButton) {
             \xoops_loadLanguage('admin/modulesadmin', 'system');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
             //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
         } else {
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
             // $displaySampleButton = $config['displaySampleButton'];
         }
     }
@@ -69,7 +69,7 @@ 
      */
     public static function hideButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = self::HIDE_BUTTONS;
         Yaml::save($app, $yamlFile);
@@ -83,7 +83,7 @@ 
      */
     public static function showButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = self::SHOW_BUTTONS;
         Yaml::save($app, $yamlFile);

class/Common/ServerStats.php

Indentation +53 added lines, -53 removed lines

@@ -19,60 +19,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats(): string
-    {
-        //mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        \xoops_loadLanguage('common', $moduleDirName);
-        $html = '';
-        //        $sql   = 'SELECT metavalue';
-        //        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
-        //        $sql   .= " WHERE metakey='version' LIMIT 1";
-        //        $query = $GLOBALS['xoopsDB']->query($sql);
-        //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . \constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
-        $html .= "<div style='padding: 8px;'>\n";
-        //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
-        //        $html .= "<br>\n";
-        //        $html .= "<br>\n";
-        $html .= '<div>' . \constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
-        $html .= "<ul>\n";
+	/**
+	 * serverStats()
+	 *
+	 * @return string
+	 */
+	public static function getServerStats(): string
+	{
+		//mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
+		$html = '';
+		//        $sql   = 'SELECT metavalue';
+		//        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
+		//        $sql   .= " WHERE metakey='version' LIMIT 1";
+		//        $query = $GLOBALS['xoopsDB']->query($sql);
+		//        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
+		$html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . \constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+		$html .= "<div style='padding: 8px;'>\n";
+		//        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
+		//        $html .= "<br>\n";
+		//        $html .= "<br>\n";
+		$html .= '<div>' . \constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+		$html .= "<ul>\n";
 
-        $gdlib = \function_exists('gd_info') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
-        if (\function_exists('gd_info')) {
-            if (true == ($gdlib = gd_info())) {
-                $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
-            }
-        }
-        //
-        //    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
-        //
-        //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
-        //
-        $downloads = \ini_get('file_uploads') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+		$gdlib = \function_exists('gd_info') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
+		$html  .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+		if (\function_exists('gd_info')) {
+			if (true == ($gdlib = gd_info())) {
+				$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+			}
+		}
+		//
+		//    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
+		//
+		//    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
+		//
+		$downloads = \ini_get('file_uploads') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
+		$html      .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
 
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . \ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . \ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . \ini_get('memory_limit') . "</span></b>\n";
-        $html .= "</ul>\n";
-        $html .= "<ul>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
-        $html .= "</ul>\n";
-        $html .= "<br>\n";
-        $html .= \constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
-        $html .= '</div>';
-        $html .= '</fieldset><br>';
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . \ini_get('upload_max_filesize') . "</span></b>\n";
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . \ini_get('post_max_size') . "</span></b>\n";
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . \ini_get('memory_limit') . "</span></b>\n";
+		$html .= "</ul>\n";
+		$html .= "<ul>\n";
+		$html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+		$html .= "</ul>\n";
+		$html .= "<br>\n";
+		$html .= \constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+		$html .= '</div>';
+		$html .= '</fieldset><br>';
 
-        return $html;
-    }
+		return $html;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -36,19 +36,19 @@ 
         //        $sql   .= " WHERE metakey='version' LIMIT 1";
         //        $query = $GLOBALS['xoopsDB']->query($sql);
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . \constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".\constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";
         $html .= "<div style='padding: 8px;'>\n";
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
         //        $html .= "<br>\n";
         //        $html .= "<br>\n";
-        $html .= '<div>' . \constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+        $html .= '<div>'.\constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";
         $html .= "<ul>\n";
 
-        $gdlib = \function_exists('gd_info') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $gdlib = \function_exists('gd_info') ? '<span style="color: green;">'.\constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.\constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
         if (\function_exists('gd_info')) {
-            if (true == ($gdlib = gd_info())) {
-                $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+            if (true==($gdlib = gd_info())) {
+                $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
         //
@@ -58,18 +58,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
         //
-        $downloads = \ini_get('file_uploads') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $downloads = \ini_get('file_uploads') ? '<span style="color: green;">'.\constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.\constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
 
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . \ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . \ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . \ini_get('memory_limit') . "</span></b>\n";
+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.\ini_get('upload_max_filesize')."</span></b>\n";
+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.\ini_get('post_max_size')."</span></b>\n";
+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.\ini_get('memory_limit')."</span></b>\n";
         $html .= "</ul>\n";
         $html .= "<ul>\n";
-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
         $html .= "</ul>\n";
         $html .= "<br>\n";
-        $html .= \constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+        $html .= \constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
         $html .= '</div>';
         $html .= '</fieldset><br>';
 

class/Common/Migrate.php

Indentation +92 added lines, -92 removed lines

@@ -25,49 +25,49 @@ 
  */
 class Migrate extends \Xmf\Database\Migrate
 {
-    private $moduleDirName;
-    private $renameColumns;
-    private $renameTables;
+	private $moduleDirName;
+	private $renameColumns;
+	private $renameTables;
 
-    /**
-     * Migrate constructor.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct()
-    {
-        $class = __NAMESPACE__ . '\\' . 'Configurator';
-        if (!\class_exists($class)) {
-            throw new \RuntimeException("Class '$class' not found");
-        }
-        $configurator       = new $class();
-        $this->renameTables = $configurator->renameTables;
-        $this->renameColumns = $configurator->renameColumns;
+	/**
+	 * Migrate constructor.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct()
+	{
+		$class = __NAMESPACE__ . '\\' . 'Configurator';
+		if (!\class_exists($class)) {
+			throw new \RuntimeException("Class '$class' not found");
+		}
+		$configurator       = new $class();
+		$this->renameTables = $configurator->renameTables;
+		$this->renameColumns = $configurator->renameColumns;
 
-        $this->moduleDirName = \basename(\dirname(__DIR__, 2));
-        parent::__construct($this->moduleDirName);
-    }
+		$this->moduleDirName = \basename(\dirname(__DIR__, 2));
+		parent::__construct($this->moduleDirName);
+	}
 
-    /**
-     * change table prefix if needed
-     */
-    private function changePrefix()
-    {
+	/**
+	 * change table prefix if needed
+	 */
+	private function changePrefix()
+	{
 //        foreach ($this->renameTables as $oldName => $newName) {
 //            if ($this->tableHandler->useTable($oldName) && !$this->tableHandler->useTable($newName)) {
 //                $this->tableHandler->renameTable($oldName, $newName);
 //            }
 //        }
-    }
+	}
 
-    /**
-     * Change integer IPv4 column to varchar IPv6 capable
-     *
-     * @param string $tableName  table to convert
-     * @param string $columnName column with IP address
-     */
-    private function convertIPAddresses($tableName, $columnName)
-    {
+	/**
+	 * Change integer IPv4 column to varchar IPv6 capable
+	 *
+	 * @param string $tableName  table to convert
+	 * @param string $columnName column with IP address
+	 */
+	private function convertIPAddresses($tableName, $columnName)
+	{
 //        if ($this->tableHandler->useTable($tableName)) {
 //            $attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
 //            if (false !== \mb_strpos($attributes, ' int(')) {
@@ -79,14 +79,14 @@ 
 //                $this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
 //            }
 //        }
-    }
+	}
 
-    /**
-     * @deprecated (just as an example here)
-     * Move do* columns from newbb_posts to newbb_posts_text table
-     */
-    private function moveDoColumns()
-    {
+	/**
+	 * @deprecated (just as an example here)
+	 * Move do* columns from newbb_posts to newbb_posts_text table
+	 */
+	private function moveDoColumns()
+	{
 //        $tableName    = 'newbb_posts_text';
 //        $srcTableName = 'newbb_posts';
 //        if ($this->tableHandler->useTable($tableName)
@@ -100,62 +100,62 @@ 
 //                $this->tableHandler->addToQueue($sql);
 //            }
 //        }
-    }
+	}
 
-    /**
-     * rename table if needed
-     */
-    private function renameTable()
-    {
-        foreach ($this->renameTables as $oldName => $newName) {
-            if ($this->tableHandler->useTable($oldName) && !$this->tableHandler->useTable($newName)) {
-                $this->tableHandler->renameTable($oldName, $newName);
-            }
-        }
-    }
+	/**
+	 * rename table if needed
+	 */
+	private function renameTable()
+	{
+		foreach ($this->renameTables as $oldName => $newName) {
+			if ($this->tableHandler->useTable($oldName) && !$this->tableHandler->useTable($newName)) {
+				$this->tableHandler->renameTable($oldName, $newName);
+			}
+		}
+	}
 
 
-    /**
-     * rename columns if needed
-     */
-    private function renameColumns()
-    {
-        foreach ($this->renameColumns as $tableName) {
-            if ($this->tableHandler->useTable($tableName)) {
-                $oldName = $tableName['from'];
-                $newName = $tableName['to'];
-                $attributes = $this->tableHandler->getColumnAttributes($tableName, $oldName);
-                if (false !== \strpos($attributes, ' int(')) {
-                    $this->tableHandler->alterColumn($tableName, $oldName, $attributes, $newName);
-                }
-            }
-        }
-    }
+	/**
+	 * rename columns if needed
+	 */
+	private function renameColumns()
+	{
+		foreach ($this->renameColumns as $tableName) {
+			if ($this->tableHandler->useTable($tableName)) {
+				$oldName = $tableName['from'];
+				$newName = $tableName['to'];
+				$attributes = $this->tableHandler->getColumnAttributes($tableName, $oldName);
+				if (false !== \strpos($attributes, ' int(')) {
+					$this->tableHandler->alterColumn($tableName, $oldName, $attributes, $newName);
+				}
+			}
+		}
+	}
 
-    /**
-     * Perform any upfront actions before synchronizing the schema
-     *
-     * Some typical uses include
-     *   table and column renames
-     *   data conversions
-     */
-    protected function preSyncActions()
-    {
-        // change 'bb' table prefix to 'newbb'
-        $this->changePrefix();
-        // columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
-        $this->moveDoColumns();
-        // Convert IP address columns from int to readable varchar(45) for IPv6
+	/**
+	 * Perform any upfront actions before synchronizing the schema
+	 *
+	 * Some typical uses include
+	 *   table and column renames
+	 *   data conversions
+	 */
+	protected function preSyncActions()
+	{
+		// change 'bb' table prefix to 'newbb'
+		$this->changePrefix();
+		// columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
+		$this->moveDoColumns();
+		// Convert IP address columns from int to readable varchar(45) for IPv6
 //        $this->convertIPAddresses('newbb_posts', 'poster_ip');
 //        $this->convertIPAddresses('newbb_report', 'reporter_ip');
 
-        // rename table
-        if ($this->renameTables && \is_array($this->renameTables)) {
-            $this->renameTable();
-        }
-        // rename column
-        if ($this->renameColumns && \is_array($this->renameColumns)) {
-            $this->renameColumns();
-        }
-    }
+		// rename table
+		if ($this->renameTables && \is_array($this->renameTables)) {
+			$this->renameTable();
+		}
+		// rename column
+		if ($this->renameColumns && \is_array($this->renameColumns)) {
+			$this->renameColumns();
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function __construct()
     {
-        $class = __NAMESPACE__ . '\\' . 'Configurator';
+        $class = __NAMESPACE__.'\\'.'Configurator';
         if (!\class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }
@@ -125,7 +125,7 @@ 
                 $oldName = $tableName['from'];
                 $newName = $tableName['to'];
                 $attributes = $this->tableHandler->getColumnAttributes($tableName, $oldName);
-                if (false !== \strpos($attributes, ' int(')) {
+                if (false!==\strpos($attributes, ' int(')) {
                     $this->tableHandler->alterColumn($tableName, $oldName, $attributes, $newName);
                 }
             }

class/Common/Breadcrumb.php

Indentation +27 added lines, -27 removed lines

@@ -32,39 +32,39 @@ 
  */
 class Breadcrumb
 {
-    public  $dirname;
-    private $bread = [];
+	public  $dirname;
+	private $bread = [];
 
-    public function __construct()
-    {
-        $this->dirname = \basename(\dirname(__DIR__, 2));
-    }
+	public function __construct()
+	{
+		$this->dirname = \basename(\dirname(__DIR__, 2));
+	}
 
-    /**
-     * Add link to breadcrumb
-     *
-     * @param string $title
-     * @param string $link
-     */
-    public function addLink($title = '', $link = ''): void
-    {
-        $this->bread[] = [
-            'link'  => $link,
-            'title' => $title,
-        ];
-    }
+	/**
+	 * Add link to breadcrumb
+	 *
+	 * @param string $title
+	 * @param string $link
+	 */
+	public function addLink($title = '', $link = ''): void
+	{
+		$this->bread[] = [
+			'link'  => $link,
+			'title' => $title,
+		];
+	}
 
-    /**
-     * Render BreadCrumb
-     */
-    public function render(): void
-    {
-        /*
+	/**
+	 * Render BreadCrumb
+	 */
+	public function render(): void
+	{
+		/*
         TODO if you want to use the render code below,
         1) create ./templates/chess_common_breadcrumb.tpl)
         2) add declaration to  xoops_version.php
         */
-        /*
+		/*
         if (!isset($GLOBALS['xoTheme']) || !\is_object($GLOBALS['xoTheme'])) {
             require $GLOBALS['xoops']->path('class/theme.php');
 
@@ -83,5 +83,5 @@ 
 
         return $html;
         */
-    }
+	}
 }

class/Common/Configurator.php

Indentation +34 added lines, -34 removed lines

@@ -24,41 +24,41 @@
  */
 class Configurator
 {
-    public $name;
-    public $paths           = [];
-    public $uploadFolders   = [];
-    public $copyBlankFiles  = [];
-    public $copyTestFolders = [];
-    public $templateFolders = [];
-    public $oldFiles        = [];
-    public $oldFolders      = [];
-    public $renameTables    = [];
-    public $renameColumns   = [];
-    public $moduleStats     = [];
-    public $modCopyright;
-    public $icons;
+	public $name;
+	public $paths           = [];
+	public $uploadFolders   = [];
+	public $copyBlankFiles  = [];
+	public $copyTestFolders = [];
+	public $templateFolders = [];
+	public $oldFiles        = [];
+	public $oldFolders      = [];
+	public $renameTables    = [];
+	public $renameColumns   = [];
+	public $moduleStats     = [];
+	public $modCopyright;
+	public $icons;
 
-    /**
-     * Configurator constructor.
-     */
-    public function __construct()
-    {
-        $config = require \dirname(__DIR__, 2) . '/config/config.php';
+	/**
+	 * Configurator constructor.
+	 */
+	public function __construct()
+	{
+		$config = require \dirname(__DIR__, 2) . '/config/config.php';
 
-        $this->name            = $config->name;
-        $this->paths           = $config->paths;
-        $this->uploadFolders   = $config->uploadFolders;
-        $this->copyBlankFiles  = $config->copyBlankFiles;
-        $this->copyTestFolders = $config->copyTestFolders;
-        $this->templateFolders = $config->templateFolders;
-        $this->oldFiles        = $config->oldFiles;
-        $this->oldFolders      = $config->oldFolders;
-        $this->renameTables    = $config->renameTables;
-        $this->renameColumns   = $config->renameColumns;
-        $this->moduleStats     = $config->moduleStats;
-        $this->modCopyright    = $config->modCopyright;
+		$this->name            = $config->name;
+		$this->paths           = $config->paths;
+		$this->uploadFolders   = $config->uploadFolders;
+		$this->copyBlankFiles  = $config->copyBlankFiles;
+		$this->copyTestFolders = $config->copyTestFolders;
+		$this->templateFolders = $config->templateFolders;
+		$this->oldFiles        = $config->oldFiles;
+		$this->oldFolders      = $config->oldFolders;
+		$this->renameTables    = $config->renameTables;
+		$this->renameColumns   = $config->renameColumns;
+		$this->moduleStats     = $config->moduleStats;
+		$this->modCopyright    = $config->modCopyright;
 
-        $this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
-        $this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
-    }
+		$this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
+		$this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function __construct()
     {
-        $config = require \dirname(__DIR__, 2) . '/config/config.php';
+        $config = require \dirname(__DIR__, 2).'/config/config.php';
 
         $this->name            = $config->name;
         $this->paths           = $config->paths;
@@ -58,7 +58,7 @@ 
         $this->moduleStats     = $config->moduleStats;
         $this->modCopyright    = $config->modCopyright;
 
-        $this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
-        $this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
+        $this->icons = require \dirname(__DIR__, 2).'/config/icons.php';
+        $this->paths = require \dirname(__DIR__, 2).'/config/paths.php';
     }
 }

class/JSON.php

Indentation +676 added lines, -676 removed lines

@@ -76,271 +76,271 @@ 
  */
 class ServicesJSON
 {
-    /**
-     * constructs a new JSON instance
-     *
-     * @param int $use object behavior flags; combine with boolean-OR
-     *
-     *                           possible values:
-     *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-     *                                   "{...}" syntax creates associative arrays
-     *                                   instead of objects in decode().
-     *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-     *                                   Values which can't be encoded (e.g. resources)
-     *                                   appear as NULL instead of throwing errors.
-     *                                   By default, a deeply-nested resource will
-     *                                   bubble up with an error, so all return values
-     *                                   from encode() should be checked with isError()
-     */
-    public function __construct($use = 0)
-    {
-        $this->use = $use;
-    }
-
-    /**
-     * convert a string from one UTF-16 char to one UTF-8 char
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * @param string $utf16 UTF-16 character
-     * @return   string  UTF-8 character
-     */
-    public function utf162utf8($utf16): string
-    {
-        // oh please oh please oh please oh please oh please
-        if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
-
-        switch (true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-    /**
-     * convert a string from one UTF-8 char to one UTF-16 char
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * @param string $utf8 UTF-8 character
-     * @return   string  UTF-16 character
-     */
-    public function utf82utf16($utf8): string
-    {
-        // oh please oh please oh please oh please oh please
-        if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch (mb_strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-    /**
-     * encodes an arbitrary variable into JSON format (and sends JSON Header)
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function encode($var)
-    {
-        header('Document-type: application/json');
-
-        return $this->encodeUnsafe($var);
-    }
-
-    /**
-     * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow CSS!!!!)
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function encodeUnsafe($var)
-    {
-        // see bug #16908 - regarding numeric locale printing
-        $lc = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
-        $ret = $this->_encode($var);
-        setlocale(LC_NUMERIC, $lc);
-
-        return $ret;
-    }
-
-    /**
-     * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function _encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-            case 'NULL':
-                return 'null';
-            case 'integer':
-                return (int)$var;
-            case 'double':
-            case 'float':
-                return (float)$var;
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii      = '';
-                $strlen_var = mb_strlen($var);
-
-                /*
+	/**
+	 * constructs a new JSON instance
+	 *
+	 * @param int $use object behavior flags; combine with boolean-OR
+	 *
+	 *                           possible values:
+	 *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
+	 *                                   "{...}" syntax creates associative arrays
+	 *                                   instead of objects in decode().
+	 *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
+	 *                                   Values which can't be encoded (e.g. resources)
+	 *                                   appear as NULL instead of throwing errors.
+	 *                                   By default, a deeply-nested resource will
+	 *                                   bubble up with an error, so all return values
+	 *                                   from encode() should be checked with isError()
+	 */
+	public function __construct($use = 0)
+	{
+		$this->use = $use;
+	}
+
+	/**
+	 * convert a string from one UTF-16 char to one UTF-8 char
+	 *
+	 * Normally should be handled by mb_convert_encoding, but
+	 * provides a slower PHP-only method for installations
+	 * that lack the multibye string extension.
+	 *
+	 * @param string $utf16 UTF-16 character
+	 * @return   string  UTF-8 character
+	 */
+	public function utf162utf8($utf16): string
+	{
+		// oh please oh please oh please oh please oh please
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+		}
+
+		$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
+
+		switch (true) {
+			case ((0x7F & $bytes) == $bytes):
+				// this case should never be reached, because we are in ASCII range
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x7F & $bytes);
+			case (0x07FF & $bytes) == $bytes:
+				// return a 2-byte UTF-8 character
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
+			case (0xFFFF & $bytes) == $bytes:
+				// return a 3-byte UTF-8 character
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
+
+	/**
+	 * convert a string from one UTF-8 char to one UTF-16 char
+	 *
+	 * Normally should be handled by mb_convert_encoding, but
+	 * provides a slower PHP-only method for installations
+	 * that lack the multibye string extension.
+	 *
+	 * @param string $utf8 UTF-8 character
+	 * @return   string  UTF-16 character
+	 */
+	public function utf82utf16($utf8): string
+	{
+		// oh please oh please oh please oh please oh please
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+		}
+
+		switch (mb_strlen($utf8)) {
+			case 1:
+				// this case should never be reached, because we are in ASCII range
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return $utf8;
+			case 2:
+				// return a UTF-16 character from a 2-byte UTF-8 char
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
+			case 3:
+				// return a UTF-16 character from a 3-byte UTF-8 char
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
+
+	/**
+	 * encodes an arbitrary variable into JSON format (and sends JSON Header)
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function encode($var)
+	{
+		header('Document-type: application/json');
+
+		return $this->encodeUnsafe($var);
+	}
+
+	/**
+	 * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow CSS!!!!)
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function encodeUnsafe($var)
+	{
+		// see bug #16908 - regarding numeric locale printing
+		$lc = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, 'C');
+		$ret = $this->_encode($var);
+		setlocale(LC_NUMERIC, $lc);
+
+		return $ret;
+	}
+
+	/**
+	 * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function _encode($var)
+	{
+		switch (gettype($var)) {
+			case 'boolean':
+				return $var ? 'true' : 'false';
+			case 'NULL':
+				return 'null';
+			case 'integer':
+				return (int)$var;
+			case 'double':
+			case 'float':
+				return (float)$var;
+			case 'string':
+				// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+				$ascii      = '';
+				$strlen_var = mb_strlen($var);
+
+				/*
                  * Iterate over every character in the string,
                  * escaping with a slash or encoding to UTF-8 where necessary
                  */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-                    $ord_var_c = ord($var[$c]);
-
-                    switch (true) {
-                        case 0x08 == $ord_var_c:
-                            $ascii .= '\b';
-                            break;
-                        case 0x09 == $ord_var_c:
-                            $ascii .= '\t';
-                            break;
-                        case 0x0A == $ord_var_c:
-                            $ascii .= '\n';
-                            break;
-                        case 0x0C == $ord_var_c:
-                            $ascii .= '\f';
-                            break;
-                        case 0x0D == $ord_var_c:
-                            $ascii .= '\r';
-                            break;
-                        case 0x22 == $ord_var_c:
-                        case 0x2F == $ord_var_c:
-                        case 0x5C == $ord_var_c:
-                            // double quote, slash, slosh
-                            $ascii .= '\\' . $var[$c];
-                            break;
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var[$c];
-                            break;
-                        case (0xC0 == ($ord_var_c & 0xE0)):
-                            // characters U-00000080 - U-000007FF, mask 110SONGLIST
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 1 >= $strlen_var) {
-                                ++$c;
-                                $ascii .= '?';
-                                break;
-                            }
-
-                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
-                            ++$c;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xE0 == ($ord_var_c & 0xF0)):
-                            if ($c + 2 >= $strlen_var) {
-                                $c     += 2;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
-                            $c     += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xF0 == ($ord_var_c & 0xF8)):
-                            if ($c + 3 >= $strlen_var) {
-                                $c     += 3;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
-                            $c     += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xF8 == ($ord_var_c & 0xFC)):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 4 >= $strlen_var) {
-                                $c     += 4;
-                                $ascii .= '?';
-                                break;
-                            }
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
-                            $c     += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xFC == ($ord_var_c & 0xFE)):
-                            if ($c + 5 >= $strlen_var) {
-                                $c     += 5;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
-                            $c     += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"' . $ascii . '"';
-            case 'array':
-                /*
+				for ($c = 0; $c < $strlen_var; ++$c) {
+					$ord_var_c = ord($var[$c]);
+
+					switch (true) {
+						case 0x08 == $ord_var_c:
+							$ascii .= '\b';
+							break;
+						case 0x09 == $ord_var_c:
+							$ascii .= '\t';
+							break;
+						case 0x0A == $ord_var_c:
+							$ascii .= '\n';
+							break;
+						case 0x0C == $ord_var_c:
+							$ascii .= '\f';
+							break;
+						case 0x0D == $ord_var_c:
+							$ascii .= '\r';
+							break;
+						case 0x22 == $ord_var_c:
+						case 0x2F == $ord_var_c:
+						case 0x5C == $ord_var_c:
+							// double quote, slash, slosh
+							$ascii .= '\\' . $var[$c];
+							break;
+						case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+							// characters U-00000000 - U-0000007F (same as ASCII)
+							$ascii .= $var[$c];
+							break;
+						case (0xC0 == ($ord_var_c & 0xE0)):
+							// characters U-00000080 - U-000007FF, mask 110SONGLIST
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c + 1 >= $strlen_var) {
+								++$c;
+								$ascii .= '?';
+								break;
+							}
+
+							$char = pack('C*', $ord_var_c, ord($var[$c + 1]));
+							++$c;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xE0 == ($ord_var_c & 0xF0)):
+							if ($c + 2 >= $strlen_var) {
+								$c     += 2;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
+							$c     += 2;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xF0 == ($ord_var_c & 0xF8)):
+							if ($c + 3 >= $strlen_var) {
+								$c     += 3;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00010000 - U-001FFFFF, mask 11110XXX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
+							$c     += 3;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xF8 == ($ord_var_c & 0xFC)):
+							// characters U-00200000 - U-03FFFFFF, mask 111110XX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c + 4 >= $strlen_var) {
+								$c     += 4;
+								$ascii .= '?';
+								break;
+							}
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
+							$c     += 4;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xFC == ($ord_var_c & 0xFE)):
+							if ($c + 5 >= $strlen_var) {
+								$c     += 5;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
+							$c     += 5;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+					}
+				}
+
+				return '"' . $ascii . '"';
+			case 'array':
+				/*
                  * As per JSON spec if any array key is not an integer
                  * we must treat the the whole array as an object. We
                  * also try to catch a sparsely populated associative
@@ -358,422 +358,422 @@ 
                  * bracket notation.
                  */
 
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
-                    $properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
-
-                    foreach ($properties as $property) {
-                        if ($this->isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . implode(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map([$this, '_encode'], $var);
-
-                foreach ($elements as $element) {
-                    if ($this->isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . implode(',', $elements) . ']';
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map([$this, 'name_value'], array_keys($vars), array_values($vars));
-
-                foreach ($properties as $property) {
-                    if ($this->isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . implode(',', $properties) . '}';
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
-        }
-    }
-
-    /**
-     * array-walking function for use in generating JSON-formatted name-value pairs
-     *
-     * @param string $name  name of key to use
-     * @param mixed  $value reference to an array element to be encoded
-     *
-     * @return   string  JSON-formatted name-value pair, like '"name":value'
-     */
-    public function name_value($name, $value)
-    {
-        $encoded_value = $this->_encode($value);
-
-        if ($this->isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->_encode((string)$name) . ':' . $encoded_value;
-    }
-
-    /**
-     * reduce a string by removing leading and trailing comments and whitespace
-     *
-     * @param string $str string value to strip of comments and whitespace
-     *
-     * @return   string  string value stripped of comments and whitespace
-     */
-    public function reduce_string($str): string
-    {
-        $str = preg_replace(
-            [
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us',
-            ],
-            '',
-            $str
-        );
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-    /**
-     * decodes a JSON string into appropriate variable
-     *
-     * @param string $str JSON-formatted string
-     *
-     * @return   array|bool|float|int|\stdClass|string|void|null   number, boolean, string, array, or object
-     *                   corresponding to given JSON input string.
-     *                   See argument 1 to ServicesJSON() above for object-output behavior.
-     *                   Note that decode() always returns strings
-     *                   in ASCII or UTF-8 format!
-     */
-    public function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (mb_strtolower($str)) {
-            case 'true':
-                return true;
-            case 'false':
-                return false;
-            case 'null':
-                return null;
-            default:
-                $m = [];
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (int)$str) ? (int)$str : (float)$str;
-                }
-
-                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim       = mb_substr($str, 0, 1);
-                    $chrs        = mb_substr($str, 1, -1);
-                    $utf8        = '';
-                    $strlen_chrs = mb_strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-                        $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
-                        $ord_chrs_c      = ord($chrs[$c]);
-
-                        switch (true) {
-                            case '\b' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case '\t' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case '\n' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case '\f' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case '\r' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-                            case '\\"' === $substr_chrs_c_2:
-                            case '\\\'' === $substr_chrs_c_2:
-                            case '\\\\' === $substr_chrs_c_2:
-                            case '\\/' === $substr_chrs_c_2:
-                                if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
-                                    || ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
-                                    $utf8 .= $chrs[++$c];
-                                }
-                                break;
-                            case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
-                                $utf8  .= $this->utf162utf8($utf16);
-                                $c     += 5;
-                                break;
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs[$c];
-                                break;
-                            case 0xC0 == ($ord_chrs_c & 0xE0):
-                                // characters U-00000080 - U-000007FF, mask 110SONGLIST
-                                //see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-                            case 0xE0 == ($ord_chrs_c & 0xF0):
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 3);
-                                $c    += 2;
-                                break;
-                            case 0xF0 == ($ord_chrs_c & 0xF8):
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 4);
-                                $c    += 3;
-                                break;
-                            case 0xF8 == ($ord_chrs_c & 0xFC):
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 5);
-                                $c    += 4;
-                                break;
-                            case 0xFC == ($ord_chrs_c & 0xFE):
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 6);
-                                $c    += 5;
-                                break;
-                        }
-                    }
-
-                    return $utf8;
-                }
-
-                if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ('[' === $str[0]) {
-                        $stk = [SERVICES_JSON_IN_ARR];
-                        $arr = [];
-                    } elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = [SERVICES_JSON_IN_OBJ];
-                            $obj = [];
-                        } else {
-                            $stk = [SERVICES_JSON_IN_OBJ];
-                            $obj = new stdClass();
-                    }
-
-                    array_push(
-                        $stk,
-                        [
-                            'what'  => SERVICES_JSON_SLICE,
-                            'where' => 0,
-                            'delim' => false,
-                        ]
-                    );
-
-                    $chrs = mb_substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ('' == $chrs) {
-                        if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                            return $arr;
-                        }
-
-                        return $obj;
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = mb_strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-                        $top             = end($stk);
-                        $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = mb_substr($chrs, $top['where'], $c - $top['where']);
-                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                                // we are in an array, so just push an element onto the stack
-                                $arr[] = $this->decode($slice);
-                            } elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = [];
-
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-                            }
-                        } elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
-                            //print("Found start of string at {$c}\n");
-                        } elseif (($chrs[$c] == $top['delim'])
-                                  && (SERVICES_JSON_IN_STR == $top['what'])
-                                  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-                        } elseif (('[' === $chrs[$c])
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
-                            //print("Found start of array at {$c}\n");
-                        } elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('{' === $chrs[$c])
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
-                            //print("Found start of object at {$c}\n");
-                        } elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('/*' === $substr_chrs_c_2)
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
-                            ++$c;
-                            //print("Found start of comment at {$c}\n");
-                        } elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            ++$c;
-
-                            for ($i = $top['where']; $i <= $c; ++$i) {
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-                            }
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        }
-                    }
-
-                    if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                        return $arr;
-                    }
-
-                    if (SERVICES_JSON_IN_OBJ == reset($stk)) {
-                        return $obj;
-                    }
-                }
-        }
-    }
-
-    /**
-     * @param      $data
-     * @param null $code
-     * @return bool
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    public function isError($data, $code = null): bool
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        }
-
-        if (is_object($data)
-            && ($data instanceof \services_json_error
-                || $data instanceof \services_json_error)) {
-            return true;
-        }
-
-        return false;
-    }
+				// treat as a JSON object
+				if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
+					$properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
+
+					foreach ($properties as $property) {
+						if ($this->isError($property)) {
+							return $property;
+						}
+					}
+
+					return '{' . implode(',', $properties) . '}';
+				}
+
+				// treat it like a regular array
+				$elements = array_map([$this, '_encode'], $var);
+
+				foreach ($elements as $element) {
+					if ($this->isError($element)) {
+						return $element;
+					}
+				}
+
+				return '[' . implode(',', $elements) . ']';
+			case 'object':
+				$vars = get_object_vars($var);
+
+				$properties = array_map([$this, 'name_value'], array_keys($vars), array_values($vars));
+
+				foreach ($properties as $property) {
+					if ($this->isError($property)) {
+						return $property;
+					}
+				}
+
+				return '{' . implode(',', $properties) . '}';
+			default:
+				return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
+		}
+	}
+
+	/**
+	 * array-walking function for use in generating JSON-formatted name-value pairs
+	 *
+	 * @param string $name  name of key to use
+	 * @param mixed  $value reference to an array element to be encoded
+	 *
+	 * @return   string  JSON-formatted name-value pair, like '"name":value'
+	 */
+	public function name_value($name, $value)
+	{
+		$encoded_value = $this->_encode($value);
+
+		if ($this->isError($encoded_value)) {
+			return $encoded_value;
+		}
+
+		return $this->_encode((string)$name) . ':' . $encoded_value;
+	}
+
+	/**
+	 * reduce a string by removing leading and trailing comments and whitespace
+	 *
+	 * @param string $str string value to strip of comments and whitespace
+	 *
+	 * @return   string  string value stripped of comments and whitespace
+	 */
+	public function reduce_string($str): string
+	{
+		$str = preg_replace(
+			[
+				// eliminate single line comments in '// ...' form
+				'#^\s*//(.+)$#m',
+
+				// eliminate multi-line comments in '/* ... */' form, at start of string
+				'#^\s*/\*(.+)\*/#Us',
+
+				// eliminate multi-line comments in '/* ... */' form, at end of string
+				'#/\*(.+)\*/\s*$#Us',
+			],
+			'',
+			$str
+		);
+
+		// eliminate extraneous space
+		return trim($str);
+	}
+
+	/**
+	 * decodes a JSON string into appropriate variable
+	 *
+	 * @param string $str JSON-formatted string
+	 *
+	 * @return   array|bool|float|int|\stdClass|string|void|null   number, boolean, string, array, or object
+	 *                   corresponding to given JSON input string.
+	 *                   See argument 1 to ServicesJSON() above for object-output behavior.
+	 *                   Note that decode() always returns strings
+	 *                   in ASCII or UTF-8 format!
+	 */
+	public function decode($str)
+	{
+		$str = $this->reduce_string($str);
+
+		switch (mb_strtolower($str)) {
+			case 'true':
+				return true;
+			case 'false':
+				return false;
+			case 'null':
+				return null;
+			default:
+				$m = [];
+
+				if (is_numeric($str)) {
+					// Lookie-loo, it's a number
+
+					// This would work on its own, but I'm trying to be
+					// good about returning integers where appropriate:
+					// return (float)$str;
+
+					// Return float or int, as appropriate
+					return ((float)$str == (int)$str) ? (int)$str : (float)$str;
+				}
+
+				if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+					// STRINGS RETURNED IN UTF-8 FORMAT
+					$delim       = mb_substr($str, 0, 1);
+					$chrs        = mb_substr($str, 1, -1);
+					$utf8        = '';
+					$strlen_chrs = mb_strlen($chrs);
+
+					for ($c = 0; $c < $strlen_chrs; ++$c) {
+						$substr_chrs_c_2 = mb_substr($chrs, $c, 2);
+						$ord_chrs_c      = ord($chrs[$c]);
+
+						switch (true) {
+							case '\b' === $substr_chrs_c_2:
+								$utf8 .= chr(0x08);
+								++$c;
+								break;
+							case '\t' === $substr_chrs_c_2:
+								$utf8 .= chr(0x09);
+								++$c;
+								break;
+							case '\n' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0A);
+								++$c;
+								break;
+							case '\f' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0C);
+								++$c;
+								break;
+							case '\r' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0D);
+								++$c;
+								break;
+							case '\\"' === $substr_chrs_c_2:
+							case '\\\'' === $substr_chrs_c_2:
+							case '\\\\' === $substr_chrs_c_2:
+							case '\\/' === $substr_chrs_c_2:
+								if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
+									|| ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
+									$utf8 .= $chrs[++$c];
+								}
+								break;
+							case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
+								// single, escaped unicode character
+								$utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
+								$utf8  .= $this->utf162utf8($utf16);
+								$c     += 5;
+								break;
+							case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+								$utf8 .= $chrs[$c];
+								break;
+							case 0xC0 == ($ord_chrs_c & 0xE0):
+								// characters U-00000080 - U-000007FF, mask 110SONGLIST
+								//see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 2);
+								++$c;
+								break;
+							case 0xE0 == ($ord_chrs_c & 0xF0):
+								// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 3);
+								$c    += 2;
+								break;
+							case 0xF0 == ($ord_chrs_c & 0xF8):
+								// characters U-00010000 - U-001FFFFF, mask 11110XXX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 4);
+								$c    += 3;
+								break;
+							case 0xF8 == ($ord_chrs_c & 0xFC):
+								// characters U-00200000 - U-03FFFFFF, mask 111110XX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 5);
+								$c    += 4;
+								break;
+							case 0xFC == ($ord_chrs_c & 0xFE):
+								// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 6);
+								$c    += 5;
+								break;
+						}
+					}
+
+					return $utf8;
+				}
+
+				if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+					// array, or object notation
+
+					if ('[' === $str[0]) {
+						$stk = [SERVICES_JSON_IN_ARR];
+						$arr = [];
+					} elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+							$stk = [SERVICES_JSON_IN_OBJ];
+							$obj = [];
+						} else {
+							$stk = [SERVICES_JSON_IN_OBJ];
+							$obj = new stdClass();
+					}
+
+					array_push(
+						$stk,
+						[
+							'what'  => SERVICES_JSON_SLICE,
+							'where' => 0,
+							'delim' => false,
+						]
+					);
+
+					$chrs = mb_substr($str, 1, -1);
+					$chrs = $this->reduce_string($chrs);
+
+					if ('' == $chrs) {
+						if (SERVICES_JSON_IN_ARR == reset($stk)) {
+							return $arr;
+						}
+
+						return $obj;
+					}
+
+					//print("\nparsing {$chrs}\n");
+
+					$strlen_chrs = mb_strlen($chrs);
+
+					for ($c = 0; $c <= $strlen_chrs; ++$c) {
+						$top             = end($stk);
+						$substr_chrs_c_2 = mb_substr($chrs, $c, 2);
+
+						if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
+							// found a comma that is not inside a string, array, etc.,
+							// OR we've reached the end of the character list
+							$slice = mb_substr($chrs, $top['where'], $c - $top['where']);
+							array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
+							//print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+							if (SERVICES_JSON_IN_ARR == reset($stk)) {
+								// we are in an array, so just push an element onto the stack
+								$arr[] = $this->decode($slice);
+							} elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
+								// we are in an object, so figure
+								// out the property name and set an
+								// element in an associative array,
+								// for now
+								$parts = [];
+
+								if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+									// "name":value pair
+									$key = $this->decode($parts[1]);
+									$val = $this->decode($parts[2]);
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								} elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+									// name:value pair, where name is unquoted
+									$key = $parts[1];
+									$val = $this->decode($parts[2]);
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								}
+							}
+						} elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
+							// found a quote, and we are not inside a string
+							array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
+							//print("Found start of string at {$c}\n");
+						} elseif (($chrs[$c] == $top['delim'])
+								  && (SERVICES_JSON_IN_STR == $top['what'])
+								  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
+							// found a quote, we're in a string, and it's not escaped
+							// we know that it's not escaped becase there is _not_ an
+							// odd number of backslashes at the end of the string so far
+							array_pop($stk);
+							//print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+						} elseif (('[' === $chrs[$c])
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a left-bracket, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
+							//print("Found start of array at {$c}\n");
+						} elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
+							// found a right-bracket, and we're in an array
+							array_pop($stk);
+							//print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						} elseif (('{' === $chrs[$c])
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a left-brace, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
+							//print("Found start of object at {$c}\n");
+						} elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
+							// found a right-brace, and we're in an object
+							array_pop($stk);
+							//print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						} elseif (('/*' === $substr_chrs_c_2)
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a comment start, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
+							++$c;
+							//print("Found start of comment at {$c}\n");
+						} elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
+							// found a comment end, and we're in one now
+							array_pop($stk);
+							++$c;
+
+							for ($i = $top['where']; $i <= $c; ++$i) {
+								$chrs = substr_replace($chrs, ' ', $i, 1);
+							}
+							//print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						}
+					}
+
+					if (SERVICES_JSON_IN_ARR == reset($stk)) {
+						return $arr;
+					}
+
+					if (SERVICES_JSON_IN_OBJ == reset($stk)) {
+						return $obj;
+					}
+				}
+		}
+	}
+
+	/**
+	 * @param      $data
+	 * @param null $code
+	 * @return bool
+	 * @todo Ultimately, this should just call PEAR::isError()
+	 */
+	public function isError($data, $code = null): bool
+	{
+		if (class_exists('pear')) {
+			return PEAR::isError($data, $code);
+		}
+
+		if (is_object($data)
+			&& ($data instanceof \services_json_error
+				|| $data instanceof \services_json_error)) {
+			return true;
+		}
+
+		return false;
+	}
 }
 
 if (class_exists('PEAR_Error')) {
-    /**
-     * Class ServicesJSON_Error
-     */
-    class ServicesJSON_Error extends PEAR_Error
-    {
-        /**
-         * ServicesJSON_Error constructor.
-         * @param string $message
-         * @param null   $code
-         * @param null   $mode
-         * @param null   $options
-         * @param null   $userinfo
-         */
-        public function __construct(
-            $message = 'unknown error',
-            $code = null,
-            $mode = null,
-            $options = null,
-            $userinfo = null
-        ) {
-            parent::__construct($message, $code, $mode, $options, $userinfo);
-        }
-    }
+	/**
+	 * Class ServicesJSON_Error
+	 */
+	class ServicesJSON_Error extends PEAR_Error
+	{
+		/**
+		 * ServicesJSON_Error constructor.
+		 * @param string $message
+		 * @param null   $code
+		 * @param null   $mode
+		 * @param null   $options
+		 * @param null   $userinfo
+		 */
+		public function __construct(
+			$message = 'unknown error',
+			$code = null,
+			$mode = null,
+			$options = null,
+			$userinfo = null
+		) {
+			parent::__construct($message, $code, $mode, $options, $userinfo);
+		}
+	}
 } else {
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class ServicesJSON_Error
-    {
-        /**
-         * ServicesJSON_Error constructor.
-         * @param string $message
-         * @param null   $code
-         * @param null   $mode
-         * @param null   $options
-         * @param null   $userinfo
-         */
-        public function __construct(
-            $message = 'unknown error',
-            $code = null,
-            $mode = null,
-            $options = null,
-            $userinfo = null
-        ) {
-        }
-    }
+	/**
+	 * @todo Ultimately, this class shall be descended from PEAR_Error
+	 */
+	class ServicesJSON_Error
+	{
+		/**
+		 * ServicesJSON_Error constructor.
+		 * @param string $message
+		 * @param null   $code
+		 * @param null   $mode
+		 * @param null   $options
+		 * @param null   $userinfo
+		 */
+		public function __construct(
+			$message = 'unknown error',
+			$code = null,
+			$mode = null,
+			$options = null,
+			$userinfo = null
+		) {
+		}
+	}
 }

Spacing +85 added lines, -85 removed lines

@@ -117,18 +117,18 @@ 
         $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
         switch (true) {
-            case ((0x7F & $bytes) == $bytes):
+            case ((0x7F & $bytes)==$bytes):
                 // this case should never be reached, because we are in ASCII range
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                 return chr(0x7F & $bytes);
-            case (0x07FF & $bytes) == $bytes:
+            case (0x07FF & $bytes)==$bytes:
                 // return a 2-byte UTF-8 character
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
-            case (0xFFFF & $bytes) == $bytes:
+                return chr(0xC0 | (($bytes >> 6) & 0x1F)).chr(0x80 | ($bytes & 0x3F));
+            case (0xFFFF & $bytes)==$bytes:
                 // return a 3-byte UTF-8 character
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
+                return chr(0xE0 | (($bytes >> 12) & 0x0F)).chr(0x80 | (($bytes >> 6) & 0x3F)).chr(0x80 | ($bytes & 0x3F));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -160,11 +160,11 @@ 
             case 2:
                 // return a UTF-16 character from a 2-byte UTF-8 char
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
+                return chr(0x07 & (ord($utf8[0]) >> 2)).chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
             case 3:
                 // return a UTF-16 character from a 3-byte UTF-8 char
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
+                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))).chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -227,10 +227,10 @@ 
             case 'NULL':
                 return 'null';
             case 'integer':
-                return (int)$var;
+                return (int) $var;
             case 'double':
             case 'float':
-                return (float)$var;
+                return (float) $var;
             case 'string':
                 // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
                 $ascii      = '';
@@ -240,97 +240,97 @@ 
                  * Iterate over every character in the string,
                  * escaping with a slash or encoding to UTF-8 where necessary
                  */
-                for ($c = 0; $c < $strlen_var; ++$c) {
+                for ($c = 0; $c<$strlen_var; ++$c) {
                     $ord_var_c = ord($var[$c]);
 
                     switch (true) {
-                        case 0x08 == $ord_var_c:
+                        case 0x08==$ord_var_c:
                             $ascii .= '\b';
                             break;
-                        case 0x09 == $ord_var_c:
+                        case 0x09==$ord_var_c:
                             $ascii .= '\t';
                             break;
-                        case 0x0A == $ord_var_c:
+                        case 0x0A==$ord_var_c:
                             $ascii .= '\n';
                             break;
-                        case 0x0C == $ord_var_c:
+                        case 0x0C==$ord_var_c:
                             $ascii .= '\f';
                             break;
-                        case 0x0D == $ord_var_c:
+                        case 0x0D==$ord_var_c:
                             $ascii .= '\r';
                             break;
-                        case 0x22 == $ord_var_c:
-                        case 0x2F == $ord_var_c:
-                        case 0x5C == $ord_var_c:
+                        case 0x22==$ord_var_c:
+                        case 0x2F==$ord_var_c:
+                        case 0x5C==$ord_var_c:
                             // double quote, slash, slosh
-                            $ascii .= '\\' . $var[$c];
+                            $ascii .= '\\'.$var[$c];
                             break;
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                        case (($ord_var_c>=0x20) && ($ord_var_c<=0x7F)):
                             // characters U-00000000 - U-0000007F (same as ASCII)
                             $ascii .= $var[$c];
                             break;
-                        case (0xC0 == ($ord_var_c & 0xE0)):
+                        case (0xC0==($ord_var_c & 0xE0)):
                             // characters U-00000080 - U-000007FF, mask 110SONGLIST
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 1 >= $strlen_var) {
+                            if ($c+1>=$strlen_var) {
                                 ++$c;
                                 $ascii .= '?';
                                 break;
                             }
 
-                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
+                            $char = pack('C*', $ord_var_c, ord($var[$c+1]));
                             ++$c;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xE0 == ($ord_var_c & 0xF0)):
-                            if ($c + 2 >= $strlen_var) {
+                        case (0xE0==($ord_var_c & 0xF0)):
+                            if ($c+2>=$strlen_var) {
                                 $c     += 2;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
+                            $char  = pack('C*', $ord_var_c, @ord($var[$c+1]), @ord($var[$c+2]));
                             $c     += 2;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xF0 == ($ord_var_c & 0xF8)):
-                            if ($c + 3 >= $strlen_var) {
+                        case (0xF0==($ord_var_c & 0xF8)):
+                            if ($c+3>=$strlen_var) {
                                 $c     += 3;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-00010000 - U-001FFFFF, mask 11110XXX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]));
                             $c     += 3;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xF8 == ($ord_var_c & 0xFC)):
+                        case (0xF8==($ord_var_c & 0xFC)):
                             // characters U-00200000 - U-03FFFFFF, mask 111110XX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 4 >= $strlen_var) {
+                            if ($c+4>=$strlen_var) {
                                 $c     += 4;
                                 $ascii .= '?';
                                 break;
                             }
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]), ord($var[$c+4]));
                             $c     += 4;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xFC == ($ord_var_c & 0xFE)):
-                            if ($c + 5 >= $strlen_var) {
+                        case (0xFC==($ord_var_c & 0xFE)):
+                            if ($c+5>=$strlen_var) {
                                 $c     += 5;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]), ord($var[$c+4]), ord($var[$c+5]));
                             $c     += 5;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -338,7 +338,7 @@ 
                     }
                 }
 
-                return '"' . $ascii . '"';
+                return '"'.$ascii.'"';
             case 'array':
                 /*
                  * As per JSON spec if any array key is not an integer
@@ -359,7 +359,7 @@ 
                  */
 
                 // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
+                if (is_array($var) && count($var) && (array_keys($var)!==range(0, count($var)-1))) {
                     $properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
 
                     foreach ($properties as $property) {
@@ -368,7 +368,7 @@ 
                         }
                     }
 
-                    return '{' . implode(',', $properties) . '}';
+                    return '{'.implode(',', $properties).'}';
                 }
 
                 // treat it like a regular array
@@ -380,7 +380,7 @@ 
                     }
                 }
 
-                return '[' . implode(',', $elements) . ']';
+                return '['.implode(',', $elements).']';
             case 'object':
                 $vars = get_object_vars($var);
 
@@ -392,9 +392,9 @@ 
                     }
                 }
 
-                return '{' . implode(',', $properties) . '}';
+                return '{'.implode(',', $properties).'}';
             default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
+                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var).' can not be encoded as JSON string');
         }
     }
 
@@ -414,7 +414,7 @@ 
             return $encoded_value;
         }
 
-        return $this->_encode((string)$name) . ':' . $encoded_value;
+        return $this->_encode((string) $name).':'.$encoded_value;
     }
 
     /**
@@ -478,84 +478,84 @@ 
                     // return (float)$str;
 
                     // Return float or int, as appropriate
-                    return ((float)$str == (int)$str) ? (int)$str : (float)$str;
+                    return ((float) $str==(int) $str) ? (int) $str : (float) $str;
                 }
 
-                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1]==$m[2]) {
                     // STRINGS RETURNED IN UTF-8 FORMAT
                     $delim       = mb_substr($str, 0, 1);
                     $chrs        = mb_substr($str, 1, -1);
                     $utf8        = '';
                     $strlen_chrs = mb_strlen($chrs);
 
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
+                    for ($c = 0; $c<$strlen_chrs; ++$c) {
                         $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
                         $ord_chrs_c      = ord($chrs[$c]);
 
                         switch (true) {
-                            case '\b' === $substr_chrs_c_2:
+                            case '\b'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x08);
                                 ++$c;
                                 break;
-                            case '\t' === $substr_chrs_c_2:
+                            case '\t'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x09);
                                 ++$c;
                                 break;
-                            case '\n' === $substr_chrs_c_2:
+                            case '\n'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0A);
                                 ++$c;
                                 break;
-                            case '\f' === $substr_chrs_c_2:
+                            case '\f'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0C);
                                 ++$c;
                                 break;
-                            case '\r' === $substr_chrs_c_2:
+                            case '\r'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0D);
                                 ++$c;
                                 break;
-                            case '\\"' === $substr_chrs_c_2:
-                            case '\\\'' === $substr_chrs_c_2:
-                            case '\\\\' === $substr_chrs_c_2:
-                            case '\\/' === $substr_chrs_c_2:
-                                if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
-                                    || ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
+                            case '\\"'===$substr_chrs_c_2:
+                            case '\\\''===$substr_chrs_c_2:
+                            case '\\\\'===$substr_chrs_c_2:
+                            case '\\/'===$substr_chrs_c_2:
+                                if (('"'===$delim && '\\\''!==$substr_chrs_c_2)
+                                    || ("'"===$delim && '\\"'!==$substr_chrs_c_2)) {
                                     $utf8 .= $chrs[++$c];
                                 }
                                 break;
                             case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
                                 // single, escaped unicode character
-                                $utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
+                                $utf16 = chr(hexdec(mb_substr($chrs, $c+2, 2))).chr(hexdec(mb_substr($chrs, $c+4, 2)));
                                 $utf8  .= $this->utf162utf8($utf16);
                                 $c     += 5;
                                 break;
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+                            case ($ord_chrs_c>=0x20) && ($ord_chrs_c<=0x7F):
                                 $utf8 .= $chrs[$c];
                                 break;
-                            case 0xC0 == ($ord_chrs_c & 0xE0):
+                            case 0xC0==($ord_chrs_c & 0xE0):
                                 // characters U-00000080 - U-000007FF, mask 110SONGLIST
                                 //see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 2);
                                 ++$c;
                                 break;
-                            case 0xE0 == ($ord_chrs_c & 0xF0):
+                            case 0xE0==($ord_chrs_c & 0xF0):
                                 // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 3);
                                 $c    += 2;
                                 break;
-                            case 0xF0 == ($ord_chrs_c & 0xF8):
+                            case 0xF0==($ord_chrs_c & 0xF8):
                                 // characters U-00010000 - U-001FFFFF, mask 11110XXX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 4);
                                 $c    += 3;
                                 break;
-                            case 0xF8 == ($ord_chrs_c & 0xFC):
+                            case 0xF8==($ord_chrs_c & 0xFC):
                                 // characters U-00200000 - U-03FFFFFF, mask 111110XX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 5);
                                 $c    += 4;
                                 break;
-                            case 0xFC == ($ord_chrs_c & 0xFE):
+                            case 0xFC==($ord_chrs_c & 0xFE):
                                 // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 6);
@@ -570,7 +570,7 @@ 
                 if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
                     // array, or object notation
 
-                    if ('[' === $str[0]) {
+                    if ('['===$str[0]) {
                         $stk = [SERVICES_JSON_IN_ARR];
                         $arr = [];
                     } elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
@@ -593,8 +593,8 @@ 
                     $chrs = mb_substr($str, 1, -1);
                     $chrs = $this->reduce_string($chrs);
 
-                    if ('' == $chrs) {
-                        if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                    if (''==$chrs) {
+                        if (SERVICES_JSON_IN_ARR==reset($stk)) {
                             return $arr;
                         }
 
@@ -605,21 +605,21 @@ 
 
                     $strlen_chrs = mb_strlen($chrs);
 
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
+                    for ($c = 0; $c<=$strlen_chrs; ++$c) {
                         $top             = end($stk);
                         $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
 
-                        if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
+                        if (($c==$strlen_chrs) || ((','===$chrs[$c]) && (SERVICES_JSON_SLICE==$top['what']))) {
                             // found a comma that is not inside a string, array, etc.,
                             // OR we've reached the end of the character list
-                            $slice = mb_substr($chrs, $top['where'], $c - $top['where']);
-                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
+                            $slice = mb_substr($chrs, $top['where'], $c-$top['where']);
+                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c+1, 'delim' => false]);
                             //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
-                            if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                            if (SERVICES_JSON_IN_ARR==reset($stk)) {
                                 // we are in an array, so just push an element onto the stack
                                 $arr[] = $this->decode($slice);
-                            } elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
+                            } elseif (SERVICES_JSON_IN_OBJ==reset($stk)) {
                                 // we are in an object, so figure
                                 // out the property name and set an
                                 // element in an associative array,
@@ -648,59 +648,59 @@ 
                                     }
                                 }
                             }
-                        } elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
+                        } elseif ((('"'===$chrs[$c]) || ("'"===$chrs[$c])) && (SERVICES_JSON_IN_STR!=$top['what'])) {
                             // found a quote, and we are not inside a string
                             array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
                             //print("Found start of string at {$c}\n");
-                        } elseif (($chrs[$c] == $top['delim'])
-                                  && (SERVICES_JSON_IN_STR == $top['what'])
-                                  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
+                        } elseif (($chrs[$c]==$top['delim'])
+                                  && (SERVICES_JSON_IN_STR==$top['what'])
+                                  && (1!=(mb_strlen(mb_substr($chrs, 0, $c))-mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\')))%2)) {
                             // found a quote, we're in a string, and it's not escaped
                             // we know that it's not escaped becase there is _not_ an
                             // odd number of backslashes at the end of the string so far
                             array_pop($stk);
                             //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-                        } elseif (('[' === $chrs[$c])
+                        } elseif (('['===$chrs[$c])
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a left-bracket, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
                             //print("Found start of array at {$c}\n");
-                        } elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
+                        } elseif ((']'===$chrs[$c]) && (SERVICES_JSON_IN_ARR==$top['what'])) {
                             // found a right-bracket, and we're in an array
                             array_pop($stk);
                             //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('{' === $chrs[$c])
+                        } elseif (('{'===$chrs[$c])
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a left-brace, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
                             //print("Found start of object at {$c}\n");
-                        } elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
+                        } elseif (('}'===$chrs[$c]) && (SERVICES_JSON_IN_OBJ==$top['what'])) {
                             // found a right-brace, and we're in an object
                             array_pop($stk);
                             //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('/*' === $substr_chrs_c_2)
+                        } elseif (('/*'===$substr_chrs_c_2)
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a comment start, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
                             ++$c;
                             //print("Found start of comment at {$c}\n");
-                        } elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
+                        } elseif (('*/'===$substr_chrs_c_2) && (SERVICES_JSON_IN_CMT==$top['what'])) {
                             // found a comment end, and we're in one now
                             array_pop($stk);
                             ++$c;
 
-                            for ($i = $top['where']; $i <= $c; ++$i) {
+                            for ($i = $top['where']; $i<=$c; ++$i) {
                                 $chrs = substr_replace($chrs, ' ', $i, 1);
                             }
                             //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
                         }
                     }
 
-                    if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                    if (SERVICES_JSON_IN_ARR==reset($stk)) {
                         return $arr;
                     }
 
-                    if (SERVICES_JSON_IN_OBJ == reset($stk)) {
+                    if (SERVICES_JSON_IN_OBJ==reset($stk)) {
                         return $obj;
                     }
                 }