thorsten / phpMyFAQ

phpmyfaq/api.php

Spacing +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@ 
 // Set language
 //
 if (PMF_Language::isASupportedLanguage($language)) {
-    require PMF_LANGUAGE_DIR . '/language_' . $language . '.php';
+    require PMF_LANGUAGE_DIR.'/language_'.$language.'.php';
 } else {
-    require PMF_LANGUAGE_DIR . '/language_en.php';
+    require PMF_LANGUAGE_DIR.'/language_en.php';
 }
 $faqConfig->setLanguage($Language);
 
@@ -94,7 +94,7 @@ 
 
         $searchString  = PMF_Filter::filterInput(INPUT_GET, 'q', FILTER_SANITIZE_STRIPPED);
         $searchResults = $search->search($searchString, false);
-        $url           = $faqConfig->get('main.referenceURL') . '/index.php?action=artikel&cat=%d&id=%d&artlang=%s';
+        $url           = $faqConfig->get('main.referenceURL').'/index.php?action=artikel&cat=%d&id=%d&artlang=%s';
 
         $faqSearchResult->reviewResultset($searchResults);
 

phpmyfaq/pdf.php

Spacing +6 added lines, -6 removed lines

@@ -35,9 +35,9 @@ 
 
 // Found an article language?
 $lang = PMF_Filter::filterInput(INPUT_POST, 'artlang', FILTER_SANITIZE_STRING);
