mambax7 / newbb5

class/CategoryHandler.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         if (!$valid_ids = $this->getIdsByPermission($permission)) {
             return $categories;
         }
-        $criteria = new \Criteria('cat_id', '(' . implode(', ', $valid_ids) . ')', 'IN');
+        $criteria = new \Criteria('cat_id', '('.implode(', ', $valid_ids).')', 'IN');
         $criteria->setSort('cat_order');
         $categories = $this->getAll($criteria, $tags, $asObject);
 

class/PermissionHandler.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     {
         if (!isset($this->_handler[$name])) {
 //            require_once __DIR__ . "/permission.{$name}.php";
-            $className             = '\\XoopsModules\\Newbb\\Permission' . ucfirst($name) . 'Handler';
+            $className             = '\\XoopsModules\\Newbb\\Permission'.ucfirst($name).'Handler';
             $this->_handler[$name] = new $className($this->db);
         }
 
@@ -377,7 +377,7 @@ 
             $criteria->add(new \Criteria('gperm_groupid', $groupid));
             $criteria->add(new \Criteria('gperm_itemid', $itemid));
             $criteria->add(new \Criteria('gperm_modid', $mid));
-            $permsObject =& $this->getObjects($criteria);
+            $permsObject = & $this->getObjects($criteria);
             if (!empty($permsObject)) {
                 foreach ($permsObject as $permObject) {
                     $this->delete($permObject);

class/UserstatsHandler.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         if (empty($id)) {
             return null;
         }
-        $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->keyName . ' = ' . (int)$id;
+        $sql = 'SELECT * FROM '.$this->table.' WHERE '.$this->keyName.' = '.(int)$id;
         if (!$result = $this->db->query($sql)) {
             return null;
         }

class/ReportHandler.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
         if (!is_array($posts)) {
             $posts = [$posts];
         }
-        $post_criteria = new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN');
+        $post_criteria = new \Criteria('post_id', '('.implode(', ', $posts).')', 'IN');
         $ret           = $this->getAll($post_criteria);
 
         return $ret;
@@ -79,18 +79,18 @@ 
         if (empty($start)) {
             $start = 0;
         }
-        $result_criteria = ' AND r.report_result = ' . $report_result;
+        $result_criteria = ' AND r.report_result = '.$report_result;
 
         if ($forums) {
             $forumCriteria = '';
         } elseif (!is_array($forums)) {
             $forums        = [$forums];
-            $forumCriteria = ' AND p.forum_id IN (' . implode(',', $forums) . ')';
+            $forumCriteria = ' AND p.forum_id IN ('.implode(',', $forums).')';
         }
-        $tables_criteria = ' FROM ' . $this->db->prefix('newbb_report') . ' r, ' . $this->db->prefix('newbb_posts') . ' p WHERE r.post_id= p.post_id';
+        $tables_criteria = ' FROM '.$this->db->prefix('newbb_report').' r, '.$this->db->prefix('newbb_posts').' p WHERE r.post_id= p.post_id';
 
         if ($report_id) {
-            $result = $this->db->query('SELECT COUNT(*) as report_count' . $tables_criteria . $forumCriteria . $result_criteria . " AND report_id $operator_for_position $report_id" . $order_criteria);
+            $result = $this->db->query('SELECT COUNT(*) as report_count'.$tables_criteria.$forumCriteria.$result_criteria." AND report_id $operator_for_position $report_id".$order_criteria);
             if ($result) {
                 $row = $this->db->fetchArray($result);
             }
@@ -98,7 +98,7 @@ 
             $start    = (int)($position / $perpage) * $perpage;
         }
 
-        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id' . $tables_criteria . $forumCriteria . $result_criteria . $order_criteria;
+        $sql    = 'SELECT r.*, p.subject, p.topic_id, p.forum_id'.$tables_criteria.$forumCriteria.$result_criteria.$order_criteria;
         $result = $this->db->query($sql, $perpage, $start);
         $ret    = [];
         //$reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');

class/Common/VersionChecks.php

Spacing +3 added lines, -3 removed lines

@@ -37,13 +37,13 @@ 
         //check for minimum XOOPS version
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -66,7 +66,7 @@ 
         $reqVer  = $module->getInfo('min_php');
         if (false !== $reqVer && '' !== $reqVer) {
             if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }

class/Common/FilesManagement.php

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 }
 
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
             }
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -60,10 +60,10 @@ 
         if (!mkdir($dst) && !is_dir($dst)) {
             while (false !== ($file = readdir($dir))) {
                 if (('.' !== $file) && ('..' !== $file)) {
-                    if (is_dir($src . '/' . $file)) {
-                        self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                    if (is_dir($src.'/'.$file)) {
+                        self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                     } else {
-                        copy($src . '/' . $file, $dst . '/' . $file);
+                        copy($src.'/'.$file, $dst.'/'.$file);
                     }
                 }
             }
@@ -158,7 +158,7 @@ 
                 self::rrmdir($fObj->getPathname());
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -191,14 +191,14 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
                 //                rmdir($fObj->getPath()); // now delete the directory
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -234,9 +234,9 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             }
         }
         return true;

class/Common/Breadcrumb.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         require_once $GLOBALS['xoops']->path('class/template.php');
         $breadcrumbTpl = new \XoopsTpl();
         $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+        $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl');
         unset($breadcrumbTpl);
 
