mambax7 / newbb5

class/Post.php

Spacing +51 added lines, -51 removed lines

@@ -122,7 +122,7 @@ 
             $attachmentSave = base64_encode(serialize($this->attachmentArray));
         }
         $this->setVar('attachment', $attachmentSave);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachmentSave) . ' WHERE post_id = ' . $this->getVar('post_id');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachmentSave).' WHERE post_id = '.$this->getVar('post_id');
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             //xoops_error($GLOBALS['xoopsDB']->error());
             return false;
@@ -152,8 +152,8 @@ 
 
         foreach ($attachOld as $key => $attach) {
             if (in_array($key, $attachArray)) {
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']));
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/thumbs/' . $attach['name_saved'])); // delete thumbnails
+                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']));
+                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/thumbs/'.$attach['name_saved'])); // delete thumbnails
                 continue;
             }
             $this->attachmentArray[$key] = $attach;
@@ -210,25 +210,25 @@ 
         if (is_array($attachments) && count($attachments) > 0) {
             $iconHandler = newbbGetIconHandler();
             $mime_path   = $iconHandler->getPath('mime');
-            require_once dirname(__DIR__) . '/include/functions.image.php';
+            require_once dirname(__DIR__).'/include/functions.image.php';
             $image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_NEWBB_ATTACHMENT . '</strong>:';
+            $post_attachment  .= '<br><strong>'._MD_NEWBB_ATTACHMENT.'</strong>:';
             $post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
             foreach ($attachments as $key => $att) {
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
                 $filetype       = $file_extension;
-                if (file_exists($GLOBALS['xoops']->path($mime_path . '/' . $filetype . '.gif'))) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+                if (file_exists($GLOBALS['xoops']->path($mime_path.'/'.$filetype.'.gif'))) {
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
                 } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
                 }
-                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $att['name_saved']));
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
+                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$att['name_saved']));
+                $file_size = number_format($file_size / 1024, 2).' KB';
                 if (in_array(strtolower($file_extension), $image_extensions)
                     && $GLOBALS['xoopsModuleConfig']['media_allowed']) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['nameDisplay'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . newbbAttachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'" /><strong>&nbsp; '.$att['nameDisplay'].'</strong> <small>('.$file_size.')</small>';
+                    $post_attachment .= '<br>'.newbbAttachmentImage($att['name_saved']);
+                    $isDisplayed = true;
                 } else {
                     if (empty($GLOBALS['xoopsModuleConfig']['show_userattach'])) {
                         $post_attachment .= '<a href="'
@@ -362,10 +362,10 @@ 
                 // End irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
                 // START hacked by irmtfan
                 // display/save all edit records.
-                $post_edit .= _MD_NEWBB_EDITEDBY . ' ' . $edit_user . ' ' . _MD_NEWBB_ON . ' ' . formatTimestamp($edit_time) . '<br>';
+                $post_edit .= _MD_NEWBB_EDITEDBY.' '.$edit_user.' '._MD_NEWBB_ON.' '.formatTimestamp($edit_time).'<br>';
                 // if reason is not empty
                 if ('' !== $edit_msg) {
-                    $post_edit .= _MD_NEWBB_EDITEDMSG . ' ' . $edit_msg . '<br>';
+                    $post_edit .= _MD_NEWBB_EDITEDMSG.' '.$edit_msg.'<br>';
                 }
                 // START hacked by irmtfan
             }
@@ -381,8 +381,8 @@ 
     {
         global $viewtopic_users;
         $newbbConfig = newbbLoadConfig();
-        require_once __DIR__ . '/../include/functions.user.php';
-        require_once __DIR__ . '/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.render.php';
 
         $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
         /** @var KarmaHandler $karmaHandler */
@@ -393,14 +393,14 @@ 
         $post['attachment'] = false;
         $post_text          = newbbDisplayTarea($this->vars['post_text']['value'], $this->getVar('dohtml'), $this->getVar('dosmiley'), $this->getVar('doxcode'), $this->getVar('doimage'), $this->getVar('dobr'));
         if (newbbIsAdmin($this->getVar('forum_id')) || $this->checkIdentity()) {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
+            $post['text'] = $post_text.'<br>'.$this->displayAttachment();
         } elseif ($newbbConfig['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
             $post['text'] = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma'));
         } elseif ($newbbConfig['allow_require_reply'] && $this->getVar('require_reply')
                   && (!$uid || !isset($viewtopic_users[$uid]))) {
             $post['text'] = _MD_NEWBB_REPLY_REQUIREMENT;
         } else {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
+            $post['text'] = $post_text.'<br>'.$this->displayAttachment();
         }
         /** @var \XoopsMemberHandler $memberHandler */
         $memberHandler = xoops_getHandler('member');
@@ -485,8 +485,8 @@ 
             $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
         }
 
-        require_once __DIR__ . '/../include/functions.time.php';
-        require_once __DIR__ . '/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.time.php';
+        require_once __DIR__.'/../include/functions.render.php';
 
         $post_id  = $this->getVar('post_id');
         $topic_id = $this->getVar('topic_id');
@@ -497,7 +497,7 @@ 
         $query_array['topic_id'] = "topic_id={$topic_id}";
         foreach ($query_vars as $var) {
             if (Request::getString($var, '', 'GET')) {
-                $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+                $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
             }
         }
         $page_query = htmlspecialchars(implode('&', array_values($query_array)));
@@ -515,11 +515,11 @@ 
             $post_text       = $this->getVar('post_text');
             $post_attachment = $this->displayAttachment();
         } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
-            $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')) . '</div>';
+            $post_text       = "<div class='karma'>".sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')).'</div>';
             $post_attachment = '';
         } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $this->getVar('require_reply')
                   && (!$uid || !in_array($uid, $viewtopic_posters))) {
-            $post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
+            $post_text       = "<div class='karma'>"._MD_NEWBB_REPLY_REQUIREMENT.'</div>';
             $post_attachment = '';
         } else {
             $post_text       = $this->getVar('post_text');
@@ -546,9 +546,9 @@ 
         }
 
         if ($posticon = $this->getVar('icon')) {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/subject/' . $posticon . '" alt="" /></a>';
+            $post_image = '<a name="'.$post_id.'"><img src="'.XOOPS_URL.'/images/subject/'.$posticon.'" alt="" /></a>';
         } else {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/icons/posticon.gif" alt="" /></a>';
+            $post_image = '<a name="'.$post_id.'"><img src="'.XOOPS_URL.'/images/icons/posticon.gif" alt="" /></a>';
         }
 
         $thread_buttons = [];
