thorsten / phpMyFAQ

phpmyfaq/lang/language_en.php

Spacing +11 added lines, -11 removed lines

@@ -668,14 +668,14 @@ 
 $PMF_LANG['ad_entry_visibility'] = 'Publish?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Please enter a password. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Passwords do not match. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "The specified user name is invalid.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Please enter a valid mail address. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Please enter your real name. ";
-$PMF_LANG['ad_user_error_delete'] =  "User account could not be deleted. ";
-$PMF_LANG['ad_user_error_noId'] =  "No ID specified. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "User account is protected. ";
+$PMF_LANG['ad_user_error_password'] = "Please enter a password. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Passwords do not match. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "The specified user name is invalid.";
+$PMF_LANG['ad_user_error_noEmail'] = "Please enter a valid mail address. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Please enter your real name. ";
+$PMF_LANG['ad_user_error_delete'] = "User account could not be deleted. ";
+$PMF_LANG['ad_user_error_noId'] = "No ID specified. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "User account is protected. ";
 $PMF_LANG['ad_user_deleteUser'] = "Delete User";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "last modified:";
@@ -1013,7 +1013,7 @@ 
 $PMF_LANG['msgSecureSwitch'] = "Switch to secure mode to login!";
 
 // added 2.6.0-alpha - 2009-10-03 by Anatoliy Belsky
-$PMF_LANG['msgTransToolNoteFileSaving']  = 'Please note that no files will we written until you click save button';
+$PMF_LANG['msgTransToolNoteFileSaving'] = 'Please note that no files will we written until you click save button';
 $PMF_LANG['msgTransToolPageBufferRecorded'] = 'Page %d buffer recorded successfully';
 $PMF_LANG['msgTransToolErrorRecordingPageBuffer'] = 'Error recording page %d buffer';
 $PMF_LANG['msgTransToolRecordingPageBuffer'] = 'Recording page %d buffer';
@@ -1025,9 +1025,9 @@ 
 $PMF_LANG['msgAttachmentInvalid'] = 'The attachment is invalid, please inform admin';
 
 // added 2.6.0-alpha - 2009-11-02 by max
-$LANG_CONF['search.numberSearchTerms']   = array(0 => 'input', 1 => 'Number of listed search terms');
+$LANG_CONF['search.numberSearchTerms'] = array(0 => 'input', 1 => 'Number of listed search terms');
 $LANG_CONF['records.orderingPopularFaqs'] = array(0 => "select", 1 => "Sorting of the top FAQ's");
-$PMF_LANG['list_all_users']            = 'List all users';
+$PMF_LANG['list_all_users'] = 'List all users';
 
 $PMF_LANG['records.orderingPopularFaqs.visits'] = "list most visited entries";
 $PMF_LANG['records.orderingPopularFaqs.voting'] = "list most voted entries";

phpmyfaq/lang/language_vi.php

Spacing +8 added lines, -8 removed lines

@@ -659,14 +659,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Publish?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Xin nhập mật khẩu. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Mật khẩu không trùng khớp. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Tên đăng nhập không hợp lệ.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Xin nhập email hợp lệ. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Xin nhập tên thật của bạn. ";
-$PMF_LANG['ad_user_error_delete'] =  "Tài khoản thành viên không thể xóa. ";
-$PMF_LANG['ad_user_error_noId'] =  "Không tìm thấy ID. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Tài khoản thành viên được khóa. ";
+$PMF_LANG['ad_user_error_password'] = "Xin nhập mật khẩu. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Mật khẩu không trùng khớp. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Tên đăng nhập không hợp lệ.";
+$PMF_LANG['ad_user_error_noEmail'] = "Xin nhập email hợp lệ. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Xin nhập tên thật của bạn. ";
+$PMF_LANG['ad_user_error_delete'] = "Tài khoản thành viên không thể xóa. ";
+$PMF_LANG['ad_user_error_noId'] = "Không tìm thấy ID. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Tài khoản thành viên được khóa. ";
 $PMF_LANG['ad_user_deleteUser'] = "Xóa thành viên";
 $PMF_LANG['ad_user_status'] = "Tình trạng:";
 $PMF_LANG['ad_user_lastModified'] = "lần thay đổi mới nhất:";

phpmyfaq/lang/language_lt.php

Spacing +11 added lines, -11 removed lines

@@ -666,14 +666,14 @@ 
 $PMF_LANG['ad_entry_visibility'] = 'Publikuoti';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Prašome įvesti slaptažodį. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Slaptažodžiai nesutampa. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Nurodytas naudotojo vardas neteisingas.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Įveskite teisingą el. pašto adresą. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Prašome įvesti savo tikrą vardą. ";
