thorsten / phpMyFAQ

phpmyfaq/src/phpMyFAQ/Auth/Ldap.php

Spacing +2 added lines, -2 removed lines

@@ -215,7 +215,7 @@ 
                 }
 
                 if (false !== $this->ldap->getDn($login)) {
-                    $this->activeServer = (int) $key;
+                    $this->activeServer = (int)$key;
                     break;
                 }
             }
@@ -288,7 +288,7 @@ 
                 }
 
                 if (false !== $this->ldap->getDn($login)) {
-                    $this->activeServer = (int) $key;
+                    $this->activeServer = (int)$key;
                     break;
                 }
             }

phpmyfaq/src/phpMyFAQ/Db/Sqlsrv.php

Indentation +6 added lines, -6 removed lines

@@ -102,10 +102,10 @@ 
     private function setConnectionOptions($user, $passwd, $database)
     {
         $this->connectionOptions = array(
-           'UID' => $user,
-           'PWD' => $passwd,
-           'Database' => $database,
-           'CharacterSet' => 'UTF-8', );
+            'UID' => $user,
+            'PWD' => $passwd,
+            'Database' => $database,
+            'CharacterSet' => 'UTF-8', );
     }
 
     /**
@@ -262,8 +262,8 @@ 
                max(%s) as current_id
            FROM 
                %s',
-           $id,
-           $table);
+            $id,
+            $table);
 
         $result = $this->query($select);
         sqlsrv_fetch($result);

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
            'UID' => $user,
            'PWD' => $passwd,
            'Database' => $database,
-           'CharacterSet' => 'UTF-8', );
+           'CharacterSet' => 'UTF-8',);
     }
 
     /**

phpmyfaq/src/phpMyFAQ/Db/Mysqli.php

Indentation +2 added lines, -2 removed lines

@@ -248,8 +248,8 @@
                MAX(%s) AS current_id
            FROM
                %s',
-           $id,
-           $table);
+            $id,
+            $table);
 
         $result = $this->query($select);
 

phpmyfaq/src/phpMyFAQ/Logging.php

Indentation +4 added lines, -4 removed lines

@@ -94,10 +94,10 @@
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchObject($result)) {
             $data[$row->id] = array(
-               'time' => $row->time,
-               'usr' => $row->usr,
-               'text' => $row->text,
-               'ip' => $row->ip,
+                'time' => $row->time,
+                'usr' => $row->usr,
+                'text' => $row->text,
+                'ip' => $row->ip,
             );
         }
 

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
             WHERE
                 time < %d',
             Db::getTablePrefix(),
-            $_SERVER['REQUEST_TIME'] - 30 * 86400
+            $_SERVER['REQUEST_TIME'] - 30*86400
         );
 
         if ($this->_config->getDb()->query($query)) {

phpmyfaq/src/phpMyFAQ/News.php

Indentation +3 added lines, -3 removed lines

@@ -166,9 +166,9 @@
 
         foreach ($news as $item) {
             $url = sprintf('%s?action=news&newsid=%d&newslang=%s',
-                           Link::getSystemRelativeUri(),
-                           $item['id'],
-                           $item['lang']);
+                            Link::getSystemRelativeUri(),
+                            $item['id'],
+                            $item['lang']);
             $oLink = new Link($url, $this->_config);
 
             if (isset($item['header'])) {

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
         if ($this->_config->get('records.numberOfShownNewsEntries') > 0 && $this->_config->getDb()->numRows($result) > 0) {
             while (($row = $this->_config->getDb()->fetchObject($result))) {
                 ++$counter;
-                if (($showArchive  && ($counter > $this->_config->get('records.numberOfShownNewsEntries'))) ||
+                if (($showArchive && ($counter > $this->_config->get('records.numberOfShownNewsEntries'))) ||
                    ((!$showArchive) && (!$forceConfLimit) &&
                    ($counter <= $this->_config->get('records.numberOfShownNewsEntries'))) ||
                    ((!$showArchive) && $forceConfLimit)) {
@@ -302,7 +302,7 @@ 
                     'allowComments' => $allowComments,
                     'link' => $row->link,
                     'linkTitle' => $row->linktitel,
-                    'target' => $row->target, );
+                    'target' => $row->target,);
             }
         }
 

phpmyfaq/src/phpMyFAQ/Instance/Elasticsearch.php

Spacing +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
                 'category_id' => $faq['category_id']
             ];
 
-            if ($i % 1000 == 0) {
+            if ($i%1000 == 0) {
                 $responses = $this->client->bulk($params);
                 $params = ['body' => []];
                 unset($responses);

phpmyfaq/src/phpMyFAQ/User.php

Spacing +19 added lines, -21 removed lines

@@ -251,7 +251,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;
@@ -281,7 +281,7 @@ 
             WHERE
                 user_id = %d '.($allowBlockedUsers ? '' : "AND account_status != 'blocked'"),
             Db::getTablePrefix(),
-            (int) $userId
+            (int)$userId
         );
 
         $res = $this->config->getDb()->query($select);
@@ -291,10 +291,10 @@ 
             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->isSuperAdmin = (bool) $user['is_superadmin'];
+        $this->userId = (int)$user['user_id'];
+        $this->login = (string)$user['login'];
+        $this->status = (string)$user['account_status'];
+        $this->isSuperAdmin = (bool)$user['is_superadmin'];
 
         // get encrypted password
         // @todo: Add a getEncPassword method to the Auth* classes for the (local and remote) Auth Sources.
@@ -359,9 +359,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 UserData) {
@@ -408,9 +408,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 UserData) {
@@ -515,7 +515,7 @@ 
         }
 
         // is $login valid?
-        $login = (string) $login;
+        $login = (string)$login;
         if (!$this->isValidLogin($login)) {
             $this->errors[] = self::ERROR_USER_LOGINNAME_TOO_SHORT;
 
@@ -531,7 +531,7 @@ 
 
         // set user-ID
         if (0 == $userId) {
-            $this->userId = (int) $this->config->getDb()->nextId(Db::getTablePrefix().'faquser', 'user_id');
+            $this->userId = (int)$this->config->getDb()->nextId(Db::getTablePrefix().'faquser', 'user_id');
         } else {
             $this->userId = $userId;
         }
@@ -788,7 +788,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;
@@ -1070,8 +1070,8 @@ 
         // 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;
 
@@ -1083,9 +1083,7 @@ 
             }
 
             switch (Utils::createRandomNumber(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:
@@ -1189,7 +1187,7 @@ 
             WHERE
                 user_id = %d",
             Db::getTablePrefix(),
-            (int) $this->isSuperAdmin,
+            (int)$this->isSuperAdmin,
             $this->userId
         );
 

phpmyfaq/src/phpMyFAQ/Auth.php

Spacing +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
         $message = '';
 
         if (!is_array($this->errors)) {
-            $this->errors = array((string) $this->errors);
+            $this->errors = array((string)$this->errors);
         }
         foreach ($this->errors as $error) {
             $message .= $error."\n";
@@ -185,7 +185,7 @@ 
         }
 
         $oldReadOnly = $this->readOnly;
-        $this->readOnly = (bool) $readOnly;
+        $this->readOnly = (bool)$readOnly;
 
         return $oldReadOnly;
     }

phpmyfaq/src/phpMyFAQ/Filter.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
         foreach ($attributes[0] as $attribute) {
             $attributeName = stristr($attribute, '=', true);
             if (!in_array($attributeName, $keep)) {
-                $html = str_replace(' ' . $attribute, '', $html);
+                $html = str_replace(' '.$attribute, '', $html);
             }
         }