@@ -557,10 +557,10 @@ 
         if ($isAdmin && ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->getVar('uid') !== $this->getVar('uid'))
             && $this->getVar('uid') > 0) {
             $mod_buttons['bann']['image']    = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $mod_buttons['bann']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+            $mod_buttons['bann']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/moderate.php?forum='.$forum_id.'&amp;uid='.$this->getVar('uid');
             $mod_buttons['bann']['name']     = _MD_NEWBB_SUSPEND_MANAGEMENT;
             $thread_buttons['bann']['image'] = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $thread_buttons['bann']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+            $thread_buttons['bann']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/moderate.php?forum='.$forum_id.'&amp;uid='.$this->getVar('uid');
             $thread_buttons['bann']['name']  = _MD_NEWBB_SUSPEND_MANAGEMENT;
         }
 
@@ -573,10 +573,10 @@ 
 
                 if ($edit_ok) {
                     $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-                    $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+                    $thread_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
                     $thread_buttons['edit']['name']  = _EDIT;
                     $mod_buttons['edit']['image']    = newbbDisplayImage('p_edit', _EDIT);
-                    $mod_buttons['edit']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+                    $mod_buttons['edit']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
                     $mod_buttons['edit']['name']     = _EDIT;
                 }
             }
@@ -586,55 +586,55 @@ 
 
                 if ($delete_ok) {
                     $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-                    $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+                    $thread_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
                     $thread_buttons['delete']['name']  = _DELETE;
                     $mod_buttons['delete']['image']    = newbbDisplayImage('p_delete', _DELETE);
-                    $mod_buttons['delete']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+                    $mod_buttons['delete']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
                     $mod_buttons['delete']['name']     = _DELETE;
                 }
             }
             if ($topicHandler->getPermission($forum_id, $topic_status, 'reply')) {
                 $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-                $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+                $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}";
                 $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
 
                 $thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
