XOOPS / XoopsCore

htdocs/include/cp_header.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
  * xoops_url/modules/module_directory_name/admin_directory_name/
  */
 
-require_once dirname(__DIR__) . '/mainfile.php';
+require_once dirname(__DIR__).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops_url = \XoopsBaseConfig::get('url');
@@ -40,7 +40,7 @@ 
         $xoops->redirect($xoops_url, 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
     }
 } else {
-    $xoops->redirect($xoops_url . '/user.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
+    $xoops->redirect($xoops_url.'/user.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
 // set config values for this module

htdocs/modules/profile/admin/permissions.php

Spacing +3 added lines, -3 removed lines

@@ -22,12 +22,12 @@ 
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $xoops = Xoops::getInstance();
 
 // Get Action type
-$op = Request::getString('op','edit');
+$op = Request::getString('op', 'edit');
 // Call header
 $xoops->header();
 
@@ -75,7 +75,7 @@ 
 $opform->display();
 
 $module_id = $xoops->module->getVar('mid');
-$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op=' . $op, $anonymous);
+$form = new Xoops\Form\GroupPermissionForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php?op='.$op, $anonymous);
 
 if ($op === 'access') {
     $member_handler = $xoops->getHandlerMember();

htdocs/modules/profile/admin/visibility.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $xoops = Xoops::getInstance();
 

htdocs/modules/profile/admin/step.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // Get main instance
 $xoops = Xoops::getInstance();
@@ -41,7 +41,7 @@ 
     default:
         // Add Scripts
         $xoops->theme()->addScript('media/xoops/xoops.js');
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_STEP, 'step.php?op=new', 'add');
         $admin_page->renderButton();
         $xoops->tpl()->assign('steps', $regstep_Handler->getObjects(null, true, false));
         $xoops->tpl()->assign('step', true);
@@ -56,7 +56,7 @@ 
         break;
 
     case "edit":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_STEP, 'step.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = Request::getInt('id', 0);
@@ -92,7 +92,7 @@ 
         break;
 
     case "delete":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_STEP, 'step.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = Request::getInt('id', 0);
@@ -114,7 +114,7 @@ 
                 echo $xoops->confirm(
                     array("ok" => 1, "id" => $id, "op" => "delete"),
                     'step.php',
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')) . '<br />'
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')).'<br />'
                 );
             }
         } else {

htdocs/modules/profile/admin/category.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $xoops = Xoops::getInstance();
 
@@ -38,7 +38,7 @@ 
 switch ($op) {
     case "list":
     default:
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
         $admin_page->renderButton();
         $criteria = new CriteriaCompo();
         $criteria->setSort('cat_weight');
@@ -56,7 +56,7 @@ 
         break;
 
     case "edit":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = Request::getInt('id', 0);
@@ -91,7 +91,7 @@ 
         break;
 
     case "delete":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_CATEGORY_LIST, 'category.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = Request::getInt('id', 0);
@@ -113,7 +113,7 @@ 
                 echo $xoops->confirm(
                     array("ok" => 1, "id" => $id, "op" => "delete"),
                     'category.php',
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')) . '<br />'
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')).'<br />'
                 );
             }
         } else {

htdocs/modules/profile/admin/field.php

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $xoops = Xoops::getInstance();
 
@@ -43,7 +43,7 @@ 
 switch ($op) {
     default:
     case "list":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
         $admin_page->renderButton();
         $fields = $field_handler->getObjects(null, true, false);
         $modules = $xoops->getHandlerModule()->getObjectsArray(null, true);
@@ -110,7 +110,7 @@ 
         break;
 
     case "edit":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = Request::getInt('id', 0);
@@ -143,7 +143,7 @@ 
                 $errors = array();
                 //if there are changed fields, fetch the fieldcategory objects
                 $fields = $field_handler->getObjects(
-                    new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"),
+                    new Criteria('field_id', "(".implode(',', $ids).")", "IN"),
                     true
                 );
                 foreach ($ids as $i) {
@@ -281,7 +281,7 @@ 
                         $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
                         if (count($removed_groups) > 0) {
                             $criteria->add(
-                                new Criteria('gperm_groupid', "(" . implode(',', $removed_groups) . ")", "IN")
+                                new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN")
                             );
                             $groupperm_handler->deleteAll($criteria);
                         }
@@ -292,7 +292,7 @@ 
                     unset($criteria);
                 }
             }
-            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
+            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id='.$obj->getVar('field_id') : 'field.php';
             $xoops->redirect($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
         }
         echo $xoops->alert('error', $obj->getHtmlErrors());
@@ -301,7 +301,7 @@ 
         break;
 
     case "delete":
-        $admin_page->addItemButton(XoopsLocale::A_ADD . ' ' . _PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+        $admin_page->addItemButton(XoopsLocale::A_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
         $admin_page->addItemButton(_PROFILE_AM_FIELD_LIST, 'field.php', 'application-view-detail');
         $admin_page->renderButton();
         $id = Request::getInt('id', 0);
@@ -323,7 +323,7 @@ 
                 echo $xoops->confirm(
                     array("ok" => 1, "id" => $id, "op" => "delete"),
                     'field.php',
-                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />'
+                    sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')).'<br />'
                 );
             }
         } else {

htdocs/modules/userrank/admin/userrank.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
  * @package         userrank
  * @author          Cointin Maxime (AKA Kraven30)
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // Get main instance
 $xoops = Xoops::getInstance();
@@ -73,7 +73,7 @@ 
                 $userrank['rank_max'] = $userrank_arr[$i]->getVar("rank_max");
                 $userrank['rank_special'] = $userrank_arr[$i]->getVar("rank_special");
                 $rank_img = ($userrank_arr[$i]->getVar("rank_image")) ? $userrank_arr[$i]->getVar("rank_image") : 'blank.gif';
-                $userrank['rank_image'] = '<img src="' . \XoopsBaseConfig::get('uploads-url') . '/' . $rank_img . '" alt="" />';
+                $userrank['rank_image'] = '<img src="'.\XoopsBaseConfig::get('uploads-url').'/'.$rank_img.'" alt="" />';
                 $xoops->tpl()->appendByRef('userrank', $userrank);
                 unset($userrank);
             }
@@ -87,7 +87,7 @@ 
 
     // New userrank
     case 'userrank_new':
-        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
+        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)).sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
         $admin_page->addItemButton(_AM_USERRANK_LIST, './userrank.php', 'application-view-detail');
         $admin_page->renderTips();
         $admin_page->renderButton();
