Passed
Push — master ( 4990f6...882d2a )
by Michael
03:01
created
class/ReadForum.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 //  URL: https://xoops.org                                                    //
30 30
 //  Project: Article Project                                                 //
31 31
 //  ------------------------------------------------------------------------ //
32
-require_once __DIR__ . '/read.php';
32
+require_once __DIR__.'/read.php';
33 33
 
34 34
 /**
35 35
  * A handler for read/unread handling
Please login to merge, or discard this patch.
class/ReadtopicHandler.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 use XoopsModules\Newbb;
34 34
 
35
-require_once __DIR__ . '/read.php';
35
+require_once __DIR__.'/read.php';
36 36
 
37 37
 /**
38 38
  * A handler for read/unread handling
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             $sticky_id = $itemHandler->getIds($criteria_sticky);
177 177
             $items     = $items_id + $sticky_id;
178 178
             $criteria  = new \CriteriaCompo(new \Criteria('uid', $uid));
179
-            $criteria->add(new \Criteria('read_item', '(' . implode(', ', $items) . ')', 'IN'));
179
+            $criteria->add(new \Criteria('read_item', '('.implode(', ', $items).')', 'IN'));
180 180
             $this->deleteAll($criteria, true);
181 181
 
182 182
             return true;
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
         $itemsObject  = $itemHandler->getAll($criteria_topic, ['topic_last_post_id']);
186 186
         $stickyObject = $itemHandler->getAll($criteria_sticky, ['topic_last_post_id']);
187
-        $itemsObject  += $stickyObject;
187
+        $itemsObject += $stickyObject;
188 188
         $items        = [];
189 189
         foreach (array_keys($itemsObject) as $key) {
190 190
             $items[$key] = $itemsObject[$key]->getVar('topic_last_post_id');
Please login to merge, or discard this patch.
class/Readtopic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 //  URL: https://xoops.org                                                    //
30 30
 //  Project: Article Project                                                 //
31 31
 //  ------------------------------------------------------------------------ //
32
-require_once __DIR__ . '/read.php';
32
+require_once __DIR__.'/read.php';
33 33
 
34 34
 /**
35 35
  * A handler for read/unread handling
Please login to merge, or discard this patch.
class/UserHandler.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         if (empty($this->users) || !$this->enableOnline) {
59 59
             return;
60 60
         }
61
-        require_once __DIR__ . '/../include/functions.render.php';
61
+        require_once __DIR__.'/../include/functions.render.php';
62 62
         $image_online  = newbbDisplayImage('online', _MD_NEWBB_ONLINE);
63 63
         $image_offline = newbbDisplayImage('offline', _MD_NEWBB_OFFLINE);
64 64
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             return;
84 84
         }
85 85
 
86
-        $sql    = 'SELECT user_digests, uid FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . ' WHERE uid IN( ' . implode(', ', array_keys($this->users)) . ')';
86
+        $sql    = 'SELECT user_digests, uid FROM '.$GLOBALS['xoopsDB']->prefix('newbb_user_stats').' WHERE uid IN( '.implode(', ', array_keys($this->users)).')';
87 87
         $result = $GLOBALS['xoopsDB']->query($sql);
88 88
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
89 89
             $this->userlist[$myrow['uid']]['digests'] = (int)$myrow['user_digests'];
Please login to merge, or discard this patch.
class/IconHandler.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -95,23 +95,23 @@  discard block
 block discarded – undo
95 95
     public function getPath($type, $dirname = 'newbb', $default = '', $endDir = 'images')
96 96
     {
97 97
         static $paths;
98
-        if (isset($paths[$endDir . '/' . $type])) {
99
-            return $paths[$endDir . '/' . $type];
98
+        if (isset($paths[$endDir.'/'.$type])) {
99
+            return $paths[$endDir.'/'.$type];
100 100
         }
101 101
 
102 102
         $theme_path = $this->template->currentTheme->path;
103 103
         $rel_dir    = "modules/{$dirname}/{$endDir}";
104 104
         // START irmtfan add default for all pathes
105 105
         if (empty($default)) {
106
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}"
107
-                : (is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
106
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}"
107
+                : (is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
108 108
                 : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}"));
109 109
         } else {
110
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
111
-                is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
112
-                is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
110
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}" : (
111
+                is_dir($theme_path."/{$rel_dir}/{$default}/") ? $theme_path."/{$rel_dir}/{$default}" : (
112
+                is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
113 113
                  . "/default/{$rel_dir}/{$type}" : (
114
-                     is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
114
+                     is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
115 115
                     : (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
116 116
                     : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
117 117
             ) // XOOPS_THEME_PATH {$default}
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
             ); // $theme_path {$default}
120 120
         }
121 121
         // END irmtfan add default for all pathes
122
-        $paths[$endDir . '/' . $type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
122
+        $paths[$endDir.'/'.$type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
123 123
 
124
-        return $paths[$endDir . '/' . $type];
124
+        return $paths[$endDir.'/'.$type];
125 125
     }
126 126
 
127 127
     // END irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
     ) {
137 137
         $this->forumImage = include $GLOBALS['xoops']->path("modules/{$dirname}/include/images.php");
138 138
 
139
-        $this->forumImage['icon']     = XOOPS_URL . $this->getPath('icon', $dirname) . '/';
140
-        $this->forumImage['language'] = XOOPS_URL . $this->getPath("language/{$language}", $dirname, 'language/english') . '/';
139
+        $this->forumImage['icon']     = XOOPS_URL.$this->getPath('icon', $dirname).'/';
140
+        $this->forumImage['language'] = XOOPS_URL.$this->getPath("language/{$language}", $dirname, 'language/english').'/';
141 141
     }
142 142
 
143 143
     /**
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
      */
