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/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/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/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);

phpmyfaq/admin/ajax.category.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         if (empty($ajaxData['categories'])) {
             $categories = array(-1); // Access for all users and groups
         } else {
-            $categories = explode(',', (int) $ajaxData['categories']);
+            $categories = explode(',', (int)$ajaxData['categories']);
         }
 
         echo json_encode(

phpmyfaq/admin/ajax.group.php

Indentation +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
         foreach ($userList as $single_user) {
             $user->getUserById($single_user, true);
             $users[] = array('user_id' => $user->getUserId(),
-                             'login' => $user->getLogin(), );
+                                'login' => $user->getLogin(), );
         }
         echo json_encode($users);
     }
@@ -78,7 +78,7 @@ 
         foreach ($memberList as $single_member) {
             $user->getUserById($single_member, true);
             $members[] = array('user_id' => $user->getUserId(),
-                               'login' => $user->getLogin(), );
+                                'login' => $user->getLogin(), );
         }
         echo json_encode($members);
     }

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
         foreach ($userList as $single_user) {
             $user->getUserById($single_user, true);
             $users[] = array('user_id' => $user->getUserId(),
-                             'login' => $user->getLogin(), );
+                             'login' => $user->getLogin(),);
         }
         echo json_encode($users);
     }
@@ -78,7 +78,7 @@ 
         foreach ($memberList as $single_member) {
             $user->getUserById($single_member, true);
             $members[] = array('user_id' => $user->getUserId(),
-                               'login' => $user->getLogin(), );
+                               'login' => $user->getLogin(),);
         }
         echo json_encode($members);
     }

phpmyfaq/admin/ajax.records.php

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 
                 foreach ($items as $item) {
                     if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'active');
+                        echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'active');
                     }
                 }
             }
@@ -72,7 +72,7 @@ 
 
                 foreach ($items as $item) {
                     if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'sticky');
+                        echo $faq->updateRecordFlag((int)$item[0], addslashes($item[1]), $item[2], 'sticky');
                     }
                 }
             }
@@ -132,7 +132,7 @@ 
 
             if (!is_null($questionIds['questions'])) {
                 foreach ($questionIds['questions'] as $questionId) {
-                    $faq->deleteQuestion((int) $questionId);
+                    $faq->deleteQuestion((int)$questionId);
                 }
             }
             echo $PMF_LANG['ad_entry_delsuc'];

Switch Indentation +79 added lines, -79 removed lines

