thorsten / phpMyFAQ

phpmyfaq/lang/language_de.php

Spacing +10 added lines, -10 removed lines

@@ -638,14 +638,14 @@ 
 $PMF_LANG["ad_entry_visibility"] = "sichtbar";
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG["ad_user_error_password"] =  "Bitte geben Sie ein Passwort ein. ";
-$PMF_LANG["ad_user_error_passwordsDontMatch"] =  "Die Passwörter stimmen nicht überein. ";
-$PMF_LANG["ad_user_error_loginInvalid"] =  "Der ausgewählte Benutzer ist ungültig.";
-$PMF_LANG["ad_user_error_noEmail"] =  "Bitte geben Sie eine korrekte E-Mailadresse ein. ";
-$PMF_LANG["ad_user_error_noRealName"] =  "Bitte geben Sie ihren Namen ein. ";
-$PMF_LANG["ad_user_error_delete"] =  "Der Benutzeraccount kann nicht gelöscht werden. ";
-$PMF_LANG["ad_user_error_noId"] =  "Keine ID ausgewählt. ";
-$PMF_LANG["ad_user_error_protectedAccount"] =  "Der Benutzeraccount ist geschützt. ";
+$PMF_LANG["ad_user_error_password"] = "Bitte geben Sie ein Passwort ein. ";
+$PMF_LANG["ad_user_error_passwordsDontMatch"] = "Die Passwörter stimmen nicht überein. ";
+$PMF_LANG["ad_user_error_loginInvalid"] = "Der ausgewählte Benutzer ist ungültig.";
+$PMF_LANG["ad_user_error_noEmail"] = "Bitte geben Sie eine korrekte E-Mailadresse ein. ";
+$PMF_LANG["ad_user_error_noRealName"] = "Bitte geben Sie ihren Namen ein. ";
+$PMF_LANG["ad_user_error_delete"] = "Der Benutzeraccount kann nicht gelöscht werden. ";
+$PMF_LANG["ad_user_error_noId"] = "Keine ID ausgewählt. ";
+$PMF_LANG["ad_user_error_protectedAccount"] = "Der Benutzeraccount ist geschützt. ";
 $PMF_LANG["ad_user_deleteUser"] = "Lösche Benutzer";
 $PMF_LANG["ad_user_status"] = "Status:";
 $PMF_LANG["ad_user_lastModified"] = "Letzte Änderung:";
@@ -980,9 +980,9 @@ 
 $PMF_LANG["ad_record_active"] = "aktiviert";
 
 // added 2.6.0-alpha - 2009-11-02 by max
-$LANG_CONF["search.numberSearchTerms"]   = array(0 => "input", 1 => "Anzahl der beliebtesten Suchbegriffe");
+$LANG_CONF["search.numberSearchTerms"] = array(0 => "input", 1 => "Anzahl der beliebtesten Suchbegriffe");
 $LANG_CONF["records.orderingPopularFaqs"] = array(0 => "select", 1 => "Sortierung der TOP-FAQ");
-$PMF_LANG["list_all_users"]            = "Alle Benutzer anzeigen";
+$PMF_LANG["list_all_users"] = "Alle Benutzer anzeigen";
 
 $PMF_LANG["records.orderingPopularFaqs.visits"] = "nach Anzahl der Besucher";
 $PMF_LANG["records.orderingPopularFaqs.voting"] = "nach Bewertung der Besucher";

phpmyfaq/attachment.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Handle attachment downloads
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Frontend
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2009-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-06-23
- */
+     * Handle attachment downloads
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Frontend
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2009-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-06-23
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

Spacing +4 added lines, -4 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();
 }
 
@@ -36,7 +36,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) {
@@ -88,7 +88,7 @@ 
         $attachment->rawOut();
         exit(0);
     } catch (Exception $e) {
-        $attachmentErrors[] = $PMF_LANG['msgAttachmentInvalid'] . ' (' . $e->getMessage() . ')';
+        $attachmentErrors[] = $PMF_LANG['msgAttachmentInvalid'].' ('.$e->getMessage().')';
     }
 } else {
     $attachmentErrors[] = $PMF_LANG['err_NotAuth'];

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/index.php

Indentation +4 added lines, -4 removed lines

@@ -436,8 +436,8 @@ 
     $users       = $faqsession->getUsersOnline();
     $totUsers    = $users[0] + $users[1];
     $usersOnline = $plr->getMsg('plmsgUserOnline', $totUsers) . ' | ' .
-                   $plr->getMsg('plmsgGuestOnline', $users[0]) .
-                   $plr->getMsg('plmsgRegisteredOnline',$users[1]);
+                    $plr->getMsg('plmsgGuestOnline', $users[0]) .
+                    $plr->getMsg('plmsgRegisteredOnline',$users[1]);
 } else {
     $usersOnline = '';
 }
