Passed
Pull Request — master (#610)
by Richard
14:27
created
htdocs/modules/system/admin/groups/main.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         $xoops->theme()->addScript('modules/system/js/admin.js');
56 56
         // Define Breadcrumb and tips
57 57
         $admin_page = new \Xoops\Module\Admin();
58
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
58
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
59 59
         $admin_page->addBreadcrumbLink(SystemLocale::GROUPS_MANAGER, $system->adminVersion('groups', 'adminpath'));
60 60
         $admin_page->addBreadcrumbLink(XoopsLocale::MAIN);
61 61
         $admin_page->addItemButton(SystemLocale::ADD_NEW_GROUP, 'admin.php?fct=groups&op=groups_add', 'add');
@@ -90,15 +90,15 @@  discard block
 block discarded – undo
90 90
             } else {
91 91
                 $groups['nb_users_by_groups'] = '';
92 92
             }
93
-            $edit_delete = '<a href="admin.php?fct=groups&amp;op=groups_edit&amp;groups_id=' . $groups_id . '">'
94
-                . '<img src="./images/icons/edit.png" border="0" alt="' . SystemLocale::EDIT_GROUP
95
-                . '" title="' . SystemLocale::EDIT_GROUP . '"></a>';
93
+            $edit_delete = '<a href="admin.php?fct=groups&amp;op=groups_edit&amp;groups_id='.$groups_id.'">'
94
+                . '<img src="./images/icons/edit.png" border="0" alt="'.SystemLocale::EDIT_GROUP
95
+                . '" title="'.SystemLocale::EDIT_GROUP.'"></a>';
96 96
             if (!in_array($group->getVar("groupid"), array(FixedGroups::ADMIN, FixedGroups::USERS, FixedGroups::ANONYMOUS, FixedGroups::REMOVED))
97 97
             ) {
98 98
                 $groups['delete'] = 1;
99
-                $edit_delete .= '<a href="admin.php?fct=groups&amp;op=groups_delete&amp;groups_id=' . $groups_id . '">'
100
-                    . '<img src="./images/icons/delete.png" border="0" alt="' . SystemLocale::DELETE_GROUP
101
-                    . '" title="' . SystemLocale::DELETE_GROUP . '"></a>';
99
+                $edit_delete .= '<a href="admin.php?fct=groups&amp;op=groups_delete&amp;groups_id='.$groups_id.'">'
100
+                    . '<img src="./images/icons/delete.png" border="0" alt="'.SystemLocale::DELETE_GROUP
101
+                    . '" title="'.SystemLocale::DELETE_GROUP.'"></a>';
102 102
             }
103 103
             $groups['edit_delete'] = $edit_delete;
104 104
             $xoops->tpl()->appendByRef('groups', $groups);
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
118 118
         // Define Breadcrumb and tips
119 119
         $admin_page = new \Xoops\Module\Admin();
120
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
120
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
121 121
         $admin_page->addBreadcrumbLink(SystemLocale::GROUPS_MANAGER, $system->adminVersion('groups', 'adminpath'));
122 122
         $admin_page->addBreadcrumbLink(SystemLocale::ADD_NEW_GROUP);
123 123
         $admin_page->addTips(SystemLocale::GROUPS_TIPS_2);
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
137 137
         // Define Breadcrumb and tips
138 138
         $admin_page = new \Xoops\Module\Admin();
139
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
139
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
140 140
         $admin_page->addBreadcrumbLink(SystemLocale::GROUPS_MANAGER, $system->adminVersion('groups', 'adminpath'));
141 141
         $admin_page->addBreadcrumbLink(SystemLocale::EDIT_GROUP);
142 142
         $admin_page->addTips(SystemLocale::GROUPS_TIPS_2);
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
     case 'groups_delete':
310 310
         // Define Breadcrumb and tips
311 311
         $admin_page = new \Xoops\Module\Admin();
312
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
312
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
313 313
         $admin_page->addBreadcrumbLink(SystemLocale::GROUPS_MANAGER, $system->adminVersion('groups', 'adminpath'));
314 314
         $admin_page->addBreadcrumbLink(SystemLocale::DELETE_GROUP);
315 315
         $admin_page->renderBreadcrumb();
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
                 $xoops->theme()->addStylesheet('modules/system/css/admin.css');
341 341
                 // Define Breadcrumb and tips
342 342
                 $system_breadcrumb->addLink(SystemLocale::DELETE_GROUP);
343
-                $system_breadcrumb->addHelp(system_adminVersion('groups', 'help') . '#edit');
343
+                $system_breadcrumb->addHelp(system_adminVersion('groups', 'help').'#edit');
344 344
                 $system_breadcrumb->render();
345 345
                 // Display message
346 346
                 echo $xoops->confirm(
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
                         "op" => "groups_delete"
351 351
                     ),
352 352
                     'admin.php?fct=groups',
353
-                    SystemLocale::Q_ARE_YOU_SURE_DELETE_THIS_GROUP . '<br />' . $obj->getVar("name") . '<br />'
353
+                    SystemLocale::Q_ARE_YOU_SURE_DELETE_THIS_GROUP.'<br />'.$obj->getVar("name").'<br />'
354 354
                 );
355 355
             }
