thorsten / phpMyFAQ

phpmyfaq/cron.verifyurls.php

Spacing +3 added lines, -3 removed lines

@@ -48,10 +48,10 @@ 
     
     define('IS_VALID_PHPMYFAQ', null);
     
-    require PMF_ROOT_DIR. '/inc/Bootstrap.php';
+    require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
     // Preload English strings
-    require_once PMF_ROOT_DIR . '/lang/language_en.php';
+    require_once PMF_ROOT_DIR.'/lang/language_en.php';
 
     if ((LANGCODE != 'en') && PMF_Language::isASupportedLanguage(LANGCODE)) {
         // Overwrite English strings with the ones we have in the current language
@@ -79,7 +79,7 @@ 
     $_records = $faq->faqRecords;
     $tot      = count($_records);
     $end      = microtime(true);
-    $output  .= ' #'.$tot.', done in '.round($end - $start, 4).' sec.'.($isRequestedByWebLocalhost ? '' : "\n");;
+    $output  .= ' #'.$tot.', done in '.round($end - $start, 4).' sec.'.($isRequestedByWebLocalhost ? '' : "\n"); ;
     $output  .= ($isRequestedByWebLocalhost ? '' : "\n");
     if ($isRequestedByWebLocalhost) {
         echo '<pre>';

phpmyfaq/open.php

Spacing +3 added lines, -3 removed lines

@@ -19,16 +19,16 @@
 
 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();
 }
 
 $faqsession->userTracking('open_questions', 0);
 
-$tpl->parse (
+$tpl->parse(
     'writeContent',
     array(
         'msgOpenQuestions'   => $PMF_LANG['msgOpenQuestions'],

phpmyfaq/api.php

Spacing +3 added lines, -3 removed lines

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

phpmyfaq/pdf.php

Spacing +6 added lines, -6 removed lines

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

Braces +3 added lines, -2 removed lines

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

phpmyfaq/register.php

Spacing +2 added lines, -2 removed lines

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

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * This module is for user registration.
- *
- * 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    Elger Thiele <elger@phpmyfaq.de>
- * @copyright 2008-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2008-01-25
- */
+     * This module is for user registration.
+     *
+     * 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    Elger Thiele <elger@phpmyfaq.de>
+     * @copyright 2008-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2008-01-25
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

phpmyfaq/show.php

Spacing +3 added lines, -3 removed lines

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Frontend for categories or list of records
- *
- * 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>
- * @copyright 2002-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2002-08-27
- */
+     * Frontend for categories or list of records
+     *
+     * 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>
+     * @copyright 2002-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2002-08-27
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';

phpmyfaq/news.php

Spacing +5 added lines, -5 removed lines

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

phpmyfaq/lang/language_sr.php

Spacing +8 added lines, -8 removed lines

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

phpmyfaq/lang/language_uk.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:";

Indentation +14 added lines, -14 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 /**
- * language_uk.php,v 1.1 2008/03/02 14:56:43 thorstenr Exp
- *
- * Ukranian language file
- *
- * @author      Oleg P. Suvolokin
- * @author      Denis A. Barybin
- * @since       2008-02-03
- * @copyright   (c) 2008 Oleg P. Suvolokin, Denis A. Barybin, phpMyFAQ Team
- *
- * 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/.
- */
+     * language_uk.php,v 1.1 2008/03/02 14:56:43 thorstenr Exp
+     *
+     * Ukranian language file
+     *
+     * @author      Oleg P. Suvolokin
+     * @author      Denis A. Barybin
+     * @since       2008-02-03
+     * @copyright   (c) 2008 Oleg P. Suvolokin, Denis A. Barybin, phpMyFAQ Team
+     *
+     * 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/.
+     */
 
 $PMF_LANG["metaCharset"] = "UTF-8";
 $PMF_LANG["metaLanguage"] = "uk";
@@ -468,7 +468,7 @@ 
 $PMF_LANG["ad_start_comments"] = "Коментарів"; 
 
 
- // Added v1.1 - 30.01.2002 - Bastian 
+    // Added v1.1 - 30.01.2002 - Bastian 
  
 $PMF_LANG["ad_categ_paste"] = "вставити"; 
 $PMF_LANG["ad_categ_cut"] = "cut";