nilsteampassnet / TeamPass

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/QRServerProvider.php

Doc Comments +3 added lines

@@ -51,6 +51,9 @@
         return $this->getContent($this->getUrl($qrtext, $size));
     }
     
+    /**
+     * @param string $value
+     */
     private function decodeColor($value) 
     {
         return vsprintf('%d-%d-%d', sscanf($value, "%02x%02x%02x"));

Spacing +8 added lines, -8 removed lines

@@ -59,13 +59,13 @@
     public function getUrl($qrtext, $size) 
     {
         return 'https://api.qrserver.com/v1/create-qr-code/'
-            . '?size=' . $size . 'x' . $size
-            . '&ecc=' . strtoupper($this->errorcorrectionlevel)
-            . '&margin=' . $this->margin
-            . '&qzone=' . $this->qzone
-            . '&bgcolor=' . $this->decodeColor($this->bgcolor)
-            . '&color=' . $this->decodeColor($this->color)
-            . '&format=' . strtolower($this->format)
-            . '&data=' . rawurlencode($qrtext);
+            . '?size='.$size.'x'.$size
+            . '&ecc='.strtoupper($this->errorcorrectionlevel)
+            . '&margin='.$this->margin
+            . '&qzone='.$this->qzone
+            . '&bgcolor='.$this->decodeColor($this->bgcolor)
+            . '&color='.$this->decodeColor($this->color)
+            . '&format='.strtolower($this->format)
+            . '&data='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php

Doc Comments +1 added lines

@@ -139,6 +139,7 @@
 
     /**
      * Get data-uri of QRCode
+     * @param string $label
      */
     public function getQRCodeImageAsDataUri($label, $secret, $size = 200)
     {

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 
         $algorithm = strtolower(trim($algorithm));
         if (!in_array($algorithm, self::$_supportedalgos))
-            throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+            throw new TwoFactorAuthException('Unsupported algorithm: '.$algorithm);
         $this->algorithm = $algorithm;
         $this->qrcodeprovider = $qrcodeprovider;
         $this->rngprovider = $rngprovider;
@@ -52,13 +52,13 @@ 
     public function createSecret($bits = 80, $requirecryptosecure = true)
     {
         $secret = '';
-        $bytes = ceil($bits / 5);   //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
+        $bytes = ceil($bits / 5); //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
         $rngprovider = $this->getRngprovider();
         if ($requirecryptosecure && !$rngprovider->isCryptographicallySecure())
             throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
         $rnd = $rngprovider->getRandomBytes($bytes);
         for ($i = 0; $i < $bytes; $i++)
-            $secret .= self::$_base32[ord($rnd[$i]) & 31];  //Mask out left 3 bits for 0-31 values
+            $secret .= self::$_base32[ord($rnd[$i]) & 31]; //Mask out left 3 bits for 0-31 values
         return $secret;
     }
 
@@ -69,11 +69,11 @@ 
     {
         $secretkey = $this->base32Decode($secret);
 
-        $timestamp = "\0\0\0\0" . pack('N*', $this->getTimeSlice($this->getTime($time)));  // Pack time into binary string
-        $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true);             // Hash it with users secret key
-        $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4);               // Use last nibble of result as index/offset and grab 4 bytes of the result
-        $value = unpack('N', $hashpart);                                                   // Unpack binary value
-        $value = $value[1] & 0x7FFFFFFF;                                                   // Drop MSB, keep only 31 bits
+        $timestamp = "\0\0\0\0".pack('N*', $this->getTimeSlice($this->getTime($time))); // Pack time into binary string
+        $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true); // Hash it with users secret key
+        $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4); // Use last nibble of result as index/offset and grab 4 bytes of the result
+        $value = unpack('N', $hashpart); // Unpack binary value
+        $value = $value[1] & 0x7FFFFFFF; // Drop MSB, keep only 31 bits
 
         return str_pad($value % pow(10, $this->digits), $this->digits, '0', STR_PAD_LEFT);
     }