356 356
         } else {
Please login to merge, or discard this patch.
htdocs/modules/system/admin/blocksadmin/main.php 2 patches
Switch Indentation   +376 added lines, -376 removed lines patch added patch discarded remove patch
@@ -71,260 +71,260 @@  discard block
 block discarded – undo
71 71
 
72 72
 switch ($op) {
73 73
 
74
-    case 'list':
75
-        // Call Header
76
-        $xoops->header('admin:system/system_blocks.tpl');
77
-        // Define Stylesheet
78
-        $xoops->theme()->addStylesheet('modules/system/css/admin.css');
79
-        // Define scripts
80
-        $xoops->theme()->addScript('modules/system/js/admin.js');
81
-        $xoops->theme()->addScript('modules/system/js/blocks.js');
82
-        // Define Breadcrumb and tips
83
-        $admin_page = new \Xoops\Module\Admin();
84
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
85
-        $admin_page->addBreadcrumbLink(
86
-            SystemLocale::BLOCKS_ADMINISTRATION,
87
-            $system->adminVersion('blocksadmin', 'adminpath')
88
-        );
89
-        $admin_page->addBreadcrumbLink(SystemLocale::MANAGE_BLOCKS);
90
-        $admin_page->renderBreadcrumb();
91
-        $admin_page->addItemButton(SystemLocale::ADD_BLOCK, 'admin.php?fct=blocksadmin&amp;op=add', 'add');
92
-        $admin_page->renderButton();
93
-        $admin_page->addTips(sprintf(
94
-            SystemLocale::BLOCKS_TIPS,
95
-            system_AdminIcons('block.png'),
96
-            system_AdminIcons('success.png'),
97
-            system_AdminIcons('cancel.png'),
98
-            SystemLocale::DRAG_OR_SORT_BLOCK,
99
-            SystemLocale::DISPLAY_BLOCK,
100
-            SystemLocale::HIDE_BLOCK
101
-        ));
102
-        $admin_page->renderTips();
103
-        // Initialize module handler
104
-        $module_handler = $xoops->getHandlerModule();
105
-        $modules = $module_handler->getObjects(null, true);
106
-        $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
107
-
108
-        $criteria->add(new Criteria('isactive', 1));
109
-        // Modules for blocks to be visible in
110
-        $display_list = $module_handler->getNameList($criteria);
111
-        unset($criteria);
112
-        // Initialize blocks handler
113
-        $block_handler = $xoops->getHandlerBlock();
114
-        $modules = $xoops->getHandlerModule()->getObjects(null, true);
115
-
116
-        $filterform = new Xoops\Form\ThemeForm('', 'filterform', 'admin.php', 'get');
117
-        $filterform->addElement(new Xoops\Form\Hidden('fct', 'blocksadmin'));
118
-        $filterform->addElement(new Xoops\Form\Hidden('op', 'list'));
119
-        $filterform->addElement(new Xoops\Form\Hidden('filter', 1));
120
-        $sel_gen = new Xoops\Form\Select(XoopsLocale::MODULES, 'selgen', $selgen);
121
-        $sel_gen->setExtra("onchange='submit()'");
122
-        $sel_gen->addOption(-1, XoopsLocale::ALL_TYPES);
123
-        $sel_gen->addOption(0, SystemLocale::CUSTOM_BLOCK);
124
-        /* @var $list XoopsModule */
125
-        foreach ($modules as $list) {
126
-            $sel_gen->addOption($list->getVar('mid'), $list->getVar('name'));
127
-        }
128
-        $filterform->addElement($sel_gen);
129
-
130
-        $sel_mod = new Xoops\Form\Select(XoopsLocale::PAGE, 'selmod', $selmod);
131
-        $sel_mod->setExtra("onchange='submit()'");
132
-        ksort($display_list);
133
-        $display_list_spec[0] = XoopsLocale::ALL_PAGES;
134
-        $display_list_spec[-1] = XoopsLocale::TOP_PAGE;
135
-        $display_list_spec[-2] = XoopsLocale::ALL_TYPES;
136
-        $display_list = $display_list_spec + $display_list;
137
-        foreach ($display_list as $k => $v) {
138
-            $sel_mod->addOption($k, $v);
139
-        }
140
-        $filterform->addElement($sel_mod);
141
-
142
-        // For selection of group access
143
-        $sel_grp = new Xoops\Form\Select(XoopsLocale::GROUPS, 'selgrp', $selgrp);
144
-        $sel_grp->setExtra("onchange='submit()'");
145
-        $member_handler = $xoops->getHandlerMember();
146
-        $group_list = $member_handler->getGroupList();
147
-        $sel_grp->addOption(-1, XoopsLocale::ALL_TYPES);
148
-        $sel_grp->addOption(0, XoopsLocale::UNASSIGNED);
149
-        foreach ($group_list as $k => $v) {
150
-            $sel_grp->addOption($k, $v);
151
-        }
152
-        $filterform->addElement($sel_grp);
153
-
154
-        $sel_vis = new Xoops\Form\Select(XoopsLocale::VISIBLE, 'selvis', $selvis);
155
-        $sel_vis->setExtra("onchange='submit()'");
156
-        $sel_vis->addOption(-1, XoopsLocale::ALL_TYPES);
157
-        $sel_vis->addOption(0, XoopsLocale::NO);
158
-        $sel_vis->addOption(1, XoopsLocale::YES);
159
-
160
-        $filterform->addElement($sel_vis);
161
-
162
-        $filterform->assign($xoops->tpl());
163
-
164
-        /* Get blocks */
165
-        $selvis = ($selvis == -1) ? null : $selvis;
166
-        $selmod = ($selmod == -2) ? null : $selmod;
167
-        $order_block = (isset($selvis) ? "" : "b.visible DESC, ") . "b.side,b.weight,b.bid";
168
-
169
-        if ($selgrp == 0) {
170
-            // get blocks that are not assigned to any groups
171
-            $blocks_arr = $block_handler->getNonGroupedBlocks($selmod, $toponlyblock = false, $selvis, $order_block);
172
-        } else {
173
-            $selgrp = ($selgrp == -1) ? null : $selgrp;
174
-            $blocks_arr = $block_handler->
175
-                getAllByGroupModule($selgrp, $selmod, $toponlyblock = false, $selvis, $order_block);
176
-        }
74
+        case 'list':
75
+            // Call Header
76
+            $xoops->header('admin:system/system_blocks.tpl');
77
+            // Define Stylesheet
78
+            $xoops->theme()->addStylesheet('modules/system/css/admin.css');
79
+            // Define scripts
80
+            $xoops->theme()->addScript('modules/system/js/admin.js');
81
+            $xoops->theme()->addScript('modules/system/js/blocks.js');
82
+            // Define Breadcrumb and tips
83
+            $admin_page = new \Xoops\Module\Admin();
84
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
85
+            $admin_page->addBreadcrumbLink(
86
+                SystemLocale::BLOCKS_ADMINISTRATION,
87
+                $system->adminVersion('blocksadmin', 'adminpath')
88
+            );
89
+            $admin_page->addBreadcrumbLink(SystemLocale::MANAGE_BLOCKS);
90
+            $admin_page->renderBreadcrumb();
91
+            $admin_page->addItemButton(SystemLocale::ADD_BLOCK, 'admin.php?fct=blocksadmin&amp;op=add', 'add');
92
+            $admin_page->renderButton();
93
+            $admin_page->addTips(sprintf(
94
+                SystemLocale::BLOCKS_TIPS,
95
+                system_AdminIcons('block.png'),
96
+                system_AdminIcons('success.png'),
97
+                system_AdminIcons('cancel.png'),
98
+                SystemLocale::DRAG_OR_SORT_BLOCK,
99
+                SystemLocale::DISPLAY_BLOCK,
100
+                SystemLocale::HIDE_BLOCK
101
+            ));
102
+            $admin_page->renderTips();
103
+            // Initialize module handler
104
+            $module_handler = $xoops->getHandlerModule();
105
+            $modules = $module_handler->getObjects(null, true);
106
+            $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
107
+
108
+            $criteria->add(new Criteria('isactive', 1));
109
+            // Modules for blocks to be visible in
110
+            $display_list = $module_handler->getNameList($criteria);
111
+            unset($criteria);
112
+            // Initialize blocks handler
113
+            $block_handler = $xoops->getHandlerBlock();
114
+            $modules = $xoops->getHandlerModule()->getObjects(null, true);
115
+
116
+            $filterform = new Xoops\Form\ThemeForm('', 'filterform', 'admin.php', 'get');
117
+            $filterform->addElement(new Xoops\Form\Hidden('fct', 'blocksadmin'));
118
+            $filterform->addElement(new Xoops\Form\Hidden('op', 'list'));
119
+            $filterform->addElement(new Xoops\Form\Hidden('filter', 1));
120
+            $sel_gen = new Xoops\Form\Select(XoopsLocale::MODULES, 'selgen', $selgen);
121
+            $sel_gen->setExtra("onchange='submit()'");
122
+            $sel_gen->addOption(-1, XoopsLocale::ALL_TYPES);
123
+            $sel_gen->addOption(0, SystemLocale::CUSTOM_BLOCK);
124
+            /* @var $list XoopsModule */
125
+            foreach ($modules as $list) {
126
+                $sel_gen->addOption($list->getVar('mid'), $list->getVar('name'));
127
+            }
128
+            $filterform->addElement($sel_gen);
129
+
130
+            $sel_mod = new Xoops\Form\Select(XoopsLocale::PAGE, 'selmod', $selmod);
131
+            $sel_mod->setExtra("onchange='submit()'");
132
+            ksort($display_list);
133
+            $display_list_spec[0] = XoopsLocale::ALL_PAGES;
134
+            $display_list_spec[-1] = XoopsLocale::TOP_PAGE;
135
+            $display_list_spec[-2] = XoopsLocale::ALL_TYPES;
136
+            $display_list = $display_list_spec + $display_list;
137
+            foreach ($display_list as $k => $v) {
138
+                $sel_mod->addOption($k, $v);
139
+            }
140
+            $filterform->addElement($sel_mod);
141
+
142
+            // For selection of group access
143
+            $sel_grp = new Xoops\Form\Select(XoopsLocale::GROUPS, 'selgrp', $selgrp);
144
+            $sel_grp->setExtra("onchange='submit()'");
145
+            $member_handler = $xoops->getHandlerMember();
146
+            $group_list = $member_handler->getGroupList();
147
+            $sel_grp->addOption(-1, XoopsLocale::ALL_TYPES);
148
+            $sel_grp->addOption(0, XoopsLocale::UNASSIGNED);
149
+            foreach ($group_list as $k => $v) {
150
+                $sel_grp->addOption($k, $v);
151
+            }
152
+            $filterform->addElement($sel_grp);
153
+
154
+            $sel_vis = new Xoops\Form\Select(XoopsLocale::VISIBLE, 'selvis', $selvis);
155
+            $sel_vis->setExtra("onchange='submit()'");
156
+            $sel_vis->addOption(-1, XoopsLocale::ALL_TYPES);
157
+            $sel_vis->addOption(0, XoopsLocale::NO);
158
+            $sel_vis->addOption(1, XoopsLocale::YES);
159
+
160
+            $filterform->addElement($sel_vis);
161
+
162
+            $filterform->assign($xoops->tpl());
163
+
164
+            /* Get blocks */
165
+            $selvis = ($selvis == -1) ? null : $selvis;
166
+            $selmod = ($selmod == -2) ? null : $selmod;
167
+            $order_block = (isset($selvis) ? "" : "b.visible DESC, ") . "b.side,b.weight,b.bid";
168
+
169
+            if ($selgrp == 0) {
170
+                // get blocks that are not assigned to any groups
171
+                $blocks_arr = $block_handler->getNonGroupedBlocks($selmod, $toponlyblock = false, $selvis, $order_block);
172
+            } else {
173
+                $selgrp = ($selgrp == -1) ? null : $selgrp;
174
+                $blocks_arr = $block_handler->
175
+                    getAllByGroupModule($selgrp, $selmod, $toponlyblock = false, $selvis, $order_block);
176
+            }
177 177
 
178
-        if ($selgen >= 0) {
179
-            foreach (array_keys($blocks_arr) as $bid) {
180
-                if ($blocks_arr[$bid]->getVar("mid") != $selgen) {
181
-                    unset($blocks_arr[$bid]);
178
+            if ($selgen >= 0) {
179
+                foreach (array_keys($blocks_arr) as $bid) {
180
+                    if ($blocks_arr[$bid]->getVar("mid") != $selgen) {
181
+                        unset($blocks_arr[$bid]);
182
+                    }
182 183
                 }
183 184
             }
184
-        }
185
-
186
-        $arr = array();
187
-        foreach (array_keys($blocks_arr) as $i) {
188
-            $arr[$i] = $blocks_arr[$i]->getValues();
189
-            $xoops->tpl()->appendByRef('blocks', $arr[$i]);
190
-        }
191
-        // Call Footer
192
-        $xoops->footer();
193
-        break;
194
-
195
-    case 'add':
196
-        // Call Header
197
-        $xoops->header('admin:system/system_blocks.tpl');
198
-        // Define Stylesheet
199
-        $xoops->theme()->addStylesheet('modules/system/css/admin.css');
200
-        // Define scripts
201
-        $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
202
-        $xoops->theme()->addScript('modules/system/js/admin.js');
203
-        $xoops->theme()->addScript('modules/system/js/blocks.js');
204
-        // Define Breadcrumb and tips
205
-        $admin_page = new \Xoops\Module\Admin();
206
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
207
-        $admin_page->addBreadcrumbLink(
208
-            SystemLocale::BLOCKS_ADMINISTRATION,
209
-            $system->adminVersion('blocksadmin', 'adminpath')
210
-        );
211
-        $admin_page->addBreadcrumbLink(SystemLocale::ADD_BLOCK);
212
-        $admin_page->renderBreadcrumb();
213
-        // Initialize blocks handler
214
-        $block_handler = $xoops->getHandlerBlock();
215
-        $block = $block_handler->create();
216
-        $form = $xoops->getModuleForm($block, 'block');
217
-        $form->getForm();
218
-        $form->display();
219
-        // Call Footer
220
-        $xoops->footer();
221
-        break;
222 185
 
223
-    case 'display':
224
-        // Initialize blocks handler
225
-        $block_handler = $xoops->getHandlerBlock();
226
-        // Get variable
227
-        $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
228
-        $visible = $system->cleanVars($_POST, 'visible', 0, 'int');
229
-        if ($block_id > 0) {
230
-            $block = $block_handler->get($block_id);
231
-            $block->setVar('visible', $visible);
232
-            if (!$block_handler->insertBlock($block)) {
233
-                $error = true;
186
+            $arr = array();
187
+            foreach (array_keys($blocks_arr) as $i) {
188
+                $arr[$i] = $blocks_arr[$i]->getValues();
189
+                $xoops->tpl()->appendByRef('blocks', $arr[$i]);
234 190
             }
235
-        }
236
-        break;
191
+            // Call Footer
192
+            $xoops->footer();
193
+            break;
237 194
 
238
-    case 'drag':
239
-        // Initialize blocks handler
240
-        $block_handler = $xoops->getHandlerBlock();
241
-        // Get variable
242
-        $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
243
-        $side = $system->cleanVars($_POST, 'side', 0, 'int');
244
-        if ($block_id > 0) {
245
-            $block = $block_handler->get($block_id);
246
-            $block->setVar('side', $side);
247
-            if (!$block_handler->insertBlock($block)) {
248
-                $error = true;
195
+        case 'add':
196
+            // Call Header
197
+            $xoops->header('admin:system/system_blocks.tpl');
198
+            // Define Stylesheet
199
+            $xoops->theme()->addStylesheet('modules/system/css/admin.css');
200
+            // Define scripts
201
+            $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
202
+            $xoops->theme()->addScript('modules/system/js/admin.js');
203
+            $xoops->theme()->addScript('modules/system/js/blocks.js');
204
+            // Define Breadcrumb and tips
205
+            $admin_page = new \Xoops\Module\Admin();
206
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
207
+            $admin_page->addBreadcrumbLink(
208
+                SystemLocale::BLOCKS_ADMINISTRATION,
209
+                $system->adminVersion('blocksadmin', 'adminpath')
210
+            );
211
+            $admin_page->addBreadcrumbLink(SystemLocale::ADD_BLOCK);
212
+            $admin_page->renderBreadcrumb();
213
+            // Initialize blocks handler
214
+            $block_handler = $xoops->getHandlerBlock();
215
+            $block = $block_handler->create();
216
+            $form = $xoops->getModuleForm($block, 'block');
217
+            $form->getForm();
218
+            $form->display();
219
+            // Call Footer
220
+            $xoops->footer();
221
+            break;
222
+
223
+        case 'display':
224
+            // Initialize blocks handler
225
+            $block_handler = $xoops->getHandlerBlock();
226
+            // Get variable
227
+            $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
228
+            $visible = $system->cleanVars($_POST, 'visible', 0, 'int');
229
+            if ($block_id > 0) {
230
+                $block = $block_handler->get($block_id);
231
+                $block->setVar('visible', $visible);
232
+                if (!$block_handler->insertBlock($block)) {
233
+                    $error = true;
234
+                }
249 235
             }
250
-        }
251
-        break;
252
-
253
-    case 'order':
254
-        // Initialize blocks handler
255
-        $block_handler = $xoops->getHandlerBlock();
256
-        if (isset($_POST['blk'])) {
257
-            $i = 0;
258
-            foreach ($_POST['blk'] as $order) {
259
-                if ($order > 0) {
260
-                    $block = $block_handler->get($order);
261
-                    $block->setVar('weight', $i);
262
-                    if (!$block_handler->insertBlock($block)) {
263
-                        $error = true;
236
+            break;
237
+
238
+        case 'drag':
239
+            // Initialize blocks handler
240
+            $block_handler = $xoops->getHandlerBlock();
241
+            // Get variable
242
+            $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
243
+            $side = $system->cleanVars($_POST, 'side', 0, 'int');
244
+            if ($block_id > 0) {
245
+                $block = $block_handler->get($block_id);
246
+                $block->setVar('side', $side);
247
+                if (!$block_handler->insertBlock($block)) {
248
+                    $error = true;
249
+                }
250
+            }
251
+            break;
252
+
253
+        case 'order':
254
+            // Initialize blocks handler
255
+            $block_handler = $xoops->getHandlerBlock();
256
+            if (isset($_POST['blk'])) {
257
+                $i = 0;
258
+                foreach ($_POST['blk'] as $order) {
259
+                    if ($order > 0) {
260
+                        $block = $block_handler->get($order);
261
+                        $block->setVar('weight', $i);
262
+                        if (!$block_handler->insertBlock($block)) {
263
+                            $error = true;
264
+                        }
265
+                        ++$i;
264 266
                     }
265
-                    ++$i;
266 267
                 }
267 268
             }
268
-        }
269
-        exit;
270
-        break;
269
+            exit;
270
+            break;
271 271
 
272
-    case 'preview':
273
-        if (!$xoops->security()->check()) {
274
-            $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
275
-            exit();
276
-        }
277
-        // Initialize blocks handler
278
-        $block_handler = $xoops->getHandlerBlock();
279
-        /* @var $block XoopsBlock */
280
-        $block = $block_handler->create();
281
-        $block->setVars($_POST);
282
-        $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
283
-        $block->setVar('content', $content);
284
-        $myts = \Xoops\Core\Text\Sanitizer::getInstance();
285
-        echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's')
286
-            . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
287
-        break;
288
-
289
-    case 'save':
290
-        if (!$xoops->security()->check()) {
291
-            $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
292
-            exit();
293
-        }
294
-        // Initialize blocks handler
295
-        $block_handler = $xoops->getHandlerBlock();
296
-        // Get avatar id
297
-        $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
298
-        if ($block_id > 0) {
299
-            $block = $block_handler->get($block_id);
300
-        } else {
272
+        case 'preview':
273
+            if (!$xoops->security()->check()) {
274
+                $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
275
+                exit();
276
+            }
277
+            // Initialize blocks handler
278
+            $block_handler = $xoops->getHandlerBlock();
279
+            /* @var $block XoopsBlock */
301 280
             $block = $block_handler->create();
302
-        }
303
-        $block_type = $system->cleanVars($_POST, 'block_type', '', 'string');
304
-        $block->setVar('block_type', $block_type);
305
-
306
-        if (!$block->isCustom()) {
307 281
             $block->setVars($_POST);
308
-            $type = $block->getVar('block_type');
309
-            $name = $block->getVar('name');
310
-            // Save block options
311
-            $options = $_POST['options'];
312
-            if (isset($options)) {
313
-                $options_count = count($options);
314
-                if ($options_count > 0) {
315
-                    //Convert array values to comma-separated
316
-                    for ($i = 0; $i < $options_count; ++$i) {
317
-                        if (is_array($options[$i])) {
318
-                            $options[$i] = implode(',', $options[$i]);
282
+            $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
283
+            $block->setVar('content', $content);
284
+            $myts = \Xoops\Core\Text\Sanitizer::getInstance();
285
+            echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's')
286
+                . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
287
+            break;
288
+
289
+        case 'save':
290
+            if (!$xoops->security()->check()) {
291
+                $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
292
+                exit();
293
+            }
294
+            // Initialize blocks handler
295
+            $block_handler = $xoops->getHandlerBlock();
296
+            // Get avatar id
297
+            $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
298
+            if ($block_id > 0) {
299
+                $block = $block_handler->get($block_id);
300
+            } else {
301
+                $block = $block_handler->create();
302
+            }
303
+            $block_type = $system->cleanVars($_POST, 'block_type', '', 'string');
304
+            $block->setVar('block_type', $block_type);
305
+
306
+            if (!$block->isCustom()) {
307
+                $block->setVars($_POST);
308
+                $type = $block->getVar('block_type');
309
+                $name = $block->getVar('name');
310
+                // Save block options
311
+                $options = $_POST['options'];
312
+                if (isset($options)) {
313
+                    $options_count = count($options);
314
+                    if ($options_count > 0) {
315
+                        //Convert array values to comma-separated
316
+                        for ($i = 0; $i < $options_count; ++$i) {
317
+                            if (is_array($options[$i])) {
318
+                                $options[$i] = implode(',', $options[$i]);
319
+                            }
319 320
                         }
321
+                        $options = implode('|', $options);
322
+                        $block->setVar('options', $options);
320 323
                     }
321
-                    $options = implode('|', $options);
322
-                    $block->setVar('options', $options);
323 324
                 }
324
-            }
325
-        } else {
326
-            $block->setVars($_POST);
327
-            switch ($block->getVar('c_type')) {
325
+            } else {
326
+                $block->setVars($_POST);
327
+                switch ($block->getVar('c_type')) {
328 328
                 case 'H':
329 329
                     $name = SystemLocale::CUSTOM_BLOCK_HTML;
330 330
                     break;
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
                 default:
338 338
                     $name = SystemLocale::CUSTOM_BLOCK_AUTO_FORMAT;
339 339
                     break;
340
-            }
340
+                }
341 341
         }
342 342
         $block->setVar('name', $name);
343 343
         $block->setVar('isactive', 1);
@@ -395,18 +395,44 @@  discard block
 block discarded – undo
395 395
         $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
396 396
         break;
397 397
 
398
-    case 'edit':
399
-        // Initialize blocks handler
400
-        $block_handler = $xoops->getHandlerBlock();
401
-        // Get avatar id
402
-        $block_id = $system->cleanVars($_REQUEST, 'bid', 0, 'int');
403
-        if ($block_id > 0) {
398
+        case 'edit':
399
+            // Initialize blocks handler
400
+            $block_handler = $xoops->getHandlerBlock();
401
+            // Get avatar id
402
+            $block_id = $system->cleanVars($_REQUEST, 'bid', 0, 'int');
403
+            if ($block_id > 0) {
404
+                // Call Header
405
+                $xoops->header('admin:system/system_blocks.tpl');
406
+                // Define Stylesheet
407
+                $xoops->theme()->addStylesheet('modules/system/css/admin.css');
408
+                $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
409
+                $xoops->theme()->addScript('modules/system/js/admin.js');
410
+                // Define Breadcrumb and tips
411
+                $admin_page = new \Xoops\Module\Admin();
412
+                $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
413
+                $admin_page->addBreadcrumbLink(
414
+                    SystemLocale::BLOCKS_ADMINISTRATION,
415
+                    $system->adminVersion('blocksadmin', 'adminpath')
416
+                );
417
+                $admin_page->addBreadcrumbLink(SystemLocale::EDIT_BLOCK);
418
+                $admin_page->renderBreadcrumb();
419
+                $block = $block_handler->get($block_id);
420
+                /* @var $form SystemBlockForm */
421
+                $form = $xoops->getModuleForm($block, 'block');
422
+                $form->getForm();
423
+                $form->display();
424
+                // Call Footer
425
+                $xoops->footer();
426
+            } else {
427
+                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
428
+            }
429
+            break;
430
+
431
+        case 'delete':
404 432
             // Call Header
405 433
             $xoops->header('admin:system/system_blocks.tpl');
406 434
             // Define Stylesheet
407 435
             $xoops->theme()->addStylesheet('modules/system/css/admin.css');
408
-            $xoops->theme()->addScript('media/jquery/plugins/jquery.form.js');
409
-            $xoops->theme()->addScript('modules/system/js/admin.js');
410 436
             // Define Breadcrumb and tips
411 437
             $admin_page = new \Xoops\Module\Admin();
412 438
             $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
@@ -414,141 +440,115 @@  discard block
 block discarded – undo
414 440
                 SystemLocale::BLOCKS_ADMINISTRATION,
415 441
                 $system->adminVersion('blocksadmin', 'adminpath')
416 442
             );
417
-            $admin_page->addBreadcrumbLink(SystemLocale::EDIT_BLOCK);
443
+            $admin_page->addBreadcrumbLink(SystemLocale::DELETE_BLOCK);
418 444
             $admin_page->renderBreadcrumb();
419
-            $block = $block_handler->get($block_id);
420
-            /* @var $form SystemBlockForm */
421
-            $form = $xoops->getModuleForm($block, 'block');
422
-            $form->getForm();
423
-            $form->display();
424
-            // Call Footer
425
-            $xoops->footer();
426
-        } else {
427
-            $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
428
-        }
429
-        break;
430
-
431
-    case 'delete':
432
-        // Call Header
433
-        $xoops->header('admin:system/system_blocks.tpl');
434
-        // Define Stylesheet
435
-        $xoops->theme()->addStylesheet('modules/system/css/admin.css');
436
-        // Define Breadcrumb and tips
437
-        $admin_page = new \Xoops\Module\Admin();
438
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
439
-        $admin_page->addBreadcrumbLink(
440
-            SystemLocale::BLOCKS_ADMINISTRATION,
441
-            $system->adminVersion('blocksadmin', 'adminpath')
442
-        );
443
-        $admin_page->addBreadcrumbLink(SystemLocale::DELETE_BLOCK);
444
-        $admin_page->renderBreadcrumb();
445
-        // Initialize blocks handler
446
-        $block_handler = $xoops->getHandlerBlock();
447
-        // Get avatar id
448
-        $block_id = $system->cleanVars($_REQUEST, 'bid', 0, 'int');
449
-        if ($block_id > 0) {
450
-            $block = $block_handler->get($block_id);
451
-            if ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_SYSTEM) {
452
-                $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_SYSTEM_BLOCKS_CANNOT_BE_DELETED);
453
-                exit();
454
-            } elseif ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_MODULE) {
455
-                // Fix for duplicated blocks created in 2.0.9 module update
456
-                // A module block can be deleted if there is more than 1 that
457
-                // has the same func_num/show_func which is mostly likely
458
-                // be the one that was duplicated in 2.0.9
459
-                if (1 >= $count = $block_handler->countSimilarBlocks(
460
-                    $block->getVar('mid'),
461
-                    $block->getVar('func_num'),
462
-                    $block->getVar('show_func')
463
-                )) {
464
-                    $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_THIS_BLOCK_CANNOT_BE_DELETED);
445
+            // Initialize blocks handler
446
+            $block_handler = $xoops->getHandlerBlock();
447
+            // Get avatar id
448
+            $block_id = $system->cleanVars($_REQUEST, 'bid', 0, 'int');
449
+            if ($block_id > 0) {
450
+                $block = $block_handler->get($block_id);
451
+                if ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_SYSTEM) {
452
+                    $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_SYSTEM_BLOCKS_CANNOT_BE_DELETED);
465 453
                     exit();
454
+                } elseif ($block->getVar('block_type') === XoopsBlock::BLOCK_TYPE_MODULE) {
455
+                    // Fix for duplicated blocks created in 2.0.9 module update
456
+                    // A module block can be deleted if there is more than 1 that
457
+                    // has the same func_num/show_func which is mostly likely
458
+                    // be the one that was duplicated in 2.0.9
459
+                    if (1 >= $count = $block_handler->countSimilarBlocks(
460
+                        $block->getVar('mid'),
461
+                        $block->getVar('func_num'),
462
+                        $block->getVar('show_func')
463
+                    )) {
464
+                        $xoops->redirect('admin.php?fct=blocksadmin', 4, SystemLocale::E_THIS_BLOCK_CANNOT_BE_DELETED);
465
+                        exit();
466
+                    }
466 467
                 }
468
+                // Call Header
469
+                $xoops->header('admin:system/system_header.tpl');
470
+                // Display Question
471
+                echo $xoops->confirm(array(
472
+                    'op'  => 'delete_ok',
473
+                    'fct' => 'blocksadmin',
474
+                    'bid' => $block->getVar('bid')
475
+                ), 'admin.php', sprintf(SystemLocale::QF_ARE_YOU_SURE_TO_DELETE_THIS_BLOCK, $block->getVar('title')));
476
+                // Call Footer
477
+                $xoops->footer();
467 478
             }
468
-            // Call Header
469
-            $xoops->header('admin:system/system_header.tpl');
470
-            // Display Question
471
-            echo $xoops->confirm(array(
472
-                'op'  => 'delete_ok',
473
-                'fct' => 'blocksadmin',
474
-                'bid' => $block->getVar('bid')
475
-            ), 'admin.php', sprintf(SystemLocale::QF_ARE_YOU_SURE_TO_DELETE_THIS_BLOCK, $block->getVar('title')));
476
-            // Call Footer
477
-            $xoops->footer();
478
-        }
479
-        break;
479
+            break;
480 480
 
481
-    case 'delete_ok':
482
-        if (!$xoops->security()->check()) {
483
-            $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
484
-            exit();
485
-        }
486
-        // Initialize blocks handler
487
-        $block_handler = $xoops->getHandlerBlock();
488
-        // Get avatar id
489
-        $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
490
-        if ($block_id > 0) {
491
-            $block = $block_handler->get($block_id);
492
-            if ($block_handler->deleteBlock($block)) {
493
-                // Delete Group link
494
-                $blockmodulelink_handler = $xoops->getHandlerBlockModuleLink();
495
-                $blockmodulelink =
496
-                    $blockmodulelink_handler->getObjects(new CriteriaCompo(new Criteria('block_id', $block_id)));
497
-                foreach ($blockmodulelink as $link) {
498
-                    $blockmodulelink_handler->delete($link, true);
499
-                }
500
-                // Delete Group permission
501
-                $groupperm_handler = $xoops->getHandlerGroupPermission();
502
-                $criteria = new CriteriaCompo(new Criteria('gperm_name', 'block_read'));
503
-                $criteria->add(new Criteria('gperm_itemid', $block_id));
504
-                $groupperm = $groupperm_handler->getObjects($criteria);
505
-                /* @var $perm XoopsGroupPerm */
506
-                foreach ($groupperm as $perm) {
507
-                    $groupperm_handler->delete($perm, true);
508
-                }
509
-                // Delete template
510
-                if ($block->getVar('template') != '') {
511
-                    $tplfile_handler = $xoops->getHandlerTplFile();
512
-                    $btemplate = $tplfile_handler->find($xoops->getConfig('template_set'), 'block', $block_id);
513
-                    if (count($btemplate) > 0) {
514
-                        $tplfile_handler->deleteTpl($btemplate[0]);
481
+        case 'delete_ok':
482
+            if (!$xoops->security()->check()) {
483
+                $xoops->redirect('admin.php?fct=blocksadmin', 3, implode('<br />', $xoops->security()->getErrors()));
484
+                exit();
485
+            }
486
+            // Initialize blocks handler
487
+            $block_handler = $xoops->getHandlerBlock();
488
+            // Get avatar id
489
+            $block_id = $system->cleanVars($_POST, 'bid', 0, 'int');
490
+            if ($block_id > 0) {
491
+                $block = $block_handler->get($block_id);
492
+                if ($block_handler->deleteBlock($block)) {
493
+                    // Delete Group link
494
+                    $blockmodulelink_handler = $xoops->getHandlerBlockModuleLink();
495
+                    $blockmodulelink =
496
+                        $blockmodulelink_handler->getObjects(new CriteriaCompo(new Criteria('block_id', $block_id)));
497
+                    foreach ($blockmodulelink as $link) {
498
+                        $blockmodulelink_handler->delete($link, true);
499
+                    }
500
+                    // Delete Group permission
501
+                    $groupperm_handler = $xoops->getHandlerGroupPermission();
502
+                    $criteria = new CriteriaCompo(new Criteria('gperm_name', 'block_read'));
503
+                    $criteria->add(new Criteria('gperm_itemid', $block_id));
504
+                    $groupperm = $groupperm_handler->getObjects($criteria);
505
+                    /* @var $perm XoopsGroupPerm */
506
+                    foreach ($groupperm as $perm) {
507
+                        $groupperm_handler->delete($perm, true);
508
+                    }
509
+                    // Delete template
510
+                    if ($block->getVar('template') != '') {
511
+                        $tplfile_handler = $xoops->getHandlerTplFile();
512
+                        $btemplate = $tplfile_handler->find($xoops->getConfig('template_set'), 'block', $block_id);
513
+                        if (count($btemplate) > 0) {
514
+                            $tplfile_handler->deleteTpl($btemplate[0]);
515
+                        }
515 516
                     }
517
+                    $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
516 518
                 }
517
-                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
519
+            } else {
520
+                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
518 521
             }
519
-        } else {
520
-            $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
521
-        }
522
-        break;
523
-
524
-    case 'clone':
525
-        // Initialize blocks handler
526
-        $block_handler = $xoops->getHandlerBlock();
527
-        // Get avatar id
528
-        $block_id = $system->cleanVars($_REQUEST, 'bid', 0, 'int');
529
-        if ($block_id > 0) {
530
-            // Call Header
531
-            $xoops->header('admin:system/system_blocks.tpl');
532
-            // Define Stylesheet
533
-            $xoops->theme()->addStylesheet('modules/system/css/admin.css');
534
-            // Define Breadcrumb and tips
535
-            $system_breadcrumb = new \Xoops\Module\Admin();
536
-            $system_breadcrumb->addBreadcrumbLink(
537
-                SystemLocale::BLOCKS_ADMINISTRATION,
538
-                system_adminVersion('blocksadmin', 'adminpath')
539
-            );
540
-            $system_breadcrumb->addBreadcrumbLink(SystemLocale::CLONE_BLOCK);
541
-            $system_breadcrumb->renderBreadcrumb();
542
-
543
-            $block = $block_handler->get($block_id);
544
-            /* @var $form SystemBlockForm */
545
-            $form = $xoops->getModuleForm($block, 'block');
546
-            $form->getForm('clone');
547
-            $form->display();
548
-            // Call Footer
549
-            $xoops->footer();
550
-        } else {
551
-            $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
552
-        }
553
-        break;
522
+            break;
523
+
524
+        case 'clone':
525
+            // Initialize blocks handler
526
+            $block_handler = $xoops->getHandlerBlock();
527
+            // Get avatar id
528
+            $block_id = $system->cleanVars($_REQUEST, 'bid', 0, 'int');
529
+            if ($block_id > 0) {
530
+                // Call Header
531
+                $xoops->header('admin:system/system_blocks.tpl');
532
+                // Define Stylesheet
533
+                $xoops->theme()->addStylesheet('modules/system/css/admin.css');
534
+                // Define Breadcrumb and tips
535
+                $system_breadcrumb = new \Xoops\Module\Admin();
536
+                $system_breadcrumb->addBreadcrumbLink(
537
+                    SystemLocale::BLOCKS_ADMINISTRATION,
538
+                    system_adminVersion('blocksadmin', 'adminpath')
539
+                );
540
+                $system_breadcrumb->addBreadcrumbLink(SystemLocale::CLONE_BLOCK);
541
+                $system_breadcrumb->renderBreadcrumb();
542
+
543
+                $block = $block_handler->get($block_id);
544
+                /* @var $form SystemBlockForm */
545
+                $form = $xoops->getModuleForm($block, 'block');
546
+                $form->getForm('clone');
547
+                $form->display();
548
+                // Call Footer
549
+                $xoops->footer();
550
+            } else {
551
+                $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
552
+            }
553
+            break;
554 554
 }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         $xoops->theme()->addScript('modules/system/js/blocks.js');
82 82
         // Define Breadcrumb and tips
83 83
         $admin_page = new \Xoops\Module\Admin();
84
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
84
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
85 85
         $admin_page->addBreadcrumbLink(
86 86
             SystemLocale::BLOCKS_ADMINISTRATION,
87 87
             $system->adminVersion('blocksadmin', 'adminpath')
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         /* Get blocks */
165 165
         $selvis = ($selvis == -1) ? null : $selvis;
166 166
         $selmod = ($selmod == -2) ? null : $selmod;
167
-        $order_block = (isset($selvis) ? "" : "b.visible DESC, ") . "b.side,b.weight,b.bid";
167
+        $order_block = (isset($selvis) ? "" : "b.visible DESC, ")."b.side,b.weight,b.bid";
168 168
 
169 169
         if ($selgrp == 0) {
170 170
             // get blocks that are not assigned to any groups
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
         $xoops->theme()->addScript('modules/system/js/blocks.js');
204 204
         // Define Breadcrumb and tips
205 205
         $admin_page = new \Xoops\Module\Admin();
206
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
206
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
207 207
         $admin_page->addBreadcrumbLink(
208 208
             SystemLocale::BLOCKS_ADMINISTRATION,
209 209
             $system->adminVersion('blocksadmin', 'adminpath')
@@ -282,8 +282,8 @@  discard block
 block discarded – undo
282 282
         $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
283 283
         $block->setVar('content', $content);
284 284
         $myts = \Xoops\Core\Text\Sanitizer::getInstance();
285
-        echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's')
286
-            . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
285
+        echo '<div id="xo-preview-dialog" title="'.$block->getVar('title', 's')
286
+            . '">'.$block->getContent('s', $block->getVar('c_type')).'</div>';
287 287
         break;
288 288
 
289 289
     case 'save':
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
             $xoops->theme()->addScript('modules/system/js/admin.js');
410 410
             // Define Breadcrumb and tips
411 411
             $admin_page = new \Xoops\Module\Admin();
412
-            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
412
+            $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
413 413
             $admin_page->addBreadcrumbLink(
414 414
                 SystemLocale::BLOCKS_ADMINISTRATION,
415 415
                 $system->adminVersion('blocksadmin', 'adminpath')
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
         $xoops->theme()->addStylesheet('modules/system/css/admin.css');
436 436
         // Define Breadcrumb and tips
437 437
         $admin_page = new \Xoops\Module\Admin();
438
-        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
438
+        $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
439 439
         $admin_page->addBreadcrumbLink(
440 440
             SystemLocale::BLOCKS_ADMINISTRATION,
441 441
             $system->adminVersion('blocksadmin', 'adminpath')
Please login to merge, or discard this patch.
htdocs/modules/system/themes/default/default.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
         $xoops->theme()->addBaseStylesheetAssets('@jqueryuicss');
50 50
         $xoops->theme()->addStylesheet('media/xoops/css/moduladmin.css');
51
-        $xoops->theme()->addStylesheet(\XoopsBaseConfig::get('adminthemes-url') . '/default/css/style.css');
51
+        $xoops->theme()->addStylesheet(\XoopsBaseConfig::get('adminthemes-url').'/default/css/style.css');
52 52
 
53 53
         // $xoops->theme()->addBaseScriptAssets('@jquery');
54 54
         // bootstrap has to come before jquery.ui or dialog close buttons are blank
@@ -56,15 +56,15 @@  discard block
 block discarded – undo
56 56
         $xoops->theme()->addBaseScriptAssets('@jqueryui');
57 57
         $xoops->theme()->addBaseScriptAssets('@jgrowl');
58 58
         // ddsmoothmenu
59
-        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url') . '/default/js/ddsmoothmenu.js');
60
-        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url') . '/default/js/tooltip.js');
59
+        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url').'/default/js/ddsmoothmenu.js');
60
+        $xoops->theme()->addScript(\XoopsBaseConfig::get('adminthemes-url').'/default/js/tooltip.js');
61 61
 
62 62
         $quick = array();
63
-        $quick[] = array('title' => SystemLocale::CONTROL_PANEL, 'link' => \XoopsBaseConfig::get('url') . '/admin.php');
63
+        $quick[] = array('title' => SystemLocale::CONTROL_PANEL, 'link' => \XoopsBaseConfig::get('url').'/admin.php');
64 64
         $quick[] = array('title' => XoopsLocale::HOME_PAGE, 'link' => \XoopsBaseConfig::get('url'));
65
-        $quick[] = array('title' => DefaultThemeLocale::XOOPS_NEWS, 'link' => \XoopsBaseConfig::get('url') . '/admin.php?xoopsorgnews=1');
65
+        $quick[] = array('title' => DefaultThemeLocale::XOOPS_NEWS, 'link' => \XoopsBaseConfig::get('url').'/admin.php?xoopsorgnews=1');
66 66
         $quick[] = array('title' => 'separator');
67
-        $quick[] = array('title' => XoopsLocale::A_LOGOUT, 'link' => \XoopsBaseConfig::get('url') . '/user.php?op=logout');
67
+        $quick[] = array('title' => XoopsLocale::A_LOGOUT, 'link' => \XoopsBaseConfig::get('url').'/user.php?op=logout');
68 68
         $xoops->tpl()->assign('quick_menu', $quick);
69 69
 
70 70
         XoopsLoad::load('module', 'system');
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
         $system_extension = new SystemExtension();
74 74
 
75 75
         $adminmenu = null;
76
-        include __DIR__ . '/menu.php';
76
+        include __DIR__.'/menu.php';
77 77
         if (!$xoops->isModule() || 'system' === $xoops->module->getVar('dirname', 'n')) {
78
-            $modpath = \XoopsBaseConfig::get('url') . '/admin.php';
78
+            $modpath = \XoopsBaseConfig::get('url').'/admin.php';
79 79
             $modname = DefaultThemeLocale::SYSTEM_OPTIONS;
80 80
             $modid = 1;
81 81
             $moddir = 'system';
@@ -83,31 +83,31 @@  discard block
 block discarded – undo
83 83
             $mod_options = $adminmenu;
84 84
             foreach (array_keys($mod_options) as $item) {
85 85
                 $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
86
-                    ? \XoopsBaseConfig::get('url') . '/modules/' . $moddir . '/' . $mod_options[$item]['link']
86
+                    ? \XoopsBaseConfig::get('url').'/modules/'.$moddir.'/'.$mod_options[$item]['link']
87 87
                     : $mod_options[$item]['link'];
88 88
                 $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
89
-                    : \XoopsBaseConfig::get('adminthemes-url') . '/default/' . $mod_options[$item]['icon'];
89
+                    : \XoopsBaseConfig::get('adminthemes-url').'/default/'.$mod_options[$item]['icon'];
90 90
                 unset($mod_options[$item]['icon_small']);
91 91
             }
92 92
 
93 93
         } else {
94 94
             $moddir = $xoops->module->getVar('dirname', 'n');
95
-            $modpath = \XoopsBaseConfig::get('url') . '/modules/' . $moddir;
95
+            $modpath = \XoopsBaseConfig::get('url').'/modules/'.$moddir;
96 96
             $modname = $xoops->module->getVar('name');
97 97
             $modid = $xoops->module->getVar('mid');
98 98
 
99 99
             $mod_options = $xoops->module->getAdminMenu();
100 100
             foreach (array_keys($mod_options) as $item) {
101 101
                 $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
102
-                    ? \XoopsBaseConfig::get('url') . "/modules/{$moddir}/" . $mod_options[$item]['link']
102
+                    ? \XoopsBaseConfig::get('url')."/modules/{$moddir}/".$mod_options[$item]['link']
103 103
                     : $mod_options[$item]['link'];
104
-                if ( XoopsLoad::fileExists($xoops->path('media/xoops/images/icons/32/' . $mod_options[$item]['icon']) ) ) {
105
-                    $mod_options[$item]['icon'] = $xoops->url('media/xoops/images/icons/32/' . $mod_options[$item]['icon']);
104
+                if (XoopsLoad::fileExists($xoops->path('media/xoops/images/icons/32/'.$mod_options[$item]['icon']))) {
105
+                    $mod_options[$item]['icon'] = $xoops->url('media/xoops/images/icons/32/'.$mod_options[$item]['icon']);
106 106
 
107
-                } elseif ( XoopsLoad::fileExists($xoops->path('modules/' . $xoops->module->dirname() . '/assets/icons/32/' . $mod_options[$item]['icon'])) ) {
108
-                    $mod_options[$item]['icon'] = $xoops->url('modules/' . $xoops->module->dirname() . '/assets/icons/32/' . $mod_options[$item]['icon']);
107
+                } elseif (XoopsLoad::fileExists($xoops->path('modules/'.$xoops->module->dirname().'/assets/icons/32/'.$mod_options[$item]['icon']))) {
108
+                    $mod_options[$item]['icon'] = $xoops->url('modules/'.$xoops->module->dirname().'/assets/icons/32/'.$mod_options[$item]['icon']);
109 109
                 } else {
110
-                    $mod_options[$item]['icon'] = $xoops->url("modules/" . $xoops->module->dirname() . "/icons/32/" . $mod_options[$item]['icon']);
110
+                    $mod_options[$item]['icon'] = $xoops->url("modules/".$xoops->module->dirname()."/icons/32/".$mod_options[$item]['icon']);
111 111
                 }
112 112
             }
113 113
             $xoops->tpl()->assign('modhasconfig', $xoops->module->getVar('hasconfig'));
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
         $xoops->tpl()->assign('extension_menu', $extension_list);
129 129
         unset($extension_list);
130 130
 
131
-        $extension_mod = $system_extension->getExtension( $moddir );
131
+        $extension_mod = $system_extension->getExtension($moddir);
132 132
         $xoops->tpl()->assign('extension_mod', $extension_mod);
133 133
 
134 134
         // add preferences menu
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
         $OPT = array();
138 138
 
139 139
         $menu[] = array(
140
-            'link' => \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=preferences', 'title' => XoopsLocale::PREFERENCES,
141
-            'absolute' => 1, 'url' => \XoopsBaseConfig::get('url') . '/modules/system/', 'options' => $OPT
140
+            'link' => \XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=preferences', 'title' => XoopsLocale::PREFERENCES,
141
+            'absolute' => 1, 'url' => \XoopsBaseConfig::get('url').'/modules/system/', 'options' => $OPT
142 142
         );
143 143
         $menu[] = array('title' => 'separator');
144 144
 
@@ -154,18 +154,18 @@  discard block
 block discarded – undo
154 154
                 $menu_handler = $xoops->getModuleHandler('menu', 'system');
155 155
                 // Define top navigation
156 156
                 if ($xoops->module->getVar('hasconfig')) {
157
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=" . $xoops->module->getVar('mid', 'e'), XoopsLocale::PREFERENCES);
157
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=".$xoops->module->getVar('mid', 'e'), XoopsLocale::PREFERENCES);
158 158
                 }
159 159
                 if ($xoops->module->getInfo('extension')) {
160
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=extensions&amp;op=update&amp;module=" . $xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
160
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=extensions&amp;op=update&amp;module=".$xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
161 161
                 } else {
162
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=" . $xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
162
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=".$xoops->module->getVar('dirname', 'e'), XoopsLocale::A_UPDATE);
163 163
                 }
164 164
                 if ($xoops->module->getInfo('blocks')) {
165
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/system/admin.php?fct=blocksadmin&amp;op=list&amp;filter=1&amp;selgen=" . $xoops->module->getVar('mid', 'e') . "&amp;selmod=-2&amp;selgrp=-1&amp;selvis=-1", XoopsLocale::BLOCKS);
165
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/system/admin.php?fct=blocksadmin&amp;op=list&amp;filter=1&amp;selgen=".$xoops->module->getVar('mid', 'e')."&amp;selmod=-2&amp;selgrp=-1&amp;selvis=-1", XoopsLocale::BLOCKS);
166 166
                 }
167 167
                 if ($xoops->module->getInfo('hasMain')) {
168
-                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'e') . "/", SystemLocale::GO_TO_MODULE);
168
+                    $menu_handler->addMenuTop(\XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'e')."/", SystemLocale::GO_TO_MODULE);
169 169
                 }
170 170
                 // Define main tab navigation
171 171
                 $i = 0;
@@ -174,14 +174,14 @@  discard block
 block discarded – undo
174 174
                     if (stripos($_SERVER['REQUEST_URI'], $menu['link']) !== false) {
175 175
                         $current = $i;
176 176
                     }
177
-                    $menu_handler->addMenuTabs( $xoops->url('modules/' . $xoops->module->getVar('dirname') . '/' . $menu['link']), $menu['title']);
177
+                    $menu_handler->addMenuTabs($xoops->url('modules/'.$xoops->module->getVar('dirname').'/'.$menu['link']), $menu['title']);
178 178
                     ++$i;
179 179
                 }
180 180
                 if ($xoops->module->getInfo('help')) {
181
-                    if (stripos($_SERVER['REQUEST_URI'], 'admin/' . $xoops->module->getInfo('help')) !== false) {
181
+                    if (stripos($_SERVER['REQUEST_URI'], 'admin/'.$xoops->module->getInfo('help')) !== false) {
182 182
                         $current = $i;
183 183
                     }
184
-                    $menu_handler->addMenuTabs('../../system/help.php?mid=' . $xoops->module->getVar('mid', 's') . '&amp;' . $xoops->module->getInfo('help'), XoopsLocale::HELP);
184
+                    $menu_handler->addMenuTabs('../../system/help.php?mid='.$xoops->module->getVar('mid', 's').'&amp;'.$xoops->module->getInfo('help'), XoopsLocale::HELP);
185 185
                 }
186 186
 
187 187
                 // Display navigation tabs
Please login to merge, or discard this patch.
htdocs/modules/system/themes/default/menu.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,16 +47,16 @@
 block discarded – undo
47 47
 $dirlist = XoopsLists::getDirListAsArray($admin_dir);
48 48
 $index = 0;
49 49
 foreach ($dirlist as $file) {
50
-    if (XoopsLoad::fileExists($admin_dir . '/' . $file . '/xoops_version.php')) {
51
-        include $admin_dir . '/' . $file . '/xoops_version.php';
50
+    if (XoopsLoad::fileExists($admin_dir.'/'.$file.'/xoops_version.php')) {
51
+        include $admin_dir.'/'.$file.'/xoops_version.php';
52 52
         if ($modversion['hasAdmin']) {
53
-            if ($xoops->getModuleConfig('active_' . $file, 'system')) {
53
+            if ($xoops->getModuleConfig('active_'.$file, 'system')) {
54 54
                 $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
55 55
                 if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
56 56
                     $adminmenu[$index]['title'] = trim($modversion['name']);
57 57
                     $adminmenu[$index]['desc'] = trim($modversion['description']);
58
-                    $adminmenu[$index]['link'] = 'admin.php?fct=' . $file;
59
-                    $adminmenu[$index]['icon'] = 'icons/' . $modversion['image'];
58
+                    $adminmenu[$index]['link'] = 'admin.php?fct='.$file;
59
+                    $adminmenu[$index]['icon'] = 'icons/'.$modversion['image'];
60 60
                 }
61 61
             }
62 62
         }
Please login to merge, or discard this patch.
htdocs/modules/system/xoops_version.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 $modversion['jquery'] = 1;
58 58
 
59 59
 // table definitions
60
-$modversion['schema']           = 'sql/schema.yml';
60
+$modversion['schema'] = 'sql/schema.yml';
61 61
 
62 62
 // Tables created by sql file or schema (without prefix!)
63 63
 $modversion['tables'] = array(
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
     'category'    => 'general',
355 355
     'formtype'    => 'textbox',
356 356
     'valuetype'   => 'text',
357
-    'default'     => 'xoops_user_' . dechex(time()),
357
+    'default'     => 'xoops_user_'.dechex(time()),
358 358
 );
359 359
 
360 360
 $modversion['config'][] = array(
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
     'category'    => 'general',
365 365
     'formtype'    => 'textbox',
366 366
     'valuetype'   => 'text',
367
-    'default'     => 'xoops_session_' . dechex(time()),
367
+    'default'     => 'xoops_session_'.dechex(time()),
368 368
 );
369 369
 
370 370
 $modversion['config'][] = array(
@@ -1052,7 +1052,7 @@  discard block
 block discarded – undo
1052 1052
     'default'     => 1,
1053 1053
 );
1054 1054
 
1055
-$icons                  = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/modules/system/images/icons');
1055
+$icons                  = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/modules/system/images/icons');
1056 1056
 $modversion['config'][] = array(
1057 1057
     'name'        => 'typeicons',
1058 1058
     'title'       => 'CONF_ICONS',
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
     'options'     => $icons,
1064 1064
 );
1065 1065
 
1066
-$breadcrumb             = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/modules/system/images/breadcrumb');
1066
+$breadcrumb             = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/modules/system/images/breadcrumb');
1067 1067
 $modversion['config'][] = array(
1068 1068
     'name'        => 'typebreadcrumb',
1069 1069
     'title'       => 'CONF_BREADCRUMB',
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
     'options'     => $breadcrumb,
1075 1075
 );
1076 1076
 
1077
-$jquery_theme           = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/media/jquery/ui/themes');
1077
+$jquery_theme           = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/media/jquery/ui/themes');
1078 1078
 $modversion['config'][] = array(
1079 1079
     'name'        => 'jquery_theme',
1080 1080
     'title'       => 'CONF_JQUERY_THEME',
Please login to merge, or discard this patch.
htdocs/modules/system/admin.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  */
24 24
 
25 25
 // Include header
26
-include __DIR__ . '/header.php';
26
+include __DIR__.'/header.php';
27 27
 
28 28
 // Get main instance
29 29
 $xoops = Xoops::getInstance();
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 if ($system->checkRight()) {
35 35
     if (isset($fct) && $fct != '') {
36 36
         $fct = preg_replace("/[^a-z0-9_\-]/i", "", $fct);
37
-        if (XoopsLoad::fileExists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/admin/' . $fct . '/xoops_version.php'))) {
37
+        if (XoopsLoad::fileExists($file = $xoops->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/admin/'.$fct.'/xoops_version.php'))) {
38 38
             // Load language file
39 39
             //system_loadLanguage($fct, $xoopsModule->getVar('dirname', 'n'));
40 40
             // Include Configuration file
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
             if ($category > 0) {
51 51
                 $group = $xoopsUser->getGroups();
52 52
                 if (in_array(FixedGroups::ADMIN, $group) || false != $sysperm_handler->checkRight('system_admin', $category, $group, $xoopsModule->getVar('mid'))) {
53
-                    if (XoopsLoad::fileExists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/admin/' . $fct . '/main.php'))) {
53
+                    if (XoopsLoad::fileExists($file = $xoops->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/admin/'.$fct.'/main.php'))) {
54 54
                         include_once $file;
55 55
                         unset($file);
56 56
                     } else {
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                     $error = true;
61 61
                 }
62 62
             } elseif ($fct === 'version') {
63
-                if (XoopsLoad::fileExists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/admin/version/main.php'))) {
63
+                if (XoopsLoad::fileExists($file = $xoops->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/admin/version/main.php'))) {
64 64
                     include_once $file;
65 65
                     unset($file);
66 66
                 } else {
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
84 84
         $part = $system->cleanVars($_REQUEST, 'type', '', 'string');
85 85
         $config_handler = $xoops->getHandlerConfig();
86 86
 
87
-        $criteria = new Criteria('conf_name', 'active_' . $part);
87
+        $criteria = new Criteria('conf_name', 'active_'.$part);
88 88
         $configs = $config_handler->getConfigs($criteria);
89 89
         foreach ($configs as $conf) {
90 90
             /* @var $conf XoopsConfigItem */
91
-            if ($conf->getVar('conf_name') == 'active_' . $part) {
91
+            if ($conf->getVar('conf_name') == 'active_'.$part) {
92 92
                 $conf->setVar('conf_value', !$conf->getVar('conf_value'));
93 93
                 $config_handler->insertConfig($conf);
94 94
             }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
     $xoops->theme()->addBaseScriptAssets('modules/system/js/admin.js');
105 105
     // Define Breadcrumb and tips
106 106
     $admin_page = new \Xoops\Module\Admin();
107
-    $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
107
+    $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
108 108
     $admin_page->addBreadcrumbLink(SystemLocale::SYSTEM_CONFIGURATION);
109 109
     $admin_page->renderBreadcrumb();
110 110
     $admin_page->addTips(SystemLocale::TIPS_MAIN);
@@ -118,16 +118,16 @@  discard block
 block discarded – undo
118 118
         $all_ok = true;
119 119
     }
120 120
 
121
-    $admin_dir = \XoopsBaseConfig::get('root-path') . '/modules/system/admin';
121
+    $admin_dir = \XoopsBaseConfig::get('root-path').'/modules/system/admin';
122 122
     $dirlist = XoopsLists::getDirListAsArray($admin_dir);
123 123
     $inactive_section = array('blocksadmin', 'groups', 'modulesadmin', 'preferences', 'tplsets', 'extensions', 'users', 'services');
124 124
     foreach ($dirlist as $directory) {
125
-        if (XoopsLoad::fileExists($file = $admin_dir . '/' . $directory . '/xoops_version.php')) {
125
+        if (XoopsLoad::fileExists($file = $admin_dir.'/'.$directory.'/xoops_version.php')) {
126 126
             require $file;
127 127
             unset($file);
128 128
 
129 129
             if ($modversion['hasAdmin']) {
130
-                if ($xoops->getModuleConfig('active_' . $directory)) {
130
+                if ($xoops->getModuleConfig('active_'.$directory)) {
131 131
                     $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
132 132
                     if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
133 133
                         $menu['file'] = $directory;
Please login to merge, or discard this patch.
htdocs/modules/system/preloads/preload.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
             && $xoops->getConfig('redirect_message_ajax')
33 33
         ) {
34 34
             $_SESSION['redirect_message'] = $args[2];
35
-            header("Location: " . preg_replace("/[&]amp;/i", '&', $url));
35
+            header("Location: ".preg_replace("/[&]amp;/i", '&', $url));
36 36
             exit();
37 37
         }
38 38
     }
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
             $xoops->theme()->addScript('', array('type' => 'text/javascript'), '
58 58
             (function($){
59 59
                 $(document).ready(function(){
60
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
60
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
61 61
             });
62 62
             })(jQuery);
63 63
             ');
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             $xoops->theme()->addScript('', array('type' => 'text/javascript'), '
76 76
             (function($){
77 77
             $(document).ready(function(){
78
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
78
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
79 79
             });
80 80
             })(jQuery);
81 81
             ');
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     public static function eventCoreServiceLocateCountryflag(Provider $provider)
94 94
     {
95 95
         if (is_a($provider, '\Xoops\Core\Service\Provider')) {
96
-            $path = dirname(__DIR__) . '/class/CountryFlagProvider.php';
96
+            $path = dirname(__DIR__).'/class/CountryFlagProvider.php';
97 97
             require $path;
98 98
             $object = new CountryFlagProvider();
99 99
             $provider->register($object);
Please login to merge, or discard this patch.
htdocs/modules/system/include/functions.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
         return false;
79 79
     }
80 80
     $language = empty($language) ? $xoops->getConfig('language') : $language;
81
-    $path = 'modules/' . $domain . '/language/';
82
-    if (XoopsLoad::fileExists($file = $xoops->path($path . $language . '/admin/' . $name . '.php'))) {
81
+    $path = 'modules/'.$domain.'/language/';
82
+    if (XoopsLoad::fileExists($file = $xoops->path($path.$language.'/admin/'.$name.'.php'))) {
83 83
         $ret = include_once $file;
84 84
     } else {
85
-        $ret = include_once $xoops->path($path . 'english/admin/' . $name . '.php');
85
+        $ret = include_once $xoops->path($path.'english/admin/'.$name.'.php');
86 86
     }
87 87
     return $ret;
88 88
 }
@@ -95,16 +95,16 @@  discard block
 block discarded – undo
95 95
 function system_adminVersion($version, $value = '')
96 96
 {
97 97
     static $tblVersion = array();
98
-    if (is_array($tblVersion) && array_key_exists($version . '.' . $value, $tblVersion)) {
99
-        return $tblVersion[$version . '.' . $value];
98
+    if (is_array($tblVersion) && array_key_exists($version.'.'.$value, $tblVersion)) {
99
+        return $tblVersion[$version.'.'.$value];
100 100
     }
101 101
     $xoops = Xoops::getInstance();
102
-    $path = $xoops->path('modules/system/admin/' . $version . '/xoops_version.php');
102
+    $path = $xoops->path('modules/system/admin/'.$version.'/xoops_version.php');
103 103
     if (XoopsLoad::fileExists($path)) {
104 104
         $modversion = array();
105 105
         include $path;
106 106
         $retvalue = $modversion[$value];
107
-        $tblVersion[$version . '.' . $value] = $retvalue;
107
+        $tblVersion[$version.'.'.$value] = $retvalue;
108 108
         return $retvalue;
109 109
     }
110 110
     return '';
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
     $xoops = Xoops::getInstance();
120 120
     $style = 'default';
121 121
 
122
-    $url = $xoops->url('modules/system/images/icons/' . $style . '/' . $img);
122
+    $url = $xoops->url('modules/system/images/icons/'.$style.'/'.$img);
123 123
     return $url;
124 124
 }
125 125
 
@@ -131,11 +131,11 @@  discard block
 block discarded – undo
131 131
 {
132 132
     $xoops = Xoops::getInstance();
133 133
 
134
-    $path = $xoops->path('modules/' . $xoops->module->getVar('dirname', 'n') . '/templates/admin/' . $name . '.tpl');
134
+    $path = $xoops->path('modules/'.$xoops->module->getVar('dirname', 'n').'/templates/admin/'.$name.'.tpl');
135 135
     if (XoopsLoad::fileExists($path)) {
136 136
         echo $xoops->tpl()->fetch($path);
137 137
     } else {
138
-        echo "Unable to read " . $name;
138
+        echo "Unable to read ".$name;
139 139
     }
140 140
 }
141 141
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
  */
148 148
 function modify_chmod($value_chmod, $path_file, $id)
149 149
 {
150
-    $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">';
150
+    $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">';
151 151
     if ($value_chmod == 777) {
152 152
         $chmod .= '<option value="777" selected><span style="color:green">777</span></option>';
153 153
     } else {
Please login to merge, or discard this patch.
htdocs/modules/system/language/english/admin/_tplsets.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  * @version     $Id$
8 8
  */
9 9
 
10
- //Nav
10
+    //Nav
11 11
 //define("_AM_SYSTEM_TEMPLATES_NAV_MANAGER","Templates Manager");
12 12
 //define("_AM_SYSTEM_TEMPLATES_NAV_MAIN","Templates Manager");
13 13
 //Tips
Please login to merge, or discard this patch.