-$PMF_LANG['ad_user_error_delete'] =  "Naudotojų paskyros nepašalintos. ";
-$PMF_LANG['ad_user_error_noId'] =  "Nenurodytas identifikatorius. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Naudotojo paskyra apsaugota. ";
+$PMF_LANG['ad_user_error_password'] = "Prašome įvesti slaptažodį. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Slaptažodžiai nesutampa. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Nurodytas naudotojo vardas neteisingas.";
+$PMF_LANG['ad_user_error_noEmail'] = "Įveskite teisingą el. pašto adresą. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Prašome įvesti savo tikrą vardą. ";
+$PMF_LANG['ad_user_error_delete'] = "Naudotojų paskyros nepašalintos. ";
+$PMF_LANG['ad_user_error_noId'] = "Nenurodytas identifikatorius. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Naudotojo paskyra apsaugota. ";
 $PMF_LANG['ad_user_deleteUser'] = "Šalinti naudotoją";
 $PMF_LANG['ad_user_status'] = "Būsena:";
 $PMF_LANG['ad_user_lastModified'] = "paskutinių keitimų data:";
@@ -1018,7 +1018,7 @@ 
 $PMF_LANG['msgSecureSwitch'] = "Jei norite prisijungti, persijunkite į saugujį režimą!";
 
 // added 2.6.0-alpha - 2009-10-03 by Anatoliy Belsky
-$PMF_LANG['msgTransToolNoteFileSaving']  = 'Pastebėkite, kad jokie failai nebus įrašyti kol nepaspausite mygtuko išsaugoti';
+$PMF_LANG['msgTransToolNoteFileSaving'] = 'Pastebėkite, kad jokie failai nebus įrašyti kol nepaspausite mygtuko išsaugoti';
 $PMF_LANG['msgTransToolPageBufferRecorded'] = 'Puslapio %d buferis sėkmingai įrašytas';
 $PMF_LANG['msgTransToolErrorRecordingPageBuffer'] = 'Klaida įrašant puslapio %d buferį';
 $PMF_LANG['msgTransToolRecordingPageBuffer'] = 'Įrašomas puslapio %d buferis';
@@ -1030,9 +1030,9 @@ 
 $PMF_LANG['msgAttachmentInvalid'] = 'Priedas yra blogas, informuokite administratorių';
 
 // added 2.6.0-alpha - 2009-11-02 by max
-$LANG_CONF['search.numberSearchTerms']   = array(0 => 'input', 1 => 'Rodomų paieškos raktažodžių skaičius');
+$LANG_CONF['search.numberSearchTerms'] = array(0 => 'input', 1 => 'Rodomų paieškos raktažodžių skaičius');
 $LANG_CONF['records.orderingPopularFaqs'] = array(0 => "select", 1 => "Populiariausių DUK rikiavimas");
-$PMF_LANG['list_all_users']            = 'Rodyti visus naudotojus';
+$PMF_LANG['list_all_users'] = 'Rodyti visus naudotojus';
 
 $PMF_LANG['records.orderingPopularFaqs.visits'] = "rodyti dažniausiai peržiūrėtus įrašus";
 $PMF_LANG['records.orderingPopularFaqs.voting'] = "rodyti geriausiai įvertintus įrašus";

phpmyfaq/lang/language_sk.php

Spacing +11 added lines, -11 removed lines

@@ -664,14 +664,14 @@ 
 $PMF_LANG['ad_entry_visibility'] = 'Publikovať?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Prosím zadajte heslo. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Heslá sa nezhodujú. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "Užívateľské meno je nesprávne.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Prosím vložte správnu e-mailovú adresu. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Prosím vložte Vaše skutočné meno. ";
-$PMF_LANG['ad_user_error_delete'] =  "Konto užívateľa nemôže byť vymazané. ";
-$PMF_LANG['ad_user_error_noId'] =  "Žiadna ID. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "Konto užívateľa je chránené. ";
+$PMF_LANG['ad_user_error_password'] = "Prosím zadajte heslo. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Heslá sa nezhodujú. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "Užívateľské meno je nesprávne.";
+$PMF_LANG['ad_user_error_noEmail'] = "Prosím vložte správnu e-mailovú adresu. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Prosím vložte Vaše skutočné meno. ";
+$PMF_LANG['ad_user_error_delete'] = "Konto užívateľa nemôže byť vymazané. ";
+$PMF_LANG['ad_user_error_noId'] = "Žiadna ID. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "Konto užívateľa je chránené. ";
 $PMF_LANG['ad_user_deleteUser'] = "Vymazať užívateľa";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "naposledy upravované:";
@@ -1009,7 +1009,7 @@ 
 $PMF_LANG['msgSecureSwitch'] = "Prepnúť na bezpečný mód pre prihlásenie!";
 
 // added 2.6.0-alpha - 2009-10-03 by Anatoliy Belsky
