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/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 {

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-
 use PMF\Helper\ResponseWrapper;
 
 //

Spacing +54 added lines, -54 removed lines

@@ -50,10 +50,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';
 }
@@ -119,7 +119,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 = '';
             $action          = 'password' === $action ? 'password' : 'login';
         }
@@ -134,7 +134,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) {
@@ -154,7 +154,7 @@ 
     $action    = 'main';
     $ssoLogout = $faqConfig->get('security.ssoLogoutRedirect');
     if ($faqConfig->get('security.ssoSupport') && !empty ($ssoLogout)) {
-        $location =  $ssoLogout;
+        $location = $ssoLogout;
     } else {
         $location = $faqConfig->get('main.referenceURL');
     }
@@ -166,7 +166,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 {
@@ -184,7 +184,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');
@@ -250,9 +250,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;
     }
 }
@@ -280,12 +280,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 = $faq->getRecordPreview($id);
 } else {
     $id              = '';
-    $title           = ' -  powered by phpMyFAQ ' . $faqConfig->get('main.currentVersion');
+    $title           = ' -  powered by phpMyFAQ '.$faqConfig->get('main.currentVersion');
     $keywords        = '';
     $metaDescription = $faqConfig->get('main.metaDescription');
 }
@@ -294,15 +294,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));
     }
 }
@@ -312,7 +312,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 = '';
 }
 
@@ -321,7 +321,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;
 }
 
@@ -356,9 +356,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
@@ -368,7 +368,7 @@ 
         $includeTemplate = 'main.tpl';
         $includePhp      = 'main.php';
     }
-    $writeLangAdress = '?sid=' . $sid;
+    $writeLangAdress = '?sid='.$sid;
 }
 
 //
@@ -391,7 +391,7 @@ 
     if ($auth) {
         $indexSet = 'index.tpl';
     } else {
-        switch($action) {
+        switch ($action) {
             case 'register':
             case 'thankyou':
                 $indexSet = 'indexNewUser.tpl';
@@ -432,9 +432,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 = '';
 }
@@ -454,18 +454,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'),
@@ -483,13 +483,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'],
@@ -557,18 +557,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>',
@@ -577,12 +577,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');
@@ -598,13 +598,13 @@ 
     if (count($user->perm->getAllUserRights($user->getUserId()))) {
         $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']
         );
     }
@@ -614,10 +614,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' : ''
         )
     );
@@ -633,7 +633,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' : ''

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

Indentation +1 added lines, -1 removed lines

@@ -54,6 +54,6 @@
 header('Content-type: text/xml');
 print $xml->outputMemory(true);
 $response = Response::create()
-	->setContent($opensearchXml->outputMemory(true));
+    ->setContent($opensearchXml->outputMemory(true));
 $response->headers->set('Content-Type', 'text/xml');
 $response->send();

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

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

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
  */
 
 use Symfony\Component\HttpFoundation\JsonResponse;
-
 use PMF\Helper\ResponseWrapper;
 
 define('IS_VALID_PHPMYFAQ', null);

Spacing +29 added lines, -29 removed lines

@@ -40,7 +40,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';
@@ -182,9 +182,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 = [];
@@ -394,9 +394,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);
 
@@ -463,7 +463,7 @@ 
                     $searchResult[] = $faqSearch->search($word);
                 }
                 foreach ($searchResult as $resultSet) {
-                    foreach($resultSet as $result) {
+                    foreach ($resultSet as $result) {
                         $mergedResult[] = $result;
                     }
                 }
@@ -500,11 +500,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);
@@ -532,11 +532,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);
@@ -591,7 +591,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,
@@ -607,8 +607,8 @@ 
                 unset($mail);
 
                 $message = array(
-                    'success' => trim($PMF_LANG['successMessage']) .
-                                 ' ' .
+                    'success' => trim($PMF_LANG['successMessage']).
+                                 ' '.
                                  trim($PMF_LANG['msgRegThankYou'])
                 );
             }
@@ -641,10 +641,10 @@ 
 
             if (!$faq->getNumberOfVotings($recordId)) {
                 $faq->addVoting($votingData);
-            }  else {
+            } else {
                 $faq->updateVoting($votingData);
             }