162 162
     public function getImageSource($image)
163 163
     {
164
-        return $this->forumImage[$this->forumImage[$image]] . $this->prefix . $image . $this->postfix;
164
+        return $this->forumImage[$this->forumImage[$image]].$this->prefix.$image.$this->postfix;
165 165
     }
166 166
 
167 167
     /**
Please login to merge, or discard this patch.
class/PermissionForumHandler.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     {
38 38
         //        $this->PermissionHandler($db);
39 39
         parent::__construct($db);
40
-        $this->templateFilename = XOOPS_VAR_PATH . '/configs/newbb_permission_template.php';
40
+        $this->templateFilename = XOOPS_VAR_PATH.'/configs/newbb_permission_template.php';
41 41
     }
42 42
 
43 43
     /**
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         $items = array_filter(array_map('trim', explode(',', FORUM_PERM_ITEMS)));
54 54
         if (!empty($fullname)) {
55 55
             foreach (array_keys($items) as $key) {
56
-                $items[$key] = 'forum_' . $items[$key];
56
+                $items[$key] = 'forum_'.$items[$key];
57 57
             }
58 58
         }
59 59
         $validPerms[(int)$fullname] = $items;
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
             return $full_items;
75 75
         }
76 76
 
77
-        require_once __DIR__ . '/../include/functions.user.php';
77
+        require_once __DIR__.'/../include/functions.user.php';
78 78
         $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
79 79
         $ip  = \Xmf\IPAddress::fromRequest()->asReadable();
80 80
         if (!empty($GLOBALS['xoopsModuleConfig']['enable_usermoderate']) && !isset($suspension[$uid][$id])
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
133 133
         }
134 134
         // Create criteria for getting only the permissions regarding this module and this user's groups
135 135
         $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $modid));
136
-        $criteria->add(new \Criteria('gperm_groupid', '(' . implode(',', $groups) . ')', 'IN'));
136
+        $criteria->add(new \Criteria('gperm_groupid', '('.implode(',', $groups).')', 'IN'));
137 137
         if ($id) {
138 138
             if (is_array($id)) {
139
-                $criteria->add(new \Criteria('gperm_itemid', '(' . implode(',', $id) . ')', 'IN'));
139
+                $criteria->add(new \Criteria('gperm_itemid', '('.implode(',', $id).')', 'IN'));
140 140
             } else {
141 141
                 $criteria->add(new \Criteria('gperm_itemid', (int)$id));
142 142
             }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
         $gperm_names = implode(', ', $this->getValidItems($modid, $id));
145 145
 
146 146
         // Add criteria for gpermnames
147
-        $criteria->add(new \Criteria('gperm_name', '(' . $gperm_names . ')', 'IN'));
147
+        $criteria->add(new \Criteria('gperm_name', '('.$gperm_names.')', 'IN'));
148 148
         // Get all permission objects in this module and for this user's groups
149 149
         $userpermissions = $this->getObjects($criteria, true);
150 150
 
@@ -182,12 +182,12 @@  discard block
 block discarded – undo
182 182
                 continue;
183 183
             }
184 184
             if ($isAdmin
185
-                || (isset($permission_set[$forumId]['forum_' . $item])
185
+                || (isset($permission_set[$forumId]['forum_'.$item])
186 186
                     && (!$topic_locked
187 187
                         || 'view' === $item))) {
188
-                $perm[] = constant('_MD_NEWBB_CAN_' . strtoupper($item));
188
+                $perm[] = constant('_MD_NEWBB_CAN_'.strtoupper($item));
189 189
             } else {
190
-                $perm[] = constant('_MD_NEWBB_CANNOT_' . strtoupper($item));
190
+                $perm[] = constant('_MD_NEWBB_CANNOT_'.strtoupper($item));
191 191
             }
192 192
         }
193 193
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
         $gpermHandler = xoops_getHandler('groupperm');
208 208
         $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
209 209
         $items        = $this->getValidPerms(true);
210
-        $criteria->add(new \Criteria('gperm_name', "('" . implode("', '", $items) . "')", 'IN'));
210
+        $criteria->add(new \Criteria('gperm_name', "('".implode("', '", $items)."')", 'IN'));
211 211
         $criteria->add(new \Criteria('gperm_itemid', $forum_id));
212 212
 
213 213
         return $gpermHandler->deleteAll($criteria);
Please login to merge, or discard this patch.
class/Helper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      */
35 35
     protected function __construct($debug = false)
