thorsten / phpMyFAQ

phpmyfaq/inc/PMF/String/UTF8ToLatinConvertable.php

Spacing +1 added lines, -1 removed lines

@@ -335,6 +335,6 @@
      */
     private static function appendU($str)
     {
-        return ((string) $str).'u';
+        return ((string)$str).'u';
     }
 }

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      *
      * @param string $language
      *
-     * @return PMF_String_Basic
+     * @return PMF_String_UTF8ToLatinConvertable
      */
     public static function getInstance($language = 'en')
     {

Indentation -1 removed lines

@@ -38,7 +38,6 @@
  * @author    Anatoliy Belsky <ab@php.net>
  * @copyright 2009-2017 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/inc/PMF/User.php

Spacing +18 added lines, -20 removed lines

@@ -242,7 +242,7 @@ 
     public function getUserId()
     {
         if (isset($this->userId) && is_int($this->userId)) {
-            return (int) $this->userId;
+            return (int)$this->userId;
         }
         $this->userId = -1;
         $this->errors[] = self::ERROR_USER_NO_USERID;
@@ -271,7 +271,7 @@ 
             WHERE
                 user_id = %d '.($allowBlockedUsers ? '' : "AND account_status != 'blocked'"),
             PMF_Db::getTablePrefix(),
-            (int) $userId
+            (int)$userId
         );
 
         $res = $this->config->getDb()->query($select);
@@ -281,9 +281,9 @@ 
             return false;
         }
         $user = $this->config->getDb()->fetchArray($res);
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get encrypted password
         // @todo: Add a getEncPassword method to the Auth* classes for the (local and remote) Auth Sources.
@@ -348,9 +348,9 @@ 
             return false;
         }
         $user = $this->config->getDb()->fetchArray($res);
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -397,9 +397,9 @@ 
             return false;
         }
 
-        $this->userId = (int) $user['user_id'];
-        $this->login = (string) $user['login'];
-        $this->status = (string) $user['account_status'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
 
         // get user-data
         if (!$this->userdata instanceof PMF_User_UserData) {
@@ -503,7 +503,7 @@ 
         }
 
         // is $login valid?
-        $login = (string) $login;
+        $login = (string)$login;
         if (!$this->isValidLogin($login)) {
             $this->errors[] = self::ERROR_USER_LOGINNAME_TOO_SHORT;
 
@@ -519,7 +519,7 @@ 
 
         // set user-ID
         if (0 == $userId) {
-            $this->userId = (int) $this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faquser', 'user_id');
+            $this->userId = (int)$this->config->getDb()->nextId(PMF_Db::getTablePrefix().'faquser', 'user_id');
         } else {
             $this->userId = $userId;
         }
@@ -775,7 +775,7 @@ 
      */
     public function isValidLogin($login)
     {
-        $login = (string) $login;
+        $login = (string)$login;
 
         if (strlen($login) < $this->loginMinLength || !preg_match($this->validUsername, $login)) {
             $this->errors[] = self::ERROR_USER_LOGIN_INVALID;
@@ -1059,12 +1059,12 @@ 
         // To make passwords harder to get wrong, a few letters & numbers have been omitted.
         // This will ensure safety with browsers using fonts with confusable letters.
         // Removed: o,O,0,1,l,L
-        $consonants = ['b','c','d','f','g','h','j','k','m','n','p','r','s','t','v','w','x','y','z'];
-        $vowels = ['a','e','i','u'];
+        $consonants = ['b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z'];
+        $vowels = ['a', 'e', 'i', 'u'];
         $newPassword = '';
         $skipped = false;
 
-        srand((double) microtime() * 1000000);
+        srand((double)microtime()*1000000);
 
         while (strlen($newPassword) < $minimumLength) {
             if (rand(0, 1)) {
@@ -1074,9 +1074,7 @@ 
             }
 
             switch (rand(0, $skipped ? 3 : ($allowUnderscore ? 5 : 4))) {
-                case 0:
-                case 1:
-                    $nextChar = $caseFunc($consonants[rand(0, 18)]);
+                case 0 : case 1 : $nextChar = $caseFunc($consonants[rand(0, 18)]);
                     break;
                 case 2:
                 case 3:

phpmyfaq/inc/PMF/User/CurrentUser.php

Spacing +3 added lines, -3 removed lines

@@ -290,7 +290,7 @@ 
             return 0;
         }
 
-        return ($_SERVER['REQUEST_TIME'] - $_SESSION[PMF_SESSION_ID_TIMESTAMP]) / 60;
+        return ($_SERVER['REQUEST_TIME'] - $_SESSION[PMF_SESSION_ID_TIMESTAMP])/60;
     }
 
     /**
@@ -365,7 +365,7 @@ 
             PMF_Db::getTablePrefix(),
             session_id(),
             $_SERVER['REQUEST_TIME'],
-            $updateLastlogin ?  "last_login = '".date('YmdHis', $_SERVER['REQUEST_TIME'])."'," : '',
+            $updateLastlogin ? "last_login = '".date('YmdHis', $_SERVER['REQUEST_TIME'])."'," : '',
             $_SERVER['REMOTE_ADDR'],
             $this->getUserId()
         );
@@ -601,7 +601,7 @@ 
      */
     protected function setSuccess($success)
     {
-        $this->loginState = (int) $success;
+        $this->loginState = (int)$success;
 
         $update = sprintf('
             UPDATE

Indentation +2 added lines, -2 removed lines

@@ -312,8 +312,8 @@
                 %sfaquser
             WHERE
                 user_id = %d',
-           PMF_Db::getTablePrefix(),
-           $this->getUserId()
+            PMF_Db::getTablePrefix(),
+            $this->getUserId()
         );
 
         $res = $this->config->getDb()->query($select);

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

@@ -500,7 +500,7 @@ 
     'dir' => $PMF_LANG['dir'],
     'writeSendAdress' => '?'.$sids.'action=search',
     'searchBox' => $PMF_LANG['msgSearch'],
-    'categoryId' => ($cat === 0) ? '%' : (int) $cat,
+    'categoryId' => ($cat === 0) ? '%' : (int)$cat,
     'showInstantResponse' => '', // @deprecated
     'headerCategories' => $PMF_LANG['msgFullCategories'],
     'msgCategory' => $PMF_LANG['msgCategory'],
@@ -547,7 +547,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),
@@ -582,7 +582,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>',
@@ -596,7 +596,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();
@@ -695,7 +695,7 @@ 
     );
 } else {
     $tpl->parseBlock('rightBox', 'latestEntriesListError', array(
-        'errorMsgLatest' => $latestEntriesParams['error'], )
+        'errorMsgLatest' => $latestEntriesParams['error'],)
     );
 }
 

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/sitemap.xml.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,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']);

Indentation +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
         $changeFreq = PMF_SITEMAP_GOOGLE_CHANGEFREQ_DAILY;
     }
     $node =
