thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Utils.php

Doc Comments +3 added lines, -3 removed lines

@@ -407,7 +407,7 @@ 
 
     /**
      * Creates a seed with microseconds.
-     * @return float|int
+     * @return integer|null
      */
     private static function makeSeed()
     {
@@ -417,8 +417,8 @@ 
 
     /**
      * Returns a random number.
-     * @param $min
-     * @param $max
+     * @param integer $min
+     * @param integer $max
      * @return int
      */
     public static function createRandomNumber($min, $max)

phpmyfaq/ajaxservice.php

Spacing +2 added lines, -2 removed lines

@@ -867,10 +867,10 @@
 
             if ($loginExist && ($email == $user->getUserData('email'))) {
                 $consonants = array(
-                    'b','c','d','f','g','h','j','k','l','m','n','p','r','s','t','v','w','x','y','z',
+                    'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z',
                 );
                 $vowels = array(
-                    'a','e','i','o','u',
+                    'a', 'e', 'i', 'o', 'u',
                 );
                 $newPassword = '';
                 for ($i = 1; $i <= 4; ++$i) {

phpmyfaq/admin/trans.edit.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 }
 
 $leftVarsOnly = array_slice($_SESSION['trans']['leftVarsOnly'],
-                                ($page - 1) * $itemsPerPage,
+                                ($page - 1)*$itemsPerPage,
                                 $itemsPerPage);
 $rightVarsOnly = &$_SESSION['trans']['rightVarsOnly'];
 

phpmyfaq/admin/ajax.group.php

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.image.php

Spacing +3 added lines, -3 removed lines

@@ -38,11 +38,11 @@ 
 
         case 'upload':
 
-            $uploadDir = PMF_ROOT_DIR . '/images/';
+            $uploadDir = PMF_ROOT_DIR.'/images/';
             $uploadFile = basename($_FILES['upload']['name']);
             $isUploaded = false;
             $height = $width = 0;
-            $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ];
+            $validFileExtensions = ['gif', 'jpg', 'jpeg', 'png'];
 
             if ($csrfOkay) {
                 if (is_uploaded_file($uploadedFile['tmp_name']) &&
@@ -70,7 +70,7 @@ 
 
                     if ($fileInfo && $isUploaded) {
                         list($width, $height) = $fileInfo;
-                        if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) {
+                        if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir.$uploadFile)) {
                             $isUploaded = true;
                         } else {
                             $isUploaded = false;

phpmyfaq/admin/ajax.trans.php

Switch Indentation +18 added lines, -18 removed lines

@@ -238,28 +238,28 @@
         echo intval($retval);
     break;
 
-    case 'send_translated_file':
+        case 'send_translated_file':
 
-        $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
-        $filename = PMF_ROOT_DIR.'/lang/language_'.$lang.'.php';
+            $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
+            $filename = PMF_ROOT_DIR.'/lang/language_'.$lang.'.php';
 
-        if (!file_exists($filename)) {
-            echo 0;
-            exit;
-        }
+            if (!file_exists($filename)) {
+                echo 0;
+                exit;
+            }
 
-        $letterTpl = '';
+            $letterTpl = '';
 
-        $mail = new PMF_Mail($faqConfig);
-        $mail->subject = 'New phpMyFAQ language file submitted';
-        $mail->message = sprintf('The file below was sent by %s, which is using phpMyFAQ %s on %s',
-            $user->userdata->get('email'),
-            $faqConfig->get('main.currentVersion'),
-            $_SERVER['HTTP_HOST']);
+            $mail = new PMF_Mail($faqConfig);
+            $mail->subject = 'New phpMyFAQ language file submitted';
+            $mail->message = sprintf('The file below was sent by %s, which is using phpMyFAQ %s on %s',
+                $user->userdata->get('email'),
+                $faqConfig->get('main.currentVersion'),
+                $_SERVER['HTTP_HOST']);
 
-        $mail->addTo('thorsten@phpmyfaq.de');
-        $mail->addAttachment($filename, null, 'text/plain');
+            $mail->addTo('thorsten@phpmyfaq.de');
+            $mail->addAttachment($filename, null, 'text/plain');
 
-        echo (int)$mail->send();
-    break;
+            echo (int)$mail->send();
+        break;
 }

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
          * Build language variable definitions
          * @todo Change input handling using PMF_Filter
          */
-            foreach ((array) @$_POST['PMF_LANG'] as $key => $val) {
+            foreach ((array)@$_POST['PMF_LANG'] as $key => $val) {
                 if (is_string($val)) {
                     $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
                     $val = str_replace("'", "\\'", $val);
@@ -62,7 +62,7 @@ 
                 }
             }
 
-            foreach ((array) @$_POST['LANG_CONF'] as $key => $val) {
+            foreach ((array)@$_POST['LANG_CONF'] as $key => $val) {
                 // if string like array(blah-blah-blah), extract the contents inside the brackets
                 if (preg_match('/^\s*array\s*\(\s*(\d+.+)\s*\).*$/', $val, $matches1)) {
                     // split the resulting string of delimiters such as "number =>"
@@ -192,7 +192,7 @@ 
             $langDir = PMF_Filter::filterInput(INPUT_POST, 'langdir', FILTER_SANITIZE_STRING);
             $langNPlurals = strval(PMF_Filter::filterVar(@$_POST['langnplurals'], FILTER_VALIDATE_INT, -1));
             $langDesc = PMF_Filter::filterInput(INPUT_POST, 'langdesc', FILTER_SANITIZE_STRING);
-            $author = (array) @$_POST['author'];
+            $author = (array)@$_POST['author'];
 
             if (empty($langCode) || empty($langName) || empty($langCharset) ||
                empty($langDir) || empty($langDesc) || empty($author)) {

phpmyfaq/admin/ajax.autosave.php

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.records.php

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;
 }

phpmyfaq/inc/PMF/Init.php

Indentation +10 added lines, -10 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);
-       foreach ($_FILES as $key => $value) {
-           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);
+        foreach ($_FILES as $key => $value) {
+            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]);