36 36
     {
37
-        $this->debug   = $debug;
37
+        $this->debug = $debug;
38 38
         parent::__construct(basename(dirname(__DIR__)));
39 39
     }
40 40
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             $this->initConfig();
66 66
         }
67 67
         $this->configs[$name] = $value;
68
-        $this->addLog("Setting config '{$name}' : " . $this->configs[$name]);
68
+        $this->addLog("Setting config '{$name}' : ".$this->configs[$name]);
69 69
 
70 70
         return $this->configs[$name];
71 71
     }
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     {
90 90
         $ret   = false;
91 91
         $db    = \XoopsDatabaseFactory::getDatabaseConnection();
92
-        $class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
92
+        $class = '\\XoopsModules\\'.ucfirst(strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler';
93 93
         $ret   = new $class($db);
94 94
         return $ret;
95 95
     }
Please login to merge, or discard this patch.
class/TopicHandler.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -88,9 +88,9 @@  discard block
 block discarded – undo
88 88
     {
89 89
         $topic_id = $object->getVar('topic_id');
90 90
         if ($force) {
91
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . " SET approved = -1 WHERE topic_id = {$topic_id}";
91
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics')." SET approved = -1 WHERE topic_id = {$topic_id}";
92 92
         } else {
93
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . " SET approved = 1 WHERE topic_id = {$topic_id}";
93
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics')." SET approved = 1 WHERE topic_id = {$topic_id}";
94 94
         }
95 95
         if (!$result = $this->db->queryF($sql)) {
96 96
             //xoops_error($this->db->error());
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     {
131 131
         $topic = null;
132 132
         if (!empty($action)) {
133
-            $sql = 'SELECT * FROM ' . $this->table . ' WHERE 1=1' . (($forum_id > 0) ? ' AND forum_id=' . (int)$forum_id : '') . ' AND topic_id ' . (($action > 0) ? '>' : '<') . (int)$topic_id . ' ORDER BY topic_id ' . (($action > 0) ? 'ASC' : 'DESC') . ' LIMIT 1';
133
+            $sql = 'SELECT * FROM '.$this->table.' WHERE 1=1'.(($forum_id > 0) ? ' AND forum_id='.(int)$forum_id : '').' AND topic_id '.(($action > 0) ? '>' : '<').(int)$topic_id.' ORDER BY topic_id '.(($action > 0) ? 'ASC' : 'DESC').' LIMIT 1';
134 134
             if ($result = $this->db->query($sql)) {
135 135
                 if ($row = $this->db->fetchArray($result)) {
136 136
                     $topic = $this->create(false);
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
     public function &getByPost($post_id)
153 153
     {
154 154
         $topic  = null;
155
-        $sql    = 'SELECT t.* FROM ' . $this->db->prefix('newbb_topics') . ' t, ' . $this->db->prefix('newbb_posts') . ' p
155
+        $sql    = 'SELECT t.* FROM '.$this->db->prefix('newbb_topics').' t, '.$this->db->prefix('newbb_posts').' p
156 156
                 WHERE t.topic_id = p.topic_id AND p.post_id = ' . (int)$post_id;
157 157
         $result = $this->db->query($sql);
158 158
         if (!$result) {
@@ -200,10 +200,10 @@  discard block
 block discarded – undo
200 200
     public function &getTopPost($topic_id)
201 201
     {
202 202
         $post = null;
203
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p,
204
-            ' . $this->db->prefix('newbb_posts_text') . ' t
203
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p,
204
+            ' . $this->db->prefix('newbb_posts_text').' t
205 205
             WHERE
206
-            p.topic_id = ' . $topic_id . ' AND p.pid = 0
206
+            p.topic_id = ' . $topic_id.' AND p.pid = 0
207 207
             AND t.post_id = p.post_id';
208 208
 
209 209
         $result = $this->db->query($sql);
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
      */
228 228
     public function getTopPostId($topic_id)
229 229
     {
230
-        $sql    = 'SELECT MIN(post_id) AS post_id FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id = ' . $topic_id . ' AND pid = 0';
230
+        $sql    = 'SELECT MIN(post_id) AS post_id FROM '.$this->db->prefix('newbb_posts').' WHERE topic_id = '.$topic_id.' AND pid = 0';
231 231
         $result = $this->db->query($sql);
232 232
         if (!$result) {
233 233
             //xoops_error($this->db->error());
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
                 $operator_for_position = '<';
273 273
             }
274 274
             //$approveCriteria = ' AND approved = 1'; // any others?
275
-            $sql    = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_posts') . ' AS p WHERE p.topic_id=' . (int)$topic->getVar('topic_id') . $approveCriteria . " AND p.post_id $operator_for_position $post_id";
275
+            $sql    = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_posts').' AS p WHERE p.topic_id='.(int)$topic->getVar('topic_id').$approveCriteria." AND p.post_id $operator_for_position $post_id";
276 276
             $result = $this->db->query($sql);
277 277
             if (!$result) {
278 278
                 //xoops_error($this->db->error());
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
             $start = (int)($position / $perpage) * $perpage;
283 283
         }
284 284
 
285
-        $sql    = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p, ' . $this->db->prefix('newbb_posts_text') . ' t WHERE p.topic_id=' . $topic->getVar('topic_id') . ' AND p.post_id = t.post_id' . $approveCriteria . " ORDER BY p.post_id $order";
285
+        $sql    = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p, '.$this->db->prefix('newbb_posts_text').' t WHERE p.topic_id='.$topic->getVar('topic_id').' AND p.post_id = t.post_id'.$approveCriteria." ORDER BY p.post_id $order";
286 286
         $result = $this->db->query($sql, $perpage, $start);
287 287
         if (!$result) {
288 288
             //xoops_error($this->db->error());
@@ -327,18 +327,18 @@  discard block
 block discarded – undo
327 327
         $postArray['post_time'] = newbbFormatTimestamp($postArray['post_time']);
328 328
 
329 329
         if (!empty($postArray['icon'])) {
330
-            $postArray['icon'] = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($postArray['icon']) . '" alt="" />';
330
+            $postArray['icon'] = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($postArray['icon']).'" alt="" />';
331 331
         } else {
332
-            $postArray['icon'] = '<a name="' . $postArray['post_id'] . '"><img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" /></a>';
332
+            $postArray['icon'] = '<a name="'.$postArray['post_id'].'"><img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" /></a>';
333 333
         }
334 334
 
335
-        $postArray['subject'] = '<a href="viewtopic.php?viewmode=thread&amp;topic_id=' . $topic->getVar('topic_id') . '&amp;forum=' . $postArray['forum_id'] . '&amp;post_id=' . $postArray['post_id'] . '">' . $postArray['subject'] . '</a>';
335
+        $postArray['subject'] = '<a href="viewtopic.php?viewmode=thread&amp;topic_id='.$topic->getVar('topic_id').'&amp;forum='.$postArray['forum_id'].'&amp;post_id='.$postArray['post_id'].'">'.$postArray['subject'].'</a>';
336 336
 
337 337
         $isActiveUser = false;
338 338
         if (isset($viewtopic_users[$postArray['uid']]['name'])) {
339 339
             $postArray['poster'] = $viewtopic_users[$postArray['uid']]['name'];
340 340
             if ($postArray['uid'] > 0) {
341
-                $postArray['poster'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $postArray['uid'] . '">' . $viewtopic_users[$postArray['uid']]['name'] . '</a>';
341
+                $postArray['poster'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$postArray['uid'].'">'.$viewtopic_users[$postArray['uid']]['name'].'</a>';
342 342
             }
343 343
         } else {
344 344
             $postArray['poster'] = empty($postArray['poster_name']) ? $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']) : $postArray['poster_name'];
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
      */
355 355
     public function &getAllPosters(&$topic, $isApproved = true)
356 356
     {
357
-        $sql = 'SELECT DISTINCT uid FROM ' . $this->db->prefix('newbb_posts') . '  WHERE topic_id=' . $topic->getVar('topic_id') . ' AND uid>0';
357
+        $sql = 'SELECT DISTINCT uid FROM '.$this->db->prefix('newbb_posts').'  WHERE topic_id='.$topic->getVar('topic_id').' AND uid>0';
358 358
         if ($isApproved) {
359 359
             $sql .= ' AND approved = 1';
360 360
         }
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
     public function getPermission($forum, $topic_locked = 0, $type = 'view')
409 409
     {
410 410
         static $_cachedTopicPerms;
411
-        require_once __DIR__ . '/../include/functions.user.php';
411
+        require_once __DIR__.'/../include/functions.user.php';
412 412
         if (newbbIsAdmin($forum)) {
413 413
             return true;
414 414
         }
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
         }
506 506
         $b1 = $this->insert($object, $force);
507 507
         $criteria->add(new \Criteria('post_id', $top_post, '<>'), 'AND');
508
-        $criteria->add(new \Criteria('pid', '(' . implode(', ', $post_ids) . ')', 'NOT IN'), 'AND');
508
+        $criteria->add(new \Criteria('pid', '('.implode(', ', $post_ids).')', 'NOT IN'), 'AND');
509 509
         $b2       = $postHandler->updateAll('pid', $top_post, $criteria, $force);
510 510
         $criteria = new \CriteriaCompo();
511 511
         $criteria->add(new \Criteria('post_id', $top_post, '='), 'AND');
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
         $allDirs  = xoops_getActiveModules();
527 527
         foreach ($allDirs as $dirname) {
528 528
             // pollresults.php file is exist in all xoopspoll versions and umfrage versions
529
-            if (file_exists($GLOBALS['xoops']->path('modules/' . $dirname . '/pollresults.php'))) {
529
+            if (file_exists($GLOBALS['xoops']->path('modules/'.$dirname.'/pollresults.php'))) {
530 530
                 $pollDirs[$dirname] = $dirname;
531 531
             }
532 532
         }
Please login to merge, or discard this patch.
class/User.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -81,13 +81,13 @@  discard block
 block discarded – undo
81 81
     $level              = [];
82 82
     $level['level']     = $showlevel;
83 83
     $level['exp']       = $ep;
84
-    $level['exp_width'] = $ep . '%';
84
+    $level['exp_width'] = $ep.'%';
85 85
     $level['hp']        = $hp;
86 86
     $level['hp_max']    = $maxhp;
87
-    $level['hp_width']  = $hpf . '%';
87
+    $level['hp_width']  = $hpf.'%';
88 88
     $level['mp']        = $mp;
89 89
     $level['mp_max']    = $maxmp;
90
-    $level['mp_width']  = $mpf . '%';
90
+    $level['mp_width']  = $mpf.'%';
91 91
 
92 92
     return $level;
93 93
 }
@@ -117,49 +117,49 @@  discard block
 block discarded – undo
117 117
 
118 118
         $user               = $this->user;
119 119
         $userbar['profile'] = [
120
-            'link' => XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid'),
120
+            'link' => XOOPS_URL.'/userinfo.php?uid='.$user->getVar('uid'),
121 121
             'name' => _PROFILE
122 122
         ];
123 123
 
124 124
         if (is_object($GLOBALS['xoopsUser'])) {
125 125
             $userbar['pm'] = [
126
-                'link' => "javascript:void openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&amp;to_userid=' . $user->getVar('uid') . "', 'pmlite', 450, 380);",
126
+                'link' => "javascript:void openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&amp;to_userid='.$user->getVar('uid')."', 'pmlite', 450, 380);",
127 127
                 'name' => _MD_NEWBB_PM
128 128
             ];
129 129
         }
130 130
         if ($user->getVar('user_viewemail') || $isAdmin) {
131 131
             $userbar['email'] = [
132
-                'link' => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');",
132
+                'link' => "javascript:void window.open('mailto:".$user->getVar('email')."', 'new');",
133 133
                 'name' => _MD_NEWBB_EMAIL
134 134
             ];
135 135
         }
136 136
         if ($url = $user->getVar('url')) {
137 137
             $userbar['url'] = [
138
-                'link' => "javascript:void window.open('" . $url . "', 'new');",
138
+                'link' => "javascript:void window.open('".$url."', 'new');",
139 139
                 'name' => _MD_NEWBB_WWW
140 140
             ];
141 141
         }
142 142
         if ($icq = $user->getVar('user_icq')) {
143 143
             $userbar['icq'] = [
144
-                'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq . "', 'new');",
144
+                'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=".$icq."', 'new');",
145 145
                 'name' => _MD_NEWBB_ICQ
146 146
             ];
147 147
         }
148 148
         if ($aim = $user->getVar('user_aim')) {
149 149
             $userbar['aim'] = [
150
-                'link' => "javascript:void window.open('aim:goim?screenname=" . $aim . '&amp;message=Hi+' . $aim . '+Are+you+there?' . "', 'new');",
150
+                'link' => "javascript:void window.open('aim:goim?screenname=".$aim.'&amp;message=Hi+'.$aim.'+Are+you+there?'."', 'new');",
151 151
                 'name' => _MD_NEWBB_AIM
152 152
             ];
153 153
         }
154 154
         if ($yim = $user->getVar('user_yim')) {
155 155
             $userbar['yim'] = [
156
-                'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . '&.src=pg' . "', 'new');",
156
+                'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=".$yim.'&.src=pg'."', 'new');",
157 157
                 'name' => _MD_NEWBB_YIM
158 158
             ];
159 159
         }
160 160
         if ($msn = $user->getVar('user_msnm')) {
161 161
             $userbar['msnm'] = [
162
-                'link' => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');",
162
+                'link' => "javascript:void window.open('http://members.msn.com?mem=".$msn."', 'new');",
163 163
                 'name' => _MD_NEWBB_MSNM
164 164
             ];
165 165
         }
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
                 $rpg_path    = $iconHandler->getPath('rpg');
184 184
                 foreach (['img_left', 'img_backing', 'img_right', 'blue', 'green', 'orange'] as $img) {
185 185
                     // irmtfan fix: double "/" removed
186
-                    $rpg_images[$img] = XOOPS_URL . $rpg_path . '/' . $img . '.gif';
186
+                    $rpg_images[$img] = XOOPS_URL.$rpg_path.'/'.$img.'.gif';
187 187
                 }
188 188
             }
189 189
             // irmtfan hardcore removed align="left"
@@ -195,13 +195,13 @@  discard block
 block discarded – undo
195 195
                      . $rpg_images['img_right']
196 196
                      . "' alt='' /></td></tr></table>";
197 197
 
198
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '<br><span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>' . sprintf($table, $rpg_images['orange'], $level['hp_width']);
199
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span><br>' . sprintf($table, $rpg_images['green'], $level['mp_width']);
200
-            $info .= '<span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>' . sprintf($table, $rpg_images['blue'], $level['exp_width']);
198
+            $info = _MD_NEWBB_LEVEL.' '.$level['level'].'<br><span title="'._MD_NEWBB_HP_DESC.'">'._MD_NEWBB_HP.' '.$level['hp'].' / '.$level['hp_max'].'</span><br>'.sprintf($table, $rpg_images['orange'], $level['hp_width']);
199
+            $info .= '<span title="'._MD_NEWBB_MP_DESC.'">'._MD_NEWBB_MP.' '.$level['mp'].' / '.$level['mp_max'].'</span><br>'.sprintf($table, $rpg_images['green'], $level['mp_width']);
200
+            $info .= '<span title="'._MD_NEWBB_EXP_DESC.'">'._MD_NEWBB_EXP.' '.$level['exp'].'</span><br>'.sprintf($table, $rpg_images['blue'], $level['exp_width']);
201 201
         } else {
202
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '; <span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>';
203
-            $info .= '<span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>';
204
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span>';
202
+            $info = _MD_NEWBB_LEVEL.' '.$level['level'].'; <span title="'._MD_NEWBB_EXP_DESC.'">'._MD_NEWBB_EXP.' '.$level['exp'].'</span><br>';
203
+            $info .= '<span title="'._MD_NEWBB_HP_DESC.'">'._MD_NEWBB_HP.' '.$level['hp'].' / '.$level['hp_max'].'</span><br>';
204
+            $info .= '<span title="'._MD_NEWBB_MP_DESC.'">'._MD_NEWBB_MP.' '.$level['mp'].' / '.$level['mp_max'].'</span>';
205 205
         }
206 206
 
207 207
         return $info;
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
         $name             = empty($GLOBALS['xoopsModuleConfig']['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
232 232
         $userinfo['name'] = $name ?: $user->getVar('uname');
233 233
 
234
-        $userinfo['link'] = '<a href=\'' . XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid') . '\'>' . $userinfo['name'] . '</a>';
234
+        $userinfo['link'] = '<a href=\''.XOOPS_URL.'/userinfo.php?uid='.$user->getVar('uid').'\'>'.$userinfo['name'].'</a>';
235 235
 
236 236
         $userinfo['avatar'] = $user->getVar('user_avatar');
237 237
         // START hacked by irmtfan - easier rank getting - consistency with previous version back rank.title and rank.image
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
         // END hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
255 255
         $userinfo['from'] = $user->getVar('user_from');
256 256
 
257
-        require_once __DIR__ . '/../include/functions.time.php';
257
+        require_once __DIR__.'/../include/functions.time.php';
258 258
         $userinfo['regdate']    = newbbFormatTimestamp($user->getVar('user_regdate'), 'reg');
259 259
         $userinfo['last_login'] = newbbFormatTimestamp($user->getVar('last_login')); // irmtfan add last_login
260 260
 
Please login to merge, or discard this patch.