-$PMF_LANG['msgTransToolNoteFileSaving']  = 'Majte prosím na pamäti, že ak dokument neuložíte, žiadne nové údaje nebudú zapísané';
+$PMF_LANG['msgTransToolNoteFileSaving'] = 'Majte prosím na pamäti, že ak dokument neuložíte, žiadne nové údaje nebudú zapísané';
 $PMF_LANG['msgTransToolPageBufferRecorded'] = 'Strana %d nahrávanie úspešné';
 $PMF_LANG['msgTransToolErrorRecordingPageBuffer'] = 'Chyba pri nahrávaní strany %d ';
 $PMF_LANG['msgTransToolRecordingPageBuffer'] = 'Nahrávanie strany %d ';
@@ -1021,9 +1021,9 @@ 
 $PMF_LANG['msgAttachmentInvalid'] = 'Príloha je chybná, prosím informujte administrátora';
 
 // added 2.6.0-alpha - 2009-11-02 by max
-$LANG_CONF['search.numberSearchTerms']   = array(0 => "input", 1 => 'Počet nájdených položiek');
+$LANG_CONF['search.numberSearchTerms'] = array(0 => "input", 1 => 'Počet nájdených položiek');
 $LANG_CONF['records.orderingPopularFaqs'] = array(0 => "select", 1 => "Triedenie top FAQ");
-$PMF_LANG['list_all_users']            = 'Zobraziť všetkých užívateľov';
+$PMF_LANG['list_all_users'] = 'Zobraziť všetkých užívateľov';
 
 $PMF_LANG['records.orderingPopularFaqs.visits'] = "zobraziť najnavštevovanejšie položky";
 $PMF_LANG['records.orderingPopularFaqs.voting'] = "zobraziť najviac hodnotené položky";

phpmyfaq/lang/language_bn.php

Spacing +8 added lines, -8 removed lines

@@ -679,14 +679,14 @@
 $PMF_LANG['ad_entry_visibility'] = 'Publish?';
 
 // added v2.0.0 - 2006-01-02 by Lars
-$PMF_LANG['ad_user_error_password'] =  "Please enter a password. ";
-$PMF_LANG['ad_user_error_passwordsDontMatch'] =  "Passwords do not match. ";
-$PMF_LANG['ad_user_error_loginInvalid'] =  "The specified user name is invalid.";
-$PMF_LANG['ad_user_error_noEmail'] =  "Please enter a valid mail adress. ";
-$PMF_LANG['ad_user_error_noRealName'] =  "Please enter your real name. ";
-$PMF_LANG['ad_user_error_delete'] =  "User account could not be deleted. ";
-$PMF_LANG['ad_user_error_noId'] =  "No ID specified. ";
-$PMF_LANG['ad_user_error_protectedAccount'] =  "User account is protected. ";
+$PMF_LANG['ad_user_error_password'] = "Please enter a password. ";
+$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Passwords do not match. ";
+$PMF_LANG['ad_user_error_loginInvalid'] = "The specified user name is invalid.";
+$PMF_LANG['ad_user_error_noEmail'] = "Please enter a valid mail adress. ";
+$PMF_LANG['ad_user_error_noRealName'] = "Please enter your real name. ";
+$PMF_LANG['ad_user_error_delete'] = "User account could not be deleted. ";
+$PMF_LANG['ad_user_error_noId'] = "No ID specified. ";
+$PMF_LANG['ad_user_error_protectedAccount'] = "User account is protected. ";
 $PMF_LANG['ad_user_deleteUser'] = "Delete User";
 $PMF_LANG['ad_user_status'] = "Status:";
 $PMF_LANG['ad_user_lastModified'] = "last modified:";

phpmyfaq/lang/language_bs.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/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

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

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

Indentation +25 added lines, -25 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 /**
- * This is the main public frontend page of phpMyFAQ. It detects the browser's
- * language, gets and sets all cookie, post and get informations and includes
- * the templates we need and set all internal variables to the template
- * variables. That's all.
- *
- * 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    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Lars Tiedemann <php@larstiedemann.de>
- * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
- * @copyright 2001-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2001-02-12
- */
+     * This is the main public frontend page of phpMyFAQ. It detects the browser's
+     * language, gets and sets all cookie, post and get informations and includes
+     * the templates we need and set all internal variables to the template
+     * variables. That's all.
+     *
+     * 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    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Lars Tiedemann <php@larstiedemann.de>
+     * @author    Matteo Scaramuccia <matteo@phpmyfaq.de>
+     * @copyright 2001-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2001-02-12
+     */
 
 //
 // Define the named constant used as a check by any included PHP file
@@ -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 {