thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Utils.php

Doc Comments +6 added lines, -6 removed lines

@@ -125,7 +125,7 @@ 
      *
      * @param string $lang Language
      *
-     * @return bool
+     * @return integer
      */
     public static function isLanguage($lang)
     {
@@ -137,7 +137,7 @@ 
      *
      * @param int $date Date
      *
-     * @return int
+     * @return boolean
      */
     public static function isLikeOnPMFDate($date)
     {
@@ -346,7 +346,7 @@ 
     /**
      * debug_backtrace() wrapper function.
      *
-     * @param $string
+     * @param string $string
      *
      * @return string
      */
@@ -407,7 +407,7 @@ 
 
     /**
      * Creates a seed with microseconds.
-     * @return float|int
+     * @return integer|null
      */
     private static function makeSeed()
     {
@@ -417,8 +417,8 @@ 
 
     /**
      * Returns a random number.
-     * @param $min
-     * @param $max
+     * @param integer $min
+     * @param integer $max
      * @return int
      */
     public static function createRandomNumber($min, $max)

Spacing +1 added lines, -1 removed lines

@@ -412,7 +412,7 @@
     private static function makeSeed()
     {
         list($usec, $sec) = explode(' ', microtime());
-        return $sec + $usec * 1000000;
+        return $sec + $usec*1000000;
     }
 
     /**

phpmyfaq/inc/PMF/User.php

Spacing +17 added lines, -19 removed lines

@@ -243,7 +243,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;
@@ -272,7 +272,7 @@ 
             WHERE
                 user_id = %d '.($allowBlockedUsers ? '' : "AND account_status != 'blocked'"),
             PMF_Db::getTablePrefix(),
-            (int) $userId
+            (int)$userId
         );
 
         $res = $this->config->getDb()->query($select);
@@ -282,9 +282,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.
@@ -349,9 +349,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) {
@@ -398,9 +398,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) {
@@ -504,7 +504,7 @@ 
         }
 
         // is $login valid?
-        $login = (string) $login;
+        $login = (string)$login;
         if (!$this->isValidLogin($login)) {
             $this->errors[] = self::ERROR_USER_LOGINNAME_TOO_SHORT;
 
@@ -520,7 +520,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;
         }
@@ -776,7 +776,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;
@@ -1058,8 +1058,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;
 
@@ -1071,9 +1071,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/ajaxservice.php

Spacing +5 added lines, -5 removed lines

@@ -435,7 +435,7 @@ 
             $mail->message = html_entity_decode(
                 $PMF_LANG['msgMailCheck'])."\n\n".
                 $faqConfig->get('main.titleFAQ').': '.
-                $faqConfig->getDefaultUrl().'admin/?action=editentry&id=' . $recordId;
+                $faqConfig->getDefaultUrl().'admin/?action=editentry&id='.$recordId;
             $result = $mail->send();
             unset($mail);
 
@@ -694,7 +694,7 @@ 
             $votingData = array(
                 'record_id' => $recordId,
                 'vote' => $vote,
-                'user_ip' => $userIp, );
+                'user_ip' => $userIp,);
 
             if (!$faq->getNumberOfVotings($recordId)) {
                 $faq->addVoting($votingData);
@@ -832,7 +832,7 @@ 
 
         $userData = array(
             'display_name' => $name,
-            'email' => $email, );
+            'email' => $email,);
         $success = $user->setUserData($userData);
 
         if (0 !== strlen($password) && 0 !== strlen($confirm)) {
@@ -867,10 +867,10 @@ 
 
             if ($loginExist && ($email == $user->getUserData('email'))) {
                 $consonants = array(
-                    'b','c','d','f','g','h','j','k','l','m','n','p','r','s','t','v','w','x','y','z',
+                    'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z',
                 );
                 $vowels = array(
-                    'a','e','i','o','u',
+                    'a', 'e', 'i', 'o', 'u',
                 );
                 $newPassword = '';
                 for ($i = 1; $i <= 4; ++$i) {