-if (is_null($lang) && !PMF_Language::isASupportedLanguage($lang) ) {
+if (is_null($lang) && !PMF_Language::isASupportedLanguage($lang)) {
     $lang = PMF_Filter::filterInput(INPUT_GET, 'artlang', FILTER_SANITIZE_STRING);
-    if (is_null($lang) && !PMF_Language::isASupportedLanguage($lang) ) {
+    if (is_null($lang) && !PMF_Language::isASupportedLanguage($lang)) {
         $lang = $LANGCODE;
     }
 }
@@ -55,7 +55,7 @@ 
 
 // authenticate with session information
 $user = PMF_User_CurrentUser::getFromCookie($faqConfig);
-if (! $user instanceof PMF_User_CurrentUser) {
+if (!$user instanceof PMF_User_CurrentUser) {
     $user = PMF_User_CurrentUser::getFromSession($faqConfig);
 }
 if ($user instanceof PMF_User_CurrentUser) {
@@ -82,7 +82,7 @@ 
 
 // Get current user and group id - default: -1
 if (!is_null($user) && $user instanceof PMF_User_CurrentUser) {
-    $current_user   = $user->getUserId();
+    $current_user = $user->getUserId();
     if ($user->perm instanceof PMF_Perm_Medium) {
         $current_groups = $user->perm->getUserGroups($current_user);
     } else {
@@ -138,14 +138,14 @@ 
     $faq->getRecord($id);
     $faq->faqRecord['category_id'] = $currentCategory;
 
-    $filename = 'FAQ-' . $id . '-' . $lang . '.pdf';
+    $filename = 'FAQ-'.$id.'-'.$lang.'.pdf';
     $pdfFile  = $pdf->generateFile($faq->faqRecord, $filename);
 }
 
 if (preg_match("/MSIE/i", $_SERVER["HTTP_USER_AGENT"])) {
     $headers[] = "Content-type: application/pdf";
     $headers[] = "Content-Transfer-Encoding: binary";
-    $headers[] = "Content-Disposition: attachment; filename=" . $filename;
+    $headers[] = "Content-Disposition: attachment; filename=".$filename;
 } else {
     $headers[] = "Content-Type: application/pdf";
 }

Braces +3 added lines, -2 removed lines

@@ -75,8 +75,9 @@
     // check user rights, set them TRUE
     $allUserRights = $user->perm->getAllUserRights($user->getUserId());
     foreach ($allRights as $right) {
-        if (in_array($right['right_id'], $allUserRights))
-            $permission[$right['name']] = true;
+        if (in_array($right['right_id'], $allUserRights)) {
+                    $permission[$right['name']] = true;
+        }
     }
 }
 

phpmyfaq/register.php

Spacing +2 added lines, -2 removed lines

@@ -20,10 +20,10 @@
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 

phpmyfaq/show.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -79,7 +79,7 @@ 
     $tpl->parse(
         'writeContent',
         array(
-            'categoryHeader'      => $PMF_LANG['msgEntriesIn'] . $catName,
+            'categoryHeader'      => $PMF_LANG['msgEntriesIn'].$catName,
             'categoryDescription' => $catDescription,
             'categoryFaqsHeader'  => $PMF_LANG['msgEntries'],
             'categoryContent'     => $records,

phpmyfaq/news.php

Spacing +5 added lines, -5 removed lines

@@ -21,10 +21,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -41,14 +41,14 @@ 
 $newsId = PMF_Filter::filterInput(INPUT_GET, 'newsid', FILTER_VALIDATE_INT);
 
 if (is_null($newsId)) {
-    header('Location: http://'.$_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
 $faqsession->userTracking('news_view', $categoryId);
 
 // Define the header of the page
-$newsMainHeader = $faqConfig->get('main.titleFAQ') . $PMF_LANG['msgNews'];
+$newsMainHeader = $faqConfig->get('main.titleFAQ').$PMF_LANG['msgNews'];
 $newsFeed       = '&nbsp;<a href="feed/news/rss.php" target="_blank"><img id="newsRSS" src="assets/img/feed.png" width="16" height="16" alt="RSS" /></a>';
 
 // Get all data from the news record
@@ -115,7 +115,7 @@ 
         'writeContent'        => $newsContent,
         'writeDateMsg'        => $newsDate,
         'msgAboutThisNews'    => $PMF_LANG['msgAboutThisNews'],
-        'writeAuthor'         => ($news['active'] && (!$expired)) ? $PMF_LANG['msgAuthor'] . ': ' . $news['authorName'] : '',
+        'writeAuthor'         => ($news['active'] && (!$expired)) ? $PMF_LANG['msgAuthor'].': '.$news['authorName'] : '',
         'editThisEntry'       => $editThisEntry,
         'writeCommentMsg'     => $commentMessage,
         'msgWriteComment'     => $PMF_LANG['newsWriteComment'],

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

Spacing +24 added lines, -24 removed lines

@@ -20,17 +20,17 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
 $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) {
@@ -49,7 +49,7 @@ 
             if (is_string($val)) {
                 $val = str_replace(array('\\\\', '\"', '\\\''), array('\\', '"', "'"), $val);
                 $val = str_replace("'", "\\'", $val);
-                $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"]  = $val;
+                $_SESSION['trans']['rightVarsOnly']["PMF_LANG[$key]"] = $val;
             } elseif (is_array($val)) {
                 /**
                  * Here we deal with a two dimensional array
@@ -64,13 +64,13 @@ 
         
         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)) {
+            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
+                    PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
                 );
                 // in an array $valArr contents like  "number substring", "substring", "number substring", "substring", ...
                 $numVal = count($valArr);
@@ -89,12 +89,12 @@ 
                             }
                         }
                     }
-                    $_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;
+                $_SESSION['trans']['rightVarsOnly']["LANG_CONF[$key]"] = $val;
             }
         }
         
@@ -109,14 +109,14 @@ 
         }
         
         $lang     = strtolower($_SESSION['trans']['rightVarsOnly']["PMF_LANG[metaLanguage]"]);
-        $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
+        $filename = PMF_ROOT_DIR."/lang/language_".$lang.".php";
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             print 0;
             exit;
         }     
         
-        if (!copy($filename, PMF_ROOT_DIR . "/lang/language_" . $lang . ".bak.php")) {
+        if (!copy($filename, PMF_ROOT_DIR."/lang/language_".$lang.".bak.php")) {
             print 0;
             exit;
         }
@@ -138,7 +138,7 @@ 
             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);
@@ -158,17 +158,17 @@ 
          
         $lang = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        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")) {
+        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")) {
+        if (!unlink(PMF_ROOT_DIR."/lang/language_$lang.php")) {
             print 0;
             exit;
         }
@@ -183,7 +183,7 @@ 
             exit;
         }        
         
-        if (!is_writable(PMF_ROOT_DIR . "/lang")) {
+        if (!is_writable(PMF_ROOT_DIR."/lang")) {
             print 0;
             exit;
         }
@@ -192,17 +192,17 @@ 
         $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));
+        $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) ||
+        if (empty($langCode) || empty($langName) || empty($langCharset) ||
            empty($langDir) || empty($langDesc) || empty($author)) {
             print 0;
             exit;
         }
         
-        $fileTpl     = <<<FILE
+        $fileTpl = <<<FILE
 <?php
 /**
  * %s
@@ -236,7 +236,7 @@ 
         $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);
+        $retval = @file_put_contents(PMF_ROOT_DIR.'/lang/language_'.strtolower($langCode).'.php', $fileTpl);
         print intval($retval);
     break;
     
@@ -244,7 +244,7 @@ 
     case 'send_translated_file':
         
         $lang     = PMF_Filter::filterInput(INPUT_GET, 'translang', FILTER_SANITIZE_STRING);
-        $filename = PMF_ROOT_DIR . "/lang/language_" . $lang . ".php";
+        $filename = PMF_ROOT_DIR."/lang/language_".$lang.".php";
         
         if (!file_exists($filename)) {
             print 0;
@@ -263,6 +263,6 @@ 
         $mail->addTo('thorsten@phpmyfaq.de');
         $mail->addAttachment($filename, null, 'text/plain');
         
-        print (int) $mail->send();
+        print (int)$mail->send();
     break;
 }

phpmyfaq/lang/language_sr.php

Spacing +8 added lines, -8 removed lines

@@ -664,14 +664,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Objavi?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Molimo unesite lozinku. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Lozinke se ne poklapaju. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Unešeno korisničko ime nije nađeno.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Unesite važeću email adresu. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Unesite Vaše pravo ime. ";
-$PMF_LANG['ad_user_error_delete'] =  "Korisnički nalog ne može biti izbrisan. ";
-$PMF_LANG['ad_user_error_noId'] =  "Nije priložen ID. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Korisnički nalog je zaštićen. ";
+$PMF_LANG['ad_user_error_password'] = "Molimo unesite lozinku. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Lozinke se ne poklapaju. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Unešeno korisničko ime nije nađeno.";
+$PMF_LANG['ad_user_error_noEmail'] = "Unesite važeću email adresu. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Unesite Vaše pravo ime. ";
+$PMF_LANG['ad_user_error_delete'] = "Korisnički nalog ne može biti izbrisan. ";
+$PMF_LANG['ad_user_error_noId'] = "Nije priložen ID. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Korisnički nalog je zaštićen. ";
 $PMF_LANG['ad_user_deleteUser'] = "Obriši korisnika";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "zadnji put menjano:";

phpmyfaq/inc/PMF/Category.php

Doc Comments +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
      *
      * @param string $val Value
      *
-     * @return boolean
+     * @return integer
      */
     public function isValIgnorable($val)
     {

Indentation +19 added lines, -19 removed lines

@@ -574,10 +574,10 @@ 
     }
 
     /**
-    * print the static tree with the number of records
-    *
-    * @return string
-    */
+     * print the static tree with the number of records
+     *
+     * @return string
+     */
     public function viewTree()
     {
         global $sids, $PMF_LANG, $plr;
@@ -1225,7 +1225,7 @@ 
             PMF_Db::getTablePrefix(),
             $category_id);
         if (!$delete_all) {
-           $query .= " AND lang = '".$category_lang."'";
+            $query .= " AND lang = '".$category_lang."'";
         }
         $this->_config->getDb()->query($query);
 
@@ -1249,7 +1249,7 @@ 
             PMF_Db::getTablePrefix(),
             $category_id);
         if (!$delete_all) {
-           $query .= " AND category_lang = '".$category_lang."'";
+            $query .= " AND category_lang = '".$category_lang."'";
         }
         $this->_config->getDb()->query($query);
 
@@ -1273,7 +1273,7 @@ 
         $translated   = array();
 
         foreach ($existcatlang as $language) {
-           $query = sprintf("
+            $query = sprintf("
                SELECT
                   name, description
                FROM
@@ -1282,13 +1282,13 @@ 
                    id = %d
                AND
                    lang = '%s'",
-               PMF_Db::getTablePrefix(),
-               $category_id,
-               $language);
-           $result = $this->_config->getDb()->query($query);
-           if ($row = $this->_config->getDb()->fetchArray($result)) {
-              $translated[$languageCodes[strtoupper($language)]] = $row['name'].('' == $row['description'] ? '' : '  ('.$row['description'].')');
-           }
+                PMF_Db::getTablePrefix(),
+                $category_id,
+                $language);
+            $result = $this->_config->getDb()->query($query);
+            if ($row = $this->_config->getDb()->fetchArray($result)) {
+                $translated[$languageCodes[strtoupper($language)]] = $row['name'].('' == $row['description'] ? '' : '  ('.$row['description'].')');
+            }
         }
         ksort($translated);
 
@@ -1342,9 +1342,9 @@ 
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchArray($result)) {
             if (!array_key_exists($row['id'],$this->categoryName)) {
-               $this->categoryName[$row['id']] = $row;
-               $this->categories[] =& $this->categoryName[$row['id']];
-               $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
+                $this->categoryName[$row['id']] = $row;
+                $this->categories[] =& $this->categoryName[$row['id']];
+                $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
             }
         }
     }
@@ -1540,8 +1540,8 @@ 
                 fd.lang = fcr.category_lang
             ORDER BY
                 fcr.category_id, fd.id',
-             PMF_Db::getTablePrefix(),
-             PMF_Db::getTablePrefix());
+                PMF_Db::getTablePrefix(),
+                PMF_Db::getTablePrefix());
         $result = $this->_config->getDb()->query($query);
 
         if ($this->_config->getDb()->numRows($result) > 0) {

Spacing +17 added lines, -17 removed lines

@@ -232,9 +232,9 @@ 
 
         while ($row = $this->_config->getDb()->fetchArray($result)) {
             $this->categoryName[$row['id']] = $row;
-            $this->categories[] =& $this->categoryName[$row['id']];
-            $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
-            $this->owner[$row['id']] =& $row['user_id'];
+            $this->categories[] = & $this->categoryName[$row['id']];
+            $this->children[$row['parent_id']][$row['id']] = & $this->categoryName[$row['id']];
+            $this->owner[$row['id']] = & $row['user_id'];
         }
 
         return $this->categories;
@@ -398,8 +398,8 @@ 
             $symbol = 'minus';
         } else {
             $temp = isset($this->children[$thisParent_id]) ? array_keys($this->children[$thisParent_id]) : array();
-            if (isset($temp[count($temp)-1])) {
-                $symbol = ($id == $temp[count($temp)-1]) ? 'angle' : 'medium';
+            if (isset($temp[count($temp) - 1])) {
+                $symbol = ($id == $temp[count($temp) - 1]) ? 'angle' : 'medium';
             }
         }
 
@@ -472,7 +472,7 @@ 
         $childs = array();
 
         if (isset($this->children[$id])) {
-            foreach(array_keys($this->children[$id]) as $childId) {
+            foreach (array_keys($this->children[$id]) as $childId) {
                 $childs = array_merge($childs, array($childId));
                 $childs = array_merge($childs, $this->getChildNodes($childId));
             }
@@ -625,7 +625,7 @@ 
         $open = 0;
         $this->expandAll();
 
-        for ($y = 0 ;$y < $this->height(); $y = $this->getNextLineTree($y)) {
+        for ($y = 0; $y < $this->height(); $y = $this->getNextLineTree($y)) {
 
             list($categoryName, $parent, $description) = $this->getLineDisplay($y);
             $level     = $this->treeTab[$y]['level'];
@@ -667,14 +667,14 @@ 
                 $num_entries = '';
             } else {
                 $totFaqRecords += $number[$parent];
-                $num_entries    = '<span class="rssCategoryLink"> ('.$plr->GetMsg('plmsgEntries',$number[$parent]);
+                $num_entries    = '<span class="rssCategoryLink"> ('.$plr->GetMsg('plmsgEntries', $number[$parent]);
                 $num_entries   .= sprintf(
                     ' <a href="feed/category/rss.php?category_id=%d&category_lang=%s" target="_blank"><img id="category_%d_RSS" src="assets/img/feed.png" width="16" height="16" alt="RSS"></a>',
                     $parent,
                     $this->language,
                     $parent
                 );
-                $num_entries   .= ')</span>';
+                $num_entries .= ')</span>';
             }
 
             $url = sprintf(
@@ -688,7 +688,7 @@ 
             $oLink->text      = $categoryName;
             $oLink->tooltip   = $description;
 
-            $output .= $oLink->toHtmlAnchor() . $num_entries;
+            $output .= $oLink->toHtmlAnchor().$num_entries;
             $open    = $level;
         }
 
@@ -731,7 +731,7 @@ 
             return $l + 1;
         } else {
             for ($i = $l + 1; $i < $this->height(); $i++) {
-                if ($this->treeTab[$i]["level"]<=$this->treeTab[$l]["level"]) {
+                if ($this->treeTab[$i]["level"] <= $this->treeTab[$l]["level"]) {
                     return $i;
                 }
             }
@@ -771,7 +771,7 @@ 
         );
 
         $oLink            = new PMF_Link($url, $this->_config);
-        $oLink->id        = 'category_' . $categoryId;
+        $oLink->id        = 'category_'.$categoryId;
         $oLink->itemTitle = $categoryName;
         $oLink->text      = $categoryName;
 
@@ -852,7 +852,7 @@ 
             return sprintf(
                 '<ul class="%s">%s</ul>',
                 $useCssClass,
-                implode('<li class="divider">' . $separator . '</li>', $temp)
+                implode('<li class="divider">'.$separator.'</li>', $temp)
             );
         } else {
             return implode($separator, $temp);
@@ -1302,7 +1302,7 @@ 
                 if ($lang == $selected_lang) {
                     $output .= " selected=\"selected\"";
                 }
-                $output .=  ">".$langname."</option>\n";
+                $output .= ">".$langname."</option>\n";
             }
         }
 
@@ -1329,10 +1329,10 @@ 
         $query .= ' ORDER BY id';
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchArray($result)) {
-            if (!array_key_exists($row['id'],$this->categoryName)) {
+            if (!array_key_exists($row['id'], $this->categoryName)) {
                $this->categoryName[$row['id']] = $row;
-               $this->categories[] =& $this->categoryName[$row['id']];
-               $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
+               $this->categories[] = & $this->categoryName[$row['id']];
+               $this->children[$row['parent_id']][$row['id']] = & $this->categoryName[$row['id']];
             }
         }
     }

phpmyfaq/writecomment.php

Spacing +2 added lines, -2 removed lines

@@ -20,10 +20,10 @@
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }