View GitHub Repository XoopsCore25

Schedule Inspection
Subscribe
Test Failed
Pull Request — master (#592)
by Lucio
10:17
created
Status
Category
Toggle Patches
htdocs/modules/system/xoops_version.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -213,8 +213,8 @@  discard block
 
 block discarded – undo
213 213 
 $modversion['config'][$i]['valuetype']   = 'int';
214 214 
 $modversion['config'][$i]['default']     = 1;
215 215 
 ++$i;
216 
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
217 
-$icons                                   = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/icons');
216 
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
217 
+$icons                                   = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH.'/modules/system/images/icons');
218 218 
 $modversion['config'][$i]['name']        = 'typeicons';
219 219 
 $modversion['config'][$i]['title']       = '_MI_SYSTEM_PREFERENCE_ICONS';
220 220 
 $modversion['config'][$i]['description'] = '';
 
@@ -224,7 +224,7 @@  discard block
 
 block discarded – undo
224 224 
 $modversion['config'][$i]['options']     = $icons;
225 225 
 $modversion['config'][$i]['category']    = 'global';
226 226 
 ++$i;
227 
-$breadcrumb                              = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/breadcrumb');
227 
+$breadcrumb                              = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH.'/modules/system/images/breadcrumb');
228 228 
 $modversion['config'][$i]['name']        = 'typebreadcrumb';
229 229 
 $modversion['config'][$i]['title']       = '_MI_SYSTEM_PREFERENCE_BREADCRUMB';
230 230 
 $modversion['config'][$i]['description'] = '';
 
@@ -234,7 +234,7 @@  discard block
 
 block discarded – undo
234 234 
 $modversion['config'][$i]['options']     = $breadcrumb;
235 235 
 $modversion['config'][$i]['category']    = 'global';
236 236 
 ++$i;
237 
-$jquery_theme                            = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/css/ui');
237 
+$jquery_theme                            = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH.'/modules/system/css/ui');
238 238 
 $modversion['config'][$i]['name']        = 'jquery_theme';
239 239 
 $modversion['config'][$i]['title']       = '_MI_SYSTEM_PREFERENCE_JQUERY_THEME';
240 240 
 $modversion['config'][$i]['description'] = '';
 
@@ -426,7 +426,7 @@  discard block
 
 block discarded – undo
426 426 
 $modversion['config'][$i]['valuetype']   = 'textbox';
427 427 
 $modversion['config'][$i]['default']     = 'head';
428 428 
 ++$i;
429 
-$editors                                 = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor');
429 
+$editors                                 = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH.'/class/xoopseditor');
430 430 
 $modversion['config'][$i]['name']        = 'blocks_editor';
431 431 
 $modversion['config'][$i]['title']       = '_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR';
432 432 
 $modversion['config'][$i]['description'] = '_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR_DSC';
Please login to merge, or discard this patch.
htdocs/modules/system/themes/zetadigme/menu.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -34,16 +34,16 @@
 
 block discarded – undo
34 34 
 $dirlist   = XoopsLists::getDirListAsArray($admin_dir);
35 35 
 $index     = 0;
