mambax7 / contact

admin/blockform.php

Spacing +9 added lines, -9 removed lines

@@ -21,9 +21,9 @@ 
 /** @var Admin $adminObject */
 /** @var Helper $helper */
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -48,9 +48,9 @@ 
     ]
 );
 $form->addElement($sideSelect);
-$form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-$form->addElement(new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-$moduleSelect = new \XoopsFormSelect(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+$form->addElement(new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+$form->addElement(new \XoopsFormRadioYN(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLE'), 'bvisible', $block['visible']));
+$moduleSelect = new \XoopsFormSelect(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
 /** @var \XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 $criteria      = new \CriteriaCompo(new \Criteria('hasmain', 1));
@@ -61,10 +61,10 @@ 
 ksort($moduleList);
 $moduleSelect->addOptionArray($moduleList);
 $form->addElement($moduleSelect);
-$form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE'), 'btitle', 50, 255, $block['title']), false);
+$form->addElement(new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'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(
@@ -82,11 +82,11 @@ 
         $tplfileHandler = xoops_getHandler('tplfile');
         $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
         if (count($btemplate) > 0) {
-            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate[0]->getVar('tpl_id').'">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
         } else {
             $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
             if (count($btemplate2) > 0) {
-                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate2[0]->getVar('tpl_id').'" target="_blank">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
             }
         }
     }

admin/blocksadmin.php

Indentation +70 added lines, -70 removed lines

@@ -88,28 +88,28 @@ 
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
         echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
-             . "</th><th align='center' nowrap='nowrap'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
-             . '<br>'
-             . _LEFT
-             . '-'
-             . _CENTER
-             . '-'
-             . _RIGHT
-             . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
-             . "</th><th align='center'>"
-             . constant('CO_' . $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_' . $moduleDirNameUpper . '_' . 'ACTION')
-             . '</th></tr>
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
+                . "</th><th align='center' nowrap='nowrap'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
+                . '<br>'
+                . _LEFT
+                . '-'
+                . _CENTER
+                . '-'
+                . _RIGHT
+                . "</th><th align='center'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
+                . "</th><th align='center'>"
+                . constant('CO_' . $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_' . $moduleDirNameUpper . '_' . 'ACTION')
+                . '</th></tr>
         ';
         $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
         $blockCount = count($blockArray);
@@ -175,69 +175,69 @@ 
             }
             $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'>
+                    . $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>';
+                    . $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) {

Spacing +53 added lines, -53 removed lines

@@ -21,7 +21,7 @@ 
 /** @var Admin $adminObject */
 /** @var Helper $helper */
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -30,10 +30,10 @@ 
 
 if (!is_object($GLOBALS['xoopsUser']) || !is_object($xoopsModule)
     || !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
+    exit(constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403'));
 }
 if ($GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
     $op = 'list';
     if (isset($_POST)) {
         foreach ($_POST as $k => $v) {
@@ -57,7 +57,7 @@ 
     function listBlocks()
     {
         global $xoopsModule, $pathIcon16;
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
         $moduleDirName = basename(dirname(__DIR__));
         $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
@@ -83,14 +83,14 @@ 
         $moduleList[0]  = _AM_SYSTEM_BLOCKS_ALLPAGES;
         ksort($moduleList);
         echo "
-        <h4 style='text-align:left;'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
-        echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
+        <h4 style='text-align:left;'>" . constant('CO_'.$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'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'TITLE')
              . "</th><th align='center' nowrap='nowrap'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'SIDE')
              . '<br>'
              . _LEFT
              . '-'
@@ -98,9 +98,9 @@ 
              . '-'
              . _RIGHT
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'WEIGHT')
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLE')
              . "</th><th align='center'>"
              . _AM_SYSTEM_BLOCKS_VISIBLEIN
              . "</th><th align='center'>"
@@ -108,7 +108,7 @@ 
              . "</th><th align='center'>"
              . _AM_SYSTEM_BLOCKS_BCACHETIME
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'ACTION')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'ACTION')
              . '</th></tr>
         ';
         $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
@@ -129,11 +129,11 @@ 
         ];
         foreach ($blockArray as $i) {
             $groupsPerms = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
-            $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
+            $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.$i->getVar('bid');
             $result = $db->query($sql);
             $modules = [];
             while (false !== ($row = $db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
 
             $cachetimeOptions = '';
@@ -239,47 +239,47 @@ 
                  . _NO
                  . '</td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='bmodule[".$i->getVar('bid')."][]' id='bmodule[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($moduleList as $k => $v) {
-                echo "<option value='$k'" . (in_array($k, $modules) ? 'selected' : '') . ">$v</option>";
+                echo "<option value='$k'".(in_array($k, $modules) ? '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'), $groupsPerms) ? 'selected' : '') . '>' . $grp->getVar('name') . '</option>';
+                echo "<option value='".$grp->getVar('groupid')."' ".(in_array($grp->getVar('groupid'), $groupsPerms) ? '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 . "'>
+            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 . "'>
+                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>";
             }
             echo "
-            <input type='hidden' name='oldtitle[" . $i->getVar('bid') . "]' value='" . $i->getVar('title') . "'>
-            <input type='hidden' name='oldside[" . $i->getVar('bid') . "]' value='" . $i->getVar('side') . "'>
-            <input type='hidden' name='oldweight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "'>
-            <input type='hidden' name='oldvisible[" . $i->getVar('bid') . "]' value='" . $i->getVar('visible') . "'>
-            <input type='hidden' name='oldgroups[" . $i->getVar('groups') . "]' value='" . $i->getVar('groups') . "'>
-            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid') . "]' value='" . $i->getVar('bcachetime') . "'>
-            <input type='hidden' name='bid[" . $i->getVar('bid') . "]' value='" . $i->getVar('bid') . "'>
+            <input type='hidden' name='oldtitle[" . $i->getVar('bid')."]' value='".$i->getVar('title')."'>
+            <input type='hidden' name='oldside[" . $i->getVar('bid')."]' value='".$i->getVar('side')."'>
+            <input type='hidden' name='oldweight[" . $i->getVar('bid')."]' value='".$i->getVar('weight')."'>
+            <input type='hidden' name='oldvisible[" . $i->getVar('bid')."]' value='".$i->getVar('visible')."'>
+            <input type='hidden' name='oldgroups[" . $i->getVar('groups')."]' value='".$i->getVar('groups')."'>
+            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid')."]' value='".$i->getVar('bcachetime')."'>
+            <input type='hidden' name='bid[" . $i->getVar('bid')."]' value='".$i->getVar('bid')."'>
             </td></tr>
             ";
             $class = ('even' === $class) ? 'odd' : 'even';
         }
         echo "<tr><td class='foot' align='center' colspan='8'>
         <input type='hidden' name='op' value='order'>
-        " . $GLOBALS['xoopsSecurity']->getTokenHTML() . "
-        <input type='submit' name='submit' value='" . _SUBMIT . "'>
+        " . $GLOBALS['xoopsSecurity']->getTokenHTML()."
+        <input type='submit' name='submit' value='" . _SUBMIT."'>
         </td></tr></table>
         </form>
         <br><br>";
@@ -290,7 +290,7 @@ 
      */
     function cloneBlock($bid)
     {
-        require_once __DIR__ . '/admin_header.php';
+        require_once __DIR__.'/admin_header.php';
 
         xoops_cp_header();
 
@@ -305,16 +305,16 @@ 
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
+        $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.(int) $bid;
         $result = $db->query($sql);
         $modules = [];
         while (false !== ($row = $db->fetchArray($result))) {
-            $modules[] = (int)$row['module_id'];
+            $modules[] = (int) $row['module_id'];
         }
         $isCustom = ('C' === $myblock->getVar('block_type') || 'E' === $myblock->getVar('block_type'));
         $block = [
-            'title' => $myblock->getVar('title') . ' Clone',
-            'form_title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
+            'title' => $myblock->getVar('title').' Clone',
+            'form_title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK'),
             'name' => $myblock->getVar('name'),
             'side' => $myblock->getVar('side'),
             'weight' => $myblock->getVar('weight'),
@@ -330,12 +330,12 @@ 
             'template' => $myblock->getVar('template'),
             'options' => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . constant('CO_' . $moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . _AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
-        require_once __DIR__ . '/blockform.php';
+        echo '<a href="blocksadmin.php">'.constant('CO_'.$moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'._AM_SYSTEM_BLOCKS_CLONEBLOCK.'<br><br>';
+        require_once __DIR__.'/blockform.php';
         /** @var XoopsThemeForm $form */
         $form->display();
         //        xoops_cp_footer();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -398,12 +398,12 @@ 
         }
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
         foreach ($bmodule as $bmid) {
-            $sql = 'INSERT INTO ' . $db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
+            $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
             $db->query($sql);
         }
         $groups = &$GLOBALS['xoopsUser']->getGroups();
         foreach ($groups as $iValue) {
-            $sql = 'INSERT INTO ' . $db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
+            $sql = 'INSERT INTO '.$db->prefix('group_permission').' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ('.$iValue.', '.$newid.", 1, 'block_read')";
             $db->query($sql);
         }
         redirect_header('blocksadmin.php?op=listar', 1, _AM_DBUPDATED);
@@ -437,7 +437,7 @@ 
      */
     function editBlock($bid)
     {
-        require_once __DIR__ . '/admin_header.php';
+        require_once __DIR__.'/admin_header.php';
         xoops_cp_header();
         $adminObject = Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
@@ -449,16 +449,16 @@ 
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
+        $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.(int) $bid;
         $result = $db->query($sql);
         $modules = [];
         while (false !== ($row = $db->fetchArray($result))) {
-            $modules[] = (int)$row['module_id'];
+            $modules[] = (int) $row['module_id'];
         }
         $isCustom = ('C' === $myblock->getVar('block_type') || 'E' === $myblock->getVar('block_type'));
         $block = [
             'title' => $myblock->getVar('title'),
-            'form_title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_EDITBLOCK'),
+            'form_title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_EDITBLOCK'),
             //        'name'       => $myblock->getVar('name'),
             'side' => $myblock->getVar('side'),
             'weight' => $myblock->getVar('weight'),
@@ -474,12 +474,12 @@ 
             'template' => $myblock->getVar('template'),
             'options' => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . constant('CO_' . $moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . _AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
-        require_once __DIR__ . '/blockform.php';
+        echo '<a href="blocksadmin.php">'.constant('CO_'.$moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'._AM_SYSTEM_BLOCKS_EDITBLOCK.'<br><br>';
+        require_once __DIR__.'/blockform.php';
         /** @var XoopsThemeForm $form */
         $form->display();
         //        xoops_cp_footer();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -535,7 +535,7 @@ 
                 $xoopsDB->query($sql);
             } else {
                 foreach ($bmodule as $bmid) {
-                    $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid, (int)$bmid);
+                    $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid, (int) $bmid);
                     $xoopsDB->query($sql);
                 }
             }
@@ -548,14 +548,14 @@ 
                 $xoopsDB->query($sql);
             }
         }
-        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
 
     if ('list' === $op) {
         xoops_cp_header();
         //        mpu_adm_menu();
         listBlocks();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -577,7 +577,7 @@ 
                     $xoopsDB->query($sql);
                 } else {
                     foreach ($bmodule[$i] as $bmid) {
-                        $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid[$i], (int)$bmid);
+                        $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid[$i], (int) $bmid);
                         $xoopsDB->query($sql);
                     }
                 }
@@ -591,7 +591,7 @@ 
                 }
             }
         }
-        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
     if ('clone' === $op) {
         cloneBlock($bid);
@@ -609,5 +609,5 @@ 
         isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
     }
 } else {
-    echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
+    echo constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403');
 }

admin/menu.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 $helper->loadLanguage('feedback');
 
 $pathIcon32 = Admin::menuIconPath('');
-$pathModIcon32 = XOOPS_URL .   '/modules/' . $moduleDirName . '/assets/images/icons/32/';
+$pathModIcon32 = XOOPS_URL.'/modules/'.$moduleDirName.'/assets/images/icons/32/';
 if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
     $pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
 }
@@ -40,41 +40,41 @@ 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_HOME,
     'desc'  => _MI_CONTACT_MENU_HOME_DESC,
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
     'link'  => 'admin/index.php',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_CONTACT,
     'desc'  => _MI_CONTACT_MENU_CONTACT_DESC,
-    'icon'  => $pathIcon32 . '/content.png',
+    'icon'  => $pathIcon32.'/content.png',
     'link'  => 'admin/main.php',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_LOGS,
     'desc'  => _MI_CONTACT_MENU_LOGS_DESC,
-    'icon'  => $pathIcon32 . '/identity.png',
+    'icon'  => $pathIcon32.'/identity.png',
     'link'  => 'admin/log.php',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_TOOLS,
     'desc'  => _MI_CONTACT_MENU_TOOLS_DESC,
-    'icon'  => $pathIcon32 . '/delete.png',
+    'icon'  => $pathIcon32.'/delete.png',
     'link'  => 'admin/tools.php',
 ];
 
 // Blocks Admin
 $adminmenu[] = [
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
+    'title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS'),
     'link' => 'admin/blocksadmin.php',
-    'icon' => $pathIcon32 . '/block.png',
+    'icon' => $pathIcon32.'/block.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_ABOUT,
     'desc'  => _MI_CONTACT_MENU_ABOUT_DESC,
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
     'link'  => 'admin/about.php',
 ];