@@ -48,98 +48,98 @@
 switch ($ajax_action) {
 
     // save active FAQs
-    case 'save_active_records':
-        if ($user->perm->checkRight($user->getUserId(), 'approverec')) {
-            if (!empty($items)) {
-                $faq = new PMF_Faq($faqConfig);
-
-                foreach ($items as $item) {
-                    if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'active');
+        case 'save_active_records':
+            if ($user->perm->checkRight($user->getUserId(), 'approverec')) {
+                if (!empty($items)) {
+                    $faq = new PMF_Faq($faqConfig);
+
+                    foreach ($items as $item) {
+                        if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
+                            echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'active');
+                        }
                     }
                 }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // save sticky FAQs
-    case 'save_sticky_records':
-        if ($user->perm->checkRight($user->getUserId(), 'editbt')) {
-            if (!empty($items)) {
-                $faq = new PMF_Faq($faqConfig);
-
-                foreach ($items as $item) {
-                    if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
-                        echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'sticky');
+            break;
+
+        // save sticky FAQs
+        case 'save_sticky_records':
+            if ($user->perm->checkRight($user->getUserId(), 'editbt')) {
+                if (!empty($items)) {
+                    $faq = new PMF_Faq($faqConfig);
+
+                    foreach ($items as $item) {
+                        if (is_array($item) && count($item) == 3 && PMF_Language::isASupportedLanguage($item[1])) {
+                            echo $faq->updateRecordFlag((int) $item[0], addslashes($item[1]), $item[2], 'sticky');
+                        }
                     }
                 }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
+            break;
 
-    // search FAQs for suggestions
-    case 'search_records':
-        if ($user->perm->checkRight($user->getUserId(), 'editbt')) {
-            $faq = new PMF_Faq($faqConfig);
-            $faqSearch = new PMF_Search($faqConfig);
-            $faqSearch->setCategory(new PMF_Category($faqConfig));
-            $faqSearchResult = new PMF_Search_Resultset($user, $faq, $faqConfig);
-            $searchResult = '';
-            $searchString = PMF_Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
+        // search FAQs for suggestions
+        case 'search_records':
+            if ($user->perm->checkRight($user->getUserId(), 'editbt')) {
+                $faq = new PMF_Faq($faqConfig);
+                $faqSearch = new PMF_Search($faqConfig);
+                $faqSearch->setCategory(new PMF_Category($faqConfig));
+                $faqSearchResult = new PMF_Search_Resultset($user, $faq, $faqConfig);
+                $searchResult = '';
+                $searchString = PMF_Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
 
-            if (!is_null($searchString)) {
+                if (!is_null($searchString)) {
 
-                $searchResult = $faqSearch->search($searchString, false);
+                    $searchResult = $faqSearch->search($searchString, false);
 
-                $faqSearchResult->reviewResultset($searchResult);
+                    $faqSearchResult->reviewResultset($searchResult);
 
-                $searchHelper = new PMF_Helper_Search($faqConfig);
-                $searchHelper->setSearchterm($searchString);
+                    $searchHelper = new PMF_Helper_Search($faqConfig);
+                    $searchHelper->setSearchterm($searchString);
 
-                echo $searchHelper->renderAdminSuggestionResult($faqSearchResult);
+                    echo $searchHelper->renderAdminSuggestionResult($faqSearchResult);
+                }
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // delete FAQs
-    case 'delete_record':
-        if ($user->perm->checkRight($user->getUserId(), 'delbt')) {
-            $recordId = PMF_Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
-            $recordLang = PMF_Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
-
-            $logging = new PMF_Logging($faqConfig);
-            $logging->logAdmin($user, 'Deleted FAQ ID '.$recordId);
-
-            $faq->deleteRecord($recordId, $recordLang);
-            echo $PMF_LANG['ad_entry_delsuc'];
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // delete open questions
-    case 'delete_question':
-        if ($user->perm->checkRight($user->getUserId(), 'delquestion')) {
-            $checks = array(
-                'filter' => FILTER_VALIDATE_INT,
-                'flags' => FILTER_REQUIRE_ARRAY,
-            );
-            $questionIds = PMF_Filter::filterInputArray(INPUT_POST, array('questions' => $checks));
-
-            if (!is_null($questionIds['questions'])) {
-                foreach ($questionIds['questions'] as $questionId) {
-                    $faq->deleteQuestion((int) $questionId);
+            break;
+
+        // delete FAQs
+        case 'delete_record':
+            if ($user->perm->checkRight($user->getUserId(), 'delbt')) {
+                $recordId = PMF_Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
+                $recordLang = PMF_Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
+
+                $logging = new PMF_Logging($faqConfig);
+                $logging->logAdmin($user, 'Deleted FAQ ID '.$recordId);
+
+                $faq->deleteRecord($recordId, $recordLang);
+                echo $PMF_LANG['ad_entry_delsuc'];
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
+            }
+            break;
+
+        // delete open questions
+        case 'delete_question':
+            if ($user->perm->checkRight($user->getUserId(), 'delquestion')) {
+                $checks = array(
+                    'filter' => FILTER_VALIDATE_INT,
+                    'flags' => FILTER_REQUIRE_ARRAY,
+                );
+                $questionIds = PMF_Filter::filterInputArray(INPUT_POST, array('questions' => $checks));
+
+                if (!is_null($questionIds['questions'])) {
+                    foreach ($questionIds['questions'] as $questionId) {
+                        $faq->deleteQuestion((int) $questionId);
+                    }
                 }
+                echo $PMF_LANG['ad_entry_delsuc'];
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
             }
-            echo $PMF_LANG['ad_entry_delsuc'];
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
+            break;
 }