thorsten / phpMyFAQ

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

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

phpmyfaq/admin/ajax.trans.php

Indentation +1 added lines, -1 removed lines

@@ -224,7 +224,7 @@
         }
 
         $fileTpl = sprintf($fileTpl, $langDesc, $authorTpl, date('Y-m-d'), $langCode, date('Y'),
-                                     $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
+                                        $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
 
         $retval = @file_put_contents(PMF_ROOT_DIR.'/lang/language_'.strtolower($langCode).'.php', $fileTpl);
         echo intval($retval);

Switch Indentation +162 added lines, -162 removed lines

@@ -40,167 +40,167 @@ 
 
 switch ($ajax_action) {
 
-    case 'save_page_buffer':
-        /*
+        case 'save_page_buffer':
+            /*
          * Build language variable definitions
          * @todo Change input handling using PMF_Filter
          */
-        foreach ((array) @$_POST['PMF_LANG'] as $key => $val) {
-            if (is_string($val)) {
-                $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
-                $val = str_replace("'", "\\'", $val);
-                $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"] = $val;
-            } elseif (is_array($val)) {
-                /*
+            foreach ((array) @$_POST['PMF_LANG'] as $key => $val) {
+                if (is_string($val)) {
+                    $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
+                    $val = str_replace("'", "\\'", $val);
+                    $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"] = $val;
+                } elseif (is_array($val)) {
+                    /*
                  * Here we deal with a two dimensional array
                  */
-                foreach ($val as $key2 => $val2) {
-                    $val2 = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val2);
-                    $val2 = str_replace("'", "\\'", $val2);
-                    $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key][$key2]"] = $val2;
+                    foreach ($val as $key2 => $val2) {
+                        $val2 = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val2);
+                        $val2 = str_replace("'", "\\'", $val2);
+                        $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key][$key2]"] = $val2;
+                    }
                 }
             }
-        }
-
-        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 =>"
-                $valArr = preg_split(
-                    '/\s*(\d+)\s*\=\>\s*/',
-                    $matches1[1],
-                    null,
-                    PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
-                );
-                $numVal = count($valArr);
-                if ($numVal > 1) {
-                    $newValArr = [];
-                    for ($i = 0; $i < $numVal; $i += 2) {
-                        if (is_numeric($valArr[$i])) {
-                            // clearing quotes
-                            if (preg_match('/^\s*\\\\*[\"|\'](.+)\\\\*[\"|\'][\s\,]*$/', $valArr[$i + 1], $matches2)) {
-                                $subVal = $matches2[1];
-                                // normalize quotes
-                                $subVal = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $subVal);
-                                $subVal = str_replace("'", "\\'", $subVal);
-                                // assembly of the original substring back
-                                $newValArr[] = $valArr[$i].' => \''.$subVal.'\'';
+
+            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 =>"
+                    $valArr = preg_split(
+                        '/\s*(\d+)\s*\=\>\s*/',
+                        $matches1[1],
+                        null,
+                        PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
+                    );
+                    $numVal = count($valArr);
+                    if ($numVal > 1) {
+                        $newValArr = [];
+                        for ($i = 0; $i < $numVal; $i += 2) {
+                            if (is_numeric($valArr[$i])) {
+                                // clearing quotes
+                                if (preg_match('/^\s*\\\\*[\"|\'](.+)\\\\*[\"|\'][\s\,]*$/', $valArr[$i + 1], $matches2)) {
+                                    $subVal = $matches2[1];
+                                    // normalize quotes
+                                    $subVal = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $subVal);
+                                    $subVal = str_replace("'", "\\'", $subVal);
+                                    // assembly of the original substring back
+                                    $newValArr[] = $valArr[$i].' => \''.$subVal.'\'';
+                                }
                             }
                         }
+                        $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = 'array('.implode(', ', $newValArr).')';
                     }
-                    $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = 'array('.implode(', ', $newValArr).')';
+                } else {  // compatibility for old behavior
+                    $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
+                    $val = str_replace("'", "\\'", $val);
+                    $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = $val;
                 }
-            } else {  // compatibility for old behavior
-                $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
-                $val = str_replace("'", "\\'", $val);
-                $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = $val;
             }
-        }
 
-        echo 1;
-    break;
+            echo 1;
+        break;
     