@@ -488,7 +488,7 @@ 
     'switchLanguages'      => PMF_Language::selectLanguages($LANGCODE, true),
     'userOnline'           => $usersOnline,
     'copyright'            => 'powered by <a href="http://www.phpmyfaq.de" target="_blank">phpMyFAQ</a> ' .
-                              $faqConfig->get('main.currentVersion'),
+                                $faqConfig->get('main.currentVersion'),
     'registerUser'         => '<a href="?action=register">' . $PMF_LANG['msgRegistration'] . '</a>',
     'sendPassword'         => '<a href="?action=password">' . $PMF_LANG['lostPassword'] . '</a>',
     'loginHeader'          => $PMF_LANG['msgLoginUser'],
@@ -517,7 +517,7 @@ 
                     '<a class="help" href="%sindex.php?action=search">%s</a>',
                     $faqSystem->getSystemUri($faqConfig),
                     $PMF_LANG["msgAdvancedSearch"]
-                 )
+                    )
             )
         );
     } else {

Spacing +57 added lines, -57 removed lines

@@ -45,10 +45,10 @@ 
 if (isset($LANGCODE) && PMF_Language::isASupportedLanguage($LANGCODE) && is_null($showCaptcha)) {
     // Overwrite English strings with the ones we have in the current language,
     // but don't include UTF-8 encoded files, these will break the captcha images
-    if (! file_exists('lang/language_' . $LANGCODE . '.php')) {
+    if (!file_exists('lang/language_'.$LANGCODE.'.php')) {
         $LANGCODE = 'en';
     }
-    require_once 'lang/language_' . $LANGCODE . '.php';
+    require_once 'lang/language_'.$LANGCODE.'.php';
 } else {
     $LANGCODE = 'en';
 }
@@ -113,7 +113,7 @@ 
                 $action = $faqaction; // SSO logins don't have $faqaction
             }
         } else {
-            $error           = $PMF_LANG['ad_auth_fail'] . ' (' . $faqusername . ')';
+            $error           = $PMF_LANG['ad_auth_fail'].' ('.$faqusername.')';
             $loginVisibility = '';
             $user            = null;
             $action          = 'password' === $action ? 'password' : 'login';
@@ -130,7 +130,7 @@ 
     // Try to authenticate with cookie information
     $user = PMF_User_CurrentUser::getFromCookie($faqConfig);
     // authenticate with session information
-    if (! $user instanceof PMF_User_CurrentUser) {
+    if (!$user instanceof PMF_User_CurrentUser) {
         $user = PMF_User_CurrentUser::getFromSession($faqConfig);
     }
     if ($user instanceof PMF_User_CurrentUser) {
@@ -167,9 +167,9 @@ 
     $action = 'main';
     $ssoLogout = $faqConfig->get('security.ssoLogoutRedirect');
     if ($faqConfig->get('security.ssoSupport') && !empty ($ssoLogout)) {
-        header('Location: ' . $ssoLogout);
+        header('Location: '.$ssoLogout);
     } else {
-        header('Location: ' . $faqConfig->get('main.referenceURL'));
+        header('Location: '.$faqConfig->get('main.referenceURL'));
     }
 }
 
@@ -177,7 +177,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 {
@@ -195,7 +195,7 @@ 
 // Use mbstring extension if available and when possible
 //
 $validMbStrings = array('ja', 'en', 'uni');
-$mbLanguage       = ($PMF_LANG['metaLanguage'] != 'ja') ? 'uni' : $PMF_LANG['metaLanguage'];
+$mbLanguage = ($PMF_LANG['metaLanguage'] != 'ja') ? 'uni' : $PMF_LANG['metaLanguage'];
 if (function_exists('mb_language') && in_array($mbLanguage, $validMbStrings)) {
     mb_language($mbLanguage);
     mb_internal_encoding('utf-8');
@@ -253,9 +253,9 @@ 
 // Found a 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;
     }
 }
@@ -283,12 +283,12 @@ 
 //
 $id = PMF_Filter::filterInput(INPUT_GET, 'id', FILTER_VALIDATE_INT);
 if (!is_null($id)) {
-    $title           = ' - ' . $faq->getRecordTitle($id);
-    $keywords        = ',' . $faq->getRecordKeywords($id);
+    $title           = ' - '.$faq->getRecordTitle($id);
+    $keywords        = ','.$faq->getRecordKeywords($id);
     $metaDescription = str_replace('"', '', $faq->getRecordPreview($id));
 } else {
     $id              = '';
-    $title           = ' -  powered by phpMyFAQ ' . $faqConfig->get('main.currentVersion');
+    $title           = ' -  powered by phpMyFAQ '.$faqConfig->get('main.currentVersion');
     $keywords        = '';
     $metaDescription = str_replace('"', '', $faqConfig->get('main.metaDescription'));
 }
@@ -297,15 +297,15 @@ 
 // found a solution ID?
 //
 $solutionId = PMF_Filter::filterInput(INPUT_GET, 'solution_id', FILTER_VALIDATE_INT);
-if (! is_null($solutionId)) {
-    $title    = ' -  powered by phpMyFAQ ' . $faqConfig->get('main.currentVersion');
+if (!is_null($solutionId)) {
+    $title    = ' -  powered by phpMyFAQ '.$faqConfig->get('main.currentVersion');
     $keywords = '';
     $faqData  = $faq->getIdFromSolutionId($solutionId);
     if (is_array($faqData)) {
         $id              = $faqData['id'];
         $lang            = $faqData['lang'];
-        $title           = ' - ' . $faq->getRecordTitle($id);
-        $keywords        = ',' . $faq->getRecordKeywords($id);
+        $title           = ' - '.$faq->getRecordTitle($id);
+        $keywords        = ','.$faq->getRecordKeywords($id);
         $metaDescription = str_replace('"', '', PMF_Utils::makeShorterText(strip_tags($faqData['content']), 12));
     }
 }
@@ -315,7 +315,7 @@ 
 //
 $tag_id = PMF_Filter::filterInput(INPUT_GET, 'tagging_id', FILTER_VALIDATE_INT);
 if (!is_null($tag_id)) {
-    $title    = ' - ' . $oTag->getTagNameById($tag_id);
+    $title    = ' - '.$oTag->getTagNameById($tag_id);
     $keywords = '';
 }
 
@@ -324,7 +324,7 @@ 
 //
 $letter = PMF_Filter::filterInput(INPUT_GET, 'letter', FILTER_SANITIZE_STRIPPED);
 if (!is_null($letter) && (1 == PMF_String::strlen($letter))) {
-    $title    = ' - ' . $letter . '...';
+    $title    = ' - '.$letter.'...';
     $keywords = $letter;
 }
 
@@ -359,9 +359,9 @@ 
 // Select the template for the requested page
 //
 if ($action != 'main') {
-    $includeTemplate = $action . '.tpl';
-    $includePhp      = $action . '.php';
-    $writeLangAdress = '?sid=' . $sid;
+    $includeTemplate = $action.'.tpl';
+    $includePhp      = $action.'.php';
+    $writeLangAdress = '?sid='.$sid;
 } else {
     if (isset($solutionId) && is_numeric($solutionId)) {
         // show the record with the solution ID
@@ -371,7 +371,7 @@ 
         $includeTemplate = 'main.tpl';
         $includePhp      = 'main.php';
     }
-    $writeLangAdress = '?sid=' . $sid;
+    $writeLangAdress = '?sid='.$sid;
 }
 
 //
@@ -394,7 +394,7 @@ 
     if ($auth) {
         $indexSet = 'index.tpl';
     } else {
-        switch($action) {
+        switch ($action) {
             case 'register':
             case 'thankyou':
                 $indexSet = 'indexNewUser.tpl';
@@ -435,9 +435,9 @@ 
 if ($faqConfig->get('main.enableUserTracking')) {
     $users       = $faqsession->getUsersOnline();
     $totUsers    = $users[0] + $users[1];
-    $usersOnline = $plr->getMsg('plmsgUserOnline', $totUsers) . ' | ' .
-                   $plr->getMsg('plmsgGuestOnline', $users[0]) .
-                   $plr->getMsg('plmsgRegisteredOnline',$users[1]);
+    $usersOnline = $plr->getMsg('plmsgUserOnline', $totUsers).' | '.
+                   $plr->getMsg('plmsgGuestOnline', $users[0]).
+                   $plr->getMsg('plmsgRegisteredOnline', $users[1]);
 } else {
     $usersOnline = '';
 }
@@ -457,18 +457,18 @@ 
 $currentPageUrl = $faqLink->getCurrentUrl();
 
 if (is_null($error)) {
-    $loginMessage = '<p>' . $PMF_LANG['ad_auth_insert'] . '</p>';
+    $loginMessage = '<p>'.$PMF_LANG['ad_auth_insert'].'</p>';
 } else {
-    $loginMessage = '<p class="error">' . $error . '</p>';
+    $loginMessage = '<p class="error">'.$error.'</p>';
 }
 
 $tplMainPage = array(
     'msgLoginUser'         => $PMF_LANG['msgLoginUser'],
-    'title'                => $faqConfig->get('main.titleFAQ') . $title,
+    'title'                => $faqConfig->get('main.titleFAQ').$title,
     'baseHref'             => $faqSystem->getSystemUri($faqConfig),
     'version'              => $faqConfig->get('main.currentVersion'),
     'header'               => str_replace('"', '', $faqConfig->get('main.titleFAQ')),
-    'metaTitle'            => str_replace('"', '', $faqConfig->get('main.titleFAQ') . $title),
+    'metaTitle'            => str_replace('"', '', $faqConfig->get('main.titleFAQ').$title),
     'metaDescription'      => $metaDescription,
     'metaKeywords'         => $keywords,
     'metaPublisher'        => $faqConfig->get('main.metaPublisher'),
@@ -476,7 +476,7 @@ 
     'metaCharset'          => 'utf-8', // backwards compability
     'phpmyfaqversion'      => $faqConfig->get('main.currentVersion'),
     'stylesheet'           => $PMF_LANG['dir'] == 'rtl' ? 'style.rtl' : 'style',
-    'currentPageUrl'       => preg_match( '/(\S+\/content\/\S+.html)\?\S*/', $currentPageUrl, $canonical ) === 1 ? $canonical[1] : $currentPageUrl,
+    'currentPageUrl'       => preg_match('/(\S+\/content\/\S+.html)\?\S*/', $currentPageUrl, $canonical) === 1 ? $canonical[1] : $currentPageUrl,
     'action'               => $action,
     'dir'                  => $PMF_LANG['dir'],
     'msgCategory'          => $PMF_LANG['msgCategory'],
@@ -487,13 +487,13 @@ 
     'writeLangAdress'      => $writeLangAdress,
     'switchLanguages'      => PMF_Language::selectLanguages($LANGCODE, true),
     'userOnline'           => $usersOnline,
-    'copyright'            => 'powered by <a href="http://www.phpmyfaq.de" target="_blank">phpMyFAQ</a> ' .
+    'copyright'            => 'powered by <a href="http://www.phpmyfaq.de" target="_blank">phpMyFAQ</a> '.
                               $faqConfig->get('main.currentVersion'),
-    'registerUser'         => '<a href="?action=register">' . $PMF_LANG['msgRegistration'] . '</a>',
-    'sendPassword'         => '<a href="?action=password">' . $PMF_LANG['lostPassword'] . '</a>',
+    'registerUser'         => '<a href="?action=register">'.$PMF_LANG['msgRegistration'].'</a>',
+    'sendPassword'         => '<a href="?action=password">'.$PMF_LANG['lostPassword'].'</a>',
     'loginHeader'          => $PMF_LANG['msgLoginUser'],
     'loginMessage'         => $loginMessage,
-    'writeLoginPath'       => $faqSystem->getSystemUri($faqConfig) . '?' . PMF_Filter::getFilteredQueryString(),
+    'writeLoginPath'       => $faqSystem->getSystemUri($faqConfig).'?'.PMF_Filter::getFilteredQueryString(),
     'faqloginaction'       => $action,
     'login'                => $PMF_LANG['ad_auth_ok'],
     'username'             => $PMF_LANG['ad_auth_user'],
@@ -552,18 +552,18 @@ 
 
 if ($faqConfig->get('main.enableRewriteRules')) {
     $tplNavigation = array(
-        "msgSearch"           => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'search.html">'.$PMF_LANG["msgAdvancedSearch"].'</a>',
-        'msgAddContent'       => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'addcontent.html">'.$PMF_LANG["msgAddContent"].'</a>',
-        "msgQuestion"         => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'ask.html">'.$PMF_LANG["msgQuestion"].'</a>',
-        "msgOpenQuestions"    => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'open.html">'.$PMF_LANG["msgOpenQuestions"].'</a>',
-        'msgHelp'             => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'help.html">'.$PMF_LANG["msgHelp"].'</a>',
-        "msgContact"          => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'contact.html">'.$PMF_LANG["msgContact"].'</a>',
-        'msgGlossary'         => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'glossary.html">' . $PMF_LANG['ad_menu_glossary'] . '</a>',
-        "backToHome"          => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'index.html">'.$PMF_LANG["msgHome"].'</a>',
-        "allCategories"       => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'showcat.html">'.$PMF_LANG["msgShowAllCategories"].'</a>',
-        'showInstantResponse' => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'instantresponse.html">'.$PMF_LANG['msgInstantResponse'].'</a>',
-        'showSitemap'         => '<a href="' . $faqSystem->getSystemUri($faqConfig) . 'sitemap/A/'.$LANGCODE.'.html">'.$PMF_LANG['msgSitemap'].'</a>',
-        'opensearch'          => $faqSystem->getSystemUri($faqConfig) . 'opensearch.html');
+        "msgSearch"           => '<a href="'.$faqSystem->getSystemUri($faqConfig).'search.html">'.$PMF_LANG["msgAdvancedSearch"].'</a>',
+        'msgAddContent'       => '<a href="'.$faqSystem->getSystemUri($faqConfig).'addcontent.html">'.$PMF_LANG["msgAddContent"].'</a>',
+        "msgQuestion"         => '<a href="'.$faqSystem->getSystemUri($faqConfig).'ask.html">'.$PMF_LANG["msgQuestion"].'</a>',
+        "msgOpenQuestions"    => '<a href="'.$faqSystem->getSystemUri($faqConfig).'open.html">'.$PMF_LANG["msgOpenQuestions"].'</a>',
+        'msgHelp'             => '<a href="'.$faqSystem->getSystemUri($faqConfig).'help.html">'.$PMF_LANG["msgHelp"].'</a>',
+        "msgContact"          => '<a href="'.$faqSystem->getSystemUri($faqConfig).'contact.html">'.$PMF_LANG["msgContact"].'</a>',
+        'msgGlossary'         => '<a href="'.$faqSystem->getSystemUri($faqConfig).'glossary.html">'.$PMF_LANG['ad_menu_glossary'].'</a>',
+        "backToHome"          => '<a href="'.$faqSystem->getSystemUri($faqConfig).'index.html">'.$PMF_LANG["msgHome"].'</a>',
+        "allCategories"       => '<a href="'.$faqSystem->getSystemUri($faqConfig).'showcat.html">'.$PMF_LANG["msgShowAllCategories"].'</a>',
+        'showInstantResponse' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'instantresponse.html">'.$PMF_LANG['msgInstantResponse'].'</a>',
+        'showSitemap'         => '<a href="'.$faqSystem->getSystemUri($faqConfig).'sitemap/A/'.$LANGCODE.'.html">'.$PMF_LANG['msgSitemap'].'</a>',
+        'opensearch'          => $faqSystem->getSystemUri($faqConfig).'opensearch.html');
 } else {
     $tplNavigation = array(
         "msgSearch"           => '<a href="index.php?'.$sids.'action=search">'.$PMF_LANG["msgAdvancedSearch"].'</a>',
@@ -572,12 +572,12 @@ 
         "msgOpenQuestions"    => '<a href="index.php?'.$sids.'action=open">'.$PMF_LANG["msgOpenQuestions"].'</a>',
         "msgHelp"             => '<a href="index.php?'.$sids.'action=help">'.$PMF_LANG["msgHelp"].'</a>',
         "msgContact"          => '<a href="index.php?'.$sids.'action=contact">'.$PMF_LANG["msgContact"].'</a>',
-        'msgGlossary'         => '<a href="index.php?'.$sids.'action=glossary">' . $PMF_LANG['ad_menu_glossary'] . '</a>',
+        'msgGlossary'         => '<a href="index.php?'.$sids.'action=glossary">'.$PMF_LANG['ad_menu_glossary'].'</a>',
         "allCategories"       => '<a href="index.php?'.$sids.'action=show">'.$PMF_LANG["msgShowAllCategories"].'</a>',
         "backToHome"          => '<a href="index.php?'.$sids.'">'.$PMF_LANG["msgHome"].'</a>',
         'showInstantResponse' => '<a href="index.php?'.$sids.'action=instantresponse">'.$PMF_LANG['msgInstantResponse'].'</a>',
         'showSitemap'         => '<a href="index.php?'.$sids.'action=sitemap&amp;lang='.$LANGCODE.'">'.$PMF_LANG['msgSitemap'].'</a>',
-        'opensearch'          => $faqSystem->getSystemUri($faqConfig) . 'opensearch.php');
+        'opensearch'          => $faqSystem->getSystemUri($faqConfig).'opensearch.php');
 }
 
 $tplNavigation['faqHome']             = $faqConfig->get('main.referenceURL');
@@ -591,7 +591,7 @@ 
 //
 if (DEBUG) {
     $tplDebug = array(
-        'debugMessages' => '<div id="debug_main"><h2>DEBUG INFORMATION:</h2>' . $faqConfig->getDb()->log() . '</div>'
+        'debugMessages' => '<div id="debug_main"><h2>DEBUG INFORMATION:</h2>'.$faqConfig->getDb()->log().'</div>'
     );
 } else {
     $tplDebug = array(
@@ -606,13 +606,13 @@ 
     if (in_array(true, $permission)) {
         $adminSection = sprintf(
             '<a href="%s">%s</a>',
-            $faqSystem->getSystemUri($faqConfig) . 'admin/index.php',
+            $faqSystem->getSystemUri($faqConfig).'admin/index.php',
             $PMF_LANG['adminSection']
         );
     } else {
         $adminSection = sprintf(
             '<a href="%s">%s</a>',
-            $faqSystem->getSystemUri($faqConfig) . 'index.php?action=ucp',
+            $faqSystem->getSystemUri($faqConfig).'index.php?action=ucp',
             $PMF_LANG['headerUserControlPanel']
         );
     }
@@ -622,10 +622,10 @@ 
         'userloggedIn',
         array(
             'msgUserControl'         => $adminSection,
-            'msgFullName'            => $PMF_LANG['ad_user_loggedin'] . $user->getLogin(),
+            'msgFullName'            => $PMF_LANG['ad_user_loggedin'].$user->getLogin(),
             'msgLoginName'           => $user->getUserData('display_name'),
-            'msgUserControlDropDown' => '<a href="?action=ucp">' . $PMF_LANG['headerUserControlPanel'] . '</a>',
-            'msgLogoutUser'          => '<a href="?action=logout">' . $PMF_LANG['ad_menu_logout'] . '</a>',
+            'msgUserControlDropDown' => '<a href="?action=ucp">'.$PMF_LANG['headerUserControlPanel'].'</a>',
+            'msgLogoutUser'          => '<a href="?action=logout">'.$PMF_LANG['ad_menu_logout'].'</a>',
             'activeUserControl'      => ('ucp' == $action) ? 'active' : ''
         )
     );
@@ -641,7 +641,7 @@ 
         'index',
         'notLoggedIn',
         array(
-            'msgRegisterUser' => '<a href="?action=register">' . $PMF_LANG['msgRegisterUser'] . '</a>',
+            'msgRegisterUser' => '<a href="?action=register">'.$PMF_LANG['msgRegisterUser'].'</a>',
             'msgLoginUser'    => sprintf($msgLoginUser, $PMF_LANG['msgLoginUser']),
             'activeRegister'  => ('register' == $action) ? 'active' : '',
             'activeLogin'     => ('login' == $action) ? 'active' : ''

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/main.php

Spacing +4 added lines, -4 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();
 }
 
@@ -37,8 +37,8 @@ 
     $showAllNews      = sprintf('<a href="?%s">%s</a>', $sids, $PMF_LANG['newsShowCurrent']);
     $archived         = true;
 } else {
-    $writeNewsHeader .= ' ' . $PMF_LANG['msgNews'];
-    $writeNewsRSS     = '&nbsp;<a href="feed/news/rss.php" target="_blank">' . 
+    $writeNewsHeader .= ' '.$PMF_LANG['msgNews'];
+    $writeNewsRSS     = '&nbsp;<a href="feed/news/rss.php" target="_blank">'. 
                         '<img id="newsRSS" src="assets/img/feed.png" width="16" height="16" alt="RSS" /></a>';
     $showAllNews      = sprintf('<a href="?%snewsid=0">%s</a>', $sids, $PMF_LANG['newsShowArchive']);
 }

phpmyfaq/translate.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();
 }
 
@@ -83,7 +83,7 @@ 
         'msgNewTranslationAddon'    => $PMF_LANG['msgNewTranslationAddon'],
         'msgNewTransSourcePane'     => $PMF_LANG['msgNewTransSourcePane'],
         'msgNewTranslationPane'     => $PMF_LANG['msgNewTranslationPane'],
-        'writeSendAdress'           => '?' . $sids . 'action=save',
+        'writeSendAdress'           => '?'.$sids.'action=save',
         'defaultContentName'        => ($user ? $user->getUserData('display_name') : ''),
         'defaultContentMail'        => ($user ? $user->getUserData('email') : ''),
         'msgNewTranslationQuestion' => $PMF_LANG['msgNewContentTheme'],

phpmyfaq/opensearch.php

Spacing +5 added lines, -5 removed lines

@@ -19,11 +19,11 @@ 
 
 define('IS_VALID_PHPMYFAQ', null);
 
-require __DIR__ . '/inc/Bootstrap.php';
-require PMF_LANGUAGE_DIR . '/' . $faqConfig->get('main.language');
+require __DIR__.'/inc/Bootstrap.php';
+require PMF_LANGUAGE_DIR.'/'.$faqConfig->get('main.language');
 
 $baseUrl   = $faqConfig->get('main.referenceURL');
-$searchUrl = $baseUrl . '/index.php?action=search';
+$searchUrl = $baseUrl.'/index.php?action=search';
 
 $xml = new XMLWriter();
 $xml->openMemory();
@@ -36,7 +36,7 @@ 
 $xml->writeElement('Description', $faqConfig->get('main.metaDescription'));
 $xml->startElement('Url');
 $xml->writeAttribute('type', 'text/html');
-$xml->writeAttribute('template', $searchUrl . '&search={searchTerms}');
+$xml->writeAttribute('template', $searchUrl.'&search={searchTerms}');
 $xml->endElement();
 $xml->writeElement('Language', $PMF_LANG['metaLanguage']);
 $xml->writeElement('OutputEncoding', 'utf-8');
@@ -45,7 +45,7 @@ 
 $xml->writeAttribute('height', 16);
 $xml->writeAttribute('width', 16);
 $xml->writeAttribute('type', 'image/png');
-$xml->text($baseUrl . '/assets/img/pmfsearch.png');
+$xml->text($baseUrl.'/assets/img/pmfsearch.png');
 
 $xml->endDocument();
 

phpmyfaq/search.php

Spacing +5 added lines, -5 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();
 }
 
@@ -106,9 +106,9 @@ 
     // Before a redirection we must force the PHP session update for preventing data loss
     session_write_close();
     if ($faqConfig->get('main.enableRewriteRules')) {
-        header('Location: ' . $faqConfig->get('main.referenceURL') . '/solution_id_' . $inputSearchTerm . '.html');
+        header('Location: '.$faqConfig->get('main.referenceURL').'/solution_id_'.$inputSearchTerm.'.html');
     } else {
-        header('Location: ' . $faqConfig->get('main.referenceURL') . '/index.php?solution_id=' . $inputSearchTerm);
+        header('Location: '.$faqConfig->get('main.referenceURL').'/index.php?solution_id='.$inputSearchTerm);
     }
     exit();
 }
@@ -129,7 +129,7 @@ 
 } else {
     $baseUrl = sprintf('%s?%saction=search&search=%s&seite=%d%s&searchcategory=%d',
         PMF_Link::getSystemRelativeUri(),
-        empty($sids) ? '' : 'sids=' . $sids . '&',
+        empty($sids) ? '' : 'sids='.$sids.'&',
         urlencode($inputSearchTerm),
         $page,
         $languages,

phpmyfaq/ajaxservice.php

Indentation +3 added lines, -3 removed lines

@@ -602,8 +602,8 @@ 
 
                 $message = array(
                     'success' => trim($PMF_LANG['successMessage']) .
-                                 ' ' .
-                                 trim($PMF_LANG['msgRegThankYou'])
+                                    ' ' .
+                                    trim($PMF_LANG['msgRegThankYou'])
                 );
             }
 
@@ -698,7 +698,7 @@ 
         $mailto   = PMF_Filter::filterInputArray(INPUT_POST,
             array('mailto' =>
                 array('filter' => FILTER_VALIDATE_EMAIL,
-                      'flags'  => FILTER_REQUIRE_ARRAY | FILTER_NULL_ON_FAILURE
+                        'flags'  => FILTER_REQUIRE_ARRAY | FILTER_NULL_ON_FAILURE
                 )
             )
         );

Spacing +29 added lines, -29 removed lines

@@ -36,7 +36,7 @@ 
 
 if (PMF_Language::isASupportedLanguage($ajaxlang)) {
     $languageCode = trim($ajaxlang);
-    require_once 'lang/language_' . $languageCode . '.php';
+    require_once 'lang/language_'.$languageCode.'.php';
 } else {
     $languageCode = 'en';
     require_once 'lang/language_en.php';
@@ -82,7 +82,7 @@ 
 // Check, if user is logged in
 //
 $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) {
@@ -199,9 +199,9 @@ 
                 }
                 
                 $commentMail =
-                    'User: ' . $commentData['username'] . ', mailto:'. $commentData['usermail'] . "\n".
-                    'New comment posted on: ' . $urlToContent .
-                    "\n\n" .
+                    'User: '.$commentData['username'].', mailto:'.$commentData['usermail']."\n".
+                    'New comment posted on: '.$urlToContent.
+                    "\n\n".
                     wordwrap($comment, 72);
 
                 $send = array();
@@ -392,9 +392,9 @@ 
 
             // @todo let the email contains the faq article both as plain text and as HTML
             $mail->message = html_entity_decode(
-                $PMF_LANG['msgMailCheck']) . "\n\n" .
-                $faqConfig->get('main.titleFAQ') . ": " .
-                $faqConfig->get('main.referenceURL') . '/admin/';
+                $PMF_LANG['msgMailCheck'])."\n\n".
+                $faqConfig->get('main.titleFAQ').": ".
+                $faqConfig->get('main.referenceURL').'/admin/';
             $result = $mail->send();
             unset($mail);
 
@@ -457,7 +457,7 @@ 
                     $searchResult[] = $faqSearch->search($word);
                 }
                 foreach ($searchResult as $resultSet) {
-                    foreach($resultSet as $result) {
+                    foreach ($resultSet as $result) {
                         $mergedResult[] = $result;
                     }
                 }
@@ -494,11 +494,11 @@ 
 
                     $faq->addQuestion($questionData);
 
-                    $questionMail = "User: " . $questionData['username'] .
-                                ", mailto:".$questionData['email'] . "\n" . $PMF_LANG["msgCategory"] .
-                                ": " . $categories[$questionData['category_id']]["name"] . "\n\n" .
-                                wordwrap($question, 72) . "\n\n" .
-                                $faqConfig->get('main.referenceURL') . '/admin/';
+                    $questionMail = "User: ".$questionData['username'].
+                                ", mailto:".$questionData['email']."\n".$PMF_LANG["msgCategory"].
+                                ": ".$categories[$questionData['category_id']]["name"]."\n\n".
+                                wordwrap($question, 72)."\n\n".
+                                $faqConfig->get('main.referenceURL').'/admin/';
 
                     $userId = $cat->getCategoryUser($questionData['category_id']);
                     $oUser  = new PMF_User($faqConfig);
@@ -526,11 +526,11 @@ 
 
                 $faq->addQuestion($questionData);
 
-                $questionMail = "User: " . $questionData['username'] .
-                                ", mailto:".$questionData['email'] . "\n" . $PMF_LANG["msgCategory"] .
-                                ": " . $categories[$questionData['category_id']]["name"] . "\n\n" .
-                                wordwrap($question, 72) . "\n\n" .
-                                $faqConfig->get('main.referenceURL') . '/admin/';
+                $questionMail = "User: ".$questionData['username'].
+                                ", mailto:".$questionData['email']."\n".$PMF_LANG["msgCategory"].
+                                ": ".$categories[$questionData['category_id']]["name"]."\n\n".
+                                wordwrap($question, 72)."\n\n".
+                                $faqConfig->get('main.referenceURL').'/admin/';
 
                 $userId = $cat->getCategoryUser($questionData['category_id']);
                 $oUser  = new PMF_User($faqConfig);
@@ -585,7 +585,7 @@ 
                 $user->setStatus('blocked');
 
                 $text = sprintf(
-                    "New user has been registrated:\n\nName: %s\nLogin name: %s\n\n" .
+                    "New user has been registrated:\n\nName: %s\nLogin name: %s\n\n".
                     "To activate this user do please use the administration interface at %s.",
                     $realname,
                     $loginname,
@@ -601,8 +601,8 @@ 
                 unset($mail);
 
                 $message = array(
-                    'success' => trim($PMF_LANG['successMessage']) .
-                                 ' ' .
+                    'success' => trim($PMF_LANG['successMessage']).
+                                 ' '.
                                  trim($PMF_LANG['msgRegThankYou'])
                 );
             }
@@ -630,7 +630,7 @@ 
 
             if (!$faq->getNumberOfVotings($recordId)) {
                 $faq->addVoting($votingData);
-            }  else {
+            } else {
                 $faq->updateVoting($votingData);
             }
             $faqRating = new PMF_Rating($faqConfig);
@@ -676,7 +676,7 @@ 
             $mail = new PMF_Mail($faqConfig);
             $mail->setReplyTo($email, $name);
             $mail->addTo($faqConfig->get('main.administrationMail'));
-            $mail->subject = 'Feedback: %sitename%';;
+            $mail->subject = 'Feedback: %sitename%'; ;
             $mail->message = $question;
             $result = $mail->send();
             unset($mail);
@@ -707,7 +707,7 @@ 
             is_array($mailto) && !empty($mailto['mailto'][0]) &&
                 $stopwords->checkBannedWord(PMF_String::htmlspecialchars($attached))) {
 
-            foreach($mailto['mailto'] as $recipient) {
+            foreach ($mailto['mailto'] as $recipient) {
                 $recipient = trim(strip_tags($recipient));
                 if (!empty($recipient)) {
                     $mail = new PMF_Mail($faqConfig);
@@ -797,16 +797,16 @@ 
 
             if ($loginExist && ($email == $user->getUserData('email'))) {
                 $consonants = array(
-                    'b','c','d','f','g','h','j','k','l','m','n','p','r','s','t','v','w','x','y','z'
+                    'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z'
                 );
                 $vowels = array(
-                    'a','e','i','o','u'
+                    'a', 'e', 'i', 'o', 'u'
                 );
                 $newPassword = '';
                 srand((double)microtime()*1000000);
                 for ($i = 1; $i <= 4; $i++) {
-                    $newPassword .= $consonants[rand(0,19)];
-                    $newPassword .= $vowels[rand(0,4)];
+                    $newPassword .= $consonants[rand(0, 19)];
+                    $newPassword .= $vowels[rand(0, 4)];
                 }
                 $user->changePassword($newPassword);
                 $text = $PMF_LANG['lostpwd_text_1']."\nUsername: ".$username."\nNew Password: ".$newPassword."\n\n".$PMF_LANG["lostpwd_text_2"];

Braces +1 added lines, -1 removed lines

@@ -630,7 +630,7 @@
 
             if (!$faq->getNumberOfVotings($recordId)) {
                 $faq->addVoting($votingData);
-            }  else {
+            } else {
                 $faq->updateVoting($votingData);
             }
             $faqRating = new PMF_Rating($faqConfig);

phpmyfaq/config/constants_ldap.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  */
 
 // Datamapping - in this example for an ADS
-$PMF_LDAP['ldap_mapping'] = array (
+$PMF_LDAP['ldap_mapping'] = array(
     'name'     => 'cn',
     'username' => 'samAccountName',
     'mail'     => 'mail'
@@ -32,7 +32,7 @@ 
 
 // LDAP-options to set
 // refer to the documentation of ldap_set_option() for information on available options
-$PMF_LDAP["ldap_options"] = array (
+$PMF_LDAP["ldap_options"] = array(
     LDAP_OPT_PROTOCOL_VERSION => 3,
     LDAP_OPT_REFERRALS        => 0
 );