-                $thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}&amp;quotedac=1";
+                $thread_buttons['quote']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}&amp;quotedac=1";
                 $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
             }
         } else {
             $mod_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $mod_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+            $mod_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
             $mod_buttons['edit']['name']  = _EDIT;
 
             $mod_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $mod_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+            $mod_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
             $mod_buttons['delete']['name']  = _DELETE;
 
             $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+            $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}";
             $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
         }
 
         if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
             $thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
-            $thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/report.php?{$page_query}";
+            $thread_buttons['report']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/report.php?{$page_query}";
             $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
         }
 
         $thread_action = [];
         // irmtfan add pdf permission
-        if (file_exists(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
+        if (file_exists(XOOPS_ROOT_PATH.'/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
             && $topicHandler->getPermission($forum_id, $topic_status, 'pdf')) {
             $thread_action['pdf']['image']  = newbbDisplayImage('pdf', _MD_NEWBB_PDF);
-            $thread_action['pdf']['link']   = XOOPS_URL . '/modules/newbb/makepdf.php?type=post&amp;pageid=0';
+            $thread_action['pdf']['link']   = XOOPS_URL.'/modules/newbb/makepdf.php?type=post&amp;pageid=0';
             $thread_action['pdf']['name']   = _MD_NEWBB_PDF;
             $thread_action['pdf']['target'] = '_blank';
         }
         // irmtfan add print permission
         if ($topicHandler->getPermission($forum_id, $topic_status, 'print')) {
             $thread_action['print']['image']  = newbbDisplayImage('printer', _MD_NEWBB_PRINT);
-            $thread_action['print']['link']   = XOOPS_URL . '/modules/newbb/print.php?form=2&amp;forum=' . $forum_id . '&amp;topic_id=' . $topic_id;
+            $thread_action['print']['link']   = XOOPS_URL.'/modules/newbb/print.php?form=2&amp;forum='.$forum_id.'&amp;topic_id='.$topic_id;
             $thread_action['print']['name']   = _MD_NEWBB_PRINT;
             $thread_action['print']['target'] = '_blank';
         }
@@ -642,45 +642,45 @@ 
         if ($GLOBALS['xoopsModuleConfig']['show_sociallinks']) {
             $full_title  = $this->getVar('subject');
             $clean_title = preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
-            $full_link   = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+            $full_link   = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post_id;
 
             $thread_action['social_twitter']['image']  = newbbDisplayImage('twitter', _MD_NEWBB_SHARE_TWITTER);
-            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text=' . $clean_title . '&amp;url=' . $full_link;
+            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text='.$clean_title.'&amp;url='.$full_link;
             $thread_action['social_twitter']['name']   = _MD_NEWBB_SHARE_TWITTER;
             $thread_action['social_twitter']['target'] = '_blank';
 
             $thread_action['social_facebook']['image']  = newbbDisplayImage('facebook', _MD_NEWBB_SHARE_FACEBOOK);
-            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u=' . $full_link;
+            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u='.$full_link;
             $thread_action['social_facebook']['name']   = _MD_NEWBB_SHARE_FACEBOOK;
             $thread_action['social_facebook']['target'] = '_blank';
 
             $thread_action['social_gplus']['image']  = newbbDisplayImage('googleplus', _MD_NEWBB_SHARE_GOOGLEPLUS);
-            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url=' . $full_link;
+            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url='.$full_link;
             $thread_action['social_gplus']['name']   = _MD_NEWBB_SHARE_GOOGLEPLUS;
             $thread_action['social_gplus']['target'] = '_blank';
 
             $thread_action['social_linkedin']['image']  = newbbDisplayImage('linkedin', _MD_NEWBB_SHARE_LINKEDIN);
-            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_linkedin']['name']   = _MD_NEWBB_SHARE_LINKEDIN;
             $thread_action['social_linkedin']['target'] = '_blank';
 
             $thread_action['social_delicious']['image']  = newbbDisplayImage('delicious', _MD_NEWBB_SHARE_DELICIOUS);
-            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_delicious']['name']   = _MD_NEWBB_SHARE_DELICIOUS;
             $thread_action['social_delicious']['target'] = '_blank';
 
             $thread_action['social_digg']['image']  = newbbDisplayImage('digg', _MD_NEWBB_SHARE_DIGG);
-            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_digg']['name']   = _MD_NEWBB_SHARE_DIGG;
             $thread_action['social_digg']['target'] = '_blank';
 
             $thread_action['social_reddit']['image']  = newbbDisplayImage('reddit', _MD_NEWBB_SHARE_REDDIT);
-            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_reddit']['name']   = _MD_NEWBB_SHARE_REDDIT;
             $thread_action['social_reddit']['target'] = '_blank';
 
             $thread_action['social_wong']['image']  = newbbDisplayImage('wong', _MD_NEWBB_SHARE_MRWONG);
-            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url=' . $full_link;
+            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url='.$full_link;
             $thread_action['social_wong']['name']   = _MD_NEWBB_SHARE_MRWONG;
             $thread_action['social_wong']['target'] = '_blank';
         }
@@ -704,7 +704,7 @@ 
             'thread_buttons'  => $thread_buttons,
             'mod_buttons'     => $mod_buttons,
             'poster'          => $poster,
-            'post_permalink'  => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '"></a>'
+            'post_permalink'  => '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?post_id='.$post_id.'"></a>'
         ];
 
         unset($thread_buttons, $mod_buttons, $eachposter);

class/ReadForum.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 //  URL: https://xoops.org                                                    //
 //  Project: Article Project                                                 //
 //  ------------------------------------------------------------------------ //
-require_once __DIR__ . '/read.php';
+require_once __DIR__.'/read.php';
 
 /**
  * A handler for read/unread handling

class/ReadtopicHandler.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/read.php';
+require_once __DIR__.'/read.php';
 
 /**
  * A handler for read/unread handling
@@ -176,7 +176,7 @@ 
             $sticky_id = $itemHandler->getIds($criteria_sticky);
             $items     = $items_id + $sticky_id;
             $criteria  = new \CriteriaCompo(new \Criteria('uid', $uid));
-            $criteria->add(new \Criteria('read_item', '(' . implode(', ', $items) . ')', 'IN'));
+            $criteria->add(new \Criteria('read_item', '('.implode(', ', $items).')', 'IN'));
             $this->deleteAll($criteria, true);
 
             return true;
@@ -184,7 +184,7 @@ 
 
         $itemsObject  = $itemHandler->getAll($criteria_topic, ['topic_last_post_id']);
         $stickyObject = $itemHandler->getAll($criteria_sticky, ['topic_last_post_id']);
-        $itemsObject  += $stickyObject;
+        $itemsObject += $stickyObject;
         $items        = [];
         foreach (array_keys($itemsObject) as $key) {
             $items[$key] = $itemsObject[$key]->getVar('topic_last_post_id');

class/Readtopic.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 //  URL: https://xoops.org                                                    //
 //  Project: Article Project                                                 //
 //  ------------------------------------------------------------------------ //
-require_once __DIR__ . '/read.php';
+require_once __DIR__.'/read.php';
 
 /**
  * A handler for read/unread handling

class/UserHandler.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
         if (empty($this->users) || !$this->enableOnline) {
             return;
         }
-        require_once __DIR__ . '/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.render.php';
         $image_online  = newbbDisplayImage('online', _MD_NEWBB_ONLINE);
         $image_offline = newbbDisplayImage('offline', _MD_NEWBB_OFFLINE);
 
@@ -83,7 +83,7 @@ 
             return;
         }
 
-        $sql    = 'SELECT user_digests, uid FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . ' WHERE uid IN( ' . implode(', ', array_keys($this->users)) . ')';
+        $sql    = 'SELECT user_digests, uid FROM '.$GLOBALS['xoopsDB']->prefix('newbb_user_stats').' WHERE uid IN( '.implode(', ', array_keys($this->users)).')';
         $result = $GLOBALS['xoopsDB']->query($sql);
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
             $this->userlist[$myrow['uid']]['digests'] = (int)$myrow['user_digests'];

class/IconHandler.php

Spacing +13 added lines, -13 removed lines

@@ -95,23 +95,23 @@ 
     public function getPath($type, $dirname = 'newbb', $default = '', $endDir = 'images')
     {
         static $paths;
-        if (isset($paths[$endDir . '/' . $type])) {
-            return $paths[$endDir . '/' . $type];
+        if (isset($paths[$endDir.'/'.$type])) {
+            return $paths[$endDir.'/'.$type];
         }
 
         $theme_path = $this->template->currentTheme->path;
         $rel_dir    = "modules/{$dirname}/{$endDir}";
         // START irmtfan add default for all pathes
         if (empty($default)) {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}"
-                : (is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}"
+                : (is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
                 : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}"));
         } else {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
-                is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
-                is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}" : (
+                is_dir($theme_path."/{$rel_dir}/{$default}/") ? $theme_path."/{$rel_dir}/{$default}" : (
+                is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
                  . "/default/{$rel_dir}/{$type}" : (
-                     is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
+                     is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
                     : (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
                     : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
             ) // XOOPS_THEME_PATH {$default}
@@ -119,9 +119,9 @@ 
             ); // $theme_path {$default}
         }
         // END irmtfan add default for all pathes
-        $paths[$endDir . '/' . $type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
+        $paths[$endDir.'/'.$type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
 
-        return $paths[$endDir . '/' . $type];
+        return $paths[$endDir.'/'.$type];
     }
 
     // END irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
@@ -136,8 +136,8 @@ 
     ) {
         $this->forumImage = include $GLOBALS['xoops']->path("modules/{$dirname}/include/images.php");
 
-        $this->forumImage['icon']     = XOOPS_URL . $this->getPath('icon', $dirname) . '/';
-        $this->forumImage['language'] = XOOPS_URL . $this->getPath("language/{$language}", $dirname, 'language/english') . '/';
+        $this->forumImage['icon']     = XOOPS_URL.$this->getPath('icon', $dirname).'/';
+        $this->forumImage['language'] = XOOPS_URL.$this->getPath("language/{$language}", $dirname, 'language/english').'/';
     }
 
     /**
@@ -161,7 +161,7 @@ 
      */
     public function getImageSource($image)
     {
-        return $this->forumImage[$this->forumImage[$image]] . $this->prefix . $image . $this->postfix;
+        return $this->forumImage[$this->forumImage[$image]].$this->prefix.$image.$this->postfix;
     }
 
     /**

class/PermissionForumHandler.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
     {
         //        $this->PermissionHandler($db);
         parent::__construct($db);
-        $this->templateFilename = XOOPS_VAR_PATH . '/configs/newbb_permission_template.php';
+        $this->templateFilename = XOOPS_VAR_PATH.'/configs/newbb_permission_template.php';
     }
 
     /**
@@ -53,7 +53,7 @@ 
         $items = array_filter(array_map('trim', explode(',', FORUM_PERM_ITEMS)));
         if (!empty($fullname)) {
             foreach (array_keys($items) as $key) {
-                $items[$key] = 'forum_' . $items[$key];
+                $items[$key] = 'forum_'.$items[$key];
             }
         }
         $validPerms[(int)$fullname] = $items;
@@ -74,7 +74,7 @@ 
             return $full_items;
         }
 
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.user.php';
         $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
         $ip  = \Xmf\IPAddress::fromRequest()->asReadable();
         if (!empty($GLOBALS['xoopsModuleConfig']['enable_usermoderate']) && !isset($suspension[$uid][$id])
@@ -133,10 +133,10 @@ 
         }
         // Create criteria for getting only the permissions regarding this module and this user's groups
         $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $modid));
-        $criteria->add(new \Criteria('gperm_groupid', '(' . implode(',', $groups) . ')', 'IN'));
+        $criteria->add(new \Criteria('gperm_groupid', '('.implode(',', $groups).')', 'IN'));
         if ($id) {
             if (is_array($id)) {
-                $criteria->add(new \Criteria('gperm_itemid', '(' . implode(',', $id) . ')', 'IN'));
+                $criteria->add(new \Criteria('gperm_itemid', '('.implode(',', $id).')', 'IN'));
             } else {
                 $criteria->add(new \Criteria('gperm_itemid', (int)$id));
             }
@@ -144,7 +144,7 @@ 
         $gperm_names = implode(', ', $this->getValidItems($modid, $id));
 
         // Add criteria for gpermnames
-        $criteria->add(new \Criteria('gperm_name', '(' . $gperm_names . ')', 'IN'));
+        $criteria->add(new \Criteria('gperm_name', '('.$gperm_names.')', 'IN'));
         // Get all permission objects in this module and for this user's groups
         $userpermissions = $this->getObjects($criteria, true);
 
@@ -182,12 +182,12 @@ 
                 continue;
             }
             if ($isAdmin
-                || (isset($permission_set[$forumId]['forum_' . $item])
+                || (isset($permission_set[$forumId]['forum_'.$item])
                     && (!$topic_locked
                         || 'view' === $item))) {
-                $perm[] = constant('_MD_NEWBB_CAN_' . strtoupper($item));
+                $perm[] = constant('_MD_NEWBB_CAN_'.strtoupper($item));
             } else {
-                $perm[] = constant('_MD_NEWBB_CANNOT_' . strtoupper($item));
+                $perm[] = constant('_MD_NEWBB_CANNOT_'.strtoupper($item));
             }
         }
 
@@ -207,7 +207,7 @@ 
         $gpermHandler = xoops_getHandler('groupperm');
         $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
         $items        = $this->getValidPerms(true);
-        $criteria->add(new \Criteria('gperm_name', "('" . implode("', '", $items) . "')", 'IN'));
+        $criteria->add(new \Criteria('gperm_name', "('".implode("', '", $items)."')", 'IN'));
         $criteria->add(new \Criteria('gperm_itemid', $forum_id));
 
         return $gpermHandler->deleteAll($criteria);

class/Helper.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
      */
     protected function __construct($debug = false)
     {
-        $this->debug   = $debug;
+        $this->debug = $debug;
         parent::__construct(basename(dirname(__DIR__)));
     }
 
@@ -65,7 +65,7 @@ 
             $this->initConfig();
         }
         $this->configs[$name] = $value;
-        $this->addLog("Setting config '{$name}' : " . $this->configs[$name]);
+        $this->addLog("Setting config '{$name}' : ".$this->configs[$name]);
 
         return $this->configs[$name];
     }
