XOOPS / XoopsCore

htdocs/modules/system/admin/blocksadmin/main.php

Spacing +7 added lines, -7 removed lines

@@ -81,7 +81,7 @@ 
         $xoops->theme()->addScript('modules/system/js/blocks.js');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::BLOCKS_ADMINISTRATION,
             $system->adminVersion('blocksadmin', 'adminpath')
@@ -164,7 +164,7 @@ 
         /* Get blocks */
         $selvis = ($selvis == -1) ? null : $selvis;
         $selmod = ($selmod == -2) ? null : $selmod;
-        $order_block = (isset($selvis) ? "" : "b.visible DESC, ") . "b.side,b.weight,b.bid";
+        $order_block = (isset($selvis) ? "" : "b.visible DESC, ")."b.side,b.weight,b.bid";
 
         if ($selgrp == 0) {
             // get blocks that are not assigned to any groups
@@ -203,7 +203,7 @@ 
         $xoops->theme()->addScript('modules/system/js/blocks.js');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::BLOCKS_ADMINISTRATION,
             $system->adminVersion('blocksadmin', 'adminpath')
@@ -282,8 +282,8 @@ 
         $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
         $block->setVar('content', $content);
         $myts = \Xoops\Core\Text\Sanitizer::getInstance();
-        echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's')
-            . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
+        echo '<div id="xo-preview-dialog" title="'.$block->getVar('title', 's')
+            . '">'.$block->getContent('s', $block->getVar('c_type')).'</div>';
         break;
 
     case 'save':
@@ -409,7 +409,7 @@ 
             $xoops->theme()->addScript('modules/system/js/admin.js');
             // Define Breadcrumb and tips
             $admin_page = new \Xoops\Module\Admin();
-            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
             $admin_page->addBreadcrumbLink(
                 SystemLocale::BLOCKS_ADMINISTRATION,
                 $system->adminVersion('blocksadmin', 'adminpath')
@@ -435,7 +435,7 @@ 
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
         $admin_page->addBreadcrumbLink(
             SystemLocale::BLOCKS_ADMINISTRATION,
             $system->adminVersion('blocksadmin', 'adminpath')

Switch Indentation +376 added lines, -376 removed lines

@@ -73,260 +73,260 @@ 
 
 switch ($op) {
 
-    case 'list':
-        // Call Header
-        $xoops->header('admin:system/system_blocks.tpl');
-        // Define Stylesheet
-        $xoops->theme()->addStylesheet('modules/system/css/admin.css');
-        // Define scripts
-        $xoops->theme()->addScript('modules/system/js/admin.js');
-        $xoops->theme()->addScript('modules/system/js/blocks.js');
-        // Define Breadcrumb and tips
-        $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
-        $admin_page->addBreadcrumbLink(
-            SystemLocale::BLOCKS_ADMINISTRATION,
-            $system->adminVersion('blocksadmin', 'adminpath')
-        );
-        $admin_page->addBreadcrumbLink(SystemLocale::MANAGE_BLOCKS);
-        $admin_page->renderBreadcrumb();
-        $admin_page->addItemButton(SystemLocale::ADD_BLOCK, 'admin.php?fct=blocksadmin&op=add', 'add');
-        $admin_page->renderButton();
-        $admin_page->addTips(sprintf(
-            SystemLocale::BLOCKS_TIPS,
-            system_AdminIcons('block.png'),
-            system_AdminIcons('success.png'),
-            system_AdminIcons('cancel.png'),
-            SystemLocale::DRAG_OR_SORT_BLOCK,
-            SystemLocale::DISPLAY_BLOCK,
-            SystemLocale::HIDE_BLOCK
-        ));
-        $admin_page->renderTips();
-        // Initialize module handler
-        $module_handler = $xoops->getHandlerModule();
-        $modules = $module_handler->getObjects(null, true);
-        $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
-
-        $criteria->add(new Criteria('isactive', 1));
-        // Modules for blocks to be visible in
-        $display_list = $module_handler->getNameList($criteria);
-        unset($criteria);
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        $modules = $xoops->getHandlerModule()->getObjects(null, true);
-
-        $filterform = new Xoops\Form\ThemeForm('', 'filterform', 'admin.php', 'get');
-        $filterform->addElement(new Xoops\Form\Hidden('fct', 'blocksadmin'));
-        $filterform->addElement(new Xoops\Form\Hidden('op', 'list'));
-        $filterform->addElement(new Xoops\Form\Hidden('filter', 1));
-        $sel_gen = new Xoops\Form\Select(XoopsLocale::MODULES, 'selgen', $selgen);
-        $sel_gen->setExtra("onchange='submit()'");
-        $sel_gen->addOption(-1, XoopsLocale::ALL_TYPES);
-        $sel_gen->addOption(0, SystemLocale::CUSTOM_BLOCK);
-        /* @var $list XoopsModule */
-        foreach ($modules as $list) {
-            $sel_gen->addOption($list->getVar('mid'), $list->getVar('name'));
-        }
-        $filterform->addElement($sel_gen);
-
-        $sel_mod = new Xoops\Form\Select(XoopsLocale::PAGE, 'selmod', $selmod);
-        $sel_mod->setExtra("onchange='submit()'");
-        ksort($display_list);
-        $display_list_spec[0] = XoopsLocale::ALL_PAGES;
-        $display_list_spec[-1] = XoopsLocale::TOP_PAGE;
-        $display_list_spec[-2] = XoopsLocale::ALL_TYPES;
-        $display_list = $display_list_spec + $display_list;
-        foreach ($display_list as $k => $v) {
-            $sel_mod->addOption($k, $v);
-        }
-        $filterform->addElement($sel_mod);
-
-        // For selection of group access
-        $sel_grp = new Xoops\Form\Select(XoopsLocale::GROUPS, 'selgrp', $selgrp);
-        $sel_grp->setExtra("onchange='submit()'");
-        $member_handler = $xoops->getHandlerMember();
-        $group_list = $member_handler->getGroupList();
-        $sel_grp->addOption(-1, XoopsLocale::ALL_TYPES);
-        $sel_grp->addOption(0, XoopsLocale::UNASSIGNED);
-        foreach ($group_list as $k => $v) {
-            $sel_grp->addOption($k, $v);
-        }
-        $filterform->addElement($sel_grp);
-
-        $sel_vis = new Xoops\Form\Select(XoopsLocale::VISIBLE, 'selvis', $selvis);
-        $sel_vis->setExtra("onchange='submit()'");
-        $sel_vis->addOption(-1, XoopsLocale::ALL_TYPES);
-        $sel_vis->addOption(0, XoopsLocale::NO);
-        $sel_vis->addOption(1, XoopsLocale::YES);
-
-        $filterform->addElement($sel_vis);
-
-        $filterform->assign($xoops->tpl());
-
-        /* Get blocks */
-        $selvis = ($selvis == -1) ? null : $selvis;
-        $selmod = ($selmod == -2) ? null : $selmod;
-        $order_block = (isset($selvis) ? "" : "b.visible DESC, ") . "b.side,b.weight,b.bid";
-
-        if ($selgrp == 0) {
-            // get blocks that are not assigned to any groups
-            $blocks_arr = $block_handler->getNonGroupedBlocks($selmod, $toponlyblock = false, $selvis, $order_block);
-        } else {
-            $selgrp = ($selgrp == -1) ? null : $selgrp;
-            $blocks_arr = $block_handler->
-                getAllByGroupModule($selgrp, $selmod, $toponlyblock = false, $selvis, $order_block);
-        }
+        case 'list':
+            // Call Header
+            $xoops->header('admin:system/system_blocks.tpl');
+            // Define Stylesheet
+            $xoops->theme()->addStylesheet('modules/system/css/admin.css');
+            // Define scripts
+            $xoops->theme()->addScript('modules/system/js/admin.js');
+            $xoops->theme()->addScript('modules/system/js/blocks.js');
+            // Define Breadcrumb and tips
+            $admin_page = new \Xoops\Module\Admin();
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+            $admin_page->addBreadcrumbLink(
+                SystemLocale::BLOCKS_ADMINISTRATION,
+                $system->adminVersion('blocksadmin', 'adminpath')
+            );
+            $admin_page->addBreadcrumbLink(SystemLocale::MANAGE_BLOCKS);
+            $admin_page->renderBreadcrumb();
+            $admin_page->addItemButton(SystemLocale::ADD_BLOCK, 'admin.php?fct=blocksadmin&op=add', 'add');
+            $admin_page->renderButton();
+            $admin_page->addTips(sprintf(
+                SystemLocale::BLOCKS_TIPS,
+                system_AdminIcons('block.png'),
+                system_AdminIcons('success.png'),
+                system_AdminIcons('cancel.png'),
+                SystemLocale::DRAG_OR_SORT_BLOCK,
+                SystemLocale::DISPLAY_BLOCK,
+                SystemLocale::HIDE_BLOCK
+            ));
+            $admin_page->renderTips();
+            // Initialize module handler
+            $module_handler = $xoops->getHandlerModule();
+            $modules = $module_handler->getObjects(null, true);
+            $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+
+            $criteria->add(new Criteria('isactive', 1));
+            // Modules for blocks to be visible in
+            $display_list = $module_handler->getNameList($criteria);
+            unset($criteria);
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            $modules = $xoops->getHandlerModule()->getObjects(null, true);
+
+            $filterform = new Xoops\Form\ThemeForm('', 'filterform', 'admin.php', 'get');
+            $filterform->addElement(new Xoops\Form\Hidden('fct', 'blocksadmin'));
+            $filterform->addElement(new Xoops\Form\Hidden('op', 'list'));
+            $filterform->addElement(new Xoops\Form\Hidden('filter', 1));
+            $sel_gen = new Xoops\Form\Select(XoopsLocale::MODULES, 'selgen', $selgen);
+            $sel_gen->setExtra("onchange='submit()'");
+            $sel_gen->addOption(-1, XoopsLocale::ALL_TYPES);
+            $sel_gen->addOption(0, SystemLocale::CUSTOM_BLOCK);
+            /* @var $list XoopsModule */
+            foreach ($modules as $list) {
+                $sel_gen->addOption($list->getVar('mid'), $list->getVar('name'));
+            }
+            $filterform->addElement($sel_gen);
+
+            $sel_mod = new Xoops\Form\Select(XoopsLocale::PAGE, 'selmod', $selmod);
+            $sel_mod->setExtra("onchange='submit()'");
+            ksort($display_list);
+            $display_list_spec[0] = XoopsLocale::ALL_PAGES;
+            $display_list_spec[-1] = XoopsLocale::TOP_PAGE;
+            $display_list_spec[-2] = XoopsLocale::ALL_TYPES;
+            $display_list = $display_list_spec + $display_list;
+            foreach ($display_list as $k => $v) {
+                $sel_mod->addOption($k, $v);
+            }
+            $filterform->addElement($sel_mod);
+
+            // For selection of group access
+            $sel_grp = new Xoops\Form\Select(XoopsLocale::GROUPS, 'selgrp', $selgrp);
+            $sel_grp->setExtra("onchange='submit()'");
+            $member_handler = $xoops->getHandlerMember();
+            $group_list = $member_handler->getGroupList();
+            $sel_grp->addOption(-1, XoopsLocale::ALL_TYPES);
+            $sel_grp->addOption(0, XoopsLocale::UNASSIGNED);
+            foreach ($group_list as $k => $v) {
+                $sel_grp->addOption($k, $v);
+            }
+            $filterform->addElement($sel_grp);
+
+            $sel_vis = new Xoops\Form\Select(XoopsLocale::VISIBLE, 'selvis', $selvis);
+            $sel_vis->setExtra("onchange='submit()'");
+            $sel_vis->addOption(-1, XoopsLocale::ALL_TYPES);
+            $sel_vis->addOption(0, XoopsLocale::NO);
+            $sel_vis->addOption(1, XoopsLocale::YES);
+
+            $filterform->addElement($sel_vis);
+
+            $filterform->assign($xoops->tpl());
+
+            /* Get blocks */
+            $selvis = ($selvis == -1) ? null : $selvis;
+            $selmod = ($selmod == -2) ? null : $selmod;
+            $order_block = (isset($selvis) ? "" : "b.visible DESC, ") . "b.side,b.weight,b.bid";
+
+            if ($selgrp == 0) {
+                // get blocks that are not assigned to any groups
+                $blocks_arr = $block_handler->getNonGroupedBlocks($selmod, $toponlyblock = false, $selvis, $order_block);
+            } else {
+                $selgrp = ($selgrp == -1) ? null : $selgrp;
+                $blocks_arr = $block_handler->
+                    getAllByGroupModule($selgrp, $selmod, $toponlyblock = false, $selvis, $order_block);
+            }
 
-        if ($selgen >= 0) {
-            foreach (array_keys($blocks_arr) as $bid) {
-                if ($blocks_arr[$bid]->getVar("mid") != $selgen) {
-                    unset($blocks_arr[$bid]);
+            if ($selgen >= 0) {
+                foreach (array_keys($blocks_arr) as $bid) {
+                    if ($blocks_arr[$bid]->getVar("mid") != $selgen) {
+                        unset($blocks_arr[$bid]);
+                    }
                 }
             }
-        }
-
-        $arr = array();
-        foreach (array_keys($blocks_arr) as $i) {
-            $arr[$i] = $blocks_arr[$i]->getValues();
-            $xoops->tpl()->appendByRef('blocks', $arr[$i]);
-        }
-        // Call Footer
-        $xoops->footer();
-        break;
-
-    case 'add':
-        // Call Header
-        $xoops->header('admin:system/system_blocks.tpl');
-        // Define Stylesheet
-        $xoops->theme()->addStylesheet('modules/system/css/admin.css');
-        // Define scripts
-        $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
-        $xoops->theme()->addScript('modules/system/js/admin.js');
-        $xoops->theme()->addScript('modules/system/js/blocks.js');
-        // Define Breadcrumb and tips
-        $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
-        $admin_page->addBreadcrumbLink(
-            SystemLocale::BLOCKS_ADMINISTRATION,
-            $system->adminVersion('blocksadmin', 'adminpath')
-        );
-        $admin_page->addBreadcrumbLink(SystemLocale::ADD_BLOCK);
-        $admin_page->renderBreadcrumb();
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        $block = $block_handler->create();
-        $form = $xoops->getModuleForm($block, 'block');
-        $form->getForm();
-        $form->display();
-        // Call Footer
-        $xoops->footer();
-        break;
 
-    case 'display':
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        // Get variable
-        $block_id = Request::getInt('bid', 0, 'post');
-        $visible = Request::getInt('visible', 0, 'post');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            $block->setVar('visible', $visible);
-            if (!$block_handler->insertBlock($block)) {
-                $error = true;
+            $arr = array();
+            foreach (array_keys($blocks_arr) as $i) {
+                $arr[$i] = $blocks_arr[$i]->getValues();
+                $xoops->tpl()->appendByRef('blocks', $arr[$i]);
             }
-        }
-        break;
+            // Call Footer
+            $xoops->footer();
+            break;
 
-    case 'drag':
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        // Get variable
-        $block_id = Request::getInt('bid', 0, 'post');
-        $side = Request::getInt('side', 0, 'post');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            $block->setVar('side', $side);
-            if (!$block_handler->insertBlock($block)) {
-                $error = true;
+        case 'add':
+            // Call Header
+            $xoops->header('admin:system/system_blocks.tpl');
+            // Define Stylesheet
+            $xoops->theme()->addStylesheet('modules/system/css/admin.css');
+            // Define scripts
+            $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
+            $xoops->theme()->addScript('modules/system/js/admin.js');
+            $xoops->theme()->addScript('modules/system/js/blocks.js');
+            // Define Breadcrumb and tips
+            $admin_page = new \Xoops\Module\Admin();
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+            $admin_page->addBreadcrumbLink(
+                SystemLocale::BLOCKS_ADMINISTRATION,
+                $system->adminVersion('blocksadmin', 'adminpath')
+            );
+            $admin_page->addBreadcrumbLink(SystemLocale::ADD_BLOCK);
+            $admin_page->renderBreadcrumb();
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            $block = $block_handler->create();
+            $form = $xoops->getModuleForm($block, 'block');
+            $form->getForm();
+            $form->display();
+            // Call Footer
+            $xoops->footer();
+            break;
+
+        case 'display':
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            // Get variable
+            $block_id = Request::getInt('bid', 0, 'post');
+            $visible = Request::getInt('visible', 0, 'post');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                $block->setVar('visible', $visible);
+                if (!$block_handler->insertBlock($block)) {
+                    $error = true;
+                }
             }
-        }
-        break;
-
-    case 'order':
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        if (isset($_POST['blk'])) {
-            $i = 0;
-            foreach ($_POST['blk'] as $order) {
-                if ($order > 0) {
-                    $block = $block_handler->get($order);
-                    $block->setVar('weight', $i);
-                    if (!$block_handler->insertBlock($block)) {
-                        $error = true;
+            break;
+
+        case 'drag':
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            // Get variable
+            $block_id = Request::getInt('bid', 0, 'post');
+            $side = Request::getInt('side', 0, 'post');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                $block->setVar('side', $side);
+                if (!$block_handler->insertBlock($block)) {
+                    $error = true;
+                }
+            }
+            break;
+
+        case 'order':
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            if (isset($_POST['blk'])) {
+                $i = 0;
+                foreach ($_POST['blk'] as $order) {
+                    if ($order > 0) {
+                        $block = $block_handler->get($order);
+                        $block->setVar('weight', $i);
+                        if (!$block_handler->insertBlock($block)) {
+                            $error = true;
+                        }
+                        ++$i;
                     }
-                    ++$i;
                 }
             }
-        }
-        exit;
-        break;
+            exit;
+            break;
 
-    case 'preview':
-        if (!$xoops->security()->check()) {
-            $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
-            exit();
-        }
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        /* @var $block XoopsBlock */
-        $block = $block_handler->create();
-        $block->setVars($_POST);
-        $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
-        $block->setVar('content', $content);
-        $myts = \Xoops\Core\Text\Sanitizer::getInstance();
-        echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's')
-            . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
-        break;
-
-    case 'save':
-        if (!$xoops->security()->check()) {
-            $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
-            exit();
-        }
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        // Get avatar id
-        $block_id = Request::getInt('bid', 0, 'post');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-        } else {
+        case 'preview':
+            if (!$xoops->security()->check()) {
+                $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
+                exit();
+            }
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            /* @var $block XoopsBlock */
             $block = $block_handler->create();
-        }
-        $block_type = Request::getString('block_type', '', 'post');
-        $block->setVar('block_type', $block_type);
-
-        if (!$block->isCustom()) {
             $block->setVars($_POST);
-            $type = $block->getVar('block_type');
-            $name = $block->getVar('name');
-            // Save block options
-            $options = $_POST['options'];
-            if (isset($options)) {
-                $options_count = count($options);
-                if ($options_count > 0) {
-                    //Convert array values to comma-separated
-                    for ($i = 0; $i < $options_count; ++$i) {
-                        if (is_array($options[$i])) {
-                            $options[$i] = implode(',', $options[$i]);
+            $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
+            $block->setVar('content', $content);
+            $myts = \Xoops\Core\Text\Sanitizer::getInstance();
+            echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's')
+                . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
+            break;
+
+        case 'save':
+            if (!$xoops->security()->check()) {
+                $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
+                exit();
+            }
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            // Get avatar id
+            $block_id = Request::getInt('bid', 0, 'post');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+            } else {
+                $block = $block_handler->create();
+            }
+            $block_type = Request::getString('block_type', '', 'post');
+            $block->setVar('block_type', $block_type);
+
+            if (!$block->isCustom()) {
+                $block->setVars($_POST);
+                $type = $block->getVar('block_type');
+                $name = $block->getVar('name');
+                // Save block options
+                $options = $_POST['options'];
+                if (isset($options)) {
+                    $options_count = count($options);
+                    if ($options_count > 0) {
+                        //Convert array values to comma-separated
+                        for ($i = 0; $i < $options_count; ++$i) {
+                            if (is_array($options[$i])) {
+                                $options[$i] = implode(',', $options[$i]);
+                            }
                         }
+                        $options = implode('|', $options);
+                        $block->setVar('options', $options);
                     }
-                    $options = implode('|', $options);
-                    $block->setVar('options', $options);
                 }
-            }
-        } else {
-            $block->setVars($_POST);
-            switch ($block->getVar('c_type')) {
+            } else {
+                $block->setVars($_POST);
+                switch ($block->getVar('c_type')) {
                 case 'H':
                     $name = SystemLocale::CUSTOM_BLOCK_HTML;
                     break;
@@ -339,7 +339,7 @@ 
                 default:
                     $name = SystemLocale::CUSTOM_BLOCK_AUTO_FORMAT;
                     break;
-            }
+                }
         }
         $block->setVar('name', $name);
         $block->setVar('isactive', 1);
@@ -397,18 +397,44 @@ 
         $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
         break;
 
-    case 'edit':
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        // Get avatar id
-        $block_id = Request::getInt('bid', 0);
-        if ($block_id > 0) {
+        case 'edit':
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            // Get avatar id
+            $block_id = Request::getInt('bid', 0);
+            if ($block_id > 0) {
+                // Call Header
+                $xoops->header('admin:system/system_blocks.tpl');
+                // Define Stylesheet
+                $xoops->theme()->addStylesheet('modules/system/css/admin.css');
+                $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
+                $xoops->theme()->addScript('modules/system/js/admin.js');
+                // Define Breadcrumb and tips
+                $admin_page = new \Xoops\Module\Admin();
+                $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+                $admin_page->addBreadcrumbLink(
+                    SystemLocale::BLOCKS_ADMINISTRATION,
+                    $system->adminVersion('blocksadmin', 'adminpath')
+                );
+                $admin_page->addBreadcrumbLink(SystemLocale::EDIT_BLOCK);
+                $admin_page->renderBreadcrumb();
+                $block = $block_handler->get($block_id);
+                /* @var $form SystemBlockForm */
+                $form = $xoops->getModuleForm($block, 'block');
+                $form->getForm();
+                $form->display();
+                // Call Footer
+                $xoops->footer();
+            } else {
+                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
+            }
+            break;
+
+        case 'delete':
             // Call Header
             $xoops->header('admin:system/system_blocks.tpl');
             // Define Stylesheet
             $xoops->theme()->addStylesheet('modules/system/css/admin.css');
-            $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
-            $xoops->theme()->addScript('modules/system/js/admin.js');
             // Define Breadcrumb and tips
             $admin_page = new \Xoops\Module\Admin();
             $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
@@ -416,141 +442,115 @@ 
                 SystemLocale::BLOCKS_ADMINISTRATION,
                 $system->adminVersion('blocksadmin', 'adminpath')
             );
-            $admin_page->addBreadcrumbLink(SystemLocale::EDIT_BLOCK);
+            $admin_page->addBreadcrumbLink(SystemLocale::DELETE_BLOCK);
             $admin_page->renderBreadcrumb();
-            $block = $block_handler->get($block_id);
-            /* @var $form SystemBlockForm */
-            $form = $xoops->getModuleForm($block, 'block');
-            $form->getForm();
-            $form->display();
-            // Call Footer
-            $xoops->footer();
-        } else {
-            $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
-        }
-        break;
-
-    case 'delete':
-        // Call Header
-        $xoops->header('admin:system/system_blocks.tpl');
-        // Define Stylesheet
-        $xoops->theme()->addStylesheet('modules/system/css/admin.css');
-        // Define Breadcrumb and tips
-        $admin_page = new \Xoops\Module\Admin();
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
-        $admin_page->addBreadcrumbLink(
-            SystemLocale::BLOCKS_ADMINISTRATION,
-            $system->adminVersion('blocksadmin', 'adminpath')
-        );
-        $admin_page->addBreadcrumbLink(SystemLocale::DELETE_BLOCK);
-        $admin_page->renderBreadcrumb();
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        // Get avatar id
-        $block_id = Request::getInt('bid', 0);
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            if ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_SYSTEM) {
-                $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_SYSTEM_BLOCKS_CANNOT_BE_DELETED);
-                exit();
-            } elseif ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_MODULE) {
-                // Fix for duplicated blocks created in 2.0.9 module update
-                // A module block can be deleted if there is more than 1 that
-                // has the same func_num/show_func which is mostly likely
-                // be the one that was duplicated in 2.0.9
-                if (1 >= $count = $block_handler->countSimilarBlocks(
-                    $block->getVar('mid'),
-                    $block->getVar('func_num'),
-                    $block->getVar('show_func')
-                )) {
-                    $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_THIS_BLOCK_CANNOT_BE_DELETED);
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            // Get avatar id
+            $block_id = Request::getInt('bid', 0);
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                if ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_SYSTEM) {
+                    $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_SYSTEM_BLOCKS_CANNOT_BE_DELETED);
                     exit();
+                } elseif ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_MODULE) {
+                    // Fix for duplicated blocks created in 2.0.9 module update
+                    // A module block can be deleted if there is more than 1 that
+                    // has the same func_num/show_func which is mostly likely
+                    // be the one that was duplicated in 2.0.9
+                    if (1 >= $count = $block_handler->countSimilarBlocks(
+                        $block->getVar('mid'),
+                        $block->getVar('func_num'),
+                        $block->getVar('show_func')
+                    )) {
+                        $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_THIS_BLOCK_CANNOT_BE_DELETED);
+                        exit();
+                    }
                 }
+                // Call Header
+                $xoops->header('admin:system/system_header.tpl');
+                // Display Question
+                echo $xoops->confirm(array(
+                    'op'  => 'delete_ok',
+                    'fct' => 'blocksadmin',
+                    'bid' => $block->getVar('bid')
+                ), 'admin.php', sprintf(SystemLocale::QF_ARE_YOU_SURE_TO_DELETE_THIS_BLOCK, $block->getVar('title')));
+                // Call Footer
+                $xoops->footer();
             }
-            // Call Header
-            $xoops->header('admin:system/system_header.tpl');
-            // Display Question
-            echo $xoops->confirm(array(
-                'op'  => 'delete_ok',
-                'fct' => 'blocksadmin',
-                'bid' => $block->getVar('bid')
-            ), 'admin.php', sprintf(SystemLocale::QF_ARE_YOU_SURE_TO_DELETE_THIS_BLOCK, $block->getVar('title')));
-            // Call Footer
-            $xoops->footer();
-        }
-        break;
+            break;
 
-    case 'delete_ok':
-        if (!$xoops->security()->check()) {
-            $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
-            exit();
-        }
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        // Get avatar id
-        $block_id = Request::getInt('bid', 0, 'post');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            if ($block_handler->deleteBlock($block)) {
-                // Delete Group link
-                $blockmodulelink_handler = $xoops->getHandlerBlockModuleLink();
-                $blockmodulelink =
-                    $blockmodulelink_handler->getObjects(new CriteriaCompo(new Criteria('block_id', $block_id)));
-                foreach ($blockmodulelink as $link) {
-                    $blockmodulelink_handler->delete($link, true);
-                }
-                // Delete Group permission
-                $groupperm_handler = $xoops->getHandlerGroupPermission();
-                $criteria = new CriteriaCompo(new Criteria('gperm_name', 'block_read'));
-                $criteria->add(new Criteria('gperm_itemid', $block_id));
-                $groupperm = $groupperm_handler->getObjects($criteria);
-                /* @var $perm XoopsGroupPerm */
-                foreach ($groupperm as $perm) {
-                    $groupperm_handler->delete($perm, true);
-                }
-                // Delete template
-                if ($block->getVar('template') != '') {
-                    $tplfile_handler = $xoops->getHandlerTplFile();
-                    $btemplate = $tplfile_handler->find($xoops->getConfig('template_set'), 'block', $block_id);
-                    if (count($btemplate) > 0) {
-                        $tplfile_handler->deleteTpl($btemplate[0]);
+        case 'delete_ok':
+            if (!$xoops->security()->check()) {
+                $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
+                exit();
+            }
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            // Get avatar id
+            $block_id = Request::getInt('bid', 0, 'post');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                if ($block_handler->deleteBlock($block)) {
+                    // Delete Group link
+                    $blockmodulelink_handler = $xoops->getHandlerBlockModuleLink();
+                    $blockmodulelink =
+                        $blockmodulelink_handler->getObjects(new CriteriaCompo(new Criteria('block_id', $block_id)));
+                    foreach ($blockmodulelink as $link) {
+                        $blockmodulelink_handler->delete($link, true);
+                    }
+                    // Delete Group permission
+                    $groupperm_handler = $xoops->getHandlerGroupPermission();
+                    $criteria = new CriteriaCompo(new Criteria('gperm_name', 'block_read'));
+                    $criteria->add(new Criteria('gperm_itemid', $block_id));
+                    $groupperm = $groupperm_handler->getObjects($criteria);
+                    /* @var $perm XoopsGroupPerm */
+                    foreach ($groupperm as $perm) {
+                        $groupperm_handler->delete($perm, true);
+                    }
+                    // Delete template
+                    if ($block->getVar('template') != '') {
+                        $tplfile_handler = $xoops->getHandlerTplFile();
+                        $btemplate = $tplfile_handler->find($xoops->getConfig('template_set'), 'block', $block_id);
+                        if (count($btemplate) > 0) {
+                            $tplfile_handler->deleteTpl($btemplate[0]);
+                        }
                     }
+                    $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
                 }
-                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
+            } else {
+                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
             }
-        } else {
-            $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
-        }
-        break;
-
-    case 'clone':
-        // Initialize blocks handler
-        $block_handler = $xoops->getHandlerBlock();
-        // Get avatar id
-        $block_id = Request::getInt('bid', 0);
-        if ($block_id > 0) {
-            // Call Header
-            $xoops->header('admin:system/system_blocks.tpl');
-            // Define Stylesheet
-            $xoops->theme()->addStylesheet('modules/system/css/admin.css');
-            // Define Breadcrumb and tips
-            $system_breadcrumb = new \Xoops\Module\Admin();
-            $system_breadcrumb->addBreadcrumbLink(
-                SystemLocale::BLOCKS_ADMINISTRATION,
-                system_adminVersion('blocksadmin', 'adminpath')
-            );
-            $system_breadcrumb->addBreadcrumbLink(SystemLocale::CLONE_BLOCK);
-            $system_breadcrumb->renderBreadcrumb();
-
-            $block = $block_handler->get($block_id);
-            /* @var $form SystemBlockForm */
-            $form = $xoops->getModuleForm($block, 'block');
-            $form->getForm('clone');
-            $form->display();
-            // Call Footer
-            $xoops->footer();
-        } else {
-            $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
-        }
-        break;
+            break;
+
+        case 'clone':
+            // Initialize blocks handler
+            $block_handler = $xoops->getHandlerBlock();
+            // Get avatar id
+            $block_id = Request::getInt('bid', 0);
+            if ($block_id > 0) {
+                // Call Header
+                $xoops->header('admin:system/system_blocks.tpl');
+                // Define Stylesheet
+                $xoops->theme()->addStylesheet('modules/system/css/admin.css');
+                // Define Breadcrumb and tips
+                $system_breadcrumb = new \Xoops\Module\Admin();
+                $system_breadcrumb->addBreadcrumbLink(
+                    SystemLocale::BLOCKS_ADMINISTRATION,
+                    system_adminVersion('blocksadmin', 'adminpath')
+                );
+                $system_breadcrumb->addBreadcrumbLink(SystemLocale::CLONE_BLOCK);
+                $system_breadcrumb->renderBreadcrumb();
+
+                $block = $block_handler->get($block_id);
+                /* @var $form SystemBlockForm */
+                $form = $xoops->getModuleForm($block, 'block');
+                $form->getForm('clone');
+                $form->display();
+                // Call Footer
+                $xoops->footer();
+            } else {
+                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
+            }
+            break;
 }

htdocs/modules/system/themes/default/default.php

Spacing +28 added lines, -28 removed lines

@@ -48,7 +48,7 @@ 
 
         $xoops->theme()->addBaseStylesheetAssets('@jqueryuicss');
         $xoops->theme()->addStylesheet('media/xoops/css/moduladmin.css');
-        $xoops->theme()->addStylesheet(\XoopsBaseConfig::get('adminthemes-url') . '/default/css/style.css');
+        $xoops->theme()->addStylesheet(\XoopsBaseConfig::get('adminthemes-url').'/default/css/style.css');
 
         // $xoops->theme()->addBaseScriptAssets('@jquery');
         // bootstrap has to come before jquery.ui or dialog close buttons are blank
@@ -56,15 +56,15 @@ 
         $xoops->theme()->addBaseScriptAssets('@jqueryui');
         $xoops->theme()->addBaseScriptAssets('@jgrowl');
         // ddsmoothmenu
-        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url') . '/default/js/ddsmoothmenu.js');
-        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url') . '/default/js/tooltip.js');
+        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url').'/default/js/ddsmoothmenu.js');
+        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url').'/default/js/tooltip.js');
 
         $quick = array();
-        $quick[] = array('title' => SystemLocale::CONTROL_PANEL, 'link' => \XoopsBaseConfig::get('url') . '/admin.php');
+        $quick[] = array('title' => SystemLocale::CONTROL_PANEL, 'link' => \XoopsBaseConfig::get('url').'/admin.php');
         $quick[] = array('title' => XoopsLocale::HOME_PAGE, 'link' => \XoopsBaseConfig::get('url'));
