thorsten / phpMyFAQ

phpmyfaq/admin/ajax.records.php

Switch Indentation +74 added lines, -74 removed lines

@@ -51,102 +51,102 @@
 switch($ajax_action) {
 
     // save active FAQs
-    case 'save_active_records':
-        if ($permission['approverec']) {
-            if (!empty($items)) {
-                $faq = new PMF_Faq($faqConfig);
+        case 'save_active_records':
+            if ($permission['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');
+                    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;
+            break;
 
-    // save sticky FAQs
-    case 'save_sticky_records':
-        if ($permission['editbt']) {
+        // save sticky FAQs
+        case 'save_sticky_records':
+            if ($permission['editbt']) {
 
-            if (!empty($items)) {
-                $faq = new PMF_Faq($faqConfig);
+                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');
+                    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 ($permission['editbt']) {
+        // search FAQs for suggestions
+        case 'search_records':
+            if ($permission['editbt']) {
 
-            $faq             = new PMF_Faq($faqConfig);
-            $faqSearch       = new PMF_Search($faqConfig);
-            $faqSearchResult = new PMF_Search_Resultset($user, $faq, $faqConfig);
-            $searchResult    = '';
-            $searchString    = PMF_Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
+                $faq             = new PMF_Faq($faqConfig);
+                $faqSearch       = new PMF_Search($faqConfig);
+                $faqSearchResult = new PMF_Search_Resultset($user, $faq, $faqConfig);
+                $searchResult    = '';
+                $searchString    = PMF_Filter::filterInput(INPUT_POST, 'search', FILTER_SANITIZE_STRIPPED);
 
-            if (!is_null($searchString)) {
-                $searchResult = $faqSearch->search($searchString, false);
+                if (!is_null($searchString)) {
+                    $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'];
-        }
-        break;
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
+            }
+            break;
 
-    // delete FAQs
-    case 'delete_record':
-        if ($permission['delbt']) {
+        // delete FAQs
+        case 'delete_record':
+            if ($permission['delbt']) {
 
-            $recordId   = PMF_Filter::filterInput(INPUT_POST, 'record_id', FILTER_VALIDATE_INT);
-            $recordLang = PMF_Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
+                $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);
+                $logging = new PMF_Logging($faqConfig);
+                $logging->logAdmin($user, 'Deleted FAQ ID ' . $recordId);
 
-            $faq->deleteRecord($recordId, $recordLang);
-            echo $PMF_LANG['ad_entry_delsuc'];
+                $faq->deleteRecord($recordId, $recordLang);
+                echo $PMF_LANG['ad_entry_delsuc'];
             
-        } else {
-            echo $PMF_LANG['err_NotAuth'];
-        }
-        break;
-
-    // delete open questions
-    case 'delete_question':
-        if ($permission['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);
+            } else {
+                echo $PMF_LANG['err_NotAuth'];
+            }
+            break;
+
+        // delete open questions
+        case 'delete_question':
+            if ($permission['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/install/update.php

Switch Indentation +12 added lines, -12 removed lines

@@ -291,18 +291,18 @@
         if (isset($PMF_LANG['metaCharset']) && strtolower($PMF_LANG['metaCharset']) != 'utf-8') {
             // UTF-8 Migration
             switch($DB['type']) {
-            case 'mysql':
-                include 'mysql.utf8migration.php';
-                break;
-
-            case 'mysqli':
-                include 'mysqli.utf8migration.php';
-                break;
-
-            default:
-                echo '<p class="hint">Please read <a target="_blank" href="../docs/documentation.en.html">' .
-                      'documenation</a> about migration to UTF-8.</p>';
-                break;
+                case 'mysql':
+                    include 'mysql.utf8migration.php';
+                    break;
+
+                case 'mysqli':
+                    include 'mysqli.utf8migration.php';
+                    break;
+
+                default:
+                    echo '<p class="hint">Please read <a target="_blank" href="../docs/documentation.en.html">' .
+                          'documenation</a> about migration to UTF-8.</p>';
+                    break;
             }
         }
 

phpmyfaq/admin/ajax.trans.php

Switch Indentation +151 added lines, -151 removed lines

@@ -39,170 +39,170 @@ 
 
 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) {
+            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)) {
-                /**
+                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
-                );
-                // in an array $valArr contents like  "number substring", "substring", "number substring", "substring", ...
-                $numVal = count($valArr);
-                if ($numVal > 1) {
-                    $newValArr = array();
-                    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
+                    );
+                    // in an array $valArr contents like  "number substring", "substring", "number substring", "substring", ...
+                    $numVal = count($valArr);
+                    if ($numVal > 1) {
+                        $newValArr = array();
+                        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;
             }
-        }
         
-        print 1;
-        break;
+            print 1;
+            break;
     
-    case 'save_translated_lang':
+        case 'save_translated_lang':
         
-        if (!$permission["edittranslation"]) {
-            print $PMF_LANG['err_NotAuth'];
-            exit;
-        }
+            if (!$permission["edittranslation"]) {
+                print $PMF_LANG['err_NotAuth'];
+                exit;
+            }
         
-        $lang     = strtolower($_SESSION['trans']['rightVarsOnly']["PMF_LANG[metaLanguage]"]);
-        $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
+            $lang     = strtolower($_SESSION['trans']['rightVarsOnly']["PMF_LANG[metaLanguage]"]);
+            $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
-            print 0;
-            exit;
-        }     
+            if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+                print 0;
+                exit;
+            }     
         
-        if (!copy($filename, PMF_ROOT_DIR . "/lang/language_" . $lang . ".bak.php")) {
-            print 0;
-            exit;
-        }
+            if (!copy($filename, PMF_ROOT_DIR . "/lang/language_" . $lang . ".bak.php")) {
+                print 0;
+                exit;
+            }
         
-        $newFileContents = '';
-        $tmpLines        = array();
+            $newFileContents = '';
+            $tmpLines        = array();
         
-        // 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);
+            // 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'";
+            // 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;");
             }
-            array_push($tmpLines, '$' . str_replace(array('[', ']'), array("['", "']"), $key) . " = $val;");
-        }
         
-        $newFileContents .= implode("\n", $tmpLines);
+            $newFileContents .= implode("\n", $tmpLines);
         
-        unset($_SESSION['trans']);
+            unset($_SESSION['trans']);
         
-        $retval = file_put_contents($filename, $newFileContents);
-        print intval($retval);
-        break;
+            $retval = file_put_contents($filename, $newFileContents);
+            print intval($retval);
+            break;
     
-    case 'remove_lang_file':
+        case 'remove_lang_file':
         
-        if (!$permission['deltranslation']) {
-            print $PMF_LANG['err_NotAuth'];
-            exit;
-        }
+            if (!$permission['deltranslation']) {
+                print $PMF_LANG['err_NotAuth'];
+                exit;
+            }
          
-        $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
+            $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
-            print 0;
-            exit;
-        }     
+            if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+                print 0;
+                exit;
+            }     
         
-        if (!copy(PMF_ROOT_DIR . "/lang/language_$lang.php", PMF_ROOT_DIR . "/lang/language_$lang.bak.php")) {
-            print 0;
-            exit;
-        }
+            if (!copy(PMF_ROOT_DIR . "/lang/language_$lang.php", PMF_ROOT_DIR . "/lang/language_$lang.bak.php")) {
+                print 0;
+                exit;
+            }
         
-        if (!unlink(PMF_ROOT_DIR . "/lang/language_$lang.php")) {
-            print 0;
-            exit;
-        }
+            if (!unlink(PMF_ROOT_DIR . "/lang/language_$lang.php")) {
+                print 0;
+                exit;
+            }
         
-        print 1;
-    break;
+            print 1;
+        break;
     
-    case 'save_added_trans':
+        case 'save_added_trans':
         
-        if (!$permission["addtranslation"]) {
-            print $PMF_LANG['err_NotAuth'];
-            exit;
-        }        
+            if (!$permission["addtranslation"]) {
+                print $PMF_LANG['err_NotAuth'];
+                exit;
+            }        
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
-            print 0;
-            exit;
-        }
+            if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+                print 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'];
+            $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)) {
-            print 0;
-            exit;
-        }
+            if(empty($langCode) || empty($langName) || empty($langCharset) ||
+               empty($langDir) || empty($langDesc) || empty($author)) {
+                print 0;
+                exit;
+            }
         
-        $fileTpl     = <<<FILE
+            $fileTpl     = <<<FILE
 <?php
 /**
  * %s
@@ -228,41 +228,41 @@ 
 \$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);
-        print intval($retval);
-    break;
+            $retval = @file_put_contents(PMF_ROOT_DIR . '/lang/language_' . strtolower($langCode) . '.php', $fileTpl);
+            print 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)) {
-            print 0;
-            exit;
-        }
+            if (!file_exists($filename)) {
+                print 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');
         
-        print (int) $mail->send();
-    break;
+            print (int) $mail->send();
+        break;
 }