-            $faqRating   = new PMF_Rating($faqConfig);
+            $faqRating = new PMF_Rating($faqConfig);
             $message = array(
                 'success' => $PMF_LANG['msgVoteThanks'],
                 'rating'  => $faqRating->getVotingResult($recordId)
@@ -695,7 +695,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);
@@ -726,7 +726,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);
@@ -816,16 +816,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"];

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

phpmyfaq/sitemap.xml.php

Indentation +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
         $changeFreq = PMF_SITEMAP_GOOGLE_CHANGEFREQ_DAILY;
     }
     $node =
-         '<url>'
+            '<url>'
         .'<loc>'.PMF_String::htmlspecialchars($location).'</loc>'
         .'<lastmod>'.$lastmod.'</lastmod>'
         .'<changefreq>'.$changeFreq.'</changefreq>'
@@ -101,7 +101,7 @@ 
 
 // Sitemap header
 $sitemap =
-     '<?xml version="1.0" encoding="UTF-8"?>'
+        '<?xml version="1.0" encoding="UTF-8"?>'
     .'<urlset xmlns="http://www.google.com/schemas/sitemap/0.84"'
     .' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'
     .' xsi:schemaLocation="http://www.google.com/schemas/sitemap/0.84'

Spacing +4 added lines, -4 removed lines

@@ -98,7 +98,7 @@ 
 $visitMin  = 0;
 if (count($items) > 0) {
     $visitsMax = $items[0]['visits'];
-    $visitMin  = $items[count($items)-1]['visits'];
+    $visitMin  = $items[count($items) - 1]['visits'];
 }
 
 // Sitemap header
@@ -120,7 +120,7 @@ 
 foreach ($items as $item) {
     $priority = PMF_SITEMAP_GOOGLE_PRIORITY_DEFAULT;
     if (($visitsMax - $visitMin) > 0) {
-        $priority = sprintf('%.1f', PMF_SITEMAP_GOOGLE_PRIORITY_DEFAULT * (1 + (($item['visits'] - $visitMin)/($visitsMax - $visitMin))));
+        $priority = sprintf('%.1f', PMF_SITEMAP_GOOGLE_PRIORITY_DEFAULT*(1 + (($item['visits'] - $visitMin)/($visitsMax - $visitMin))));
     }
     // a. We use plain PMF urls w/o any SEO schema
     $link = str_replace($_SERVER['SCRIPT_NAME'], '/index.php', $item['url']);
@@ -151,7 +151,7 @@ 
     if (function_exists('gzencode')) {
         $sitemapGz = gzencode($sitemap);
         $response->headers->set('Content-Type', 'application/x-gzip');
-        $response->headers->set('Content-Disposition', 'attachment; filename="' . PMF_SITEMAP_GOOGLE_FILENAME_GZ . '"');
+        $response->headers->set('Content-Disposition', 'attachment; filename="'.PMF_SITEMAP_GOOGLE_FILENAME_GZ.'"');
         $response->headers->set('Content-Length', strlen($sitemapGz));
         $response->setContent($sitemapGz);
     } else {
@@ -159,7 +159,7 @@ 
     }
 } else {
     $response->headers->set('Content-Type', 'text/xml');
-    $response->headers->set('Content-Disposition', 'inline; filename="' . PMF_SITEMAP_GOOGLE_FILENAME . '"');
+    $response->headers->set('Content-Disposition', 'inline; filename="'.PMF_SITEMAP_GOOGLE_FILENAME.'"');
     $response->headers->set('Content-Length', PMF_String::strlen($sitemap));
     $response->setContent($sitemap);
 }

phpmyfaq/admin/ajax.config_list.php

Indentation +4 added lines, -4 removed lines