-        $quick[] = array('title' => DefaultThemeLocale::XOOPS_NEWS, 'link' => \XoopsBaseConfig::get('url') . '/admin.php?xoopsorgnews=1');
+        $quick[] = array('title' => DefaultThemeLocale::XOOPS_NEWS, 'link' => \XoopsBaseConfig::get('url').'/admin.php?xoopsorgnews=1');
         $quick[] = array('title' => 'separator');
-        $quick[] = array('title' => XoopsLocale::A_LOGOUT, 'link' => \XoopsBaseConfig::get('url') . '/user.php?op=logout');
+        $quick[] = array('title' => XoopsLocale::A_LOGOUT, 'link' => \XoopsBaseConfig::get('url').'/user.php?op=logout');
         $xoops->tpl()->assign('quick_menu', $quick);
 
         XoopsLoad::load('module', 'system');
@@ -73,9 +73,9 @@ 
         $system_extension = new SystemExtension();
 
         $adminmenu = null;
-        include __DIR__ . '/menu.php';
+        include __DIR__.'/menu.php';
         if (!$xoops->isModule() || 'system' === $xoops->module->getVar('dirname', 'n')) {
-            $modpath = \XoopsBaseConfig::get('url') . '/admin.php';
+            $modpath = \XoopsBaseConfig::get('url').'/admin.php';
             $modname = DefaultThemeLocale::SYSTEM_OPTIONS;
             $modid = 1;
             $moddir = 'system';
@@ -83,31 +83,31 @@ 
             $mod_options = $adminmenu;
             foreach (array_keys($mod_options) as $item) {
                 $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
-                    ? \XoopsBaseConfig::get('url') . '/modules/' . $moddir . '/' . $mod_options[$item]['link']
+                    ? \XoopsBaseConfig::get('url').'/modules/'.$moddir.'/'.$mod_options[$item]['link']
                     : $mod_options[$item]['link'];
                 $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
-                    : \XoopsBaseConfig::get('adminthemes-url') . '/default/' . $mod_options[$item]['icon'];
+                    : \XoopsBaseConfig::get('adminthemes-url').'/default/'.$mod_options[$item]['icon'];
                 unset($mod_options[$item]['icon_small']);
             }
 
         } else {
             $moddir = $xoops->module->getVar('dirname', 'n');
-            $modpath = \XoopsBaseConfig::get('url') . '/modules/' . $moddir;
+            $modpath = \XoopsBaseConfig::get('url').'/modules/'.$moddir;
             $modname = $xoops->module->getVar('name');
             $modid = $xoops->module->getVar('mid');
 
             $mod_options = $xoops->module->getAdminMenu();
             foreach (array_keys($mod_options) as $item) {
                 $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
-                    ? \XoopsBaseConfig::get('url') . "/modules/{$moddir}/" . $mod_options[$item]['link']
+                    ? \XoopsBaseConfig::get('url')."/modules/{$moddir}/".$mod_options[$item]['link']
                     : $mod_options[$item]['link'];
-                if ( XoopsLoad::fileExists($xoops->path('media/xoops/images/icons/32/' . $mod_options[$item]['icon']) ) ) {
-                    $mod_options[$item]['icon'] = $xoops->url('media/xoops/images/icons/32/' . $mod_options[$item]['icon']);
+                if (XoopsLoad::fileExists($xoops->path('media/xoops/images/icons/32/'.$mod_options[$item]['icon']))) {
+                    $mod_options[$item]['icon'] = $xoops->url('media/xoops/images/icons/32/'.$mod_options[$item]['icon']);
 
-                } elseif ( XoopsLoad::fileExists($xoops->path('modules/' . $xoops->module->dirname() . '/assets/icons/32/' . $mod_options[$item]['icon'])) ) {
-                    $mod_options[$item]['icon'] = $xoops->url('modules/' . $xoops->module->dirname() . '/assets/icons/32/' . $mod_options[$item]['icon']);
+                } elseif (XoopsLoad::fileExists($xoops->path('modules/'.$xoops->module->dirname().'/assets/icons/32/'.$mod_options[$item]['icon']))) {
+                    $mod_options[$item]['icon'] = $xoops->url('modules/'.$xoops->module->dirname().'/assets/icons/32/'.$mod_options[$item]['icon']);
                 } else {
-                    $mod_options[$item]['icon'] = $xoops->url("modules/" . $xoops->module->dirname() . "/icons/32/" . $mod_options[$item]['icon']);
+                    $mod_options[$item]['icon'] = $xoops->url("modules/".$xoops->module->dirname()."/icons/32/".$mod_options[$item]['icon']);
                 }
             }
             $xoops->tpl()->assign('modhasconfig', $xoops->module->getVar('hasconfig'));
@@ -128,7 +128,7 @@ 
         $xoops->tpl()->assign('extension_menu', $extension_list);
         unset($extension_list);
 
-        $extension_mod = $system_extension->getExtension( $moddir );
+        $extension_mod = $system_extension->getExtension($moddir);
         $xoops->tpl()->assign('extension_mod', $extension_mod);
 
         // add preferences menu
@@ -137,8 +137,8 @@ 
         $OPT = array();
 
         $menu[] = array(
-            'link' => \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=preferences', 'title' => XoopsLocale::PREFERENCES,
-            'absolute' => 1, 'url' => \XoopsBaseConfig::get('url') . '/modules/system/', 'options' => $OPT
+            'link' => \XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=preferences', 'title' => XoopsLocale::PREFERENCES,
+            'absolute' => 1, 'url' => \XoopsBaseConfig::get('url').'/modules/system/', 'options' => $OPT
         );
         $menu[] = array('title' => 'separator');
 
@@ -154,18 +154,18 @@ 
                 $menu_handler = $xoops->getModuleHandler('menu', 'system');
                 // Define top navigation
                 if ($xoops->module->getVar('hasconfig')) {
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoops->module->getVar('mid', 'e'), XoopsLocale::PREFERENCES);
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=preferences&op=showmod&mod=".$xoops->module->getVar('mid', 'e'), XoopsLocale::PREFERENCES);
                 }
                 if ($xoops->module->getInfo('extension')) {
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=extensions&op=update&module=" . $xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=extensions&op=update&module=".$xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
                 } else {
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=modulesadmin&op=update&module=".$xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
                 }
                 if ($xoops->module->getInfo('blocks')) {
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoops->module->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", XoopsLocale::BLOCKS);
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=".$xoops->module->getVar('mid', 'e')."&selmod=-2&selgrp=-1&selvis=-1", XoopsLocale::BLOCKS);
                 }
                 if ($xoops->module->getInfo('hasMain')) {
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'e') . "/", SystemLocale::GO_TO_MODULE);
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'e')."/", SystemLocale::GO_TO_MODULE);
                 }
                 // Define main tab navigation
                 $i = 0;