         return $html;

class/Migrate.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }

class/PostHandler.php

Spacing +16 added lines, -16 removed lines

@@ -58,7 +58,7 @@ 
     {
         $id   = (int)$id;
         $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p LEFT JOIN '.$this->db->prefix('newbb_posts_text').' t ON p.post_id=t.post_id WHERE p.post_id='.$id;
         if ($array = $this->db->fetchArray($this->db->query($sql))) {
             $post = $this->create(false);
             $post->assignVars($array);
@@ -87,7 +87,7 @@ 
         $topic_id = 0,
         $approved = 1
     ) {
-        $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
+        $sql = 'SELECT p.*, t.*, tp.topic_status FROM '
                   . $this->db->prefix('newbb_posts')
                   . ' p LEFT JOIN '
                   . $this->db->prefix('newbb_posts_text')
@@ -380,14 +380,14 @@ 
 
         /* Set active post as deleted */
         if ($post->getVar('approved') > 0 && empty($force)) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
+            $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET approved = -1 WHERE post_id = '.$post->getVar('post_id');
             if (!$result = $this->db->queryF($sql)) {
             }
             /* delete pending post directly */
         } else {
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('delete post error: ' . $sql);
+                $post->setErrors('delete post error: '.$sql);
 
                 return false;
             }
@@ -395,7 +395,7 @@ 
 
             $sql = sprintf('DELETE FROM %s WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('Could not remove post text: ' . $sql);
+                $post->setErrors('Could not remove post text: '.$sql);
 
                 return false;
             }
@@ -432,11 +432,11 @@ 
                 }
             }
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
-                            LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.topic_id = t.topic_id
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics').' t
+                            LEFT JOIN ' . $this->db->prefix('newbb_posts').' p ON p.topic_id = t.topic_id
                             SET t.topic_last_post_id = p.post_id
-                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id') . '
-                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id=t.topic_id)';
+                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id').'
+                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts').' WHERE topic_id=t.topic_id)';
             if (!$result = $this->db->queryF($sql)) {
             }
         }
@@ -458,7 +458,7 @@ 
             }
             // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
             if (!$post->isTopic()) {
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
+                $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET pid = '.$post->getVar('pid').' WHERE approved=1 AND pid='.$post->getVar('post_id');
                 if (!$result = $this->db->queryF($sql)) {
                     //xoops_error($this->db->error());
                 }
@@ -482,12 +482,12 @@ 
             return parent::getCount($criteria);
         }
 
-        $sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT COUNT(*) as count'.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         // LEFT JOIN
         $sql .= $join;
         // WHERE
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             //xoops_error($this->db->error().'<br>'.$sql);
@@ -512,14 +512,14 @@ 
     public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
     {
         $ret = [];
-        $sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT p.*, t.* '.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         if (!empty($join)) {
             $sql .= $join;
         }
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
         }
         $result = $this->db->query($sql, (int)$limit, (int)$start);
@@ -560,7 +560,7 @@ 
         parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
         parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
 
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_posts_text').' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM '.$this->table.') )';
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;