mambax7 / newbb5

class/Plugin/userlog.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             case 'viewtopic.php':
                 /** @var Newbb\TopicHandler $topicHandler */
                 $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-                $post_id      = Request::getInt('post_id', 0);// !empty($_REQUEST["post_id"]) ? (int)($_REQUEST["post_id"]) : 0;
+                $post_id      = Request::getInt('post_id', 0); // !empty($_REQUEST["post_id"]) ? (int)($_REQUEST["post_id"]) : 0;
                 $move         = strtolower(Request::getString('move', '', 'GET')); // isset($_GET['move'])? strtolower($_GET['move']) : '';
                 $topic_id     = Request::getInt('topic_id', 0); // !empty($_REQUEST["topic_id"]) ? (int)($_REQUEST["topic_id"]) : 0;
                 if (!empty($post_id)) {

class/plugins/plugin.tag.php

Indentation +9 added lines, -9 removed lines

@@ -85,14 +85,14 @@
 
     /* clear tag-item links */
     $sql = "    DELETE FROM {$linkHandler->table}"
-           . '    WHERE '
-           . "        tag_modid = {$mid}"
-           . '        AND '
-           . '        ( tag_itemid NOT IN '
-           . "            ( SELECT DISTINCT {$itemHandler->keyName} "
-           . "                FROM {$itemHandler->table} "
-           . "                WHERE {$itemHandler->table}.approved > 0"
-           . '            ) '
-           . '        )';
+            . '    WHERE '
+            . "        tag_modid = {$mid}"
+            . '        AND '
+            . '        ( tag_itemid NOT IN '
+            . "            ( SELECT DISTINCT {$itemHandler->keyName} "
+            . "                FROM {$itemHandler->table} "
+            . "                WHERE {$itemHandler->table}.approved > 0"
+            . '            ) '
+            . '        )';
     $linkHandler->db->queryF($sql);
 }

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     /** @var TopicHandler $itemHandler */
     $itemHandler = Newbb\Helper::getInstance()->getHandler('Topic');
     /** @var \XoopsObject $itemsObject */
-    $itemsObject = $itemHandler->getObjects(new \Criteria('topic_id', '(' . implode(', ', $items_id) . ')', 'IN'), true);
+    $itemsObject = $itemHandler->getObjects(new \Criteria('topic_id', '('.implode(', ', $items_id).')', 'IN'), true);
 
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {

class/TypeHandler.php

Spacing +9 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
                . "         LEFT JOIN {$this->table} AS o ON o.{$this->keyName} = l.{$this->keyName} "
                . '     WHERE '
                . '        l.forum_id '
-               . (empty($forums) ? 'IS NOT NULL' : 'IN (' . implode(', ', $forums) . ')')
+               . (empty($forums) ? 'IS NOT NULL' : 'IN ('.implode(', ', $forums).')')
                . '         ORDER BY l.type_order ASC';
         if (false === ($result = $this->db->query($sql))) {
             //xoops_error($this->db->error());
@@ -104,8 +104,8 @@ 
         $types_update = array_filter($types_update);
 
         if (!empty($types_valid)) {
-            $sql = 'DELETE FROM ' . $this->db->prefix('newbb_type_forum') . ' WHERE ' . ' forum_id = ' . $forum_id . ' AND ' . // irmtfan bug fix: delete other forums types when update the type for a specific forum
-                   "     {$this->keyName} NOT IN (" . implode(', ', $types_valid) . ')';
+            $sql = 'DELETE FROM '.$this->db->prefix('newbb_type_forum').' WHERE '.' forum_id = '.$forum_id.' AND '.// irmtfan bug fix: delete other forums types when update the type for a specific forum
+                   "     {$this->keyName} NOT IN (".implode(', ', $types_valid).')';
             if (false === ($result = $this->db->queryF($sql))) {
             }
         }
@@ -117,7 +117,7 @@ 
                 if ($types_existing[$key]['type_order'] == $order) {
                     continue;
                 }
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_type_forum') . " SET type_order = {$order}" . " WHERE  {$this->keyName} = {$key} AND forum_id = {$forum_id}";
+                $sql = 'UPDATE '.$this->db->prefix('newbb_type_forum')." SET type_order = {$order}"." WHERE  {$this->keyName} = {$key} AND forum_id = {$forum_id}";
                 if (false === ($result = $this->db->queryF($sql))) {
                 }
             }
@@ -130,7 +130,7 @@ 
                 //if (!in_array($key, $types_add)) continue;
                 $type_query[] = "({$key}, {$forum_id}, {$order})";
             }