@@ -89,7 +89,7 @@ 
     {
         $ret   = false;
         $db    = \XoopsDatabaseFactory::getDatabaseConnection();
-        $class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
+        $class = '\\XoopsModules\\'.ucfirst(strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler';
         $ret   = new $class($db);
         return $ret;
     }

class/TopicHandler.php

Spacing +18 added lines, -18 removed lines

@@ -88,9 +88,9 @@ 
     {
         $topic_id = $object->getVar('topic_id');
         if ($force) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . " SET approved = -1 WHERE topic_id = {$topic_id}";
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics')." SET approved = -1 WHERE topic_id = {$topic_id}";
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . " SET approved = 1 WHERE topic_id = {$topic_id}";
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics')." SET approved = 1 WHERE topic_id = {$topic_id}";
         }
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
@@ -130,7 +130,7 @@ 
     {
         $topic = null;
         if (!empty($action)) {
-            $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';
+            $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';
             if ($result = $this->db->query($sql)) {
                 if ($row = $this->db->fetchArray($result)) {
                     $topic = $this->create(false);
@@ -152,7 +152,7 @@ 
     public function &getByPost($post_id)
     {
         $topic  = null;
-        $sql    = 'SELECT t.* FROM ' . $this->db->prefix('newbb_topics') . ' t, ' . $this->db->prefix('newbb_posts') . ' p
+        $sql    = 'SELECT t.* FROM '.$this->db->prefix('newbb_topics').' t, '.$this->db->prefix('newbb_posts').' p
                 WHERE t.topic_id = p.topic_id AND p.post_id = ' . (int)$post_id;
         $result = $this->db->query($sql);
         if (!$result) {
@@ -200,10 +200,10 @@ 
     public function &getTopPost($topic_id)
     {
         $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p,
-            ' . $this->db->prefix('newbb_posts_text') . ' t
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p,
+            ' . $this->db->prefix('newbb_posts_text').' t
             WHERE
-            p.topic_id = ' . $topic_id . ' AND p.pid = 0
+            p.topic_id = ' . $topic_id.' AND p.pid = 0
             AND t.post_id = p.post_id';
 
         $result = $this->db->query($sql);
@@ -227,7 +227,7 @@ 
      */
     public function getTopPostId($topic_id)
     {
-        $sql    = 'SELECT MIN(post_id) AS post_id FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id = ' . $topic_id . ' AND pid = 0';
+        $sql    = 'SELECT MIN(post_id) AS post_id FROM '.$this->db->prefix('newbb_posts').' WHERE topic_id = '.$topic_id.' AND pid = 0';
         $result = $this->db->query($sql);
         if (!$result) {
             //xoops_error($this->db->error());
@@ -272,7 +272,7 @@ 
                 $operator_for_position = '<';
             }
             //$approveCriteria = ' AND approved = 1'; // any others?
-            $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";
+            $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";
             $result = $this->db->query($sql);
             if (!$result) {
                 //xoops_error($this->db->error());
@@ -282,7 +282,7 @@ 
             $start = (int)($position / $perpage) * $perpage;
         }
 
-        $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";
+        $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";
         $result = $this->db->query($sql, $perpage, $start);
         if (!$result) {
             //xoops_error($this->db->error());
@@ -327,18 +327,18 @@ 
         $postArray['post_time'] = newbbFormatTimestamp($postArray['post_time']);
 
         if (!empty($postArray['icon'])) {
-            $postArray['icon'] = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($postArray['icon']) . '" alt="" />';
+            $postArray['icon'] = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($postArray['icon']).'" alt="" />';
         } else {
-            $postArray['icon'] = '<a name="' . $postArray['post_id'] . '"><img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" /></a>';
+            $postArray['icon'] = '<a name="'.$postArray['post_id'].'"><img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" /></a>';
         }
 
-        $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>';
+        $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>';
 
         $isActiveUser = false;
         if (isset($viewtopic_users[$postArray['uid']]['name'])) {
             $postArray['poster'] = $viewtopic_users[$postArray['uid']]['name'];
             if ($postArray['uid'] > 0) {
-                $postArray['poster'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $postArray['uid'] . '">' . $viewtopic_users[$postArray['uid']]['name'] . '</a>';
+                $postArray['poster'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$postArray['uid'].'">'.$viewtopic_users[$postArray['uid']]['name'].'</a>';
             }
         } else {
             $postArray['poster'] = empty($postArray['poster_name']) ? $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']) : $postArray['poster_name'];
@@ -354,7 +354,7 @@ 
      */
     public function &getAllPosters(&$topic, $isApproved = true)
     {
-        $sql = 'SELECT DISTINCT uid FROM ' . $this->db->prefix('newbb_posts') . '  WHERE topic_id=' . $topic->getVar('topic_id') . ' AND uid>0';
+        $sql = 'SELECT DISTINCT uid FROM '.$this->db->prefix('newbb_posts').'  WHERE topic_id='.$topic->getVar('topic_id').' AND uid>0';
         if ($isApproved) {
             $sql .= ' AND approved = 1';
         }
@@ -408,7 +408,7 @@ 
     public function getPermission($forum, $topic_locked = 0, $type = 'view')
     {
         static $_cachedTopicPerms;
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.user.php';
         if (newbbIsAdmin($forum)) {
             return true;
         }
@@ -505,7 +505,7 @@ 
         }
         $b1 = $this->insert($object, $force);
         $criteria->add(new \Criteria('post_id', $top_post, '<>'), 'AND');
-        $criteria->add(new \Criteria('pid', '(' . implode(', ', $post_ids) . ')', 'NOT IN'), 'AND');
+        $criteria->add(new \Criteria('pid', '('.implode(', ', $post_ids).')', 'NOT IN'), 'AND');
         $b2       = $postHandler->updateAll('pid', $top_post, $criteria, $force);
         $criteria = new \CriteriaCompo();
         $criteria->add(new \Criteria('post_id', $top_post, '='), 'AND');
@@ -526,7 +526,7 @@ 
         $allDirs  = xoops_getActiveModules();
         foreach ($allDirs as $dirname) {
             // pollresults.php file is exist in all xoopspoll versions and umfrage versions
-            if (file_exists($GLOBALS['xoops']->path('modules/' . $dirname . '/pollresults.php'))) {
+            if (file_exists($GLOBALS['xoops']->path('modules/'.$dirname.'/pollresults.php'))) {
                 $pollDirs[$dirname] = $dirname;
             }
         }