-         '<url>'
+            '<url>'
         .'<loc>'.PMF_String::htmlspecialchars($location).'</loc>'
         .'<lastmod>'.$lastmod.'</lastmod>'
         .'<changefreq>'.$changeFreq.'</changefreq>'
@@ -99,7 +99,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.9"'
     .' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'
     .' xsi:schemaLocation="http://www.google.com/schemas/sitemap/0.9'

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

phpmyfaq/admin/category.main.php

Indentation +21 added lines, -21 removed lines

@@ -321,19 +321,19 @@ 
 
         if ($cat['lang'] == $lang) {
             // add sub category (if current language)
-           printf('
+            printf('
             <a class="btn btn-info btn-sm" href="?action=addcategory&amp;cat=%s&amp;lang=%s"><span title="%s" class="fa fa-plus fa-fw"></span></a> ',
-               $cat['id'],
-               $cat['lang'],
-               $PMF_LANG['ad_quick_category']
-           );
+                $cat['id'],
+                $cat['lang'],
+                $PMF_LANG['ad_quick_category']
+            );
 
-           // rename (sub) category (if current language)
-           printf('
+            // rename (sub) category (if current language)
+            printf('
                <a class="btn btn-info btn-sm" href="?action=editcategory&amp;cat=%s"><span title="%s" class="fa fa-edit fa-fw"></a> ',
-               $cat['id'],
-               $PMF_LANG['ad_kateg_rename']
-           );
+                $cat['id'],
+                $PMF_LANG['ad_kateg_rename']
+            );
         }
 
         // translate category (always)
@@ -357,20 +357,20 @@ 
 
         if ($cat['lang'] == $lang) {
             // cut category (if current language)
-           printf(
-               '<a class="btn btn-warning btn-sm" href="?action=cutcategory&amp;cat=%s"><span title="%s" class="fa fa-cut fa-fw"></a> ',
-               $cat['id'],
-               $PMF_LANG['ad_categ_cut']
-           );
+            printf(
+                '<a class="btn btn-warning btn-sm" href="?action=cutcategory&amp;cat=%s"><span title="%s" class="fa fa-cut fa-fw"></a> ',
+                $cat['id'],
+                $PMF_LANG['ad_categ_cut']
+            );
 
             if ($category->numParent($cat['parent_id']) > 1) {
                 // move category (if current language) AND more than 1 category at the same level)
-              printf(
-                  '<a class="btn btn-warning btn-sm" href="?action=movecategory&amp;cat=%s&amp;parent_id=%s"><span title="%s" class="fa fa-sort fa-fw"></a> ',
-                  $cat['id'],
-                  $cat['parent_id'],
-                  $PMF_LANG['ad_categ_move']
-              );
+                printf(
+                    '<a class="btn btn-warning btn-sm" href="?action=movecategory&amp;cat=%s&amp;parent_id=%s"><span title="%s" class="fa fa-sort fa-fw"></a> ',
+                    $cat['id'],
+                    $cat['parent_id'],
+                    $PMF_LANG['ad_categ_move']
+                );
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
                             <i aria-hidden="true" class="fa fa-plus fa-fw"></i> <?php echo $PMF_LANG['ad_kateg_add']; ?>
                         </a>
                         <a class="btn btn-info" href="?action=showcategory">
-                            <i aria-hidden="true" class="fa fa-th fa-fw"></i> <?php echo $PMF_LANG['ad_categ_show'];?>
+                            <i aria-hidden="true" class="fa fa-th fa-fw"></i> <?php echo $PMF_LANG['ad_categ_show']; ?>
                         </a>
                     </div>
                 </h2>