36 36 
 foreach ($dirlist as $file) {
37 
-    if (file_exists($admin_dir . '/' . $file . '/xoops_version.php')) {
38 
-        include $admin_dir . '/' . $file . '/xoops_version.php';
37 
+    if (file_exists($admin_dir.'/'.$file.'/xoops_version.php')) {
38 
+        include $admin_dir.'/'.$file.'/xoops_version.php';
39 39 
         if ($modversion['hasAdmin']) {
40 
-            if (xoops_getModuleOption('active_' . $file, 'system')) {
40 
+            if (xoops_getModuleOption('active_'.$file, 'system')) {
41 41 
                 $category = isset($modversion['category']) ? (int)$modversion['category'] : 0;
42 42 
                 if (false !== $all_ok || in_array($modversion['category'], $ok_syscats)) {
43 43 
                     $adminmenu[$index]['title'] = trim($modversion['name']);
44 44 
                     $adminmenu[$index]['desc']  = trim($modversion['description']);
45 
-                    $adminmenu[$index]['link']  = 'admin.php?fct=' . $file;
46 
-                    $adminmenu[$index]['icon']  = 'icons/' . $modversion['image'];
45 
+                    $adminmenu[$index]['link']  = 'admin.php?fct='.$file;
46 
+                    $adminmenu[$index]['icon']  = 'icons/'.$modversion['image'];
47 47 
                 }
48 48 
             }
49 49 
         }
Please login to merge, or discard this patch.
htdocs/modules/system/themes/zetadigme/zetadigme.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch 
@@ -48,7 +48,7 @@  discard block
 
 block discarded – undo
48 48 
     {
49 49 
         parent::header();
50 50 
         global $xoopsConfig, $xoopsUser, $xoopsModule, $xoTheme, $xoopsDB;
51 
-        $tpl =& $this->template;
51 
+        $tpl = & $this->template;
52 52 
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
53 53 
         $xoTheme->addScript('', '', '
54 54 
         startList = function() {
 
@@ -145,46 +145,46 @@  discard block
 
 block discarded – undo
145 145 
         $menu[0]['link']     = XOOPS_URL;
146 146 
         $menu[0]['title']    = _YOURHOME;
147 147 
         $menu[0]['absolute'] = 1;
148 
-        $menu[1]['link']     = XOOPS_URL . '/admin.php?xoopsorgnews=1';
148 
+        $menu[1]['link']     = XOOPS_URL.'/admin.php?xoopsorgnews=1';
149 149 
         $menu[1]['title']    = 'XOOPS News';
150 150 
         $menu[1]['absolute'] = 1;
151 
-        $menu[1]['icon']     = XOOPS_ADMINTHEME_URL . '/zetadigme/img/xoops.png';
152 
-        $menu[2]['link']     = XOOPS_URL . '/user.php?op=logout';
151 
+        $menu[1]['icon']     = XOOPS_ADMINTHEME_URL.'/zetadigme/img/xoops.png';
152 
+        $menu[2]['link']     = XOOPS_URL.'/user.php?op=logout';
153 153 
         $menu[2]['title']    = _LOGOUT;
154 154 
         $menu[2]['absolute'] = 1;
155 
-        $menu[2]['icon']     = XOOPS_ADMINTHEME_URL . '/zetadigme/img/logout.png';
156 
-        $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _CPHOME, 'menu' => $menu));
155 
+        $menu[2]['icon']     = XOOPS_ADMINTHEME_URL.'/zetadigme/img/logout.png';
156 
+        $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => _CPHOME, 'menu' => $menu));
157 157 
         //add SYSTEM  Menu items
158 
-        include __DIR__ . '/menu.php';
158 
+        include __DIR__.'/menu.php';
159 159 
         $system_options = $adminmenu;
160 160 
         foreach (array_keys($adminmenu) as $item) {
161 
-            $system_options[$item]['link'] = empty($adminmenu[$item]['absolute']) ? XOOPS_URL . '/modules/system/' . $adminmenu[$item]['link'] : $adminmenu[$item]['link'];
162 
-            $system_options[$item]['icon'] = empty($adminmenu[$item]['icon_small']) ? '' : XOOPS_ADMINTHEME_URL . '/zetadigme/' . $adminmenu[$item]['icon_small'];
161 
+            $system_options[$item]['link'] = empty($adminmenu[$item]['absolute']) ? XOOPS_URL . '/modules/system/'.$adminmenu[$item]['link'] : $adminmenu[$item]['link'];
162 
+            $system_options[$item]['icon'] = empty($adminmenu[$item]['icon_small']) ? '' : XOOPS_ADMINTHEME_URL.'/zetadigme/'.$adminmenu[$item]['icon_small'];
163 163 
             unset($system_options[$item]['icon_small']);
164 164 
         }
165 
-        $tpl->append('navitems', array('link' => XOOPS_URL . '/modules/system/admin.php', 'text' => _AD_SYSOPTIONS, 'menu' => $system_options));
165 
+        $tpl->append('navitems', array('link' => XOOPS_URL.'/modules/system/admin.php', 'text' => _AD_SYSOPTIONS, 'menu' => $system_options));
166 166 
         if (empty($xoopsModule) || 'system' === $xoopsModule->getVar('dirname', 'n')) {
167 
-            $modpath     = XOOPS_URL . '/admin.php';
167 
+            $modpath     = XOOPS_URL.'/admin.php';
168 168 
             $modname     = _AD_SYSOPTIONS;
169 169 
             $modid       = 1;
170 170 
             $moddir      = 'system';
171 171 
             $mod_options = $adminmenu;
172 172 
             foreach (array_keys($mod_options) as $item) {
173 
-                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/' . $moddir . '/' . $mod_options[$item]['link'] : $mod_options[$item]['link'];
174 
-                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_ADMINTHEME_URL . '/zetadigme/' . $mod_options[$item]['icon'];
173 
+                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/'.$moddir.'/'.$mod_options[$item]['link'] : $mod_options[$item]['link'];
174 
+                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_ADMINTHEME_URL.'/zetadigme/'.$mod_options[$item]['icon'];
175 175 
                 unset($mod_options[$item]['icon_small']);
176 176 
             }
177 177 
         } else {
178 178 
             $moddir      = $xoopsModule->getVar('dirname', 'n');
179 
-            $modpath     = XOOPS_URL . '/modules/' . $moddir;
179 
+            $modpath     = XOOPS_URL.'/modules/'.$moddir;
180 180 
             $modname     = $xoopsModule->getVar('name');
181 181 
             $modid       = $xoopsModule->getVar('mid');
182 182 
             $mod_options = $xoopsModule->getAdminMenu();
183 183 
             foreach (array_keys($mod_options) as $item) {
184 
-                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
184 
+                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/".$mod_options[$item]['link'] : $mod_options[$item]['link'];
185 185 
                 //$mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
186 186 
                 //mb for direct URL access to icons in modules Admin
187 
-                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']));
187 
+                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL."/modules/{$moddir}/".$mod_options[$item]['icon']));
188 188 
             }
189 189 
         }
190 190 
         $tpl->assign('mod_options', $mod_options);
 
@@ -205,29 +205,29 @@  discard block
 
 block discarded – undo
205 205 
         $moduleperm_handler = xoops_getHandler('groupperm');
206 206 
         foreach ($mods as $mod) {
207 207 
             $rtn        = array();
208 
-            $modOptions = array();                                                         //add for sub menus
208 
+            $modOptions = array(); //add for sub menus
209 209 
             $sadmin     = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
210 210 
             if ($sadmin) {
211 211 
                 $info = $mod->getInfo();
212 212 
                 if (!empty($info['adminindex'])) {
213 
-                    $rtn['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
213 
+                    $rtn['link'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['adminindex'];
214 214 
                 } else {
215 
-                    $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
215 
+                    $rtn['link'] = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid');
216 216 
                 }
217 217 
                 $rtn['title']    = $mod->name();
218 218 
                 $rtn['absolute'] = 1;
219 
-                $rtn['url']      = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/'; //add for sub menus
220 
-                $modOptions      = $mod->getAdminMenu();                                        //add for sub menus
221 
-                $rtn['options']  = $modOptions;                                             //add for sub menus
219 
+                $rtn['url']      = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'; //add for sub menus
220 
+                $modOptions      = $mod->getAdminMenu(); //add for sub menus
221 
+                $rtn['options']  = $modOptions; //add for sub menus
222 222
223 223 
                 if (isset($info['icon']) && $info['icon'] !== '') {
224 
-                    $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon'];
224 
+                    $rtn['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['icon'];
225 225 
                 }
226 226 
                 $menu[] = $rtn;
227 227 
             }
228 228 
         }
229 229 
         $tpl->append('navitems', array(
230 
-            'link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin',
230 
+            'link' => XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin',
231 231 
             'text' => _AM_SYSTEM_MODULES,
232 232 
             'dir'  => $mod->getVar('dirname', 'n'),
233 233 
             'menu' => $menu));
 
@@ -239,54 +239,54 @@  discard block
 
 block discarded – undo
239 239 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=1',
240 240 
             'title'    => _THEME_GENERAL,
241 241 
             'absolute' => 1,
242 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
243 
-        $OPT[]  = array(
242 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
243 
+        $OPT[] = array(
244 244 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=2',
245 245 
             'title'    => _THEME_USERSETTINGS,
246 246 
             'absolute' => 1,
247 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
248 
-        $OPT[]  = array(
247 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
248 
+        $OPT[] = array(
249 249 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=3',
250 250 
             'title'    => _THEME_METAFOOTER,
251 251 
             'absolute' => 1,
252 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
253 
-        $OPT[]  = array(
252 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
253 
+        $OPT[] = array(
254 254 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=4',
255 255 
             'title'    => _THEME_CENSOR,
256 256 
             'absolute' => 1,
257 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
258 
-        $OPT[]  = array(
257 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
258 
+        $OPT[] = array(
259 259 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=5',
260 260 
             'title'    => _THEME_SEARCH,
261 261 
             'absolute' => 1,
262 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
263 
-        $OPT[]  = array(
262 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
263 
+        $OPT[] = array(
264 264 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=6',
265 265 
             'title'    => _THEME_MAILER,
266 266 
             'absolute' => 1,
267 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
268 
-        $OPT[]  = array(
267 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
268 
+        $OPT[] = array(
269 269 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=7',
270 270 
             'title'    => _THEME_AUTHENTICATION,
271 271 
             'absolute' => 1,
272 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
273 
-        $OPT[]  = array(
272 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
273 
+        $OPT[] = array(
274 274 
             'link'     => 'admin.php?fct=preferences&op=showmod&mod=1',
275 275 
             'title'    => _THEME_MODULESETTINGS,
276 276 
             'absolute' => 1,
277 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/prefs_small.png');
277 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/prefs_small.png');
278 278 
         $menu[] = array(
279 
-            'link'     => XOOPS_URL . '/modules/system/admin.php?fct=preferences',
279 
+            'link'     => XOOPS_URL.'/modules/system/admin.php?fct=preferences',
280 280 
             'title'    => _AD_SYSOPTIONS,
281 281 
             'absolute' => 1,
282 
-            'url'      => XOOPS_URL . '/modules/system/',
282 
+            'url'      => XOOPS_URL.'/modules/system/',
283 283 
             'options'  => $OPT);
284 284
285 285 
         foreach ($mods as $mod) {
286 286 
             $rtn    = array();
287 287 
             $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
288 288 
             if ($sadmin && ($mod->getVar('hasnotification') || is_array($mod->getInfo('config')) || is_array($mod->getInfo('comments')))) {
289 
-                $rtn['link']     = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
289 
+                $rtn['link']     = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid');
290 290 
                 $rtn['title']    = $mod->name();
291 291 
                 $rtn['absolute'] = 1;
292 292 
                 $menu[]          = $rtn;
 
@@ -294,7 +294,7 @@  discard block
 
 block discarded – undo
294 294 
             //$menu[] = $rtn;
295 295 
         }
296 296 
         $tpl->append('navitems', array(
297 
-            'link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin',
297 
+            'link' => XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin',
298 298 
             'text' => _THEME_SITEPREF,
299 299 
             'dir'  => $mod->getVar('dirname', 'n'),
300 300 
             'menu' => $menu));
 
@@ -304,27 +304,27 @@  discard block
 
 block discarded – undo
304 304 
             'link'     => 'http://www.xoops.org',
305 305 
             'title'    => 'XOOPS',
306 306 
             'absolute' => 1,
307 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/xoops.png');
307 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/xoops.png');
308 308 
         $menu[] = array(
309 309 
             'link'     => 'http://www.xoops.org/modules/library/',
310 310 
             'title'    => _AD_XOOPSTHEMES,
311 311 
             'absolute' => 1,
312 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/tweb.png');
312 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/tweb.png');
313 313 
         $menu[] = array(
314 314 
             'link'     => 'http://www.xoops.org/modules/repository/',
315 315 
             'title'    => _AD_XOOPSMODULES,
316 316 
             'absolute' => 1,
317 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/xoops.png');
317 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/zetadigme/icons/xoops.png');
318 318 
         $menu[] = array(
319 319 
             'link'     => 'http://xoops.org',
320 320 
             'title'    => 'XOOPS',
321 321 
             'absolute' => 1);
322 
-        $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _AD_INTERESTSITES, 'menu' => $menu));
322 
+        $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => _AD_INTERESTSITES, 'menu' => $menu));
323 323 
         //add OPTIONS/links for local support
324 
-        if (file_exists($file = XOOPS_ADMINTHEME_PATH . '/zetadigme/language/' . $xoopsConfig['language'] . '/localsupport.php')) {
325 
-            $links = include XOOPS_ADMINTHEME_PATH . '/zetadigme/language/' . $xoopsConfig['language'] . '/localsupport.php';
324 
+        if (file_exists($file = XOOPS_ADMINTHEME_PATH.'/zetadigme/language/'.$xoopsConfig['language'].'/localsupport.php')) {
325 
+            $links = include XOOPS_ADMINTHEME_PATH.'/zetadigme/language/'.$xoopsConfig['language'].'/localsupport.php';
326 326 
             if (count($links) > 0) {
327 
-                $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _AD_LOCALSUPPORT, 'menu' => $links));
327 
+                $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => _AD_LOCALSUPPORT, 'menu' => $links));
328 328 
             }
329 329 
         }
330 330 
         if (is_object($xoopsModule) || !empty($_GET['xoopsorgnews'])) {
 
@@ -337,17 +337,17 @@  discard block
 
 block discarded – undo
337 337 
             if ($sadmin) {
338 338 
                 $info = $mod->getInfo();
339 339 
                 if (!empty($info['adminindex'])) {
340 
-                    $rtn['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
340 
+                    $rtn['link'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['adminindex'];
341 341 
                 } else {
342 
-                    $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
342 
+                    $rtn['link'] = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid');
343 343 
                 }
344 344 
                 $rtn['title']        = $mod->getVar('name');
345 345 
                 $rtn ['description'] = $mod->getInfo('description');
346 346 
                 $rtn['absolute']     = 1;
347 347 
                 if (isset($info['icon_big'])) {
348 
-                    $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon_big'];
348 
+                    $rtn['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['icon_big'];
349 349 
                 } elseif (isset($info['image'])) {
350 
-                    $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['image'];
350 
+                    $rtn['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['image'];
351 351 
                 }
352 352 
             }
353 353 
             $tpl->append('modules', $rtn);
Please login to merge, or discard this patch.
htdocs/modules/system/themes/thadmin/thadmin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -39,7 +39,7 @@
 
 block discarded – undo
39 39 
      */
40 40 
     public function __construct()
41 41 
     {
42 
-        include_once XOOPS_ROOT_PATH . '/modules/thadmin/include/cp_functions.php';
42 
+        include_once XOOPS_ROOT_PATH.'/modules/thadmin/include/cp_functions.php';
43 43 
     }
44 44
45 45 
     /**
Please login to merge, or discard this patch.
htdocs/modules/system/themes/default/default.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch 
@@ -51,21 +51,21 @@  discard block
 
 block discarded – undo
51 51 
         parent::header();
52 52
53 53 
         global $xoopsConfig, $xoopsUser, $xoopsModule, $xoTheme, $xoopsTpl, $xoopsDB;
54 
-        $tpl =& $this->template;
54 
+        $tpl = & $this->template;
55 55
56 56 
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
57 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/styleswitch.js');
58 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/formenu.js');
59 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/menu.js');
60 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tooltip.js');
57 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/default/js/styleswitch.js');
58 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/default/js/formenu.js');
59 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/default/js/menu.js');
60 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/default/js/tooltip.js');
61 61 
 //        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tabs.jquery.tools.min.js');
62 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tabs.js');
63 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tabs.slideshow.js');
62 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/default/js/tabs.js');
63 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/default/js/tabs.slideshow.js');
64 64
65 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
66 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/dark.css', array('title' => 'dark', 'media' => 'screen'));
67 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/silver.css', array('title' => 'silver', 'media' => 'screen'));
68 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/orange.css', array('title' => 'orange', 'media' => 'screen'));
65 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/default/css/style.css');
66 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/default/css/dark.css', array('title' => 'dark', 'media' => 'screen'));
67 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/default/css/silver.css', array('title' => 'silver', 'media' => 'screen'));
68 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/default/css/orange.css', array('title' => 'orange', 'media' => 'screen'));
69 69
70 70 
         $tpl->assign('lang_cp', _CPHOME);
71 71 
         //start system overview
 
@@ -96,42 +96,42 @@  discard block
 
 block discarded – undo
96 96 
         $menu[0]['link']     = XOOPS_URL;
97 97 
         $menu[0]['title']    = _YOURHOME;
98 98 
         $menu[0]['absolute'] = 1;
99 
-        $menu[1]['link']     = XOOPS_URL . '/admin.php?xoopsorgnews=1';
99 
+        $menu[1]['link']     = XOOPS_URL.'/admin.php?xoopsorgnews=1';
100 100 
         $menu[1]['title']    = _OXYGEN_NEWS;
101 101 
         $menu[1]['absolute'] = 1;
102 
-        $menu[1]['icon']     = XOOPS_ADMINTHEME_URL . '/default/images/xoops.png';
103 
-        $menu[2]['link']     = XOOPS_URL . '/user.php?op=logout';
102 
+        $menu[1]['icon']     = XOOPS_ADMINTHEME_URL.'/default/images/xoops.png';
103 
+        $menu[2]['link']     = XOOPS_URL.'/user.php?op=logout';
104 104 
         $menu[2]['title']    = _LOGOUT;
105 105 
         $menu[2]['absolute'] = 1;
106 
-        $menu[2]['icon']     = XOOPS_ADMINTHEME_URL . '/default/images/logout.png';
107 
-        $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _CPHOME, 'menu' => $menu));
106 
+        $menu[2]['icon']     = XOOPS_ADMINTHEME_URL.'/default/images/logout.png';
107 
+        $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => _CPHOME, 'menu' => $menu));
108 108
109 109 
         //add SYSTEM  Menu items
110 
-        include __DIR__ . '/menu.php';
110 
+        include __DIR__.'/menu.php';
111 111 
         if (empty($xoopsModule) || 'system' === $xoopsModule->getVar('dirname', 'n')) {
112 
-            $modpath = XOOPS_URL . '/admin.php';
112 
+            $modpath = XOOPS_URL.'/admin.php';
113 113 
             $modname = _OXYGEN_SYSOPTIONS;
114 114 
             $modid   = 1;
115 115 
             $moddir  = 'system';
116 116
117 117 
             $mod_options = $adminmenu;
118 118 
             foreach (array_keys($mod_options) as $item) {
119 
-                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/' . $moddir . '/' . $mod_options[$item]['link'] : $mod_options[$item]['link'];
120 
-                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_ADMINTHEME_URL . '/default/' . $mod_options[$item]['icon'];
119 
+                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/'.$moddir.'/'.$mod_options[$item]['link'] : $mod_options[$item]['link'];
120 
+                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_ADMINTHEME_URL.'/default/'.$mod_options[$item]['icon'];
121 121 
                 unset($mod_options[$item]['icon_small']);
122 122 
             }
123 123 
         } else {
124 124 
             $moddir  = $xoopsModule->getVar('dirname', 'n');
125 
-            $modpath = XOOPS_URL . '/modules/' . $moddir;
126 
-            $modname = $xoopsModule->getInfo('name') . '  (' . $xoopsModule->getInfo('version') . '  ' . $xoopsModule->getInfo('module_status') . ')';
125 
+            $modpath = XOOPS_URL.'/modules/'.$moddir;
126 
+            $modname = $xoopsModule->getInfo('name').'  ('.$xoopsModule->getInfo('version').'  '.$xoopsModule->getInfo('module_status').')';
127 127 
             $modid   = $xoopsModule->getVar('mid');
128 128
129 129 
             $mod_options = $xoopsModule->getAdminMenu();
130 130 
             foreach (array_keys($mod_options) as $item) {
131 
-                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
131 
+                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/".$mod_options[$item]['link'] : $mod_options[$item]['link'];
132 132 
                 //                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
133 133 
                 //mb for direct URL access to icons in modules Admin
134 
-                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']));
134 
+                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL."/modules/{$moddir}/".$mod_options[$item]['icon']));
135 135 
             }
136 136 
         }
137 137 
 
@@ -155,29 +155,29 @@  discard block
 
 block discarded – undo
155 155 
         $moduleperm_handler = xoops_getHandler('groupperm');
156 156 
         foreach ($mods as $mod) {
157 157 
             $rtn        = array();
158 
-            $modOptions = array();                                                         //add for sub menus
158 
+            $modOptions = array(); //add for sub menus
159 159 
             $sadmin     = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
160 160 
             if ($sadmin) {
161 161 
                 $info = $mod->getInfo();
162 162 
                 if (!empty($info['adminindex'])) {
163 
-                    $rtn['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
163 
+                    $rtn['link'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['adminindex'];
164 164 
                 } else {
165 
-                    $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
165 
+                    $rtn['link'] = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid');
166 166 
                 }
167 167 
                 $rtn['title']    = htmlspecialchars($mod->name(), ENT_QUOTES);
168 168 
                 $rtn['absolute'] = 1;
169 
-                $rtn['url']      = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/'; //add for sub menus
170 
-                $modOptions      = $mod->getAdminMenu();                                        //add for sub menus
171 
-                $rtn['options']  = $modOptions;                                             //add for sub menus
169 
+                $rtn['url']      = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'; //add for sub menus
170 
+                $modOptions      = $mod->getAdminMenu(); //add for sub menus
171 
+                $rtn['options']  = $modOptions; //add for sub menus
172 172
173 173 
                 if (isset($info['icon']) && $info['icon'] !== '') {
174 
-                    $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon'];
174 
+                    $rtn['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['icon'];
175 175 
                 }
176 176 
                 $menu[] = $rtn;
177 177 
             }
178 178 
         }
179 179 
         $tpl->append('navitems', array(
180 
-            'link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin',
180 
+            'link' => XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin',
181 181 
             'text' => _AM_SYSTEM_MODULES,
182 182 
             'dir'  => $mod->getVar('dirname', 'n'),
183 183 
             'menu' => $menu));
 
@@ -190,63 +190,63 @@  discard block
 
 block discarded – undo
190 190 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=1',
191 191 
             'title'    => _OXYGEN_GENERAL,
192 192 
             'absolute' => 1,
193 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
193 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
194 194 
         $OPT[] = array(
195 195 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=2',
196 196 
             'title'    => _OXYGEN_USERSETTINGS,
197 197 
             'absolute' => 1,
198 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
198 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
199 199 
         $OPT[] = array(
200 200 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=3',
201 201 
             'title'    => _OXYGEN_METAFOOTER,
202 202 
             'absolute' => 1,
203 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
203 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
204 204 
         $OPT[] = array(
205 205 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=4',
206 206 
             'title'    => _OXYGEN_CENSOR,
207 207 
             'absolute' => 1,
208 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
208 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
209 209 
         $OPT[] = array(
210 210 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=5',
211 211 
             'title'    => _OXYGEN_SEARCH,
212 212 
             'absolute' => 1,
213 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
213 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
214 214 
         $OPT[] = array(
215 215 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=6',
216 216 
             'title'    => _OXYGEN_MAILER,
217 217 
             'absolute' => 1,
218 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
218 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
219 219 
         $OPT[] = array(
220 220 
             'link'     => 'admin.php?fct=preferences&op=show&confcat_id=7',
221 221 
             'title'    => _OXYGEN_AUTHENTICATION,
222 222 
             'absolute' => 1,
223 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
223 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
224 224 
         $OPT[] = array(
225 225 
             'link'     => 'admin.php?fct=preferences&op=showmod&mod=1',
226 226 
             'title'    => _OXYGEN_MODULESETTINGS,
227 227 
             'absolute' => 1,
228 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
228 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/icons/prefs_small.png');
229 229
230 230 
         $menu[] = array(
231 
-            'link'     => XOOPS_URL . '/modules/system/admin.php?fct=preferences',
231 
+            'link'     => XOOPS_URL.'/modules/system/admin.php?fct=preferences',
232 232 
             'title'    => _OXYGEN_SYSOPTIONS,
233 233 
             'absolute' => 1,
234 
-            'url'      => XOOPS_URL . '/modules/system/',
234 
+            'url'      => XOOPS_URL.'/modules/system/',
235 235 
             'options'  => $OPT);
236 236
237 237 
         foreach ($mods as $mod) {
238 238 
             $rtn    = array();
239 239 
             $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
240 240 
             if ($sadmin && ($mod->getVar('hasnotification') || is_array($mod->getInfo('config')) || is_array($mod->getInfo('comments')))) {
241 
-                $rtn['link']     = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
241 
+                $rtn['link']     = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid');
242 242 
                 $rtn['title']    = htmlspecialchars($mod->name(), ENT_QUOTES);
243 243 
                 $rtn['absolute'] = 1;
244 
-                $rtn['icon']     = XOOPS_ADMINTHEME_URL . '/gui/oxygen/icons/prefs_small.png';
244 
+                $rtn['icon']     = XOOPS_ADMINTHEME_URL.'/gui/oxygen/icons/prefs_small.png';
245 245 
                 $menu[]          = $rtn;
246 246 
             }
247 247 
         }
248 248 
         $tpl->append('navitems', array(
249 
-            'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences',
249 
+            'link' => XOOPS_URL.'/modules/system/admin.php?fct=preferences',
250 250 
             'text' => _OXYGEN_SITEPREF,
251 251 
             'dir'  => $mod->getVar('dirname', 'n'),
252 252 
             'menu' => $menu));
 
@@ -261,30 +261,30 @@  discard block
 
 block discarded – undo
261 261 
             'link'     => 'http://xoops.org',
262 262 
             'title'    => _OXYGEN_WEBSITE,
263 263 
             'absolute' => 1,
264 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/images/xoops.png');
264 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/images/xoops.png');
265 265 
         $menu[] = array(
266 266 
             'link'     => 'http://www.xoops.org/modules/repository/',
267 267 
             'title'    => _OXYGEN_XOOPSMODULES,
268 268 
             'absolute' => 1,
269 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/images/xoops.png');
269 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/images/xoops.png');
270 270 
         $menu[] = array(
271 271 
             'link'     => 'http://www.xoops.org/modules/extgallery/',
272 272 
             'title'    => _OXYGEN_XOOPSTHEMES,
273 273 
             'absolute' => 1,
274 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/default/images/tweb.png');
274 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/default/images/tweb.png');
275 275
276 
-        $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _OXYGEN_INTERESTSITES, 'menu' => $menu));
276 
+        $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => _OXYGEN_INTERESTSITES, 'menu' => $menu));
277 277
278 278 
         //add OPTIONS/links for local support
279 
-        if (file_exists($file = XOOPS_ADMINTHEME_PATH . '/default/language/' . $xoopsConfig['language'] . '/localsupport.php')) {
280 
-            $links = include XOOPS_ADMINTHEME_PATH . '/default/language/' . $xoopsConfig['language'] . '/localsupport.php';
279 
+        if (file_exists($file = XOOPS_ADMINTHEME_PATH.'/default/language/'.$xoopsConfig['language'].'/localsupport.php')) {
280 
+            $links = include XOOPS_ADMINTHEME_PATH.'/default/language/'.$xoopsConfig['language'].'/localsupport.php';
281 281 
             if (count($links) > 0) {
282 
-                $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _OXYGEN_LOCALSUPPORT, 'menu' => $links));
282 
+                $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => _OXYGEN_LOCALSUPPORT, 'menu' => $links));
283 283 
             }
284 284 
         }
285 285
286 286 
         if (is_object($xoopsModule) || !empty($_GET['xoopsorgnews'])) {
287 
-            if (is_object($xoopsModule) && file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('adminmenu'))) {
287 
+            if (is_object($xoopsModule) && file_exists($file = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('adminmenu'))) {
288 288 
                 include $file;
289 289 
             }
290 290 
 
@@ -297,17 +297,17 @@  discard block
 
 block discarded – undo
297 297 
                 $rtn  = array();
298 298 
                 $info = $mod->getInfo();
299 299 
                 if (!empty($info ['adminindex'])) {
300 
-                    $rtn ['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['adminindex'];
300 
+                    $rtn ['link'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info ['adminindex'];
301 301 
                 } else {
302 
-                    $rtn ['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
302 
+                    $rtn ['link'] = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid');
303 303 
                 }
304 304 
                 $rtn ['title']       = htmlspecialchars($mod->getVar('name'), ENT_QUOTES);
305 305 
                 $rtn ['description'] = $mod->getInfo('description');
306 306 
                 $rtn ['absolute']    = 1;
307 307 
                 if (isset($info ['icon_big'])) {
308 
-                    $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['icon_big'];
308 
+                    $rtn ['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info ['icon_big'];
309 309 
                 } elseif (isset($info ['image'])) {
310 
-                    $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['image'];
310 
+                    $rtn ['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info ['image'];
311 311 
                 }
312 312
313 313 
                 $tpl->append('modules', $rtn);
Please login to merge, or discard this patch.
htdocs/modules/system/themes/transition/menu.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -46,16 +46,16 @@
 
 block discarded – undo
46 46 
 $dirlist   = XoopsLists::getDirListAsArray($admin_dir);
47 47 
 $index     = 0;
48 48 
 foreach ($dirlist as $file) {
49 
-    if (file_exists($admin_dir . '/' . $file . '/xoops_version.php')) {
50 
-        include $admin_dir . '/' . $file . '/xoops_version.php';
49 
+    if (file_exists($admin_dir.'/'.$file.'/xoops_version.php')) {
50 
+        include $admin_dir.'/'.$file.'/xoops_version.php';
51 51 
         if ($modversion['hasAdmin']) {
52 
-            if (xoops_getModuleOption('active_' . $file, 'system')) {
52 
+            if (xoops_getModuleOption('active_'.$file, 'system')) {
53 53 
                 $category = isset($modversion['category']) ? (int)$modversion['category'] : 0;
54 54 
                 if (false !== $all_ok || in_array($modversion['category'], $ok_syscats)) {
55 55 
                     $adminmenu[$index]['title'] = trim($modversion['name']);
56 56 
                     $adminmenu[$index]['desc']  = trim($modversion['description']);
57 
-                    $adminmenu[$index]['link']  = 'admin.php?fct=' . $file;
58 
-                    $adminmenu[$index]['icon']  = 'icons/' . $iconsSet . '/' . $modversion['image'];
57 
+                    $adminmenu[$index]['link']  = 'admin.php?fct='.$file;
58 
+                    $adminmenu[$index]['icon']  = 'icons/'.$iconsSet.'/'.$modversion['image'];
59 59 
                 }
60 60 
             }
61 61 
         }
Please login to merge, or discard this patch.
htdocs/modules/system/themes/transition/transition.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch 
@@ -62,14 +62,14 @@  discard block
 
 block discarded – undo
62 62 
         parent::header();
63 63
64 64 
         global $xoopsConfig, $xoopsUser, $xoopsModule, $xoTheme, $xoopsTpl, $xoopsDB;
65 
-        $tpl =& $this->template;
65 
+        $tpl = & $this->template;
66 66
67 67 
         // Determine if information box must be shown
68 
-        $currentScript = str_replace(XOOPS_ROOT_PATH . '/', '', $_SERVER['SCRIPT_FILENAME']);
68 
+        $currentScript = str_replace(XOOPS_ROOT_PATH.'/', '', $_SERVER['SCRIPT_FILENAME']);
69 69
70 
-        if('admin.php' == $currentScript){
70 
+        if ('admin.php' == $currentScript) {
71 71 
             $show = isset($_GET['show']) ? $_GET['show'] : '';
72 
-            if('info' == $show){
72 
+            if ('info' == $show) {
73 73 
                 $tpl->assign('showTransitionInfo', true);
74 74 
             }
75 75 
         }
 
@@ -80,26 +80,26 @@  discard block
 
 block discarded – undo
80 80 
             $icons = 'transition';
81 81 
         }
82 82
83 
-        $tpl->assign('theme_icons', XOOPS_URL . '/modules/system/images/icons/' . $iconsSet);
83 
+        $tpl->assign('theme_icons', XOOPS_URL.'/modules/system/images/icons/'.$iconsSet);
84 84
85 85 
         // language
86 86 
         $tpl->assign('xoops_language', $xoopsConfig['language']);
87 87
88 88 
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
89 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/transition/js/styleswitch.js');
90 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/transition/js/formenu.js');
91 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/transition/js/menu.js');
92 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/transition/js/tooltip.js');
89 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/transition/js/styleswitch.js');
90 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/transition/js/formenu.js');
91 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/transition/js/menu.js');
92 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/transition/js/tooltip.js');
93 93 
 //        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/transition/js/tabs.jquery.tools.min.js');
94 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/transition/js/tabs.js');
95 
-        $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/transition/js/tabs.slideshow.js');
94 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/transition/js/tabs.js');
95 
+        $xoTheme->addScript(XOOPS_ADMINTHEME_URL.'/transition/js/tabs.slideshow.js');
96 96
97 97 
         $xoTheme->addStylesheet('https://fonts.googleapis.com/css?family=Roboto+Condensed:300,300i,400,400i,700,700i|Roboto:300,300i,400,400i,700,700i');
98 98 
 //        $xoTheme->addStylesheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css');
99 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/transition/css/style.css');
100 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/transition/css/dark.css', array('title' => 'dark', 'media' => 'screen'));
101 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/transition/css/silver.css', array('title' => 'silver', 'media' => 'screen'));
102 
-        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/transition/css/orange.css', array('title' => 'orange', 'media' => 'screen'));
99 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/transition/css/style.css');
100 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/transition/css/dark.css', array('title' => 'dark', 'media' => 'screen'));
101 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/transition/css/silver.css', array('title' => 'silver', 'media' => 'screen'));
102 
+        $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL.'/transition/css/orange.css', array('title' => 'orange', 'media' => 'screen'));
103 103
104 104 
         $tpl->assign('lang_cp', _CPHOME);
105 105 
         //start system overview
 
@@ -128,44 +128,44 @@  discard block
 
 block discarded – undo
128 128 
         //Add  CONTROL PANEL  Menu  items
129 129 
         $menu                = array();
130 130 
         $menu[0]['link']     = XOOPS_URL;
131 
-        $menu[0]['title']    = "<span class='fa fa-home'></span> " . _YOURHOME;
131 
+        $menu[0]['title']    = "<span class='fa fa-home'></span> "._YOURHOME;
132 132 
         $menu[0]['absolute'] = 1;
133 
-        $menu[1]['link']     = XOOPS_URL . '/admin.php?xoopsorgnews=1';
134 
-        $menu[1]['title']    = "<span class='fa fa-newspaper-o'></span> " . _OXYGEN_NEWS;
133 
+        $menu[1]['link']     = XOOPS_URL.'/admin.php?xoopsorgnews=1';
134 
+        $menu[1]['title']    = "<span class='fa fa-newspaper-o'></span> "._OXYGEN_NEWS;
135 135 
         $menu[1]['absolute'] = 1;
136 
-        $menu[1]['icon']     = XOOPS_ADMINTHEME_URL . '/transition/images/xoops.png';
137 
-        $menu[2]['link']     = XOOPS_URL . '/user.php?op=logout';
138 
-        $menu[2]['title']    = "<span class='fa fa-sign-out'></span> " . _LOGOUT;
136 
+        $menu[1]['icon']     = XOOPS_ADMINTHEME_URL.'/transition/images/xoops.png';
137 
+        $menu[2]['link']     = XOOPS_URL.'/user.php?op=logout';
138 
+        $menu[2]['title']    = "<span class='fa fa-sign-out'></span> "._LOGOUT;
139 139 
         $menu[2]['absolute'] = 1;
140 
-        $menu[2]['icon']     = XOOPS_ADMINTHEME_URL . '/transition/images/logout.png';
141 
-        $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => '<span class="fa fa-cog"></span> ' . _CPHOME, 'menu' => $menu));
140 
+        $menu[2]['icon']     = XOOPS_ADMINTHEME_URL.'/transition/images/logout.png';
141 
+        $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => '<span class="fa fa-cog"></span> '._CPHOME, 'menu' => $menu));
142 142
143 143 
         //add SYSTEM  Menu items
144 
-        include __DIR__ . '/menu.php';
144 
+        include __DIR__.'/menu.php';
145 145 
         if (empty($xoopsModule) || 'system' === $xoopsModule->getVar('dirname', 'n')) {
146 
-            $modpath = XOOPS_URL . '/admin.php';
146 
+            $modpath = XOOPS_URL.'/admin.php';
147 147 
             $modname = _OXYGEN_SYSOPTIONS;
148 148 
             $modid   = 1;
149 149 
             $moddir  = 'system';
150 150
151 151 
             $mod_options = $adminmenu;
152 152 
             foreach (array_keys($mod_options) as $item) {
153 
-                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/' . $moddir . '/' . $mod_options[$item]['link'] : $mod_options[$item]['link'];
154 
-                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . '/modules/system/images/' . $mod_options[$item]['icon'];
153 
+                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/'.$moddir.'/'.$mod_options[$item]['link'] : $mod_options[$item]['link'];
154 
+                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL.'/modules/system/images/'.$mod_options[$item]['icon'];
155 155 
                 unset($mod_options[$item]['icon_small']);
156 156 
             }
157 157 
         } else {
158 158 
             $moddir  = $xoopsModule->getVar('dirname', 'n');
159 
-            $modpath = XOOPS_URL . '/modules/' . $moddir;
159 
+            $modpath = XOOPS_URL.'/modules/'.$moddir;
160 160 
             $modname = $xoopsModule->getVar('name');
161 161 
             $modid   = $xoopsModule->getVar('mid');
162 162
163 163 
             $mod_options = $xoopsModule->getAdminMenu();
164 164 
             foreach (array_keys($mod_options) as $item) {
165 
-                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
165 
+                $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/".$mod_options[$item]['link'] : $mod_options[$item]['link'];
166 166 
                 //                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
167 167 
                 //mb for direct URL access to icons in modules Admin
168 
-                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']));
168 
+                $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL."/modules/{$moddir}/".$mod_options[$item]['icon']));
169 169 
             }
170 170 
         }
171 171 
 
@@ -189,30 +189,30 @@  discard block
 
 block discarded – undo
189 189 
         $moduleperm_handler = xoops_getHandler('groupperm');
190 190 
         foreach ($mods as $mod) {
191 191 
             $rtn        = array();
192 
-            $modOptions = array();                                                         //add for sub menus
192 
+            $modOptions = array(); //add for sub menus
193 193 
             $sadmin     = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
194 194 
             if ($sadmin) {
195 195 
                 $info = $mod->getInfo();
196 196 
                 if (!empty($info['adminindex'])) {
197 
-                    $rtn['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
197 
+                    $rtn['link'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['adminindex'];
198 198 
                 } else {
199 
-                    $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=' . $mod->getVar('mid');
199 
+                    $rtn['link'] = XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mod->getVar('mid');
200 200 
                 }
201 201 
                 $rtn['title']    = htmlspecialchars($mod->name(), ENT_QUOTES);
202 202 
                 $rtn['absolute'] = 1;
203 
-                $rtn['url']      = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/'; //add for sub menus
204 
-                $modOptions      = $mod->getAdminMenu();                                        //add for sub menus
205 
-                $rtn['options']  = $modOptions;                                             //add for sub menus
203 
+                $rtn['url']      = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'; //add for sub menus
204 
+                $modOptions      = $mod->getAdminMenu(); //add for sub menus
205 
+                $rtn['options']  = $modOptions; //add for sub menus
206 206
207 207 
                 if (isset($info['icon']) && $info['icon'] !== '') {
208 
-                    $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon'];
208 
+                    $rtn['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info['icon'];
209 209 
                 }
210 210 
                 $menu[] = $rtn;
211 211 
             }
212 212 
         }
213 213 
         $tpl->append('navitems', array(
214 
-            'link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin',
215 
-            'text' => '<span class="fa fa-puzzle-piece"></span> ' . _AM_SYSTEM_MODULES,
214 
+            'link' => XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin',
215 
+            'text' => '<span class="fa fa-puzzle-piece"></span> '._AM_SYSTEM_MODULES,
216 216 
             'dir'  => $mod->getVar('dirname', 'n'),
217 217 
             'menu' => $menu));
218 218 
 
@@ -224,64 +224,64 @@  discard block
 
 block discarded – undo
224 224 
             'link'     => 'admin.php?fct=preferences&amp;op=show&amp;confcat_id=1',
225 225 
             'title'    => _OXYGEN_GENERAL,
226 226 
             'absolute' => 1,
227 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
227 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
228 228 
         $OPT[] = array(
229 229 
             'link'     => 'admin.php?fct=preferences&amp;op=show&amp;confcat_id=2',
230 230 
             'title'    => _OXYGEN_USERSETTINGS,
231 231 
             'absolute' => 1,
232 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
232 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
233 233 
         $OPT[] = array(
234 234 
             'link'     => 'admin.php?fct=preferences&amp;op=show&amp;confcat_id=3',
235 235 
             'title'    => _OXYGEN_METAFOOTER,
236 236 
             'absolute' => 1,
237 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
237 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
238 238 
         $OPT[] = array(
239 239 
             'link'     => 'admin.php?fct=preferences&amp;op=show&amp;confcat_id=4',
240 240 
             'title'    => _OXYGEN_CENSOR,
241 241 
             'absolute' => 1,
242 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
242 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
243 243 
         $OPT[] = array(
244 244 
             'link'     => 'admin.php?fct=preferences&amp;op=show&amp;confcat_id=5',
245 245 
             'title'    => _OXYGEN_SEARCH,
246 246 
             'absolute' => 1,
247 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
247 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
248 248 
         $OPT[] = array(
249 249 
             'link'     => 'admin.php?fct=preferences&amp;op=show&amp;confcat_id=6',
250 250 
             'title'    => _OXYGEN_MAILER,
251 251 
             'absolute' => 1,
252 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
252 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
253 253 
         $OPT[] = array(
254 254 
             'link'     => 'admin.php?fct=preferences&amp;op=show&amp;confcat_id=7',
255 255 
             'title'    => _OXYGEN_AUTHENTICATION,
256 256 
             'absolute' => 1,
257 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
257 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
258 258 
         $OPT[] = array(
259 259 
             'link'     => 'admin.php?fct=preferences&amp;op=showmod&amp;mod=1',
260 260 
             'title'    => _OXYGEN_MODULESETTINGS,
261 261 
             'absolute' => 1,
262 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/icons/prefs_small.png');
262 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/icons/prefs_small.png');
263 263
264 264 
         $menu[] = array(
265 
-            'link'     => XOOPS_URL . '/modules/system/admin.php?fct=preferences',
265 
+            'link'     => XOOPS_URL.'/modules/system/admin.php?fct=preferences',
266 266 
             'title'    => _OXYGEN_SYSOPTIONS,
267 267 
             'absolute' => 1,
268 
-            'url'      => XOOPS_URL . '/modules/system/',
268 
+            'url'      => XOOPS_URL.'/modules/system/',
269 269 
             'options'  => $OPT);
270 270
271 271 
         foreach ($mods as $mod) {
272 272 
             $rtn    = array();
273 273 
             $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
274 274 
             if ($sadmin && ($mod->getVar('hasnotification') || is_array($mod->getInfo('config')) || is_array($mod->getInfo('comments')))) {
275 
-                $rtn['link']     = XOOPS_URL . '/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=' . $mod->getVar('mid');
275 
+                $rtn['link']     = XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mod->getVar('mid');
276 276 
                 $rtn['title']    = htmlspecialchars($mod->name(), ENT_QUOTES);
277 277 
                 $rtn['absolute'] = 1;
278 
-                $rtn['icon']     = XOOPS_ADMINTHEME_URL . '/gui/oxygen/icons/prefs_small.png';
278 
+                $rtn['icon']     = XOOPS_ADMINTHEME_URL.'/gui/oxygen/icons/prefs_small.png';
279 279 
                 $menu[]          = $rtn;
280 280 
             }
281 281 
         }
282 282 
         $tpl->append('navitems', array(
283 
-            'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences',
284 
-            'text' => '<span class="fa fa-wrench"></span> ' . _OXYGEN_SITEPREF,
283 
+            'link' => XOOPS_URL.'/modules/system/admin.php?fct=preferences',
284 
+            'text' => '<span class="fa fa-wrench"></span> '._OXYGEN_SITEPREF,
285 285 
             'dir'  => $mod->getVar('dirname', 'n'),
286 286 
             'menu' => $menu));
287 287 
 
@@ -295,30 +295,30 @@  discard block
 
 block discarded – undo
295 295 
             'link'     => 'http://xoops.org',
296 296 
             'title'    => _OXYGEN_WEBSITE,
297 297 
             'absolute' => 1,
298 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/images/xoops.png');
298 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/images/xoops.png');
299 299 
         $menu[] = array(
300 300 
             'link'     => 'http://www.xoops.org/modules/repository/',
301 301 
             'title'    => _OXYGEN_XOOPSMODULES,
302 302 
             'absolute' => 1,
303 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/images/xoops.png');
303 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/images/xoops.png');
304 304 
         $menu[] = array(
305 305 
             'link'     => 'http://www.xoops.org/modules/extgallery/',
306 306 
             'title'    => _OXYGEN_XOOPSTHEMES,
307 307 
             'absolute' => 1,
308 
-            'icon'     => XOOPS_ADMINTHEME_URL . '/transition/images/tweb.png');
308 
+            'icon'     => XOOPS_ADMINTHEME_URL.'/transition/images/tweb.png');
309 309
310 
-        $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => '<span class="fa fa-link"></span> ' . _OXYGEN_INTERESTSITES, 'menu' => $menu));
310 
+        $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => '<span class="fa fa-link"></span> '._OXYGEN_INTERESTSITES, 'menu' => $menu));
311 311
312 312 
         //add OPTIONS/links for local support
313 
-        if (file_exists($file = XOOPS_ADMINTHEME_PATH . '/transition/language/' . $xoopsConfig['language'] . '/localsupport.php')) {
314 
-            $links = include XOOPS_ADMINTHEME_PATH . '/transition/language/' . $xoopsConfig['language'] . '/localsupport.php';
313 
+        if (file_exists($file = XOOPS_ADMINTHEME_PATH.'/transition/language/'.$xoopsConfig['language'].'/localsupport.php')) {
314 
+            $links = include XOOPS_ADMINTHEME_PATH.'/transition/language/'.$xoopsConfig['language'].'/localsupport.php';
315 315 
             if (count($links) > 0) {
316 
-                $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => '<span class="fa fa-link"></span> ' . _OXYGEN_LOCALSUPPORT, 'menu' => $links));
316 
+                $tpl->append('navitems', array('link' => XOOPS_URL.'/admin.php', 'text' => '<span class="fa fa-link"></span> '._OXYGEN_LOCALSUPPORT, 'menu' => $links));
317 317 
             }
318 318 
         }
319 319
320 320 
         if (is_object($xoopsModule) || !empty($_GET['xoopsorgnews'])) {
321 
-            if (is_object($xoopsModule) && file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('adminmenu'))) {
321 
+            if (is_object($xoopsModule) && file_exists($file = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('adminmenu'))) {
322 322 
                 include $file;
323 323 
             }
324 324 
 
@@ -331,17 +331,17 @@  discard block
 
 block discarded – undo
331 331 
                 $rtn  = array();
332 332 
                 $info = $mod->getInfo();
333 333 
                 if (!empty($info ['adminindex'])) {
334 
-                    $rtn ['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['adminindex'];
334 
+                    $rtn ['link'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info ['adminindex'];
335 335 
                 } else {
336 
-                    $rtn ['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=' . $mod->getVar('mid');
336 
+                    $rtn ['link'] = XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mod->getVar('mid');
337 337 
                 }
338 338 
                 $rtn ['title']       = htmlspecialchars($mod->getVar('name'), ENT_QUOTES);
339 339 
                 $rtn ['description'] = $mod->getInfo('description');
340 340 
                 $rtn ['absolute']    = 1;
341 341 
                 if (isset($info ['icon_big'])) {
342 
-                    $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['icon_big'];
342 
+                    $rtn ['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info ['icon_big'];
343 343 
                 } elseif (isset($info ['image'])) {
344 
-                    $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['image'];
344 
+                    $rtn ['icon'] = XOOPS_URL.'/modules/'.$mod->getVar('dirname', 'n').'/'.$info ['image'];
345 345 
                 }
346 346
347 347 
                 $tpl->append('modules', $rtn);
Please login to merge, or discard this patch.
htdocs/modules/protector/search.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -4,6 +4,6 @@
 
 block discarded – undo
4 4
5 5 
 $mydirname = basename(__DIR__);
6 6 
 $mydirpath = __DIR__;
7 
-require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname
7 
+require $mydirpath.'/mytrustdirname.php'; // set $mytrustdirname
8 8
9 
-require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/search.php';
9 
+require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/search.php';
Please login to merge, or discard this patch.
htdocs/modules/protector/preloads/core.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -32,7 +32,7 @@  discard block
 
 block discarded – undo
32 32 
      */
33 33 
     public static function eventCoreIncludeCommonStart($args)
34 34 
     {
35 
-        include XOOPS_TRUST_PATH . '/modules/protector/include/precheck.inc.php';
35 
+        include XOOPS_TRUST_PATH.'/modules/protector/include/precheck.inc.php';
36 36 
     }
37 37
38 38 
     /**
 
@@ -40,7 +40,7 @@  discard block
 
 block discarded – undo
40 40 
      */
41 41 
     public static function eventCoreIncludeCommonEnd($args)
42 42 
     {
43 
-        include XOOPS_TRUST_PATH . '/modules/protector/include/postcheck.inc.php';
43 
+        include XOOPS_TRUST_PATH.'/modules/protector/include/postcheck.inc.php';
44 44 
     }
45 45
46 46 
     /**
Please login to merge, or discard this patch.