thorsten / phpMyFAQ

phpmyfaq/src/phpMyFAQ/Helper/SearchHelper.php

Spacing +3 added lines, -3 removed lines

@@ -210,8 +210,8 @@ 
         $confPerPage = $this->_config->get('records.numberOfRecordsPerPage');
         $numOfResults = $resultSet->getNumberOfResults();
 
-        $totalPages = ceil($numOfResults / $confPerPage);
-        $lastPage = $currentPage * $confPerPage;
+        $totalPages = ceil($numOfResults/$confPerPage);
+        $lastPage = $currentPage*$confPerPage;
         $firstPage = $lastPage - $confPerPage;
 
         if (0 < $numOfResults) {
@@ -285,7 +285,7 @@ 
                 $oLink->itemTitle = $oLink->tooltip = $result->question;
 
                 $html .= '<li>';
-                $html .= $this->renderScore($result->score * 33);
+                $html .= $this->renderScore($result->score*33);
                 $html .= sprintf('<strong>%s</strong>: %s<br />',
                     $categoryInfo[0]['name'],
                     $oLink->toHtmlAnchor()

phpmyfaq/src/phpMyFAQ/Helper/CategoryHelper.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
         $numFaqs = $this->Category->getNumberOfRecordsOfCategory();
 
         if ($numCategories > 0) {
-            for ($y = 0;$y < $numCategories; $y = $this->Category->getNextLineTree($y)) {
+            for ($y = 0; $y < $numCategories; $y = $this->Category->getNextLineTree($y)) {
                 list($hasChild, $name, $categoryId, $description, $active) = $this->Category->getLineDisplay($y);
 
                 if (!$active) {
@@ -158,7 +158,7 @@ 
         $this->Category->expandAll();
 
         if ($numCategories > 0) {
-            for ($y = 0;$y < $this->Category->height(); $y = $this->Category->getNextLineTree($y)) {
+            for ($y = 0; $y < $this->Category->height(); $y = $this->Category->getNextLineTree($y)) {
                 list($hasChild, $categoryName, $parent, $description, $active) = $this->Category->getLineDisplay($y);
 
                 if (!$active) {
@@ -253,7 +253,7 @@ 
     {
         $categories = '';
         foreach ($this->Category->categories as $cat) {
-            if (0 === (int) $cat['parent_id']) {
+            if (0 === (int)$cat['parent_id']) {
                 $categories .= sprintf(
                     '<li><a href="?action=show&cat=%d">%s</a></li>',
                     $cat['id'],

phpmyfaq/src/phpMyFAQ/Helper/HttpHelper.php

Spacing +4 added lines, -4 removed lines

@@ -65,12 +65,12 @@ 
     public function addHeader()
     {
         header('Expires: Thu, 07 Apr 1977 14:47:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate');
         header('Cache-Control: post-check=0, pre-check=0', false);
         header('Pragma: no-cache');
         header('Vary: Negotiate,Accept');
-        header('Content-type: ' . $this->contentType);
+        header('Content-type: '.$this->contentType);
     }
 
     /**
@@ -118,7 +118,7 @@ 
      *  Sends the CORS header.
      */
     public function sendCorsHeader() {
-        header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
+        header('Access-Control-Allow-Origin: '.$_SERVER['HTTP_ORIGIN']);
     }
 
     /**
@@ -140,7 +140,7 @@ 
         // for preventing data loss
         session_write_close();
         $this->sendStatus(301);
-        header('Location: ' . $url);
+        header('Location: '.$url);
     }
 
     /**

phpmyfaq/src/phpMyFAQ/Template.php

Spacing +15 added lines, -15 removed lines

@@ -86,7 +86,7 @@ 
 
         foreach ($myTemplate as $templateName => $filename) {
             $this->templates[$templateName] = $this->readTemplateFile(
-                'assets/themes/' . $tplSetName . '/templates/' . $filename,
+                'assets/themes/'.$tplSetName.'/templates/'.$filename,
                 $templateName
             );
         }
@@ -100,7 +100,7 @@ 
      */
     public function merge($from, $into)
     {
-        $this->outputs[$into] = str_replace('{{ ' . $from . ' }}', $this->outputs[$from], $this->outputs[$into]);
+        $this->outputs[$into] = str_replace('{{ '.$from.' }}', $this->outputs[$from], $this->outputs[$into]);
         $this->outputs[$from] = null;
     }
 
@@ -121,12 +121,12 @@ 
             foreach ($rawBlocks as $key => $rawBlock) {
                 if (in_array($key, $this->blocksTouched) && $key !== 'unblocked') {
                     $tmp = str_replace($rawBlock, $this->blocks[$templateName][$key], $tmp);
-                    $tmp = str_replace('[' . $key . ']', '', $tmp);
-                    $tmp = str_replace('[/' . $key . ']', '', $tmp);
+                    $tmp = str_replace('['.$key.']', '', $tmp);
+                    $tmp = str_replace('[/'.$key.']', '', $tmp);
                 } elseif ($key !== 'unblocked') {
                     $tmp = str_replace($rawBlock, '', $tmp);
-                    $tmp = str_replace('[' . $key . ']', '', $tmp);
-                    $tmp = str_replace('[/' . $key . ']', '', $tmp);
+                    $tmp = str_replace('['.$key.']', '', $tmp);
+                    $tmp = str_replace('[/'.$key.']', '', $tmp);
                 }
             }
         }
@@ -146,9 +146,9 @@ 
         if (isset($filters[$templateName])) {
             if (count($filters[$templateName])) {
                 foreach ($filters[$templateName] as $filter) {
-                    $filterMethod = 'render' . ucfirst(key($filter)) . 'Filter';
+                    $filterMethod = 'render'.ucfirst(key($filter)).'Filter';
                     $filteredVar = $this->tplHelper->$filterMethod(current($filter));
-                    $tmp = str_replace('{{ ' . current($filter) . ' | ' . key($filter) . ' }}', $filteredVar, $tmp);
+                    $tmp = str_replace('{{ '.current($filter).' | '.key($filter).' }}', $filteredVar, $tmp);
                 }
             }
         }
@@ -210,7 +210,7 @@ 
                     $block = $this->multiplyBlock($this->blocks[$templateName][$blockName], $blockContent);
                     break;
                 } else {
-                    $block = str_replace('{{ ' . $var . ' }}', $val, $block);
+                    $block = str_replace('{{ '.$var.' }}', $val, $block);
                 }
             }
 
@@ -256,7 +256,7 @@ 
 
             return $tplContent;
         } else {
-            return '<p><span style="color: red;">Error:</span> Cannot open the file ' . $filename . '.</p>';
+            return '<p><span style="color: red;">Error:</span> Cannot open the file '.$filename.'.</p>';
         }
     }
 
@@ -299,7 +299,7 @@ 
         for ($i = 0; $i < $multiplyTimes; ++$i) {
             $tmpBlock[$i] = $block;
             foreach ($replace as $var => $val) {
-                $tmpBlock[$i] = str_replace('{{ ' . $var . ' }}', $val[$i], $tmpBlock[$i]);
+                $tmpBlock[$i] = str_replace('{{ '.$var.' }}', $val[$i], $tmpBlock[$i]);
             }
         }
 
@@ -329,14 +329,14 @@ 
                 Strings::preg_match('/\[.+\]/', $tmpBlocks[0][$i], $name);
                 $name = Strings::preg_replace('/[\[\[\/\]]/', '', $name);
                 // remove block tags from block
-                $res = str_replace('[' . $name[0] . ']', '', $tmpBlocks[0][$i]);
-                $res = str_replace('[/' . $name[0] . ']', '', $res);
+                $res = str_replace('['.$name[0].']', '', $tmpBlocks[0][$i]);
+                $res = str_replace('[/'.$name[0].']', '', $res);
                 $tplBlocks[$name[0]] = $res;
 
                 // unblocked content
                 $unblocked = str_replace($tplBlocks[$name[0]], '', $unblocked);
-                $unblocked = str_replace('[' . $name[0] . ']', '', $unblocked);
-                $unblocked = str_replace('[/' . $name[0] . ']', '', $unblocked);
+                $unblocked = str_replace('['.$name[0].']', '', $unblocked);
+                $unblocked = str_replace('[/'.$name[0].']', '', $unblocked);
             }
 
             $hits = [];

phpmyfaq/src/phpMyFAQ/Search/Resultset.php

Spacing +1 added lines, -1 removed lines

@@ -216,6 +216,6 @@
             $score += $object->relevance_keywords;
         }
 
-        return round($score / 3 * 100);
+        return round($score/3*100);
     }
 }

phpmyfaq/src/phpMyFAQ/Meta.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
      */
     public function add(MetaEntity $data)
     {
-        $id = $this->config->getDb()->nextId(Db::getTablePrefix() . 'faqmeta', 'id');
+        $id = $this->config->getDb()->nextId(Db::getTablePrefix().'faqmeta', 'id');
 
         $query = sprintf("
             INSERT INTO
@@ -183,7 +183,7 @@ 
             $this->config->getLanguage()->getLanguage()
         );
 
-        return (boolean) $this->config->getDb()->query($query);
+        return (boolean)$this->config->getDb()->query($query);
     }
 
     /**
@@ -199,7 +199,7 @@ 
             $id
         );
 
-        return (boolean) $this->config->getDb()->query($query);
+        return (boolean)$this->config->getDb()->query($query);
 
     }
 }

phpmyfaq/src/phpMyFAQ/Session.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
             }
 
             foreach ($botBlacklist as $bot) {
-                if ((bool) Strings::strstr($agent, $bot)) {
+                if ((bool)Strings::strstr($agent, $bot)) {
                     ++$bots;
                 }
             }

phpmyfaq/src/phpMyFAQ/Captcha.php

Indentation +2 added lines, -2 removed lines

@@ -476,8 +476,8 @@
                %sfaqcaptcha 
            WHERE 
                id = '%s'",
-           Db::getTablePrefix(),
-           $this->code
+            Db::getTablePrefix(),
+            $this->code
         );
 
         $result = $this->_config->getDb()->query($select);

Spacing +12 added lines, -12 removed lines

@@ -206,7 +206,7 @@ 
         $this->drawText();
         if (function_exists('imagejpeg')) {
             header('Content-Type: image/jpeg');
-            imagejpeg($this->img, null, (int) $this->quality);
+            imagejpeg($this->img, null, (int)$this->quality);
         } elseif (function_exists('imagegif')) {
             header('Content-Type: image/gif');
             imagegif($this->img);
@@ -314,7 +314,7 @@ 
         $w1 = 0;
         $w2 = 0;
 
-        for ($x = 0; $x < $this->width; $x += (int) $nextline) {
+        for ($x = 0; $x < $this->width; $x += (int)$nextline) {
             if ($x < $this->width) {
                 imageline($this->img, $x + $w1, 0, $x + $w2, $this->height - 1, rand($color1, $color2));
             }
@@ -345,18 +345,18 @@ 
     {
         $len = Strings::strlen($this->code);
         $w1 = 15;
-        $w2 = $this->width / ($len + 1);
+        $w2 = $this->width/($len + 1);
 
         for ($p = 0; $p < $len; ++$p) {
             $letter = $this->code[$p];
             if (count($this->fonts) > 0) {
                 $font = $this->fonts[rand(0, count($this->fonts) - 1)];
             }
-            $size = rand(20, $this->height / 2.2);
+            $size = rand(20, $this->height/2.2);
             $rotation = rand(-23, 23);
             $y = rand($size + 3, $this->height - 5);
             // $w1 += rand(- $this->width / 90, $this->width / 40 );
-            $x = $w1 + $w2 * $p;
+            $x = $w1 + $w2*$p;
             $c1 = []; // fore char color
             $c2 = []; // back char color
             do {
@@ -370,28 +370,28 @@ 
             } while ($c1['b'] == $this->_backgroundColor['b']);
             $c1 = imagecolorallocate($this->img, $c1['r'], $c1['g'], $c1['b']);
             do {
-                $c2['r'] = ($c1['r'] < 100 ? $c1['r'] * 2 : mt_rand(30, 199));
+                $c2['r'] = ($c1['r'] < 100 ? $c1['r']*2 : mt_rand(30, 199));
             } while (($c2['r'] == $this->_backgroundColor['r']) && ($c2['r'] == $c1['r']));
             do {
-                $c2['g'] = ($c1['g'] < 100 ? $c1['g'] * 2 : mt_rand(30, 199));
+                $c2['g'] = ($c1['g'] < 100 ? $c1['g']*2 : mt_rand(30, 199));
             } while (($c2['g'] == $this->_backgroundColor['g']) && ($c2['g'] == $c1['g']));
             do {
-                $c2['b'] = ($c1['b'] < 100 ? $c1['b'] * 2 : mt_rand(30, 199));
+                $c2['b'] = ($c1['b'] < 100 ? $c1['b']*2 : mt_rand(30, 199));
             } while (($c2['b'] == $this->_backgroundColor['b']) && ($c2['b'] == $c1['b']));
             $c2 = imagecolorallocate($this->img, $c2['r'], $c2['g'], $c2['b']);
             // Add the letter
             if (function_exists('imagettftext') && (count($this->fonts) > 0)) {
-                imagettftext($this->img, $size, $rotation, $x + 2, $y,     $c2, $font, $letter);
+                imagettftext($this->img, $size, $rotation, $x + 2, $y, $c2, $font, $letter);
                 imagettftext($this->img, $size, $rotation, $x + 1, $y + 1, $c2, $font, $letter);
-                imagettftext($this->img, $size, $rotation, $x,     $y - 2,   $c1, $font, $letter);
+                imagettftext($this->img, $size, $rotation, $x, $y - 2, $c1, $font, $letter);
             } else {
                 $size = 5;
                 $c3 = imagecolorallocate($this->img, 0, 0, 255);
                 $x = 20;
                 $y = 12;
                 $s = 30;
-                imagestring($this->img, $size, $x + 1 + ($s * $p), $y + 1, $letter, $c3);
-                imagestring($this->img, $size, $x + ($s * $p),     $y,   $letter, $c1);
+                imagestring($this->img, $size, $x + 1 + ($s*$p), $y + 1, $letter, $c3);
+                imagestring($this->img, $size, $x + ($s*$p), $y, $letter, $c1);
             }
         }
 

phpmyfaq/src/phpMyFAQ/Category.php

Spacing +31 added lines, -31 removed lines

@@ -214,7 +214,7 @@ 
             WHERE' : '
             AND';
             $where .= "
-                fc.lang = '" . $this->language . "'";
+                fc.lang = '" . $this->language."'";
         }
 
         $query = sprintf('
@@ -255,10 +255,10 @@ 
         if ($result) {
             while ($row = $this->config->getDb()->fetchArray($result)) {
                 $this->categoryName[$row['id']] = $row;
-                $this->categories[] =& $this->categoryName[$row['id']];
-                $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
-                $this->owner[$row['id']] =& $row['user_id'];
-                $this->moderators[$row['id']] =& $row['group_id'];
+                $this->categories[] = & $this->categoryName[$row['id']];
+                $this->children[$row['parent_id']][$row['id']] = & $this->categoryName[$row['id']];
+                $this->owner[$row['id']] = & $row['user_id'];
+                $this->moderators[$row['id']] = & $row['group_id'];
             }
         }
 
@@ -321,13 +321,13 @@ 
             $query .= 'parent_id = 0';
         }
         foreach (explode(',', $categories) as $cats) {
-            $_query .= ' OR parent_id = ' . $cats;
+            $_query .= ' OR parent_id = '.$cats;
         }
         if (false === $parentId && 0 < Strings::strlen($_query)) {
             $query .= Strings::substr($_query, 4);
         }
         if (isset($this->language) && preg_match("/^[a-z\-]{2,}$/", $this->language)) {
-            $query .= " AND lang = '" . $this->language . "'";
+            $query .= " AND lang = '".$this->language."'";
         }
         $query .= ' ORDER BY id';
         $result = $this->config->getDb()->query($query);
@@ -354,7 +354,7 @@ 
             Db::getTablePrefix()
         );
         if (isset($this->language) && preg_match("/^[a-z\-]{2,}$/", $this->language)) {
-            $query .= " WHERE lang = '" . $this->language . "'";
+            $query .= " WHERE lang = '".$this->language."'";
         }
         $result = $this->config->getDb()->query($query);
         while ($row = $this->config->getDb()->fetchArray($result)) {
@@ -394,7 +394,7 @@ 
             Db::getTablePrefix()
         );
         if (isset($this->language) && preg_match("/^[a-z\-]{2,}$/", $this->language)) {
-            $query .= " AND lang = '" . $this->language . "'";
+            $query .= " AND lang = '".$this->language."'";
         }
         $result = $this->config->getDb()->query($query);
 
@@ -435,7 +435,7 @@ 
             Db::getTablePrefix()
         );
         if (isset($this->language) && preg_match("/^[a-z\-]{2,}$/", $this->language)) {
-            $query .= " AND lang = '" . $this->language . "'";
+            $query .= " AND lang = '".$this->language."'";
         }
         $result = $this->config->getDb()->query($query);
         while ($row = $this->config->getDb()->fetchArray($result)) {
@@ -805,7 +805,7 @@ 
             if (0 === $number[$parent] && 0 === $level) {
                 $numFaqs = '';
             } else {
-                $numFaqs = '<span class="rssCategoryLink"> (' . $plr->GetMsg('plmsgEntries', $number[$parent]);
+                $numFaqs = '<span class="rssCategoryLink"> ('.$plr->GetMsg('plmsgEntries', $number[$parent]);
                 if ($this->config->get('main.enableRssFeeds')) {
                     $numFaqs .= sprintf(
                         ' <a href="feed/category/rss.php?category_id=%d&category_lang=%s" target="_blank"><i aria-hidden="true" class="fas fa-rss"></i></a>',
@@ -828,7 +828,7 @@ 
             $oLink->text = $categoryName;
             $oLink->tooltip = $description;
 
-            $output .= $oLink->toHtmlAnchor() . $numFaqs;
+            $output .= $oLink->toHtmlAnchor().$numFaqs;
             $open = $level;
         }
 
@@ -937,7 +937,7 @@ 
         );
 
         $oLink = new Link($url, $this->config);
-        $oLink->id = 'category_' . $categoryId;
+        $oLink->id = 'category_'.$categoryId;
         $oLink->itemTitle = $categoryName;
         $oLink->text = $categoryName;
 
@@ -1024,15 +1024,15 @@ 
 
     public function generateCategoriesList(array $categories, $level)
     {
-        $output = '<div class="pmf-categories pmf-slider-categories-' . $level . '" ><ul id="categories_' . $level . '">';
+        $output = '<div class="pmf-categories pmf-slider-categories-'.$level.'" ><ul id="categories_'.$level.'">';
         if (count($categories) > 0) {
             foreach ($categories as $category) {
-                $output .= '<li class="slide_category_2" id="' . $category->getId() . '" >';
-                $output .= '<span class="info">' . $category->getName() . '</span>';
+                $output .= '<li class="slide_category_2" id="'.$category->getId().'" >';
+                $output .= '<span class="info">'.$category->getName().'</span>';
                 if ('' != $category->getImage()) {
-                    $output .= '<img src="' . '/images/' . $category->getImage() . '" alt="' . $category->getName() . '">';
+                    $output .= '<img src="'.'/images/'.$category->getImage().'" alt="'.$category->getName().'">';
                 } else {
-                    $output .= '<img src="/images/no_picture.png" alt="' . $category->getName() . '">';
+                    $output .= '<img src="/images/no_picture.png" alt="'.$category->getName().'">';
                 }
                 $output .= '</li>';
             }
@@ -1299,7 +1299,7 @@ 
     {
         // If we only need a new language, we don't need a new category id
         if (is_null($id)) {
-            $id = $this->config->getDb()->nextId(Db::getTablePrefix() . 'faqcategories', 'id');
+            $id = $this->config->getDb()->nextId(Db::getTablePrefix().'faqcategories', 'id');
         }
 
         $query = sprintf("
@@ -1446,19 +1446,19 @@ 
         foreach ($tables as $pair) {
             foreach ($pair as $_table => $_field) {
                 $result = $result && $this->config->getDb()->query(sprintf('UPDATE %s SET %s = %d WHERE %s = %d',
-                        Db::getTablePrefix() . $_table,
+                        Db::getTablePrefix().$_table,
                         $_field,
                         $temp_cat,
                         $_field,
                         $category_id_2));
                 $result = $result && $this->config->getDb()->query(sprintf('UPDATE %s SET %s = %d WHERE %s = %d',
-                        Db::getTablePrefix() . $_table,
+                        Db::getTablePrefix().$_table,
                         $_field,
                         $category_id_2,
                         $_field,
                         $category_id_1));
                 $result = $result && $this->config->getDb()->query(sprintf('UPDATE %s SET %s = %d WHERE %s = %d',
-                        Db::getTablePrefix() . $_table,
+                        Db::getTablePrefix().$_table,
                         $_field,
                         $category_id_1,
                         $_field,
@@ -1471,19 +1471,19 @@ 
         foreach ($tables2 as $pair) {
             foreach ($pair as $_table => $_field) {
                 $result = $result && $this->config->getDb()->query(sprintf("UPDATE %s SET %s = '%d' WHERE %s = '%d'",
-                        Db::getTablePrefix() . $_table,
+                        Db::getTablePrefix().$_table,
                         $_field,
                         $temp_cat,
                         $_field,
                         $category_id_2));
                 $result = $result && $this->config->getDb()->query(sprintf("UPDATE %s SET %s = '%d' WHERE %s = '%d'",
-                        Db::getTablePrefix() . $_table,
+                        Db::getTablePrefix().$_table,
                         $_field,
                         $category_id_2,
                         $_field,
                         $category_id_1));
                 $result = $result && $this->config->getDb()->query(sprintf("UPDATE %s SET %s = '%d' WHERE %s = '%d'",
-                        Db::getTablePrefix() . $_table,
+                        Db::getTablePrefix().$_table,
                         $_field,
                         $category_id_1,
                         $_field,
@@ -1542,7 +1542,7 @@ 
             Db::getTablePrefix(),
             $category_id);
         if (!$delete_all) {
-            $query .= " AND lang = '" . $category_lang . "'";
+            $query .= " AND lang = '".$category_lang."'";
         }
         $this->config->getDb()->query($query);
 
@@ -1568,7 +1568,7 @@ 
             Db::getTablePrefix(),
             $category_id);
         if (!$delete_all) {
-            $query .= " AND category_lang = '" . $category_lang . "'";
+            $query .= " AND category_lang = '".$category_lang."'";
         }
         $this->config->getDb()->query($query);
 
@@ -1604,7 +1604,7 @@ 
                 $language);
             $result = $this->config->getDb()->query($query);
             if ($row = $this->config->getDb()->fetchArray($result)) {
-                $translated[$languageCodes[strtoupper($language)]] = $row['name'] . ('' == $row['description'] ? '' : '  (' . $row['description'] . ')');
+                $translated[$languageCodes[strtoupper($language)]] = $row['name'].('' == $row['description'] ? '' : '  ('.$row['description'].')');
             }
         }
         ksort($translated);
@@ -1627,11 +1627,11 @@ 
 
         foreach (Language::getAvailableLanguages() as $lang => $langname) {
             if (!in_array(strtolower($lang), $existcatlang)) {
-                $output .= "\t<option value=\"" . strtolower($lang) . '"';
+                $output .= "\t<option value=\"".strtolower($lang).'"';
                 if ($lang == $selected_lang) {
                     $output .= ' selected="selected"';
                 }
-                $output .= '>' . $langname . "</option>\n";
+                $output .= '>'.$langname."</option>\n";
             }
         }
 
@@ -1651,7 +1651,7 @@ 
                 %sfaqcategories',
             Db::getTablePrefix());
         if (isset($this->language) && preg_match("/^[a-z\-]{2,}$/", $this->language)) {
-            $query .= " WHERE lang != '" . $this->language . "'";
+            $query .= " WHERE lang != '".$this->language."'";
         }
         $query .= ' ORDER BY id';
         $result = $this->config->getDb()->query($query);