@@ -99,7 +99,7 @@ 
 
     // Edit userrank
     case 'userrank_edit':
-        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
+        $admin_page->addTips(sprintf(_AM_USERRANK_TIPS_FORM1, implode(', ', $mimetypes)).sprintf(_AM_USERRANK_TIPS_FORM2, $upload_size / 1000));
         $admin_page->addItemButton(_AM_USERRANK_ADD, './userrank.php?op=userrank_new', 'add');
         $admin_page->addItemButton(_AM_USERRANK_LIST, './userrank.php', 'application-view-detail');
         $admin_page->renderTips();
@@ -127,7 +127,7 @@ 
         $verif_rank_special = ($_POST["rank_special"] == 1) ? "1" : "0";
         $obj->setVar("rank_special", $verif_rank_special);
 
-        $uploader_rank_img = new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-url') . '/ranks', $mimetypes, $upload_size, null, null);
+        $uploader_rank_img = new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-url').'/ranks', $mimetypes, $upload_size, null, null);
 
         if ($uploader_rank_img->fetchMedia("rank_image")) {
             $uploader_rank_img->setPrefix("rank");
@@ -136,10 +136,10 @@ 
                 $errors = $uploader_rank_img->getErrors();
                 $xoops->redirect("javascript:history.go(-1)", 3, $errors);
             } else {
-                $obj->setVar("rank_image", 'ranks/' . $uploader_rank_img->getSavedFileName());
+                $obj->setVar("rank_image", 'ranks/'.$uploader_rank_img->getSavedFileName());
             }
         } else {
-            $obj->setVar("rank_image", 'ranks/' . $_POST["rank_image"]);
+            $obj->setVar("rank_image", 'ranks/'.$_POST["rank_image"]);
         }
 
         if ($userrank_Handler->insert($obj)) {
@@ -159,7 +159,7 @@ 
                 $xoops->redirect("userrank.php", 3, implode(",", $xoops->security()->getErrors()));
             }
             if ($userrank_Handler->delete($obj)) {
-                $urlfile = \XoopsBaseConfig::get('uploads-url') . '/' . $obj->getVar("rank_image");
+                $urlfile = \XoopsBaseConfig::get('uploads-url').'/'.$obj->getVar("rank_image");
                 if (is_file($urlfile)) {
                     chmod($urlfile, 0777);
                     unlink($urlfile);
@@ -172,7 +172,7 @@ 
             $rank_img = ($obj->getVar("rank_image")) ? $obj->getVar("rank_image") : 'blank.gif';
             echo $xoops->confirm(array(
                 "ok" => 1, "rank_id" => $_REQUEST["rank_id"], "op" => "userrank_delete"
-            ), $_SERVER["REQUEST_URI"], sprintf(_AM_USERRANK_SUREDEL) . '<br \><img src="' . \XoopsBaseConfig::get('uploads-url') . '/' . $rank_img . '" alt="" /><br \>');
+            ), $_SERVER["REQUEST_URI"], sprintf(_AM_USERRANK_SUREDEL).'<br \><img src="'.\XoopsBaseConfig::get('uploads-url').'/'.$rank_img.'" alt="" /><br \>');
         }
         break;
 

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