@@ -90,7 +90,7 @@ 
         for ($i = -$discrepancy; $i <= $discrepancy; $i++)
             $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     /**
@@ -102,7 +102,7 @@ 
         }
         // In general, it's not possible to prevent length leaks. So it's OK to leak the length. The important part is that
         // we don't leak information about the difference of the two strings.
-        if (strlen($safe)===strlen($user)) {
+        if (strlen($safe) === strlen($user)) {
             $result = 0;
             for ($i = 0; $i < strlen($safe); $i++)
                 $result |= (ord($safe[$i]) ^ ord($user[$i]));
@@ -161,7 +161,7 @@ 
 
     private function getTimeSlice($time = null, $offset = 0)
     {
-        return (int)floor($time / $this->period) + ($offset * $this->period);
+        return (int) floor($time / $this->period) + ($offset * $this->period);
     }
 
     /**
@@ -169,17 +169,17 @@ 
      */
     public function getQRText($label, $secret)
     {
-        return 'otpauth://totp/' . rawurlencode($label)
-            . '?secret=' . rawurlencode($secret)
-            . '&issuer=' . rawurlencode($this->issuer)
-            . '&period=' . intval($this->period)
-            . '&algorithm=' . rawurlencode(strtoupper($this->algorithm))
-            . '&digits=' . intval($this->digits);
+        return 'otpauth://totp/'.rawurlencode($label)
+            . '?secret='.rawurlencode($secret)
+            . '&issuer='.rawurlencode($this->issuer)
+            . '&period='.intval($this->period)
+            . '&algorithm='.rawurlencode(strtoupper($this->algorithm))
+            . '&digits='.intval($this->digits);
     }
 
     private function base32Decode($value)
     {
-        if (strlen($value)==0) return '';
+        if (strlen($value) == 0) return '';
 
         if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
             throw new TwoFactorAuthException('Invalid base32 string');

includes/libraries/Email/Phpmailer/class.pop3.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      * Connect to a POP3 server.
      * @access public
      * @param string $host
-     * @param integer|boolean $port
+     * @param integer $port
      * @param integer $tval
      * @return boolean
      */

Spacing +4 added lines, -4 removed lines

@@ -169,13 +169,13 @@ 
         if (false === $port) {
             $this->port = $this->POP3_PORT;
         } else {
-            $this->port = (integer)$port;
+            $this->port = (integer) $port;
         }
         // If no timeout value provided, use default
         if (false === $timeout) {
             $this->tval = $this->POP3_TIMEOUT;
         } else {
-            $this->tval = (integer)$timeout;
+            $this->tval = (integer) $timeout;
         }
         $this->do_debug = $debug_level;
         $this->username = $username;
@@ -276,11 +276,11 @@ 
         }
 
         // Send the Username
-        $this->sendString("USER $username" . self::CRLF);
+        $this->sendString("USER $username".self::CRLF);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . self::CRLF);
+            $this->sendString("PASS $password".self::CRLF);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/QRicketProvider.php

Spacing +6 added lines, -6 removed lines

@@ -44,11 +44,11 @@
     public function getUrl($qrtext, $size) 
     {
         return 'http://qrickit.com/api/qr'
-            . '?qrsize=' . $size
-            . '&e=' . strtolower($this->errorcorrectionlevel)
-            . '&bgdcolor=' . $this->bgcolor
-            . '&fgdcolor=' . $this->color
-            . '&t=' . strtolower($this->format)
-            . '&d=' . rawurlencode($qrtext);
+            . '?qrsize='.$size
+            . '&e='.strtolower($this->errorcorrectionlevel)
+            . '&bgdcolor='.$this->bgcolor
+            . '&fgdcolor='.$this->color
+            . '&t='.strtolower($this->format)
+            . '&d='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

includes/libraries/Authentication/TwoFactorAuth/Providers/Rng/CSRNGProvider.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 class CSRNGProvider implements IRNGProvider
 {
     public function getRandomBytes($bytecount) {
-        return random_bytes($bytecount);    // PHP7+
+        return random_bytes($bytecount); // PHP7+
     }
 
     public function isCryptographicallySecure() {

includes/libraries/Email/Phpmailer/language/phpmailer.lang-ar.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
-$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية '.
                                           'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';

install/upgrade.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         } elseif (substr_count($val, '$pre = ') > 0) {
             $_SESSION['pre'] = getSettingValue($val);
         } elseif (substr_count($val, "define('SECUREPATH',") > 0) {
-            $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');')-24)."/sk.php";
+            $_SESSION['sk_file'] = substr($val, 23, strpos($val, ');') - 24)."/sk.php";
         }
     }
 }

backups/script.backup.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
         // Do clean
         unlink($settings['bck_script_path'].'/'.$bck_filename.'.sql');
-        rename (
+        rename(
             $settings['bck_script_path'].'/'.$bck_filename.'.encrypted.sql',
             $settings['bck_script_path'].'/'.$bck_filename.'.sql'
         );

includes/libraries/Email/Phpmailer/class.smtp.php

Spacing +34 added lines, -34 removed lines

@@ -227,21 +227,21 @@ 
                 break;
             case 'html':
                 //Cleans up output a bit for a better looking, HTML-safe output
-                echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities(
+                echo gmdate('Y-m-d H:i:s').' '.htmlentities(
                     preg_replace('/[\r\n]+/', '', $str),
                     ENT_QUOTES,
                     'UTF-8'
-                ) . "<br>\n";
+                )."<br>\n";
                 break;
             case 'echo':
             default:
                 //Normalize line breaks
                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                echo gmdate('Y-m-d H:i:s')."\t".str_replace(
                     "\n",
                     "\n                   \t                  ",
                     trim($str)
-                ) . "\n";
+                )."\n";
         }
     }
 
@@ -275,7 +275,7 @@ 
         }
         // Connect to the SMTP server
         $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            "Connection: opening to $host:$port, timeout=$timeout, options=".
             var_export($options, true),
             self::DEBUG_CONNECTION
         );
