thorsten / phpMyFAQ

phpmyfaq/inc/PMF/String.php

Doc Comments +2 added lines, -2 removed lines

@@ -280,7 +280,7 @@ 
     /**
      * Search and replace by a regexp using a callback.
      *
-     * @param string|array $pattern
+     * @param string $pattern
      * @param function     $callback
      * @param string|array $subject
      * @param int          $limit
@@ -314,7 +314,7 @@ 
      *
      * @param string $str String
      *
-     * @return bool
+     * @return string|boolean
      */
     public static function isUTF8($str)
     {

Indentation +3 added lines, -3 removed lines

@@ -182,9 +182,9 @@
     public static function isLangUTF8ToLatinConvertable($language)
     {
         $iso_languages = array('af', 'sq', 'br', 'ca', 'da', 'en', 'fo', 'gl', 'de', 'is', 'it',
-                               'ku', 'la', 'lb', 'nb', 'oc', 'pt', 'es', 'sw', 'sv', 'wa', 'eu',
-                               // NOTE this languages are not fully supported by latin1 
-                               'nl', 'fr', 'et', 'fi', 'cy',
+                                'ku', 'la', 'lb', 'nb', 'oc', 'pt', 'es', 'sw', 'sv', 'wa', 'eu',
+                                // NOTE this languages are not fully supported by latin1 
+                                'nl', 'fr', 'et', 'fi', 'cy',
         );
 
         return in_array($language, $iso_languages);

phpmyfaq/inc/PMF/System.php

Doc Comments +2 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
      * Returns the current API version of phpMyFAQ for installation and
      * version in the database.
      *
-     * @return int
+     * @return string
      */
     public static function getApiVersion()
     {
@@ -219,7 +219,7 @@ 
      *
      * @param PMF_Configuration $faqConfig
      *
-     * @return mixed
+     * @return string
      */
     public function getSystemUri(PMF_Configuration $faqConfig)
     {

Spacing +5 added lines, -5 removed lines

@@ -87,11 +87,11 @@
      * @var array
      */
     private $supportedDatabases = [
-        'mysqli' => [ self::VERSION_MINIMUM_PHP, 'MySQL 5.x / Percona Server 5.x / MariaDB 5.x and later' ],
-        'pgsql' => [ self::VERSION_MINIMUM_PHP, 'PostgreSQL 9.x' ],
-        'sqlite3' => [ self::VERSION_MINIMUM_PHP, 'SQLite 3' ],
-        'mssql' => [ self::VERSION_MINIMUM_PHP, 'MS SQL Server 2012 and later (deprecated, PHP 5 only)' ],
-        'sqlsrv' => [ self::VERSION_MINIMUM_PHP, 'MS SQL Server 2012 Driver for PHP (PHP 5 and PHP 7)']
+        'mysqli' => [self::VERSION_MINIMUM_PHP, 'MySQL 5.x / Percona Server 5.x / MariaDB 5.x and later'],
+        'pgsql' => [self::VERSION_MINIMUM_PHP, 'PostgreSQL 9.x'],
+        'sqlite3' => [self::VERSION_MINIMUM_PHP, 'SQLite 3'],
+        'mssql' => [self::VERSION_MINIMUM_PHP, 'MS SQL Server 2012 and later (deprecated, PHP 5 only)'],
+        'sqlsrv' => [self::VERSION_MINIMUM_PHP, 'MS SQL Server 2012 Driver for PHP (PHP 5 and PHP 7)']
     ];
 
     /**

phpmyfaq/inc/PMF/Tags.php

Doc Comments +1 added lines, -1 removed lines

@@ -703,7 +703,7 @@
     }
 
     /**
-     * @param $chr
+     * @param string $chr
      *
      * @return bool
      */

Indentation +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
             $tagName = trim($tagName);
             if (PMF_String::strlen($tagName) > 0) {
                 if (!in_array(PMF_String::strtolower($tagName),
-                              array_map(array('PMF_String', 'strtolower'), $currentTags))) {
+                                array_map(array('PMF_String', 'strtolower'), $currentTags))) {
                     // Create the new tag
                     $newTagId = $this->_config->getDb()->nextId(PMF_Db::getTablePrefix().'faqtags', 'tagging_id');
                     $query = sprintf("

phpmyfaq/inc/PMF/Template.php

Doc Comments +2 added lines, -2 removed lines

@@ -260,7 +260,7 @@ 
      * This function multiplies blocks.
      *
      * @param string $block        Blockname
-     * @param array  $blockContent Content of block
+     * @param string  $blockContent Content of block
      *
      * @return string implode('', $tmpBlock)
      */
@@ -351,7 +351,7 @@ 
      *
      * @param string $content Content to check
      *
-     * @return array
+     * @return string
      */
     private function _checkContent($content)
     {

phpmyfaq/inc/PMF/TransTool.php

Doc Comments +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
      *
      * @param string $val Value
      *
-     * @return bool
+     * @return integer
      */
     public function isValIgnorable($val)
     {

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
         $exemplaryNPlurals = intval($exemplary['PMF_LANG[nplurals]']);
         $toCheckNPlurals = intval($toCheck['PMF_LANG[nplurals]']);
         // One English plural form is equal to (xx/en) of xx plural forms (1/2, 2/2, 3/2,..,6/2..)
-        $pluralsRatio = ($toCheckNPlurals != -1) ? ($toCheckNPlurals / $exemplaryNPlurals) : 1;
+        $pluralsRatio = ($toCheckNPlurals != -1) ? ($toCheckNPlurals/$exemplaryNPlurals) : 1;
 
         $retval = $countAll = $countTranslated = 0;
 
@@ -125,7 +125,7 @@ 
                 }
             }
 
-            $retval = floor(100 * $countTranslated / $countAll);
+            $retval = floor(100*$countTranslated/$countAll);
         }
 
         unset($exemplary, $toCheck);

phpmyfaq/inc/PMF/User.php

Doc Comments +3 added lines, -1 removed lines

@@ -492,7 +492,7 @@ 
      * @param string $pass   Password
      * @param int    $userId User ID
      *
-     * @return mixed
+     * @return boolean
      */
     public function createUser($login, $pass = '', $userId = 0)
     {
@@ -1107,6 +1107,8 @@ 
     /**
      * Sends mail to the current user.
      *
+     * @param string $subject
+     * @param string $message
      * @return bool
      */
     public function mailUser($subject, $message)

Spacing +18 added lines, -20 removed lines

@@ -242,7 +242,7 @@ 
     public function getUserId()
     {
         if (isset($this->userId) && is_int($this->userId)) {
-            return (int) $this->userId;
+            return (int)$this->userId;
         }
         $this->userId = -1;
         $this->errors[] = self::ERROR_USER_NO_USERID;
@@ -271,7 +271,7 @@ 
             WHERE
                 user_id = %d '.($allowBlockedUsers ? '' : "AND account_status != 'blocked'"),
             PMF_Db::getTablePrefix(),
-            (int) $userId
+            (int)$userId
         );
 
         $res = $this->config->getDb()->query($select);
@@ -281,9 +281,9 @@ 
             return false;
         }
         $user = $this->config->getDb()->fetchArray($res);
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get encrypted password
         // @todo: Add a getEncPassword method to the Auth* classes for the (local and remote) Auth Sources.
@@ -348,9 +348,9 @@ 
             return false;
         }
         $user = $this->config->getDb()->fetchArray($res);
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -397,9 +397,9 @@ 
             return false;
         }
 
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -503,7 +503,7 @@ 
         }
 
         // is $login valid?
-        $login = (string) $login;
+        $login = (string)$login;
         if (!$this->isValidLogin($login)) {
             $this->errors[] = self::ERROR_USER_LOGINNAME_TOO_SHORT;
 
@@ -519,7 +519,7 @@ 
 
         // set user-ID
         if (0 == $userId) {
-            $this->userId = (int) $this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faquser', 'user_id');
+            $this->userId = (int)$this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faquser', 'user_id');
         } else {
             $this->userId = $userId;
         }
@@ -775,7 +775,7 @@ 
      */
     public function isValidLogin($login)
     {
-        $login = (string) $login;
+        $login = (string)$login;
 
         if (strlen($login) < $this->loginMinLength || !preg_match($this->validUsername, $login)) {
             $this->errors[] = self::ERROR_USER_LOGIN_INVALID;
@@ -1059,12 +1059,12 @@ 
         // To make passwords harder to get wrong, a few letters & numbers have been omitted.
         // This will ensure safety with browsers using fonts with confusable letters.
         // Removed: o,O,0,1,l,L
-        $consonants = ['b','c','d','f','g','h','j','k','m','n','p','r','s','t','v','w','x','y','z'];
-        $vowels = ['a','e','i','u'];
+        $consonants = ['b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z'];
+        $vowels = ['a', 'e', 'i', 'u'];
         $newPassword = '';
         $skipped = false;
 
-        srand((double) microtime() * 1000000);
+        srand((double)microtime()*1000000);
 
         while (strlen($newPassword) < $minimumLength) {
             if (rand(0, 1)) {
@@ -1074,9 +1074,7 @@ 
             }
 
             switch (rand(0, $skipped ? 3 : ($allowUnderscore ? 5 : 4))) {
-                case 0:
-                case 1:
-                    $nextChar = $caseFunc($consonants[rand(0, 18)]);
+                case 0 : case 1 : $nextChar = $caseFunc($consonants[rand(0, 18)]);
                     break;
                 case 2:
                 case 3:

phpmyfaq/inc/PMF/User/UserData.php

Doc Comments +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
      * Returns the field $field of the user data. If $field is an
      * array, an associative array will be returned.
      *
-     * @param mixed $field Field(s)
+     * @param string $field Field(s)
      *
      * @return mixed
      */

Spacing +3 added lines, -3 removed lines

@@ -182,7 +182,7 @@ 
      */
     public function load($userId)
     {
-        $userId = (int) $userId;
+        $userId = (int)$userId;
         if (($userId <= 0) && ($userId != -1)) {
             return false;
         }
@@ -250,7 +250,7 @@ 
      */
     public function add($userId)
     {
-        $userId = (int) $userId;
+        $userId = (int)$userId;
         if (($userId <= 0) && ($userId != -1)) {
             return false;
         }
@@ -285,7 +285,7 @@ 
      */
     public function delete($userId)
     {
-        $userId = (int) $userId;
+        $userId = (int)$userId;
         if (($userId <= 0) && ($userId != -1)) {
             return false;
         }

phpmyfaq/inc/PMF/Utils.php

Doc Comments +3 added lines, -3 removed lines

@@ -125,7 +125,7 @@ 
      *
      * @param string $lang Language
      *
-     * @return bool
+     * @return integer
      */
     public static function isLanguage($lang)
     {
@@ -137,7 +137,7 @@ 
      *
      * @param int $date Date
      *
-     * @return int
+     * @return boolean
      */
     public static function isLikeOnPMFDate($date)
     {
@@ -319,7 +319,7 @@ 
     /**
      * debug_backtrace() wrapper function.
      *
-     * @param $string
+     * @param string $string
      *
      * @return string
      */

phpmyfaq/admin/ajax.autosave.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     $dateEnd = PMF_Filter::filterInput(INPUT_POST, 'dateEnd', FILTER_SANITIZE_STRING);
     $question = PMF_Filter::filterInput(INPUT_POST, 'question', FILTER_SANITIZE_STRING);
     $categories = PMF_Filter::filterInputArray(INPUT_POST, array('rubrik' => array('filter' => FILTER_VALIDATE_INT,
-                                                                                      'flags' => FILTER_REQUIRE_ARRAY, )));
+                                                                                        'flags' => FILTER_REQUIRE_ARRAY, )));
     $record_lang = PMF_Filter::filterInput(INPUT_POST, 'lang', FILTER_SANITIZE_STRING);
     $tags = PMF_Filter::filterInput(INPUT_POST, 'tags', FILTER_SANITIZE_STRING);
     $active = PMF_Filter::filterInput(INPUT_POST, 'active', FILTER_SANITIZE_STRING);

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     $dateEnd = PMF_Filter::filterInput(INPUT_POST, 'dateEnd', FILTER_SANITIZE_STRING);
     $question = PMF_Filter::filterInput(INPUT_POST, 'question', FILTER_SANITIZE_STRING);
     $categories = PMF_Filter::filterInputArray(INPUT_POST, array('rubrik' => array('filter' => FILTER_VALIDATE_INT,
-                                                                                      'flags' => FILTER_REQUIRE_ARRAY, )));
+                                                                                      'flags' => FILTER_REQUIRE_ARRAY,)));
     $record_lang = PMF_Filter::filterInput(INPUT_POST, 'lang', FILTER_SANITIZE_STRING);
     $tags = PMF_Filter::filterInput(INPUT_POST, 'tags', FILTER_SANITIZE_STRING);
     $active = PMF_Filter::filterInput(INPUT_POST, 'active', FILTER_SANITIZE_STRING);