-            $sql = 'INSERT INTO ' . $this->db->prefix('newbb_type_forum') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+            $sql = 'INSERT INTO '.$this->db->prefix('newbb_type_forum').' (type_id, forum_id, type_order) '.' VALUES '.implode(', ', $type_query);
             if (false === ($result = $this->db->queryF($sql))) {
                 //xoops_error($this->db->error());
             }
@@ -156,7 +156,7 @@ 
         /*
          * Remove forum-type links
          */
-        $sql = 'DELETE' . ' FROM ' . $this->db->prefix('newbb_type_forum') . ' WHERE  ' . $this->keyName . ' = ' . $object->getVar($this->keyName);
+        $sql = 'DELETE'.' FROM '.$this->db->prefix('newbb_type_forum').' WHERE  '.$this->keyName.' = '.$object->getVar($this->keyName);
         if (false === ($result = $this->db->{$queryFunc}($sql))) {
             // xoops_error($this->db->error());
         }
@@ -164,7 +164,7 @@ 
         /*
          * Reset topic type linked to this type
          */
-        $sql = 'UPATE' . ' ' . $this->db->prefix('newbb_topics') . ' SET ' . $this->keyName . '=0' . ' WHERE  ' . $this->keyName . ' = ' . $object->getVar($this->keyName);
+        $sql = 'UPATE'.' '.$this->db->prefix('newbb_topics').' SET '.$this->keyName.'=0'.' WHERE  '.$this->keyName.' = '.$object->getVar($this->keyName);
         if (false === ($result = $this->db->{$queryFunc}($sql))) {
             //xoops_error($this->db->error());
         }
@@ -183,11 +183,11 @@ 
     public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
     {
         /* clear forum-type links */
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_type_forum') . " WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_type_forum')." WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
         $this->db->queryF($sql);
 
         /* reconcile topic-type link */
-        $sql = 'UPATE ' . $this->db->prefix('newbb_topics') . " SET {$this->keyName} = 0" . " WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
+        $sql = 'UPATE '.$this->db->prefix('newbb_topics')." SET {$this->keyName} = 0"." WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
         $this->db->queryF($sql);
 
         return true;

Indentation +9 added lines, -9 removed lines

@@ -42,14 +42,14 @@ 
         $forums = (is_array($forums) ? array_filter(array_map('intval', array_map('trim', $forums))) : (empty($forums) ? 0 : [(int)$forums]));
 
         $sql = '    SELECT o.type_id, o.type_name, o.type_color, l.type_order'
-               . '     FROM '
-               . $this->db->prefix('newbb_type_forum')
-               . ' AS l '
-               . "         LEFT JOIN {$this->table} AS o ON o.{$this->keyName} = l.{$this->keyName} "
-               . '     WHERE '
-               . '        l.forum_id '
-               . (empty($forums) ? 'IS NOT NULL' : 'IN (' . implode(', ', $forums) . ')')
-               . '         ORDER BY l.type_order ASC';
+                . '     FROM '
+                . $this->db->prefix('newbb_type_forum')
+                . ' AS l '
+                . "         LEFT JOIN {$this->table} AS o ON o.{$this->keyName} = l.{$this->keyName} "
+                . '     WHERE '
+                . '        l.forum_id '
+                . (empty($forums) ? 'IS NOT NULL' : 'IN (' . implode(', ', $forums) . ')')
+                . '         ORDER BY l.type_order ASC';
         if (false === ($result = $this->db->query($sql))) {
             //xoops_error($this->db->error());
             return $ret;
@@ -105,7 +105,7 @@ 
 
         if (!empty($types_valid)) {
             $sql = 'DELETE FROM ' . $this->db->prefix('newbb_type_forum') . ' WHERE ' . ' forum_id = ' . $forum_id . ' AND ' . // irmtfan bug fix: delete other forums types when update the type for a specific forum
-                   "     {$this->keyName} NOT IN (" . implode(', ', $types_valid) . ')';
+                    "     {$this->keyName} NOT IN (" . implode(', ', $types_valid) . ')';
             if (false === ($result = $this->db->queryF($sql))) {
             }
         }

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;