@@ -285,7 +285,7 @@ 
             $socket_context = stream_context_create($options);
             set_error_handler(array($this, 'errorHandler'));
             $this->smtp_conn = stream_socket_client(
-                $host . ":" . $port,
+                $host.":".$port,
                 $errno,
                 $errstr,
                 $timeout,
@@ -317,7 +317,7 @@ 
                 $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -336,7 +336,7 @@ 
         }
         // Get any announcement
         $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
         return true;
     }
 
@@ -406,9 +406,9 @@ 
                 return false;
             }
 
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
             self::edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                'Auth methods available on the server: '.implode(',', $this->server_caps['AUTH']),
                 self::DEBUG_LOWLEVEL
             );
 
@@ -423,7 +423,7 @@ 
                     $this->setError('No supported authentication methods found');
                     return false;
                 }
-                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
             }
 
             if (!in_array($authtype, $this->server_caps['AUTH'])) {
@@ -442,7 +442,7 @@ 
                 // Send encoded username and password
                 if (!$this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -470,7 +470,7 @@ 
                 $oauth = $OAuth->getOauth64();
 
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 '.$oauth, 235)) {
                     return false;
                 }
                 break;
@@ -501,7 +501,7 @@ 
 
                 if (!$this->sendCommand(
                     'AUTH NTLM',
-                    'AUTH NTLM ' . base64_encode($msg1),
+                    'AUTH NTLM '.base64_encode($msg1),
                     334
                 )
                 ) {
@@ -533,7 +533,7 @@ 
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
                 // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
+                $response = $username.' '.$this->hmac($challenge, $password);
 
                 // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
@@ -577,7 +577,7 @@ 
         $k_ipad = $key ^ $ipad;
         $k_opad = $key ^ $opad;
 
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+        return md5($k_opad.pack('H*', md5($k_ipad.$data)));
     }
 
     /**
@@ -689,7 +689,7 @@ 
                 }
                 //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
                 if ($in_headers) {
-                    $line = "\t" . $line;
+                    $line = "\t".$line;
                 }
             }
             $lines_out[] = $line;
@@ -698,9 +698,9 @@ 
             foreach ($lines_out as $line_out) {
                 //RFC2821 section 4.5.2
                 if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
+                    $line_out = '.'.$line_out;
                 }
-                $this->client_send($line_out . self::CRLF);
+                $this->client_send($line_out.self::CRLF);
             }
         }
 
@@ -727,7 +727,7 @@ 
     public function hello($host = '')
     {
         //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+        return (boolean) ($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
     }
 
     /**
@@ -741,7 +741,7 @@ 
      */
     protected function sendHello($hello, $host)
     {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $noerror = $this->sendCommand($hello, $hello.' '.$host, 250);
         $this->helo_rply = $this->last_reply;
         if ($noerror) {
             $this->parseHelloFields($hello);
@@ -809,7 +809,7 @@ 
         $useVerp = ($this->do_verp ? ' XVERP' : '');
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -846,7 +846,7 @@ 
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $address . '>',
+            'RCPT TO:<'.$address.'>',
             array(250, 251)
         );
     }
@@ -882,7 +882,7 @@ 
             $this->setError("Command '$command' contained line breaks");
             return false;
         }
-        $this->client_send($commandstring . self::CRLF);
+        $this->client_send($commandstring.self::CRLF);
 
         $this->last_reply = $this->get_lines();
         // Fetch SMTP code and possible error code explanation
@@ -892,8 +892,8 @@ 
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
             // Cut off error code from each response line
             $detail = preg_replace(
-                "/{$code}[ -]" .
-                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . "/m",
+                "/{$code}[ -]".
+                ($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
                 '',
                 $this->last_reply
             );
@@ -904,9 +904,9 @@ 
             $detail = substr($this->last_reply, 4);
         }
 
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
 
-        if (!in_array($code, (array)$expect)) {
+        if (!in_array($code, (array) $expect)) {
             $this->setError(
                 "$command command failed",
                 $detail,
@@ -914,7 +914,7 @@ 
                 $code_ex
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
                 self::DEBUG_CLIENT
             );
             return false;
@@ -976,7 +976,7 @@ 
     public function turn()
     {
         $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        $this->edebug('SMTP NOTICE: '.$this->error['error'], self::DEBUG_CLIENT);
         return false;
     }
 
@@ -1102,7 +1102,7 @@ 
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1110,8 +1110,8 @@ 
             // Now check if reads took too long
             if ($endtime and time() > $endtime) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached (' .
-                    $this->Timelimit . ' sec)',
+                    'SMTP -> get_lines(): timelimit reached ('.
+                    $this->Timelimit.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1225,7 +1225,7 @@ 
             $errmsg
         );
         $this->edebug(
-            $notice . ' Error #' . $errno . ': ' . $errmsg . " [$errfile line $errline]",
+            $notice.' Error #'.$errno.': '.$errmsg." [$errfile line $errline]",
             self::DEBUG_CONNECTION
         );
     }