Completed
Pull Request — master (#624)
by Michael
24:05
created
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/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.
htdocs/modules/system/menu.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,15 +40,15 @@
 block discarded – undo
40 40
 $dirlist = XoopsLists::getDirListAsArray($admin_dir);
41 41
 $index = 0;
42 42
 foreach ($dirlist as $file) {
43
-    if (XoopsLoad::fileExists($fileinc = $admin_dir . '/' . $file . '/xoops_version.php')) {
43
+    if (XoopsLoad::fileExists($fileinc = $admin_dir.'/'.$file.'/xoops_version.php')) {
44 44
         include $fileinc;
45 45
         unset($fileinc);
46 46
         if ($modversion['hasAdmin']) {
47
-            if ($xoops->getModuleConfig('active_' . $file, 'system')) {
47
+            if ($xoops->getModuleConfig('active_'.$file, 'system')) {
48 48
                 $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
49 49
                 if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
50 50
                     $adminmenu[$index]['title'] = trim($modversion['name']);
51
-                    $adminmenu[$index]['link'] = 'admin.php?fct=' . $file;
51
+                    $adminmenu[$index]['link'] = 'admin.php?fct='.$file;
52 52
                     $adminmenu[$index]['image'] = $modversion['image'];
53 53
                 }
54 54
             }
Please login to merge, or discard this patch.
htdocs/modules/system/blocks/online.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
         $members = '';
51 51
         for ($i = 0; $i < $total; ++$i) {
52 52
             if ($onlines[$i]['online_uid'] > 0) {
53
-                $members .= ' <a href="' . \XoopsBaseConfig::get('url') . '/userinfo.php?uid=' . $onlines[$i]['online_uid'] . '" title="' . $onlines[$i]['online_uname'] . '">' . $onlines[$i]['online_uname'] . '</a>,';
53
+                $members .= ' <a href="'.\XoopsBaseConfig::get('url').'/userinfo.php?uid='.$onlines[$i]['online_uid'].'" title="'.$onlines[$i]['online_uname'].'">'.$onlines[$i]['online_uname'].'</a>,';
54 54
             } else {
55 55
                 ++$guests;
56 56
             }
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         $block['online_total'] = sprintf(XoopsLocale::F_USERS_ONLINE, $total);
59 59
         if ($xoops->isModule()) {
60 60
             $mytotal = $online_handler->getCount(new Criteria('online_module', $xoops->module->getVar('mid')));
61
-            $block['online_total'] .= ' (' . sprintf(XoopsLocale::F_USERS_BROWSING, $mytotal, $xoops->module->getVar('name')) . ')';
61
+            $block['online_total'] .= ' ('.sprintf(XoopsLocale::F_USERS_BROWSING, $mytotal, $xoops->module->getVar('name')).')';
62 62
         }
63 63
         $block['lang_members'] = XoopsLocale::MEMBERS;
64 64
         $block['lang_guests'] = XoopsLocale::GUESTS;
Please login to merge, or discard this patch.
htdocs/modules/system/class/plugin/usermenu.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
             // View Account
29 29
             $ret[] = [
30 30
                 'name' => XoopsLocale::VIEW_ACCOUNT,
31
-                'link' => $xoops->url('userinfo.php?uid=' . $xoops->user->getVar('uid')),
31
+                'link' => $xoops->url('userinfo.php?uid='.$xoops->user->getVar('uid')),
32 32
                 'icon' => 'glyphicon-user',
33 33
             ];
34 34
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
             $name = XoopsLocale::INBOX;
60 60
             if ($pm_count = $pm_handler->getCount($criteria)) {
61
-                $name = XoopsLocale::INBOX . ' <span class="badge">' . $pm_count . '</span>';
61
+                $name = XoopsLocale::INBOX.' <span class="badge">'.$pm_count.'</span>';
62 62
             }
63 63
 
64 64
             $ret[] = [
Please login to merge, or discard this patch.
htdocs/modules/system/class/form/block.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -152,17 +152,17 @@
 block discarded – undo
152 152
                 if (count($btemplate) > 0) {
153 153
                     $this->addElement(new Xoops\Form\Label(
154 154
                         XoopsLocale::CONTENT,
155
-                        '<a href="' . \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
156
-                        . $btemplate[0]->getVar('tpl_id') . '">' . SystemLocale::EDIT_TEMPLATE . '</a>'
155
+                        '<a href="'.\XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
156
+                        . $btemplate[0]->getVar('tpl_id').'">'.SystemLocale::EDIT_TEMPLATE.'</a>'
157 157
                     ));
158 158
                 } else {
159 159
                     $btemplate2 = $tplfile_handler->find('default', 'block', $this->obj->getVar('bid'));
160 160
                     if (count($btemplate2) > 0) {
161 161
                         $this->addElement(new Xoops\Form\Label(
162 162
                             XoopsLocale::CONTENT,
163
-                            '<a href="' . \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
164
-                            . $btemplate2[0]->getVar('tpl_id') . '" rel="external">'
165
-                            . SystemLocale::EDIT_TEMPLATE . '</a>'
163
+                            '<a href="'.\XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
164
+                            . $btemplate2[0]->getVar('tpl_id').'" rel="external">'
165
+                            . SystemLocale::EDIT_TEMPLATE.'</a>'
166 166
                         ));
167 167
                     }
168 168
                 }
Please login to merge, or discard this patch.
htdocs/modules/system/class/form/user.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@
 block discarded – undo
145 145
         } else {
146 146
             //add each user groups
147 147
             foreach ($groups as $key => $group) {
148
-                $group_select[] = new Xoops\Form\Hidden('groups[' . $key . ']', $group);
148
+                $group_select[] = new Xoops\Form\Hidden('groups['.$key.']', $group);
149 149
             }
150 150
         }
151 151
         foreach ($group_select as $group) {
Please login to merge, or discard this patch.
htdocs/modules/system/header.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  */
20 20
 
21 21
 // Include XOOPS control panel header
22
-include_once dirname(dirname(__DIR__)) . '/include/cp_header.php';
22
+include_once dirname(dirname(__DIR__)).'/include/cp_header.php';
23 23
 
24 24
 $xoops = Xoops::getInstance();
25 25
 
@@ -48,4 +48,4 @@  discard block
 block discarded – undo
48 48
 XoopsLoad::load('systembreadcrumb', 'system');
49 49
 
50 50
 $system_breadcrumb = SystemBreadcrumb::getInstance($fct);
51
-$system_breadcrumb->addLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
51
+$system_breadcrumb->addLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
Please login to merge, or discard this patch.
htdocs/modules/maintenance/admin/about.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
  * @version         $Id$
21 21
  */
22 22
 
23
-include __DIR__ . '/header.php';
23
+include __DIR__.'/header.php';
24 24
 $xoops = Xoops::getInstance();
25 25
 $xoops->header();
26 26
 $aboutAdmin = new \Xoops\Module\Admin();
Please login to merge, or discard this patch.