thorsten / phpMyFAQ

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

phpmyfaq/admin/att.main.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 $itemsPerPage = 32;
 $allCrumbs = $fa->getBreadcrumbs();
 
-$crumbs = array_slice($allCrumbs, ($page - 1) * $itemsPerPage, $itemsPerPage);
+$crumbs = array_slice($allCrumbs, ($page - 1)*$itemsPerPage, $itemsPerPage);
 
 $pagination = new PMF_Pagination(
     $faqConfig,

phpmyfaq/admin/category.showstructure.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
             'parent_id' => $parent_id,
             'name' => PMF_Filter::filterInput(INPUT_POST, 'name', FILTER_SANITIZE_STRING),
             'description' => PMF_Filter::filterInput(INPUT_POST, 'description', FILTER_SANITIZE_STRING),
-            'user_id' => PMF_Filter::filterInput(INPUT_POST, 'user_id', FILTER_VALIDATE_INT), );
+            'user_id' => PMF_Filter::filterInput(INPUT_POST, 'user_id', FILTER_VALIDATE_INT),);
 
         // translate.category only returns non-existent languages to translate too
         if ($category->addCategory($category_data, $parent_id, $category_data['id'])) {

Indentation +8 added lines, -8 removed lines

@@ -99,14 +99,14 @@
         print '<td>';
         if ($cat['lang'] != $LANGCODE) {
             // translate category
-           printf(
-               '<a href="%s?action=translatecategory&amp;cat=%s&amp;trlang=%s" title="%s"><span title="%s" class="fa fa-share"></span></a></a>',
-               $currentLink,
-               $cat['id'],
-               $LANGCODE,
-               $PMF_LANG['ad_categ_translate'],
-               $PMF_LANG['ad_categ_translate']
-           );
+            printf(
+                '<a href="%s?action=translatecategory&amp;cat=%s&amp;trlang=%s" title="%s"><span title="%s" class="fa fa-share"></span></a></a>',
+                $currentLink,
+                $cat['id'],
+                $LANGCODE,
+                $PMF_LANG['ad_categ_translate'],
+                $PMF_LANG['ad_categ_translate']
+            );
         }
         printf('&nbsp;%s<strong>%s</strong>',
             $indent,

phpmyfaq/admin/dashboard.php

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
                     $getJson = PMF_Filter::filterInput(INPUT_POST, 'getJson', FILTER_SANITIZE_STRING);
                     if (!is_null($getJson) && 'verify' === $getJson) {
                         set_error_handler(
-                            function ($severity, $message, $file, $line) {
+                            function($severity, $message, $file, $line) {
                                 throw new ErrorException($message, $severity, $severity, $file, $line);
                             }
                         );

Braces +5 added lines, -2 removed lines

@@ -38,8 +38,11 @@
                     <a href="?action=config">
                         <?php if ($faqConfig->get('main.maintenanceMode')): ?>
                         <span class="label label-important"><?php print $PMF_LANG['msgMaintenanceMode']; ?></span>
-                        <?php else: ?>
-                        <span class="label label-success"><?php print $PMF_LANG['msgOnlineMode']; ?></span>
+                        <?php else {
+    : ?>
+                        <span class="label label-success"><?php print $PMF_LANG['msgOnlineMode'];
+}
+?></span>
                         <?php endif; ?>
                     </a>
                 </div>

phpmyfaq/admin/group.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_msg_mysqlerr']);
         }
         foreach ($groupMembers as $memberId) {
-            $perm->addToGroup((int) $memberId, $groupId);
+            $perm->addToGroup((int)$memberId, $groupId);
         }
         $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
             $PMF_LANG['ad_msg_savedsuc_1'],
@@ -91,7 +91,7 @@ 
             $message .= sprintf('<p class="alert alert-danger">%s</p>', $PMF_LANG['ad_msg_mysqlerr']);
         }
         foreach ($groupRights as $rightId) {
-            $perm->grantGroupRight($groupId, (int) $rightId);
+            $perm->grantGroupRight($groupId, (int)$rightId);
         }
         $message .= sprintf('<p class="alert alert-success">%s <strong>%s</strong> %s</p>',
             $PMF_LANG['ad_msg_savedsuc_1'],

phpmyfaq/admin/news.php

Spacing +2 added lines, -2 removed lines

@@ -510,7 +510,7 @@ 
         'active' => (is_null($active)) ? 'n' : 'y',
         'comment' => (is_null($comment)) ? 'n' : 'y',
         'dateStart' => (empty($dateStart)) ? '00000000000000' : str_replace('-', '', $dateStart).'000000',
-        'dateEnd' => (empty($dateEnd))  ? '99991231235959' : str_replace('-', '', $dateEnd).'235959',
+        'dateEnd' => (empty($dateEnd)) ? '99991231235959' : str_replace('-', '', $dateEnd).'235959',
         'link' => $link,
         'linkTitle' => $linktitle,
         'date' => date('YmdHis'),
@@ -562,7 +562,7 @@ 
         'active' => (is_null($active)) ? 'n' : 'y',
         'comment' => (is_null($comment)) ? 'n' : 'y',
         'dateStart' => (empty($dateStart)) ? '00000000000000' : str_replace('-', '', $dateStart).'000000',
-        'dateEnd' => (empty($dateEnd))   ? '99991231235959' : str_replace('-', '', $dateEnd).'235959',
+        'dateEnd' => (empty($dateEnd)) ? '99991231235959' : str_replace('-', '', $dateEnd).'235959',
         'link' => $link,
         'linkTitle' => $linktitle,
         'date' => date('YmdHis'),

phpmyfaq/admin/record.show.php

Spacing +4 added lines, -4 removed lines

@@ -223,11 +223,11 @@ 
                     $fdTable.'.active AS active',
                     $fdTable.'.thema AS thema',
                     $fdTable.'.content AS content',
-                    $fdTable.'.updated AS updated', ))
+                    $fdTable.'.updated AS updated',))
             ->setJoinedTable($fcrTable)
             ->setJoinedColumns(array(
                     $fdTable.'.id = '.$fcrTable.'.record_id',
-                    $fdTable.'.lang = '.$fcrTable.'.record_lang', ));
+                    $fdTable.'.lang = '.$fcrTable.'.record_lang',));
 
         if (is_numeric($searchTerm)) {
             $search->setMatchingColumns(array($fdTable.'.solution_id'));
@@ -243,7 +243,7 @@ 
         $faqsFound = array();
 
         while ($row = $faqConfig->getDb()->fetchObject($result)) {
-            if ($searchCat != 0 && $searchCat != (int) $row->category_id) {
+            if ($searchCat != 0 && $searchCat != (int)$row->category_id) {
                 continue;
             }
 
@@ -443,7 +443,7 @@ 
                                             <input type="checkbox" lang="<?php echo $record['lang'] ?>"
                                                onclick="saveStatus(<?php echo $cid.', ['.$record['id'].']' ?>, 'sticky', '<?php echo $user->getCsrfTokenFromSession() ?>');"
                                                id="sticky_record_<?php echo $cid.'_'.$record['id'] ?>"
-                                            <?php echo($record['sticky'] ? 'checked' :  '    ') ?>>
+                                            <?php echo($record['sticky'] ? 'checked' : '    ') ?>>
                                         </label>
                                     </td>
                                     <td>

phpmyfaq/admin/report.export.php

Spacing +10 added lines, -10 removed lines

@@ -44,18 +44,18 @@
 
     $text = [];
     $text[0] = [];
-    ($useCategory)     ? $text[0][] = $PMF_LANG['ad_stat_report_category'] : '';
-    ($useSubcategory)  ? $text[0][] = $PMF_LANG['ad_stat_report_sub_category'] : '';
-    ($useTranslation)  ? $text[0][] = $PMF_LANG['ad_stat_report_translations'] : '';
-    ($useLanguage)     ? $text[0][] = $PMF_LANG['ad_stat_report_language'] : '';
-    ($useId)           ? $text[0][] = $PMF_LANG['ad_stat_report_id'] : '';
-    ($useSticky)       ? $text[0][] = $PMF_LANG['ad_stat_report_sticky'] : '';
-    ($useTitle)        ? $text[0][] = $PMF_LANG['ad_stat_report_title'] : '';
+    ($useCategory) ? $text[0][] = $PMF_LANG['ad_stat_report_category'] : '';
+    ($useSubcategory) ? $text[0][] = $PMF_LANG['ad_stat_report_sub_category'] : '';
+    ($useTranslation) ? $text[0][] = $PMF_LANG['ad_stat_report_translations'] : '';
+    ($useLanguage) ? $text[0][] = $PMF_LANG['ad_stat_report_language'] : '';
+    ($useId) ? $text[0][] = $PMF_LANG['ad_stat_report_id'] : '';
+    ($useSticky) ? $text[0][] = $PMF_LANG['ad_stat_report_sticky'] : '';
+    ($useTitle) ? $text[0][] = $PMF_LANG['ad_stat_report_title'] : '';
     ($useCreationDate) ? $text[0][] = $PMF_LANG['ad_stat_report_creation_date'] : '';
-    ($useOwner)        ? $text[0][] = $PMF_LANG['ad_stat_report_owner'] : '';
+    ($useOwner) ? $text[0][] = $PMF_LANG['ad_stat_report_owner'] : '';
     ($useLastModified) ? $text[0][] = $PMF_LANG['ad_stat_report_last_modified_person'] : '';
-    ($useUrl)          ? $text[0][] = $PMF_LANG['ad_stat_report_url'] : '';
-    ($useVisits)       ? $text[0][] = $PMF_LANG['ad_stat_report_visits'] : '';
+    ($useUrl) ? $text[0][] = $PMF_LANG['ad_stat_report_url'] : '';
+    ($useVisits) ? $text[0][] = $PMF_LANG['ad_stat_report_visits'] : '';
 
     $report = new PMF_Report($faqConfig);