thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Session.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             }
 
             foreach ($botBlacklist as $bot) {
-                if ((bool) PMF_String::strstr($agent, $bot)) {
+                if ((bool)PMF_String::strstr($agent, $bot)) {
                     ++$bots;
                 }
             }

phpmyfaq/inc/PMF/String/Abstract.php

Indentation +8 added lines, -8 removed lines

@@ -77,14 +77,14 @@
             return mb_detect_encoding($str, 'UTF-8', true);
         } else {
             $regex = '/^([\x00-\x7f]|'
-                   .'[\xc2-\xdf][\x80-\xbf]|'
-                   .'\xe0[\xa0-\xbf][\x80-\xbf]|'
-                   .'[\xe1-\xec][\x80-\xbf]{2}|'
-                   .'\xed[\x80-\x9f][\x80-\xbf]|'
-                   .'[\xee-\xef][\x80-\xbf]{2}|'
-                   .'\xf0[\x90-\xbf][\x80-\xbf]{2}|'
-                   .'[\xf1-\xf3][\x80-\xbf]{3}|'
-                   .'\xf4[\x80-\x8f][\x80-\xbf]{2})*$/';
+                    .'[\xc2-\xdf][\x80-\xbf]|'
+                    .'\xe0[\xa0-\xbf][\x80-\xbf]|'
+                    .'[\xe1-\xec][\x80-\xbf]{2}|'
+                    .'\xed[\x80-\x9f][\x80-\xbf]|'
+                    .'[\xee-\xef][\x80-\xbf]{2}|'
+                    .'\xf0[\x90-\xbf][\x80-\xbf]{2}|'
+                    .'[\xf1-\xf3][\x80-\xbf]{3}|'
+                    .'\xf4[\x80-\x8f][\x80-\xbf]{2})*$/';
 
             return preg_match($regex, $str) === 1;
         }

phpmyfaq/index.php

Indentation +3 added lines, -3 removed lines

@@ -427,8 +427,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 = '';
 }
@@ -484,7 +484,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' => $faqConfig->get('security.enableRegistration') ? '<a href="?action=register">'.$PMF_LANG['msgRegistration'].'</a>' : '',
     'sendPassword' => '<a href="?action=password">'.$PMF_LANG['lostPassword'].'</a>',
     'msgFullName' => $PMF_LANG['ad_user_loggedin'].$user->getLogin(),

Spacing +5 added lines, -5 removed lines

@@ -475,7 +475,7 @@ 
     'dir' => $PMF_LANG['dir'],
     'writeSendAdress' => '?'.$sids.'action=search',
     'searchBox' => $PMF_LANG['msgSearch'],
-    'categoryId' => ($cat === 0) ? '%' : (int) $cat,
+    'categoryId' => ($cat === 0) ? '%' : (int)$cat,
     'headerCategories' => $PMF_LANG['msgFullCategories'],
     'msgCategory' => $PMF_LANG['msgCategory'],
     'msgExportAllFaqs' => $PMF_LANG['msgExportAllFaqs'],
@@ -519,7 +519,7 @@ 
         array(
             'writeSendAdress' => '?'.$sids.'action=search',
             'searchBox' => $PMF_LANG['msgSearch'],
-            'categoryId' => ($cat === 0) ? '%' : (int) $cat,
+            'categoryId' => ($cat === 0) ? '%' : (int)$cat,
             'msgSearch' => sprintf(
                 '<a class="help" href="%sindex.php?action=search">%s</a>',
                 $faqSystem->getSystemUri($faqConfig),
@@ -554,7 +554,7 @@ 
         'allCategories' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'showcat.html">'.$PMF_LANG['msgShowAllCategories'].'</a>',
         'faqOverview' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'overview.html">'.$PMF_LANG['faqOverview'].'</a>',
         'showSitemap' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'sitemap/A/'.$LANGCODE.'.html">'.$PMF_LANG['msgSitemap'].'</a>',
-        'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.html', );
+        'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.html',);
 } else {
     $tplNavigation = array(
         'msgSearch' => '<a href="index.php?'.$sids.'action=search">'.$PMF_LANG['msgAdvancedSearch'].'</a>',
@@ -568,7 +568,7 @@ 
         'faqOverview' => '<a href="index.php?'.$sids.'action=overview">'.$PMF_LANG['faqOverview'].'</a>',
         'backToHome' => '<a href="index.php?'.$sids.'">'.$PMF_LANG['msgHome'].'</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->getDefaultUrl();
@@ -662,7 +662,7 @@ 
     );
 } else {
     $tpl->parseBlock('rightBox', 'latestEntriesListError', array(
-        'errorMsgLatest' => $latestEntriesParams['error'], )
+        'errorMsgLatest' => $latestEntriesParams['error'],)
     );
 }
 

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

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
             }
         }
 
-        uasort($relatedTags, function ($a, $b) {
+        uasort($relatedTags, function($a, $b) {
             return ($b - $a);
             }
         );

phpmyfaq/send2friend.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
 
 $send2friendLink = sprintf('%sindex.php?action=artikel&cat=%d&id=%d&artlang=%s',
     $faqConfig->getDefaultUrl(),
-    (int) $cat,
-    (int) $id,
+    (int)$cat,
+    (int)$id,
     urlencode($artlang));
 
 $captchaHelper = new PMF_Helper_Captcha($faqConfig);

phpmyfaq/inc/PMF/Date.php

Indentation -1 removed lines

@@ -38,7 +38,6 @@
  * @author    Anatoliy Belsky <ab@php.net>
  * @copyright 2009-2015 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- 
  * @link      http://www.phpmyfaq.de
  * @since     2009-04-06
  */

phpmyfaq/setup/update.php

Spacing +3 added lines, -3 removed lines

@@ -229,7 +229,7 @@ 
     // Backup of config/elasticsearch.php if exists
     if (file_exists(PMF_ROOT_DIR.'/config/elasticsearch.php')) {
         if (!copy(PMF_ROOT_DIR.'/config/elasticsearch.php', PMF_ROOT_DIR.'/config/elasticsearch.bak.php')) {
-            echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ' .
+            echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file '.
                 '../config/elasticsearch.bak.php could not be written. Please correct this!</p>';
         } else {
             $checkElasticsearchSetupFile = true;
@@ -597,7 +597,7 @@ 
         foreach ($query as $key => $executeQuery) {
             $result = $faqConfig->getDb()->query($executeQuery);
             echo '.';
-            if (!($key % 100)) {
+            if (!($key%100)) {
                 echo '<br />';
             }
             if (!$result) {
@@ -617,7 +617,7 @@ 
             }
             usleep(10000);
             ++$count;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 ob_flush();
             }
         }

Indentation +22 added lines, -22 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Main update script.
- *
- * PHP Version 5.5
- *
- * 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
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Thomas Melchinger <t.melchinger@uni.de>
- * @author    Matteo Scaramuccia <matteo@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-01-10
- */
+     * Main update script.
+     *
+     * PHP Version 5.5
+     *
+     * 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
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Thomas Melchinger <t.melchinger@uni.de>
+     * @author    Matteo Scaramuccia <matteo@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-01-10
+     */
 define('COPYRIGHT', '&copy; 2001-2015 <a target="_blank" href="http://www.phpmyfaq.de/">phpMyFAQ Team</a>');
 define('PMF_ROOT_DIR', dirname(dirname(__FILE__)));
 define('IS_VALID_PHPMYFAQ', null);
@@ -160,7 +160,7 @@ 
                 // 2.5 versions only
                 if (version_compare($version, '2.6.0-alpha', '<') && !is_writeable('../template')) {
                     echo '<p class="alert alert-danger text-center"><strong>Please change the directory ../template '.
-                         'and its contents writable (777 on Linux/UNIX).</strong></p>';
+                            'and its contents writable (777 on Linux/UNIX).</strong></p>';
                 }
 
                 // We only support updates from 2.6+
@@ -206,7 +206,7 @@ 
     if (file_exists(PMF_ROOT_DIR.'/config/database.php')) {
         if (!copy(PMF_ROOT_DIR.'/config/database.php', PMF_ROOT_DIR.'/config/database.bak.php')) {
             echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ../config/database.bak.php '.
-                  'could not be written. Please correct this!</p>';
+                    'could not be written. Please correct this!</p>';
         } else {
             $checkDatabaseSetupFile = true;
             $updateMessages[] = 'A backup of your database configuration file has been made.';
@@ -603,8 +603,8 @@ 
             if (!$result) {
                 echo '</div>';
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ '.
-                      'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'.
-                      '</p>';
+                        'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'.
+                        '</p>';
                 printf(
                     '<p class="alert alert-danger"><strong>DB error:</strong> %s</p>',
                     $faqConfig->getDb()->error()
@@ -881,7 +881,7 @@ 
             printf('<span title="%s"><i class="fa fa-circle"></i></span>', $executeQuery);
             if (!$result) {
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again '.
-                      'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
+                        'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
                 printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error());
                 printf('<code>%s</code>', htmlentities($executeQuery));
                 PMF_System::renderFooter();

phpmyfaq/inc/PMF/Configuration.php

Spacing +6 added lines, -6 removed lines

@@ -395,12 +395,12 @@
     public function update(Array $newConfigs)
     {
         $runtimeConfigs = [
-            'core.database',           // PMF_DB_Driver
-            'core.instance',           // PMF_Instance
-            'core.language',           // Language
-            'core.ldap',               // PMF_Ldap
-            'core.ldapConfig',         // $PMF_LDAP
-            'core.elasticsearch',      // Elasticsearch\Client
+            'core.database', // PMF_DB_Driver
+            'core.instance', // PMF_Instance
+            'core.language', // Language
+            'core.ldap', // PMF_Ldap
+            'core.ldapConfig', // $PMF_LDAP
+            'core.elasticsearch', // Elasticsearch\Client
             'core.elasticsearchConfig' // $PMF_ES
         ];