Spacing +46 added lines, -46 removed lines

@@ -55,7 +55,7 @@ 
     default:
         // 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::TEMPLATES_MANAGER, $system->adminVersion('tplsets', 'adminpath'));
         $admin_page->renderBreadcrumb();
         $admin_page->addTips(SystemLocale::TEMPLATES_TIPS);
@@ -104,7 +104,7 @@ 
             $xoops->redirect('admin.php?fct=tplsets', 3, implode('<br />', $xoops->security()->getErrors()));
         }
         // Assign Breadcrumb menu
-        $system_breadcrumb->addHelp(system_adminVersion('tplsets', 'help') . '#override');
+        $system_breadcrumb->addHelp(system_adminVersion('tplsets', 'help').'#override');
         $system_breadcrumb->addLink(SystemLocale::FILES_GENERATED);
         $system_breadcrumb->render();
 
@@ -113,8 +113,8 @@ 
             if (isset($_REQUEST['select_theme']) && isset($_REQUEST['force_generated'])) {
                 //on verifie si le dossier module existe
                 $template_overload = \XoopsBaseConfig::get('themes-path')
-                    . '/' . $_REQUEST['select_theme'] . '/modules';
-                $indexFile = \XoopsBaseConfig::get('root-path') . "/modules/system/include/index.html";
+                    . '/'.$_REQUEST['select_theme'].'/modules';
+                $indexFile = \XoopsBaseConfig::get('root-path')."/modules/system/include/index.html";
                 $verif_write = false;
                 $text = '';
 
@@ -125,7 +125,7 @@ 
                         mkdir($template_overload, 0777);
                     }
                     chmod($template_overload, 0777);
-                    copy($indexFile, $template_overload . "/index.html");
+                    copy($indexFile, $template_overload."/index.html");
                 }
 
                 $tplset = Request::getString('tplset', 'default', 'post');