@@ -174,14 +174,14 @@ 
                     if (stripos($_SERVER['REQUEST_URI'], $menu['link']) !== false) {
                         $current = $i;
                     }
-                    $menu_handler->addMenuTabs( $xoops->url('modules/' . $xoops->module->getVar('dirname') . '/' . $menu['link']), $menu['title']);
+                    $menu_handler->addMenuTabs($xoops->url('modules/'.$xoops->module->getVar('dirname').'/'.$menu['link']), $menu['title']);
                     ++$i;
                 }
                 if ($xoops->module->getInfo('help')) {
-                    if (stripos($_SERVER['REQUEST_URI'], 'admin/' . $xoops->module->getInfo('help')) !== false) {
+                    if (stripos($_SERVER['REQUEST_URI'], 'admin/'.$xoops->module->getInfo('help')) !== false) {
                         $current = $i;
                     }
-                    $menu_handler->addMenuTabs('../../system/help.php?mid=' . $xoops->module->getVar('mid', 's') . '&' . $xoops->module->getInfo('help'), XoopsLocale::HELP);
+                    $menu_handler->addMenuTabs('../../system/help.php?mid='.$xoops->module->getVar('mid', 's').'&'.$xoops->module->getInfo('help'), XoopsLocale::HELP);
                 }
 
                 // Display navigation tabs

htdocs/modules/system/themes/default/menu.php

Spacing +5 added lines, -5 removed lines

@@ -47,16 +47,16 @@
 $dirlist = XoopsLists::getDirListAsArray($admin_dir);
 $index = 0;
 foreach ($dirlist as $file) {
-    if (XoopsLoad::fileExists($admin_dir . '/' . $file . '/xoops_version.php')) {
-        include $admin_dir . '/' . $file . '/xoops_version.php';
+    if (XoopsLoad::fileExists($admin_dir.'/'.$file.'/xoops_version.php')) {
+        include $admin_dir.'/'.$file.'/xoops_version.php';
         if ($modversion['hasAdmin']) {
-            if ($xoops->getModuleConfig('active_' . $file, 'system')) {
+            if ($xoops->getModuleConfig('active_'.$file, 'system')) {
                 $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
                 if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                     $adminmenu[$index]['title'] = trim($modversion['name']);
                     $adminmenu[$index]['desc'] = trim($modversion['description']);
-                    $adminmenu[$index]['link'] = 'admin.php?fct=' . $file;
-                    $adminmenu[$index]['icon'] = 'icons/' . $modversion['image'];
+                    $adminmenu[$index]['link'] = 'admin.php?fct='.$file;
+                    $adminmenu[$index]['icon'] = 'icons/'.$modversion['image'];
                 }
             }
         }

htdocs/modules/system/xoops_version.php

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
 $modversion['jquery'] = 1;
 
 // table definitions
-$modversion['schema']           = 'sql/schema.yml';
+$modversion['schema'] = 'sql/schema.yml';
 
 // Tables created by sql file or schema (without prefix!)
 $modversion['tables'] = array(
@@ -354,7 +354,7 @@ 
     'category'    => 'general',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'xoops_user_' . dechex(time()),
+    'default'     => 'xoops_user_'.dechex(time()),
 );
 
 $modversion['config'][] = array(
@@ -364,7 +364,7 @@ 
     'category'    => 'general',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'xoops_session_' . dechex(time()),
+    'default'     => 'xoops_session_'.dechex(time()),
 );
 
 $modversion['config'][] = array(
@@ -1052,7 +1052,7 @@ 
     'default'     => 1,
 );
 
-$icons                  = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/modules/system/images/icons');
+$icons                  = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/modules/system/images/icons');
 $modversion['config'][] = array(
     'name'        => 'typeicons',
     'title'       => 'CONF_ICONS',
@@ -1063,7 +1063,7 @@ 
     'options'     => $icons,
 );
 
-$breadcrumb             = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/modules/system/images/breadcrumb');
+$breadcrumb             = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/modules/system/images/breadcrumb');
 $modversion['config'][] = array(
     'name'        => 'typebreadcrumb',
     'title'       => 'CONF_BREADCRUMB',
@@ -1074,7 +1074,7 @@ 
     'options'     => $breadcrumb,
 );
 
-$jquery_theme           = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/media/jquery/ui/themes');
+$jquery_theme           = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/media/jquery/ui/themes');
 $modversion['config'][] = array(
     'name'        => 'jquery_theme',
     'title'       => 'CONF_JQUERY_THEME',

htdocs/modules/system/preloads/preload.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
             && $xoops->getConfig('redirect_message_ajax')
         ) {
             $_SESSION['redirect_message'] = $args[2];
-            header("Location: " . preg_replace("/[&]amp;/i", '&', $url));
+            header("Location: ".preg_replace("/[&]amp;/i", '&', $url));
             exit();
         }
     }
@@ -57,7 +57,7 @@ 
             $xoops->theme()->addScript('', array('type' => 'text/javascript'), '
             (function($){
                 $(document).ready(function(){
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
             });
             })(jQuery);
             ');
@@ -75,7 +75,7 @@ 
             $xoops->theme()->addScript('', array('type' => 'text/javascript'), '
             (function($){
             $(document).ready(function(){
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
             });
             })(jQuery);
             ');
@@ -93,7 +93,7 @@ 
     public static function eventCoreServiceLocateCountryflag(Provider $provider)
     {
         if (is_a($provider, '\Xoops\Core\Service\Provider')) {
-            $path = dirname(__DIR__) . '/class/CountryFlagProvider.php';
+            $path = dirname(__DIR__).'/class/CountryFlagProvider.php';
             require $path;
             $object = new CountryFlagProvider();
             $provider->register($object);

htdocs/modules/system/include/functions.php

Spacing +11 added lines, -11 removed lines

@@ -78,11 +78,11 @@ 
         return false;
     }
     $language = empty($language) ? $xoops->getConfig('language') : $language;
-    $path = 'modules/' . $domain . '/language/';
-    if (XoopsLoad::fileExists($file = $xoops->path($path . $language . '/admin/' . $name . '.php'))) {
+    $path = 'modules/'.$domain.'/language/';
+    if (XoopsLoad::fileExists($file = $xoops->path($path.$language.'/admin/'.$name.'.php'))) {
         $ret = include_once $file;
     } else {
-        $ret = include_once $xoops->path($path . 'english/admin/' . $name . '.php');
+        $ret = include_once $xoops->path($path.'english/admin/'.$name.'.php');
     }
     return $ret;
 }
@@ -95,16 +95,16 @@ 
 function system_adminVersion($version, $value = '')
 {
     static $tblVersion = array();
-    if (is_array($tblVersion) && array_key_exists($version . '.' . $value, $tblVersion)) {
-        return $tblVersion[$version . '.' . $value];
+    if (is_array($tblVersion) && array_key_exists($version.'.'.$value, $tblVersion)) {
+        return $tblVersion[$version.'.'.$value];
     }
     $xoops = Xoops::getInstance();
-    $path = $xoops->path('modules/system/admin/' . $version . '/xoops_version.php');
+    $path = $xoops->path('modules/system/admin/'.$version.'/xoops_version.php');
     if (XoopsLoad::fileExists($path)) {
         $modversion = array();
         include $path;
         $retvalue = $modversion[$value];
-        $tblVersion[$version . '.' . $value] = $retvalue;
+        $tblVersion[$version.'.'.$value] = $retvalue;
         return $retvalue;
     }
     return '';
@@ -119,7 +119,7 @@ 
     $xoops = Xoops::getInstance();
     $style = 'default';
 
-    $url = $xoops->url('modules/system/images/icons/' . $style . '/' . $img);
+    $url = $xoops->url('modules/system/images/icons/'.$style.'/'.$img);
     return $url;
 }
 
@@ -131,11 +131,11 @@ 
 {
     $xoops = Xoops::getInstance();
 
-    $path = $xoops->path('modules/' . $xoops->module->getVar('dirname', 'n') . '/templates/admin/' . $name . '.tpl');
+    $path = $xoops->path('modules/'.$xoops->module->getVar('dirname', 'n').'/templates/admin/'.$name.'.tpl');
     if (XoopsLoad::fileExists($path)) {
         echo $xoops->tpl()->fetch($path);
     } else {
-        echo "Unable to read " . $name;
+        echo "Unable to read ".$name;
     }
 }
 
@@ -147,7 +147,7 @@ 
  */
 function modify_chmod($value_chmod, $path_file, $id)
 {
-    $chmod = '<div id="loading_' . $id . '" align="center" style="display:none;">' . '<img src="./images/mimetypes/spinner.gif" title="Loading" alt="Loading" width="12px"/></div>' . '<div id="chmod' . $id . '">' . '<select size="1" onChange="filemanager_modify_chmod(\'' . $path_file . '\', \'' . $id . '\')" name="chmod" id="chmod">';
+    $chmod = '<div id="loading_'.$id.'" align="center" style="display:none;">'.'<img src="./images/mimetypes/spinner.gif" title="Loading" alt="Loading" width="12px"/></div>'.'<div id="chmod'.$id.'">'.'<select size="1" onChange="filemanager_modify_chmod(\''.$path_file.'\', \''.$id.'\')" name="chmod" id="chmod">';
     if ($value_chmod == 777) {
         $chmod .= '<option value="777" selected><span style="color:green">777</span></option>';
     } else {

htdocs/modules/system/language/english/admin/_tplsets.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version     $Id$
  */
 
- //Nav
+    //Nav
 //define("_AM_SYSTEM_TEMPLATES_NAV_MANAGER","Templates Manager");
 //define("_AM_SYSTEM_TEMPLATES_NAV_MAIN","Templates Manager");
 //Tips

htdocs/modules/system/language/english/_blocks.php

Spacing +1 added lines, -1 removed lines

@@ -49,4 +49,4 @@
 //define("_MB_SYSTEM_NUMTHEME", "%s themes");
 //define("_MB_SYSTEM_THSHOW", "Display screenshot image");
 //define("_MB_SYSTEM_THWIDTH", "Screenshot image width");
-define("_MB_SYSTEM_REMEMBERME","Remember me");
\ No newline at end of file
+define("_MB_SYSTEM_REMEMBERME", "Remember me");
\ No newline at end of file

htdocs/modules/system/menu.php

Spacing +3 added lines, -3 removed lines

@@ -40,15 +40,15 @@
 $dirlist = XoopsLists::getDirListAsArray($admin_dir);
 $index = 0;
 foreach ($dirlist as $file) {
-    if (XoopsLoad::fileExists($fileinc = $admin_dir . '/' . $file . '/xoops_version.php')) {
+    if (XoopsLoad::fileExists($fileinc = $admin_dir.'/'.$file.'/xoops_version.php')) {
         include $fileinc;
         unset($fileinc);
         if ($modversion['hasAdmin']) {
-            if ($xoops->getModuleConfig('active_' . $file, 'system')) {
+            if ($xoops->getModuleConfig('active_'.$file, 'system')) {
                 $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
                 if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                     $adminmenu[$index]['title'] = trim($modversion['name']);
-                    $adminmenu[$index]['link'] = 'admin.php?fct=' . $file;
+                    $adminmenu[$index]['link'] = 'admin.php?fct='.$file;
                     $adminmenu[$index]['image'] = $modversion['image'];
                 }
             }