From de219c5f96de27b867a32e4cdc61045a63d178b3 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 19 Jan 2017 21:43:52 +0000 Subject: [PATCH] Apply fixes from StyleCI --- .../MTProtoTools/AuthKeyHandler.php | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php b/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php index 47dae75c..43c6b243 100644 --- a/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php @@ -482,13 +482,13 @@ trait AuthKeyHandler { for ($retry_id_total = 1; $retry_id_total <= $this->settings['max_tries']['authorization']; $retry_id_total++) { try { - \danog\MadelineProto\Logger::log('Binding authorization keys...'); - $nonce = \danog\PHP\Struct::unpack('datacenter->temp_auth_key['id'])[0]; - $perm_auth_key_id = \danog\PHP\Struct::unpack('datacenter->auth_key['id'])[0]; - $temp_session_id = \danog\PHP\Struct::unpack('datacenter->session_id)[0]; - $message_data = $this->serialize_object(['type' => 'bind_auth_key_inner'], + \danog\MadelineProto\Logger::log('Binding authorization keys...'); + $nonce = \danog\PHP\Struct::unpack('datacenter->temp_auth_key['id'])[0]; + $perm_auth_key_id = \danog\PHP\Struct::unpack('datacenter->auth_key['id'])[0]; + $temp_session_id = \danog\PHP\Struct::unpack('datacenter->session_id)[0]; + $message_data = $this->serialize_object(['type' => 'bind_auth_key_inner'], [ 'nonce' => $nonce, 'temp_auth_key_id' => $temp_auth_key_id, @@ -497,31 +497,31 @@ trait AuthKeyHandler 'expires_at' => $expires_at, ] ); - $int_message_id = $this->generate_message_id(); + $int_message_id = $this->generate_message_id(); - $message_id = \danog\PHP\Struct::pack('posmod(-strlen($encrypted_data), 16)); - list($aes_key, $aes_iv) = $this->aes_calculate($message_key, $this->datacenter->auth_key['auth_key']); - $encrypted_message = $this->datacenter->auth_key['id'].$message_key.$this->ige_encrypt($encrypted_data.$padding, $aes_key, $aes_iv); - $res = $this->method_call('auth.bindTempAuthKey', ['perm_auth_key_id' => $perm_auth_key_id, 'nonce' => $nonce, 'expires_at' => $expires_at, 'encrypted_message' => $encrypted_message], $int_message_id); - var_dump($res); - if ($res === true) { - \danog\MadelineProto\Logger::log('Successfully binded temporary and permanent authorization keys.'); + $message_id = \danog\PHP\Struct::pack('posmod(-strlen($encrypted_data), 16)); + list($aes_key, $aes_iv) = $this->aes_calculate($message_key, $this->datacenter->auth_key['auth_key']); + $encrypted_message = $this->datacenter->auth_key['id'].$message_key.$this->ige_encrypt($encrypted_data.$padding, $aes_key, $aes_iv); + $res = $this->method_call('auth.bindTempAuthKey', ['perm_auth_key_id' => $perm_auth_key_id, 'nonce' => $nonce, 'expires_at' => $expires_at, 'encrypted_message' => $encrypted_message], $int_message_id); + var_dump($res); + if ($res === true) { + \danog\MadelineProto\Logger::log('Successfully binded temporary and permanent authorization keys.'); - return true; + return true; + } + } catch (\danog\MadelineProto\Exception $e) { + \danog\MadelineProto\Logger::log('An exception occurred while generating the authorization key: '.$e->getMessage().' Retrying (try number '.$retry_id_total.')...'); + } catch (\danog\MadelineProto\RPCErrorException $e) { + \danog\MadelineProto\Logger::log('An RPCErrorException occurred while generating the authorization key: '.$e->getMessage().' Retrying (try number '.$retry_id_total.')...'); + } finally { + $this->datacenter->new_outgoing = []; + $this->datacenter->new_incoming = []; + } } - } catch (\danog\MadelineProto\Exception $e) { - \danog\MadelineProto\Logger::log('An exception occurred while generating the authorization key: '.$e->getMessage().' Retrying (try number '.$retry_id_total.')...'); - } catch (\danog\MadelineProto\RPCErrorException $e) { - \danog\MadelineProto\Logger::log('An RPCErrorException occurred while generating the authorization key: '.$e->getMessage().' Retrying (try number '.$retry_id_total.')...'); - } finally { - $this->datacenter->new_outgoing = []; - $this->datacenter->new_incoming = []; - } - } - throw new \danog\MadelineProto\Exception('An error occurred while binding temporary and permanent authorization keys.'); + throw new \danog\MadelineProto\Exception('An error occurred while binding temporary and permanent authorization keys.'); } }