Passed
Pull Request — master (#610)
by Richard
14:27
created
htdocs/modules/system/help.php 1 patch
Spacing   +48 added lines, -48 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
 $xoops = Xoops::getInstance();
29 29
 $system = System::getInstance();
@@ -42,24 +42,24 @@  discard block
 block discarded – undo
42 42
 if ($mid > 0) {
43 43
     $module = $xoops->getModuleById($mid);
44 44
 
45
-    $system_breadcrumb->addLink($module->getVar('name'), 'help.php?mid=' . $module->getVar('mid', 's'));
45
+    $system_breadcrumb->addLink($module->getVar('name'), 'help.php?mid='.$module->getVar('mid', 's'));
46 46
     $system_breadcrumb->addLink(system_adminVersion($page, 'name'));
47 47
     $system_breadcrumb->render();
48 48
 
49 49
     if ($module->getVar('dirname', 'e') === 'system') {
50 50
 
51
-        $admin_dir = \XoopsBaseConfig::get('root-path') . '/modules/system/admin';
51
+        $admin_dir = \XoopsBaseConfig::get('root-path').'/modules/system/admin';
52 52
         $dirlist = XoopsLists::getDirListAsArray($admin_dir);
53 53
 
54 54
         foreach ($dirlist as $directory) {
55
-            if (XoopsLoad::fileExists($file = $admin_dir . '/' . $directory . '/xoops_version.php')) {
55
+            if (XoopsLoad::fileExists($file = $admin_dir.'/'.$directory.'/xoops_version.php')) {
56 56
 
57 57
                 require $file;
58 58
                 unset($file);
59 59
 
60 60
                 if ($modversion['help']) {
61 61
                     $help['name'] = system_adminVersion($directory, 'name');
62
-                    $help['link'] = 'help.php?mid=' . $mid . '&' . system_adminVersion($directory, 'help');
62
+                    $help['link'] = 'help.php?mid='.$mid.'&'.system_adminVersion($directory, 'help');
63 63
 
64 64
                     $xoops->tpl()->appendByRef('help', $help);
65 65
                     unset($help);
@@ -72,12 +72,12 @@  discard block
 block discarded – undo
72 72
         $list_help = array();
73 73
         $listed_mods[0] = $module->toArray();
74 74
         $helplist = $module->getInfo('helpsection');
75
-        $j=0;
75
+        $j = 0;
76 76
         if (is_array($helplist)) {
77 77
             foreach ($helplist as $helpitem) {
78 78
                 if (($helpitem['name'] != '') && ($helpitem['link'] != '')) {
79 79
                     $list_help[$j]['name'] = $helpitem['name'];
80
-                    $list_help[$j]['link'] = 'help.php?mid=' . $mid . '&' . $helpitem['link'];
80
+                    $list_help[$j]['link'] = 'help.php?mid='.$mid.'&'.$helpitem['link'];
81 81
                     ++$j;
82 82
                 }
83 83
             }
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
             $xoopsTpl->assign('list_mods', $listed_mods);
86 86
         }
87 87
         unset ($helplist);
88
-        if (( $module->getInfo('help') != '' ) && ($j == 0)) {
88
+        if (($module->getInfo('help') != '') && ($j == 0)) {
89 89
             $help['name'] = $module->getInfo('name');
90
-            $help['link'] = 'help.php?mid=' . $mid . '&' . $module->getInfo('help');
90
+            $help['link'] = 'help.php?mid='.$mid.'&'.$module->getInfo('help');
91 91
             $xoopsTpl->appendByRef('help', $help);
92 92
         }
93 93
         unset($help);
@@ -100,22 +100,22 @@  discard block
 block discarded – undo
100 100
 
101 101
     if ($page !== '') {
102 102
         // Call template
103
-        if ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.tpl')) {
104
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.tpl');
105
-        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.html')) {
106
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.html');
107
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl')) {
108
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl');
109
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html')) {
110
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html');
111
-        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.tpl')) {
112
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.tpl');
113
-        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.html')) {
114
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.html');
115
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl')) {
116
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl');
117
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html')) {
118
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html');
103
+        if ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.tpl')) {
104
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.tpl');
105
+        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.html')) {
106
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.html');
107
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.tpl')) {
108
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.tpl');
109
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.html')) {
110
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.html');
111
+        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.tpl')) {
112
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.tpl');
113
+        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.html')) {
114
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.html');
115
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.tpl')) {
116
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.tpl');
117
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.html')) {
118
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.html');
119 119
         } else {
120 120
             $xoops->tpl()->assign('load_error', 1);
121 121
         }
@@ -126,23 +126,23 @@  discard block
 block discarded – undo
126 126
         $xoops->tpl()->assign('helpcontent', $helpcontent);
127 127
     } else {
128 128
         if ($helpfile = XoopsLoad::fileExists(
129
-            \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
130
-            . '/locale/' . XoopsLocale::getLocale() . '/help/module_index.html'
129
+            \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
130
+            . '/locale/'.XoopsLocale::getLocale().'/help/module_index.html'
131 131
         )) {
132 132
             $helpcontent = $xoops->tpl()->fetch(
133
-                \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
134
-                . '/locale/' . XoopsLocale::getLocale() . '/help/module_index.html'
133
+                \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
134
+                . '/locale/'.XoopsLocale::getLocale().'/help/module_index.html'
135 135
             );
136 136
         } elseif (XoopsLoad::fileExists(
137
-            \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
138
-            . '/language/' . $xoops->getConfig('language') . '/help/module_index.html'
137
+            \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
138
+            . '/language/'.$xoops->getConfig('language').'/help/module_index.html'
139 139
         )) {
140 140
             $helpcontent = $xoops->tpl()->fetch(
141
-                \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
142
-                . '/language/' . $xoops->getConfig('language') . '/help/module_index.html'
141
+                \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
142
+                . '/language/'.$xoops->getConfig('language').'/help/module_index.html'
143 143
             );
144 144
         } else {
145
-            $helpcontent = '<p>' . $module->getInfo('description') . '</p>';
145
+            $helpcontent = '<p>'.$module->getInfo('description').'</p>';
146 146
         }
147 147
         $xoops->tpl()->assign('helpcontent', $helpcontent);
148 148
     }
@@ -169,19 +169,19 @@  discard block
 block discarded – undo
169 169
         $listed_mods[$i]['description'] = $module->getInfo('description');
170 170
 
171 171
         if ($module->getVar('dirname', 'e') === 'system') {
172
-            $admin_dir = \XoopsBaseConfig::get('root-path') . '/modules/system/admin';
172
+            $admin_dir = \XoopsBaseConfig::get('root-path').'/modules/system/admin';
173 173
             $dirlist = XoopsLists::getDirListAsArray($admin_dir);
174 174
 
175 175
             foreach ($dirlist as $directory) {
176
-                if (XoopsLoad::fileExists($file = $admin_dir . '/' . $directory . '/xoops_version.php')) {
176
+                if (XoopsLoad::fileExists($file = $admin_dir.'/'.$directory.'/xoops_version.php')) {
177 177
 
178 178
                     require $file;
179 179
                     unset($file);
180 180
 
181 181
                     if ($modversion['help']) {
182 182
                         $list_help[$j]['name'] = system_adminVersion($directory, 'name');
183
-                        $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e')
184
-                            . '&amp;' . system_adminVersion($directory, 'help');
183
+                        $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e')
184
+                            . '&amp;'.system_adminVersion($directory, 'help');
185 185
                     }
186 186
                     unset($modversion);
187 187
                     ++$j;
@@ -190,15 +190,15 @@  discard block
 block discarded – undo
190 190
             unset($dirlist);
191 191
         } else {
192 192
             $helplist = $module->getInfo('helpsection');
193
-            $k=0;
193
+            $k = 0;
194 194
 
195 195
             // Only build the list if one has been defined.
196 196
             if (is_array($helplist)) {
197 197
                 foreach ($helplist as $helpitem) {
198 198
                     if (($helpitem['name'] != '') && ($helpitem['link'] != '')) {
199 199
                         $list_help[$j]['name'] = $helpitem['name'];
200
-                        $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e')
201
-                            . '&amp;' . $helpitem['link'];
200
+                        $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e')
201
+                            . '&amp;'.$helpitem['link'];
202 202
                         ++$j;
203 203
                         ++$k;
204 204
                     }
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
207 207
             unset($helplist);
208 208
 
209 209
             // If there is no help section ($k=0), and a lone help parameter has been defined.
210
-            if (( $module->getInfo('help') != '' ) && ($k == 0)) {
210
+            if (($module->getInfo('help') != '') && ($k == 0)) {
211 211
                 $list_help[$j]['name'] = $module->getInfo('name');
212
-                $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e')
213
-                    . '&amp;' . $module->getInfo('help');
212
+                $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e')
213
+                    . '&amp;'.$module->getInfo('help');
214 214
             }
215 215
         }
216 216
         $listed_mods[$i]['help_page'] = $list_help;
@@ -225,15 +225,15 @@  discard block
 block discarded – undo
225 225
     $xoops->tpl()->assign('list_mods', $listed_mods);
226 226
 
227 227
     if (XoopsLoad::fileExists(
228
-        \XoopsBaseConfig::get('root-path') . '/modules/system/language/'
229
-        . $xoops->getConfig('language') . '/help/help_center.html'
228
+        \XoopsBaseConfig::get('root-path').'/modules/system/language/'
229
+        . $xoops->getConfig('language').'/help/help_center.html'
230 230
     )) {
231 231
         $helpcontent = $xoops->tpl()->fetch(
232
-            \XoopsBaseConfig::get('root-path') . '/modules/system/language/' . $xoops->getConfig('language')
232
+            \XoopsBaseConfig::get('root-path').'/modules/system/language/'.$xoops->getConfig('language')
233 233
             . '/help/help_center.html'
234 234
         );
235 235
     } else {
236
-        $helpcontent = '<div id="non-modhelp">' . SystemLocale::WELCOME_TO_XOOPS_HELP_CENTER . '</div>';
236
+        $helpcontent = '<div id="non-modhelp">'.SystemLocale::WELCOME_TO_XOOPS_HELP_CENTER.'</div>';
237 237
     }
238 238
 
239 239
     $xoops->tpl()->assign('helpcontent', $helpcontent);
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/login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
         $block['lang_lostpass'] = XoopsLocale::Q_LOST_YOUR_PASSWORD;
32 32
         $block['lang_registernow'] = XoopsLocale::REGISTER_NOW;
33 33
         if ($xoops->getConfig('use_ssl') == 1 && $xoops->getConfig('sslloginlink') != '') {
34
-            $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('" . $xoops->getConfig('sslloginlink') . "', 'ssllogin', 300, 200);\">" . SystemLocale::SECURE_LOGIN . "</a>";
34
+            $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('".$xoops->getConfig('sslloginlink')."', 'ssllogin', 300, 200);\">".SystemLocale::SECURE_LOGIN."</a>";
35 35
         } elseif ($xoops->getConfig('usercookie')) {
36 36
             $block['lang_rememberme'] = XoopsLocale::REMEMBER_ME;
37 37
         }
Please login to merge, or discard this patch.
htdocs/modules/system/blocks/main.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
                 $block['modules'][$i]['highlight'] = true;
53 53
                 $block['nothome'] = true;
54 54
             }
55
-             /* @var $plugin MenusPluginInterface */
55
+                /* @var $plugin MenusPluginInterface */
56 56
             if ($xoops->isModule() && $module->getVar('dirname') == $xoops->module->getVar('dirname') && $plugin = \Xoops\Module\Plugin::getPlugin($module->getVar('dirname'), 'menus')) {
57 57
                 $sublinks = $plugin->subMenus();
58 58
                 foreach ($sublinks as $sublink) {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
         if (in_array($i, $read_allowed)) {
42 42
             $block['modules'][$i]['name'] = $module->getVar('name');
43 43
             $block['modules'][$i]['dirname'] = $module->getVar('dirname');
44
-            if (XoopsLoad::fileExists($xoops->path('modules/' . $module->getVar('dirname') . '/icons/logo_small.png'))) {
45
-                $block['modules'][$i]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/icons/logo_small.png');
44
+            if (XoopsLoad::fileExists($xoops->path('modules/'.$module->getVar('dirname').'/icons/logo_small.png'))) {
45
+                $block['modules'][$i]['image'] = $xoops->url('modules/'.$module->getVar('dirname').'/icons/logo_small.png');
46 46
             }
47 47
             if ($xoops->isModule() && ($i == $xoops->module->getVar('mid'))) {
48 48
                 $block['modules'][$i]['highlight'] = true;
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
                 foreach ($sublinks as $sublink) {
59 59
                     $block['modules'][$i]['sublinks'][] = array(
60 60
                         'name' => $sublink['name'],
61
-                        'url'  => \XoopsBaseConfig::get('url') . '/modules/' . $module->getVar('dirname') . '/' . $sublink['url']
61
+                        'url'  => \XoopsBaseConfig::get('url').'/modules/'.$module->getVar('dirname').'/'.$sublink['url']
62 62
                     );
63 63
                 }
64 64
             }
Please login to merge, or discard this patch.
htdocs/modules/system/blocks/newmembers.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     $count = count($newmembers);
41 41
     for ($i = 0; $i < $count; ++$i) {
42 42
         if ($options[1] == 1) {
43
-            $block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url') . '/' . $newmembers[$i]->getVar('user_avatar') : '';
43
+            $block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url').'/'.$newmembers[$i]->getVar('user_avatar') : '';
44 44
         } else {
45 45
             $block['users'][$i]['avatar'] = '';
46 46
         }
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 function b_system_newmembers_edit($options)
55 55
 {
56 56
     $block_form = new Xoops\Form\BlockForm();
57
-    $block_form->addElement( new Xoops\Form\Text(SystemLocale::NUMBER_OF_USERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
57
+    $block_form->addElement(new Xoops\Form\Text(SystemLocale::NUMBER_OF_USERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
58 58
     $block_form->addElement(new Xoops\Form\RadioYesNo(SystemLocale::DISPLAY_USERS_AVATARS, 'options[1]', $options[1]));
59 59
     return $block_form->render();
60 60
 }
Please login to merge, or discard this patch.
htdocs/modules/system/blocks/themes.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,20 +25,20 @@  discard block
 block discarded – undo
25 25
     $theme_options = '';
26 26
     $theme_set_allowed = $xoops->getConfig('theme_set_allowed');
27 27
     foreach ($theme_set_allowed as $theme) {
28
-        $theme_options .= '<option value="' . $theme . '"';
28
+        $theme_options .= '<option value="'.$theme.'"';
29 29
         if ($theme == $xoops->getConfig('theme_set')) {
30 30
             $theme_options .= ' selected="selected"';
31 31
         }
32
-        $theme_options .= '>' . $theme . '</option>';
32
+        $theme_options .= '>'.$theme.'</option>';
33 33
     }
34 34
     $block = array();
35 35
     if ($options[0] == 1) {
36
-        $block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"" . \XoopsBaseConfig::get('themes-url') . "/" . $xoops->getConfig('theme_set') . "/screenshot.png\" alt=\"screenshot\" width=\"" . (int)($options[1]) . "\" /><br /><select class=\"span2\" id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/screenshot.png', '" . \XoopsBaseConfig::get('url') . "');\">" . $theme_options . "</select><br /><input type=\"submit\" value=\"" . XoopsLocale::A_GO . "\" />";
36
+        $block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"".\XoopsBaseConfig::get('themes-url')."/".$xoops->getConfig('theme_set')."/screenshot.png\" alt=\"screenshot\" width=\"".(int)($options[1])."\" /><br /><select class=\"span2\" id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/screenshot.png', '".\XoopsBaseConfig::get('url')."');\">".$theme_options."</select><br /><input type=\"submit\" value=\"".XoopsLocale::A_GO."\" />";
37 37
     } else {
38
-        $block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
38
+        $block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">'.$theme_options.'</select>';
39 39
     }
40 40
 
41
-    $block['theme_select'] .= '<br />(' . sprintf(SystemLocale::F_THEMES, '<strong>' . count($theme_set_allowed) . '</strong>') . ')<br />';
41
+    $block['theme_select'] .= '<br />('.sprintf(SystemLocale::F_THEMES, '<strong>'.count($theme_set_allowed).'</strong>').')<br />';
42 42
     return $block;
43 43
 }
44 44
 
@@ -46,6 +46,6 @@  discard block
 block discarded – undo
46 46
 {
47 47
     $block_form = new Xoops\Form\BlockForm();
48 48
     $block_form->addElement(new Xoops\Form\RadioYesNo(SystemLocale::DISPLAY_SCREENSHOT_IMAGE, 'options[0]', $options[0]));
49
-    $block_form->addElement( new Xoops\Form\Text(SystemLocale::SCREENSHOT_IMAGE_WIDTH, 'options[1]', 1, 3, $options[1]), true);
49
+    $block_form->addElement(new Xoops\Form\Text(SystemLocale::SCREENSHOT_IMAGE_WIDTH, 'options[1]', 1, 3, $options[1]), true);
50 50
     return $block_form->render();
51 51
 }
Please login to merge, or discard this patch.
htdocs/modules/system/blocks/user.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
         if (is_array($menu) && !empty($menu)) {
42 42
             $block['modules'][$i]['name'] = $menu['name'];
43
-            $block['modules'][$i]['link'] = $xoops->url('modules/' . $dirname . '/' . $menu['link']);
43
+            $block['modules'][$i]['link'] = $xoops->url('modules/'.$dirname.'/'.$menu['link']);
44 44
             $block['modules'][$i]['image'] = $menu['image'];
45 45
             $block['modules'][$i]['icon'] = 'glyphicon glyphicon-none';
46 46
             $block['modules'][$i]['dirname'] = $dirname;
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
                         $block['modules'][$i]['sublinks'][] = array(
55 55
                             'name' => $sublink['name'],
56 56
                             'title' => $sublink['name'],
57
-                            'url'  => $xoops->url('modules/' . $dirname . '/' . $sublink['url'])
57
+                            'url'  => $xoops->url('modules/'.$dirname.'/'.$sublink['url'])
58 58
                         );
59 59
                     }
60 60
                 }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     // View Account
68 68
     array_unshift($block['modules'], array(
69 69
         'name' => XoopsLocale::VIEW_ACCOUNT,
70
-        'link' => $xoops->url('userinfo.php?uid=' . $xoops->user->getVar('uid')),
70
+        'link' => $xoops->url('userinfo.php?uid='.$xoops->user->getVar('uid')),
71 71
         'icon' => 'glyphicon glyphicon-user',
72 72
         'title' => XoopsLocale::VIEW_ACCOUNT,
73 73
     ));
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     $name = XoopsLocale::INBOX;
101 101
     $class = '';
102 102
     if ($pm_count = $pm_handler->getCount($criteria)) {
103
-        $name = XoopsLocale::INBOX . ' <span class="badge">' . $pm_count . '</span>';
103
+        $name = XoopsLocale::INBOX.' <span class="badge">'.$pm_count.'</span>';
104 104
         //$class = 'text-info';
105 105
     }
106 106
 
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/blocks/topposters.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     for ($i = 0; $i < $count; ++$i) {
42 42
         $block['users'][$i]['rank'] = $i + 1;
43 43
         if ($options[1] == 1) {
44
-            $block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url') . '/' . $topposters[$i]->getVar('user_avatar') : '';
44
+            $block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url').'/'.$topposters[$i]->getVar('user_avatar') : '';
45 45
         } else {
46 46
             $block['users'][$i]['avatar'] = '';
47 47
         }
Please login to merge, or discard this patch.