-    case 'save_translated_lang':
-
-        if (!$user->perm->checkRight($user->getUserId(), 'edittranslation')) {
-            echo $PMF_LANG['err_NotAuth'];
-            exit;
-        }
-
-        $lang = strtolower($_SESSION['trans']['rightVarsOnly']['PMF_LANG[metaLanguage]']);
-        $filename = PMF_ROOT_DIR.'/lang/language_'.$lang.'.php';
-
-        if (!is_writable(PMF_ROOT_DIR.'/lang')) {
-            echo 0;
-            exit;
-        }
-
-        if (!copy($filename, PMF_ROOT_DIR.'/lang/language_'.$lang.'.bak.php')) {
-            echo 0;
-            exit;
-        }
-
-        $newFileContents = '';
-        $tmpLines = [];
-
-        // Read in the head of the file we're writing to
-        $fh = fopen($filename, 'r');
-        do {
-            $line = fgets($fh);
-            array_push($tmpLines, rtrim($line));
-        } while ('*/' != substr(trim($line), -2));
-        fclose($fh);
-
-        // Construct lines with variable definitions
-        foreach ($_SESSION['trans']['rightVarsOnly'] as $key => $val) {
-            if (0 === strpos($key, 'PMF_LANG')) {
-                $val = "'$val'";
+        case 'save_translated_lang':
+
+            if (!$user->perm->checkRight($user->getUserId(), 'edittranslation')) {
+                echo $PMF_LANG['err_NotAuth'];
+                exit;
             }
-            array_push($tmpLines, '$'.str_replace(array('[', ']'), array("['", "']"), $key)." = $val;");
-        }
 
-        $newFileContents .= implode("\n", $tmpLines);
+            $lang = strtolower($_SESSION['trans']['rightVarsOnly']['PMF_LANG[metaLanguage]']);
+            $filename = PMF_ROOT_DIR.'/lang/language_'.$lang.'.php';
 
-        unset($_SESSION['trans']);
+            if (!is_writable(PMF_ROOT_DIR.'/lang')) {
+                echo 0;
+                exit;
+            }
 
-        $retval = file_put_contents($filename, $newFileContents);
-        echo intval($retval);
-        break;
+            if (!copy($filename, PMF_ROOT_DIR.'/lang/language_'.$lang.'.bak.php')) {
+                echo 0;
+                exit;
+            }
 
-    case 'remove_lang_file':
+            $newFileContents = '';
+            $tmpLines = [];
+
+            // Read in the head of the file we're writing to
+            $fh = fopen($filename, 'r');
+            do {
+                $line = fgets($fh);
+                array_push($tmpLines, rtrim($line));
+            } while ('*/' != substr(trim($line), -2));
+            fclose($fh);
+
+            // Construct lines with variable definitions
+            foreach ($_SESSION['trans']['rightVarsOnly'] as $key => $val) {
+                if (0 === strpos($key, 'PMF_LANG')) {
+                    $val = "'$val'";
+                }
+                array_push($tmpLines, '$'.str_replace(array('[', ']'), array("['", "']"), $key)." = $val;");
+            }
+
+            $newFileContents .= implode("\n", $tmpLines);
 
-        if (!$user->perm->checkRight($user->getUserId(), 'deltranslation')) {
-            echo $PMF_LANG['err_NotAuth'];
-            exit;
-        }
+            unset($_SESSION['trans']);
 
-        $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
+            $retval = file_put_contents($filename, $newFileContents);
+            echo intval($retval);
+            break;
 
-        if (!is_writable(PMF_ROOT_DIR.'/lang')) {
-            echo 0;
-            exit;
-        }
+        case 'remove_lang_file':
 
-        if (!copy(PMF_ROOT_DIR."/lang/language_$lang.php", PMF_ROOT_DIR."/lang/language_$lang.bak.php")) {
-            echo 0;
-            exit;
-        }
+            if (!$user->perm->checkRight($user->getUserId(), 'deltranslation')) {
+                echo $PMF_LANG['err_NotAuth'];
+                exit;
+            }
 
-        if (!unlink(PMF_ROOT_DIR."/lang/language_$lang.php")) {
-            echo 0;
-            exit;
-        }
+            $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
 
-        echo 1;
-        break;
+            if (!is_writable(PMF_ROOT_DIR.'/lang')) {
+                echo 0;
+                exit;
+            }
+
+            if (!copy(PMF_ROOT_DIR."/lang/language_$lang.php", PMF_ROOT_DIR."/lang/language_$lang.bak.php")) {
+                echo 0;
+                exit;
+            }
 
-    case 'save_added_trans':
-
-        if (!$user->perm->checkRight($user->getUserId(), 'addtranslation')) {
-            echo $PMF_LANG['err_NotAuth'];
-            exit;
-        }
-
-        if (!is_writable(PMF_ROOT_DIR.'/lang')) {
-            echo 0;
-            exit;
-        }
-
-        $langCode = PMF_Filter::filterInput(INPUT_POST, 'translang', FILTER_SANITIZE_STRING);
-        $langName = @$languageCodes[$langCode];
-        $langCharset = 'UTF-8';
-        $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'];
-
-        if (empty($langCode) || empty($langName) || empty($langCharset) ||
-           empty($langDir) || empty($langDesc) || empty($author)) {
-            echo 0;
-            exit;
-        }
-
-        $fileTpl = <<<FILE
+            if (!unlink(PMF_ROOT_DIR."/lang/language_$lang.php")) {
+                echo 0;
+                exit;
+            }
+
+            echo 1;
+            break;
+
+        case 'save_added_trans':
+
+            if (!$user->perm->checkRight($user->getUserId(), 'addtranslation')) {
+                echo $PMF_LANG['err_NotAuth'];
+                exit;
+            }
+
+            if (!is_writable(PMF_ROOT_DIR.'/lang')) {
+                echo 0;
+                exit;
+            }
+
+            $langCode = PMF_Filter::filterInput(INPUT_POST, 'translang', FILTER_SANITIZE_STRING);
+            $langName = @$languageCodes[$langCode];
+            $langCharset = 'UTF-8';
+            $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'];
+
+            if (empty($langCode) || empty($langName) || empty($langCharset) ||
+               empty($langDir) || empty($langDesc) || empty($author)) {
+                echo 0;
+                exit;
+            }
+
+            $fileTpl = <<<FILE
 <?php
 /**
  * %s
@@ -226,40 +226,40 @@ 
 \$PMF_LANG['nplurals'] = '%s';
 FILE;
 
-        $authorTpl = '';
-        foreach ($author as $authorData) {
-            $authorTpl .= " * @author    $authorData\n";
-        }
+            $authorTpl = '';
+            foreach ($author as $authorData) {
+                $authorTpl .= " * @author    $authorData\n";
+            }
 
-        $fileTpl = sprintf($fileTpl, $langDesc, $authorTpl, date('Y-m-d'), $langCode, date('Y'),
-                                     $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
+            $fileTpl = sprintf($fileTpl, $langDesc, $authorTpl, date('Y-m-d'), $langCode, date('Y'),
+                                         $langCharset, strtolower($langCode), $langName, $langDir, $langNPlurals);
 
-        $retval = @file_put_contents(PMF_ROOT_DIR.'/lang/language_'.strtolower($langCode).'.php', $fileTpl);
-        echo intval($retval);
-    break;
+            $retval = @file_put_contents(PMF_ROOT_DIR.'/lang/language_'.strtolower($langCode).'.php', $fileTpl);
+            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 +6 added lines, -6 removed lines

@@ -29,9 +29,9 @@ 
 }
 
 $ajax_action = PMF_Filter::filterInput(INPUT_GET, 'ajaxaction', FILTER_SANITIZE_STRING);
-$csrfToken  = PMF_Filter::filterInput(INPUT_POST, 'csrf', FILTER_SANITIZE_STRING);
+$csrfToken = PMF_Filter::filterInput(INPUT_POST, 'csrf', FILTER_SANITIZE_STRING);
 if (is_null($csrfToken)) {
-    $csrfToken  = PMF_Filter::filterInput(INPUT_GET, 'csrf', FILTER_SANITIZE_STRING);
+    $csrfToken = PMF_Filter::filterInput(INPUT_GET, 'csrf', FILTER_SANITIZE_STRING);
 }
 
 if (!isset($_SESSION['phpmyfaq_csrf_token']) || $_SESSION['phpmyfaq_csrf_token'] !== $csrfToken) {
@@ -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)) {
@@ -260,6 +260,6 @@ 
         $mail->addTo('thorsten@phpmyfaq.de');
         $mail->addAttachment($filename, null, 'text/plain');
 
-        echo (int) $mail->send();
+        echo (int)$mail->send();
     break;
 }