@@ -153,42 +153,42 @@ 
                                 $module = $xoops->getModuleByDirname($moddir);
                                 if (is_object($module)) {
                                     // create module folder
-                                    if (!is_dir($template_overload . '/' . $module->getVar('dirname'))) {
-                                        mkdir($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                        chmod($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                        copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/index.html');
+                                    if (!is_dir($template_overload.'/'.$module->getVar('dirname'))) {
+                                        mkdir($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                        chmod($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                        copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/index.html');
                                     }
 
                                     // create block folder
-                                    if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                        if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                            mkdir($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
+                                    if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                        if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                            mkdir($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
                                         }
-                                        chmod($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
-                                        copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/blocks' . '/index.html');
+                                        chmod($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
+                                        copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/blocks'.'/index.html');
                                     }
 
                                     $class = "odd";
-                                    $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">' . XoopsLocale::C_MODULES . ucfirst($module->getVar('dirname')) . '</th></tr><tr><th align="center">' . XoopsLocale::TYPES . '</th><th  align="center">' . XoopsLocale::FILES . '</th><th>' . XoopsLocale::STATUS . '</th></tr>';
+                                    $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">'.XoopsLocale::C_MODULES.ucfirst($module->getVar('dirname')).'</th></tr><tr><th align="center">'.XoopsLocale::TYPES.'</th><th  align="center">'.XoopsLocale::FILES.'</th><th>'.XoopsLocale::STATUS.'</th></tr>';
 
                                     // create template
                                     $templates = $tpltpl_handler->find($tplsetname, 'module', null, $moddir);
                                     for ($j = 0; $j < count($templates); ++$j) {
                                         $filename = $templates[$j]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/'.$filename;
 
                                             $tplfile = $tpltpl_handler->get($templates[$j]->getVar('tpl_id'), true);
 
                                             if (is_object($tplfile)) {
                                                 if (!XoopsLoad::fileExists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     $open = fopen($physical_file, 'w+');
-                                                    if (fwrite($open, "" . html_entity_decode($tplfile->getVar('tpl_source', 'E'), ENT_QUOTES))) {
-                                                        $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::TEMPLATES . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                    if (fwrite($open, "".html_entity_decode($tplfile->getVar('tpl_source', 'E'), ENT_QUOTES))) {
+                                                        $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
                                                         if (XoopsLoad::fileExists($physical_file)) {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                         } else {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                         }
                                                         $verif_write = true;
                                                     }
@@ -204,18 +204,18 @@ 
                                     for ($k = 0; $k < count($btemplates); ++$k) {
                                         $filename = $btemplates[$k]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/blocks/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/blocks/'.$filename;
                                             $btplfile = $tpltpl_handler->get($btemplates[$k]->getVar('tpl_id'), true);
 
                                             if (is_object($btplfile)) {
                                                 if (!XoopsLoad::fileExists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     $open = fopen($physical_file, 'w+');
-                                                    if (fwrite($open, "" . utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E'))) . "")) {
-                                                        $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::BLOCKS . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                    if (fwrite($open, "".utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E')))."")) {
+                                                        $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
                                                         if (XoopsLoad::fileExists($physical_file)) {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                         } else {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                         }
                                                         $verif_write = true;
                                                     }
@@ -241,23 +241,23 @@ 
                             $module = $xoops->getModuleByDirname($moddir);
                             if (is_object($module)) {
                                 // create module folder
-                                if (!is_dir($template_overload . '/' . $module->getVar('dirname'))) {
-                                    mkdir($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                    chmod($template_overload . '/' . $module->getVar('dirname'), 0777);
-                                    copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/index.html');
+                                if (!is_dir($template_overload.'/'.$module->getVar('dirname'))) {
+                                    mkdir($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                    chmod($template_overload.'/'.$module->getVar('dirname'), 0777);
+                                    copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/index.html');
                                 }
 
                                 // create block folder
-                                if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                    if (!is_dir($template_overload . '/' . $module->getVar('dirname') . '/blocks')) {
-                                        mkdir($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
+                                if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                    if (!is_dir($template_overload.'/'.$module->getVar('dirname').'/blocks')) {
+                                        mkdir($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
                                     }
-                                    chmod($template_overload . '/' . $module->getVar('dirname') . '/blocks', 0777);
-                                    copy($indexFile, $template_overload . '/' . $module->getVar('dirname') . '/blocks' . '/index.html');
+                                    chmod($template_overload.'/'.$module->getVar('dirname').'/blocks', 0777);
+                                    copy($indexFile, $template_overload.'/'.$module->getVar('dirname').'/blocks'.'/index.html');
                                 }
 
                                 $class = "odd";
-                                $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">' . XoopsLocale::C_MODULES . ucfirst($module->getVar('dirname')) . '</th></tr><tr><th align="center">' . XoopsLocale::TYPES . '</th><th  align="center">' . XoopsLocale::FILES . '</th><th>' . XoopsLocale::STATUS . '</th></tr>';
+                                $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">'.XoopsLocale::C_MODULES.ucfirst($module->getVar('dirname')).'</th></tr><tr><th align="center">'.XoopsLocale::TYPES.'</th><th  align="center">'.XoopsLocale::FILES.'</th><th>'.XoopsLocale::STATUS.'</th></tr>';
                                 $select_templates_modules = $_REQUEST['select_templates_modules'];
                                 for ($l = 0; $l < count($_REQUEST['select_templates_modules']); ++$l) {
                                     // create template
@@ -265,7 +265,7 @@ 
                                     for ($j = 0; $j < count($templates); ++$j) {
                                         $filename = $templates[$j]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/'.$filename;
 
                                             $tplfile = $tpltpl_handler->get($templates[$j]->getVar('tpl_id'), true);
 
@@ -274,11 +274,11 @@ 
                                                     if ($select_templates_modules[$l] == $filename) {
                                                         $open = fopen($physical_file, 'w+');
                                                         if (fwrite($open, html_entity_decode($tplfile->getVar('tpl_source', 'E'), ENT_QUOTES))) {
-                                                            $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::TEMPLATES . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                            $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
                                                             if (XoopsLoad::fileExists($physical_file)) {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                             } else {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                             }
                                                             $verif_write = true;
                                                         }
@@ -295,19 +295,19 @@ 
                                     for ($k = 0; $k < count($btemplates); ++$k) {
                                         $filename = $btemplates[$k]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = \XoopsBaseConfig::get('themes-path') . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/blocks/' . $filename;
+                                            $physical_file = \XoopsBaseConfig::get('themes-path').'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/blocks/'.$filename;
                                             $btplfile = $tpltpl_handler->get($btemplates[$k]->getVar('tpl_id'), true);
 
                                             if (is_object($btplfile)) {
                                                 if (!XoopsLoad::fileExists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     if ($select_templates_modules[$l] == $filename) {
                                                         $open = fopen($physical_file, 'w+');
-                                                        if (fwrite($open, utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E'))) . "")) {
-                                                            $text .= '<tr class="' . $class . '"><td align="center">' . XoopsLocale::BLOCKS . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                        if (fwrite($open, utf8_encode(html_entity_decode($btplfile->getVar('tpl_source', 'E')))."")) {
+                                                            $text .= '<tr class="'.$class.'"><td align="center">'.XoopsLocale::BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
                                                             if (XoopsLoad::fileExists($physical_file)) {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                             } else {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                             }
                                                             $verif_write = true;
                                                         }
@@ -365,14 +365,14 @@ 
         }
         $clean_path_file = Request::getString('path_file', '');
         if (!empty($clean_path_file)) {
-            $path_file = realpath(\XoopsBaseConfig::get('themes-path') . '/' . trim($clean_path_file));
+            $path_file = realpath(\XoopsBaseConfig::get('themes-path').'/'.trim($clean_path_file));
             $path_file = str_replace('\\', '/', $path_file);
             $pathInfo = pathinfo($path_file);
             if (!in_array($pathInfo['extension'], array('css', 'html', 'tpl'))) {
                 $xoops->redirect("admin.php?fct=tplsets", 2, XoopsLocale::E_NOT_DONE);
             }
             // copy file
-            $copy_file = $path_file . '.back';
+            $copy_file = $path_file.'.back';
             copy($path_file, $copy_file);
             // Save modif
             if (isset($_REQUEST['templates'])) {

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

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