@@ -98,8 +98,8 @@ 
                         echo PMF_Language::languageOptions(
                             str_replace(
                                 array(
-                                     'language_',
-                                     '.php'
+                                        'language_',
+                                        '.php'
                                 ),
                                 '',
                                 $faqConfig->get('main.language')
@@ -110,7 +110,7 @@ 
                     } else {
                         echo '<option value="language_en.php">English</option>';
                     }
-                   break;
+                    break;
                 
                 case 'records.orderby':
                     echo PMF_Configuration::sortingOptions($faqConfig->get($key));
@@ -147,7 +147,7 @@ 
                                   ? ' selected="selected"'
                                   : '';
                         printf('<option value="%d"%s>%s</option>',
-                               $i, $selected, $item);
+                                $i, $selected, $item);
                     }
                     break;
                     

Spacing +11 added lines, -11 removed lines

@@ -20,14 +20,14 @@ 
 
 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();
 }
 
-require PMF_ROOT_DIR . '/inc/libs/twitteroauth/twitteroauth.php';
+require PMF_ROOT_DIR.'/inc/libs/twitteroauth/twitteroauth.php';
 
 if (!empty($_SESSION['access_token'])) {
     $connection = new TwitterOAuth(
@@ -134,7 +134,7 @@ 
                     $templates = $faqSystem->getAvailableTemplates();
 
                     foreach ($templates as $template => $selected) {
-                        printf ("<option%s>%s</option>",
+                        printf("<option%s>%s</option>",
                             ($selected === true ? ' selected="selected"' : ''),
                             $template
                         );
@@ -142,7 +142,7 @@ 
                     break;
                     
                 case "records.attachmentsStorageType":
-                    foreach($PMF_LANG['att_storage_type'] as $i => $item) {
+                    foreach ($PMF_LANG['att_storage_type'] as $i => $item) {
                         $selected = $faqConfig->get($key) == $i
                                   ? ' selected="selected"'
                                   : '';
@@ -226,18 +226,18 @@ 
 
                 echo '<a target="_blank" href="https://dev.twitter.com/apps/new">Create Twitter App for your FAQ</a>';
                 echo "<br />\n";
-                echo "Your Callback URL is: " .$faqConfig->get('main.referenceURL') . "/services/twitter/callback.php";
+                echo "Your Callback URL is: ".$faqConfig->get('main.referenceURL')."/services/twitter/callback.php";
             }
 
             if (!isset($content)) {
                 echo '<a target="_blank" href="../services/twitter/redirect.php">';
                 echo '<img src="../assets/img/twitter.signin.png" alt="Sign in with Twitter"/></a>';
             } elseif (isset($content)) {
-                echo $content->screen_name . "<br />\n";
-                echo "<img src='" . $content->profile_image_url_https . "'><br />\n";
-                echo "Follower: " . $content->followers_count . "<br />\n";
-                echo "Status Count: " . $content->statuses_count . "<br />\n";
-                echo "Status: " . $content->status->text;
+                echo $content->screen_name."<br />\n";
+                echo "<img src='".$content->profile_image_url_https."'><br />\n";
+                echo "Follower: ".$content->followers_count."<br />\n";
+                echo "Status Count: ".$content->statuses_count."<br />\n";
+                echo "Status: ".$content->status->text;
             }
             echo '</div>';
             echo '</div>';

phpmyfaq/admin/ajax.records.php

Spacing +5 added lines, -5 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();
 }
 
@@ -48,7 +48,7 @@ 
     $items[0][2] = 0;
 }
 
-switch($ajax_action) {
+switch ($ajax_action) {
 
     // save active FAQs
     case 'save_active_records':
@@ -119,7 +119,7 @@ 
             $recordLang = PMF_Filter::filterInput(INPUT_POST, 'record_lang', FILTER_SANITIZE_STRING);
 
             $logging = new PMF_Logging($faqConfig);
-            $logging->logAdmin($user, 'Deleted FAQ ID ' . $recordId);
+            $logging->logAdmin($user, 'Deleted FAQ ID '.$recordId);
 
             $faq->deleteRecord($recordId, $recordLang);
             echo $PMF_LANG['ad_entry_delsuc'];
@@ -133,7 +133,7 @@ 
     case 'delete_question':
         if ($permission['delquestion']) {
 
-            $checks  = array(
+            $checks = array(
                 'filter'  => FILTER_VALIDATE_INT,
                 'flags'   => FILTER_REQUIRE_ARRAY
             );