thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Helper/Category.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/inc/PMF/Init.php

Indentation +23 added lines, -23 removed lines

@@ -138,16 +138,16 @@ 
         return $filename;
     }
 
-   /**
-    * Clean the filename of any uploaded file by the user and force an error
-    * when calling is_uploaded_file($_FILES[key]['tmp_name']) if the cleanup goes wrong.
-    */
-   private static function _cleanFilenames()
-   {
-       reset($_FILES);
-       while (list($key, $value) = each($_FILES)) {
-           if (is_array($_FILES[$key]['name'])) {
-               reset($_FILES[$key]['name']);
+    /**
+     * Clean the filename of any uploaded file by the user and force an error
+     * when calling is_uploaded_file($_FILES[key]['tmp_name']) if the cleanup goes wrong.
+     */
+    private static function _cleanFilenames()
+    {
+        reset($_FILES);
+        while (list($key, $value) = each($_FILES)) {
+            if (is_array($_FILES[$key]['name'])) {
+                reset($_FILES[$key]['name']);
                 // We have a multiple upload with the same name for <input />
                 while (list($idx, $value2) = each($_FILES[$key]['name'])) {
                     $_FILES[$key]['name'][$idx] = self::_basicFilenameClean($_FILES[$key]['name'][$idx]);
@@ -158,19 +158,19 @@ 
                         $_FILES[$key]['error'][$idx] = UPLOAD_ERR_NO_FILE;
                     }
                 }
-               reset($_FILES[$key]['name']);
-           } else {
-               $_FILES[$key]['name'] = self::_basicFilenameClean($_FILES[$key]['name']);
-               if ('' == $_FILES[$key]['name']) {
-                   $_FILES[$key]['type'] = '';
-                   $_FILES[$key]['tmp_name'] = '';
-                   $_FILES[$key]['size'] = 0;
-                   $_FILES[$key]['error'] = UPLOAD_ERR_NO_FILE;
-               }
-           }
-       }
-       reset($_FILES);
-   }
+                reset($_FILES[$key]['name']);
+            } else {
+                $_FILES[$key]['name'] = self::_basicFilenameClean($_FILES[$key]['name']);
+                if ('' == $_FILES[$key]['name']) {
+                    $_FILES[$key]['type'] = '';
+                    $_FILES[$key]['tmp_name'] = '';
+                    $_FILES[$key]['size'] = 0;
+                    $_FILES[$key]['error'] = UPLOAD_ERR_NO_FILE;
+                }
+            }
+        }
+        reset($_FILES);
+    }
 
     /**
      * Cleans a html string from some xss issues.

phpmyfaq/inc/PMF/Installer.php

Spacing +1 added lines, -1 removed lines

@@ -783,7 +783,7 @@
             }
             usleep(1000);
             ++$count;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 echo '| ';
             }
         }

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 use Symfony\Component\ClassLoader\Psr4ClassLoader;
 use Elasticsearch\ClientBuilder;
-use Psr\Log\NullLogger;
-use GuzzleHttp\Ring\Client\CurlHandler;
 
 /**
  * The Installer class installs phpMyFAQ. Classy.

phpmyfaq/inc/PMF/Language.php

Spacing +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
     {
         global $languageCodes;
 
-        $search = array('language_' , '.php');
+        $search = array('language_', '.php');
         $languages = $languageFiles = [];
 
         $dir = new DirectoryIterator(PMF_LANGUAGE_DIR);

phpmyfaq/inc/PMF/Language/Plurals.php

Spacing +10 added lines, -10 removed lines

@@ -68,7 +68,7 @@ 
     public function __construct($translation)
     {
         $this->PMF_TRANSL = $translation;
-        $this->nPlurals = (int) $this->PMF_TRANSL['nplurals'];
+        $this->nPlurals = (int)$this->PMF_TRANSL['nplurals'];
         $this->lang = $this->PMF_TRANSL['metaLanguage'];
 
         if ($this->plural($this->lang, 0) != -1) {
@@ -156,7 +156,7 @@ 
             // Note: expressions in .po files are not strict C expressions, so extra braces might be
             // needed for that expression to work here (for example see 'lt')
             case 'ar':
-                return ($n == 0) ? 0 : ($n == 1 ? 1 : ($n == 2 ? 2 : (($n % 100 >= 3 && $n % 100 <= 10) ? 3 : (($n % 100 >= 11 && $n % 100 <= 99) || ($n % 100 == 1) || ($n % 100 == 2) ? 4 : 5))));
+                return ($n == 0) ? 0 : ($n == 1 ? 1 : ($n == 2 ? 2 : (($n%100 >= 3 && $n%100 <= 10) ? 3 : (($n%100 >= 11 && $n%100 <= 99) || ($n%100 == 1) || ($n%100 == 2) ? 4 : 5))));
             case 'bn':
                 return 0;
             case 'cy':
@@ -196,27 +196,27 @@ 
             case 'ko':
                 return 0;
             case 'lt':
-                return ($n % 10 == 1 && $n % 100 != 11) ? 0 : ($n % 10 >= 2 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+                return ($n%10 == 1 && $n%100 != 11) ? 0 : ($n%10 >= 2 && ($n%100 < 10 || $n%100 >= 20) ? 1 : 2);
             case 'lv':
-                return ($n % 10 == 1 && $n % 100 != 11) ? 0 : ($n != 0 ? 1 : 2);
+                return ($n%10 == 1 && $n%100 != 11) ? 0 : ($n != 0 ? 1 : 2);
             case 'nb':
                 return $n != 1;
             case 'nl':
                 return $n != 1;
             case 'pl':
-                return ($n == 1) ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+                return ($n == 1) ? 0 : ($n%10 >= 2 && $n%10 <= 4 && ($n%100 < 10 || $n%100 >= 20) ? 1 : 2);
             case 'pt':
                 return $n != 1;
             case 'pt-br':
                 return $n > 1;
             case 'ro':
-                return ($n == 1) ? 0 : (($n == 0 || ($n % 100 > 0 && $n % 100 < 20)) ? 1 : 2);
+                return ($n == 1) ? 0 : (($n == 0 || ($n%100 > 0 && $n%100 < 20)) ? 1 : 2);
             case 'ru':
-                return ($n % 10 == 1 && $n % 100 != 11) ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+                return ($n%10 == 1 && $n%100 != 11) ? 0 : ($n%10 >= 2 && $n%10 <= 4 && ($n%100 < 10 || $n%100 >= 20) ? 1 : 2);
             case 'sl':
-                return ($n % 100 == 1) ? 0 : ($n % 100 == 2 ? 1 : ($n % 100 == 3 || n % 100 == 4 ? 2 : 3));
+                return ($n%100 == 1) ? 0 : ($n%100 == 2 ? 1 : ($n%100 == 3 || n%100 == 4 ? 2 : 3));
             case 'sr':
-                return ($n % 10 == 1 && $n % 100 != 11) ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+                return ($n%10 == 1 && $n%100 != 11) ? 0 : ($n%10 >= 2 && $n%10 <= 4 && ($n%100 < 10 || $n%100 >= 20) ? 1 : 2);
             case 'sv':
                 return $n != 1;
             case 'th':
@@ -226,7 +226,7 @@ 
             case 'tw':
                 return 0;
             case 'uk':
-                return ($n % 10 == 1 && $n % 100 != 11) ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+                return ($n%10 == 1 && $n%100 != 11) ? 0 : ($n%10 >= 2 && $n%10 <= 4 && ($n%100 < 10 || $n%100 >= 20) ? 1 : 2);
             case 'vi':
                 return 0;
             case 'zh':

phpmyfaq/inc/PMF/Linkverifier.php

Indentation +1 added lines, -1 removed lines

@@ -774,7 +774,7 @@
                         $inforeasons[] = sprintf(
                             $PMF_LANG['ad_linkcheck_openurl_infoprefix'],
                             PMF_String::htmlspecialchars($value['absurl'])
-                         ).$value['reason'];
+                            ).$value['reason'];
                     }
                 } else {
                     $_classname = 'urlfail';

Spacing +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
         while (list(, $type) = each($types)) {
             preg_match_all("|[^?&]$type\=(\"?'?`?)([[:alnum:]\:\#%?=;&@/\ \.\_\-\{\}]+)\\1|i", $string, $matches);
             $sz = sizeof($matches[2]);
-            for ($i = 0;$i < $sz; ++$i) {
+            for ($i = 0; $i < $sz; ++$i) {
                 $this->urlpool[$type][] = $matches[2][$i];
                 ++$urlCount;
             }

phpmyfaq/inc/PMF/Logging.php

Indentation +4 added lines, -4 removed lines

@@ -94,10 +94,10 @@
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchObject($result)) {
             $data[$row->id] = array(
-               'time' => $row->time,
-               'usr' => $row->usr,
-               'text' => $row->text,
-               'ip' => $row->ip,
+                'time' => $row->time,
+                'usr' => $row->usr,
+                'text' => $row->text,
+                'ip' => $row->ip,
             );
         }
 

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
             WHERE
                 time < %d',
             PMF_Db::getTablePrefix(),
-            $_SERVER['REQUEST_TIME'] - 30 * 86400
+            $_SERVER['REQUEST_TIME'] - 30*86400
         );
 
         if ($this->_config->getDb()->query($query)) {

phpmyfaq/inc/PMF/Network.php

Spacing +2 added lines, -2 removed lines

@@ -153,8 +153,8 @@
         $bytes_addr = unpack('n*', inet_pton($addr));
         $bytes_test = unpack('n*', inet_pton($ip));
 
-        for ($i = 1; $i <= ceil($preflen / 16); ++$i) {
-            $left = $preflen - 16 * ($i - 1);
+        for ($i = 1; $i <= ceil($preflen/16); ++$i) {
+            $left = $preflen - 16*($i - 1);
             if ($left > 16) {
                 $left = 16;
             }

phpmyfaq/inc/PMF/News.php

Indentation +3 added lines, -3 removed lines

@@ -150,9 +150,9 @@
 
         foreach ($news as $item) {
             $url = sprintf('%s?action=news&newsid=%d&newslang=%s',
-                           PMF_Link::getSystemRelativeUri(),
-                           $item['id'],
-                           $item['lang']);
+                            PMF_Link::getSystemRelativeUri(),
+                            $item['id'],
+                            $item['lang']);
             $oLink = new PMF_Link($url, $this->_config);
 
             if (isset($item['header'])) {

Spacing +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
         if ($this->_config->get('records.numberOfShownNewsEntries') > 0 && $this->_config->getDb()->numRows($result) > 0) {
             while (($row = $this->_config->getDb()->fetchObject($result))) {
                 ++$counter;
-                if (($showArchive  && ($counter > $this->_config->get('records.numberOfShownNewsEntries'))) ||
+                if (($showArchive && ($counter > $this->_config->get('records.numberOfShownNewsEntries'))) ||
                    ((!$showArchive) && (!$forceConfLimit) &&
                    ($counter <= $this->_config->get('records.numberOfShownNewsEntries'))) ||
                    ((!$showArchive) && $forceConfLimit)) {
@@ -125,7 +125,7 @@ 
                         'allowComments' => ('y' == $row->comment),
                         'link' => $row->link,
                         'linkTitle' => $row->linktitel,
-                        'target' => $row->target, );
+                        'target' => $row->target,);
                     $news[] = $item;
                 }
             }
@@ -286,7 +286,7 @@ 
                     'allowComments' => $allowComments,
                     'link' => $row->link,
                     'linkTitle' => $row->linktitel,
-                    'target' => $row->target, );
+                    'target' => $row->target,);
             }
         }