aandrieux/Test-Miroir
1
0
Fork 0
mirror of https://github.com/xPaw/PHP-Source-Query.git synced 2026-05-18 14:33:34 +02:00
Code Issues Releases Wiki Activity

Rename some variables for clarity

Browse Source
This commit is contained in:
Pavel Djundik
2015-10-22 11:58:33 +03:00
parent 8b475d2649
commit 2bbe339458
5 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/SourceQuery.php
+10 -11
View File
@@ -122,7 +122,7 @@
/**
* Opens connection to server
*
* @param string $Ip Server ip
* @param string $Address Server ip
* @param int $Port Server port
* @param int $Timeout Timeout period
* @param int $Engine Engine the server runs on (goldsource, source)
@@ -130,7 +130,7 @@
* @throws InvalidArgumentException
* @throws SocketException
*/
public function Connect( $Ip, $Port, $Timeout = 3, $Engine = self::SOURCE )
public function Connect( $Address, $Port, $Timeout = 3, $Engine = self::SOURCE )
{
$this->Disconnect( );
@@ -139,7 +139,7 @@
throw new InvalidArgumentException( 'Timeout must be an integer.', InvalidArgumentException::TIMEOUT_NOT_INTEGER );
}
$this->Socket->Open( $Ip, (int)$Port, $Timeout, (int)$Engine );
$this->Socket->Open( $Address, (int)$Port, $Timeout, (int)$Engine );
$this->Connected = true;
}
@@ -309,18 +309,17 @@
// You can use https://github.com/xPaw/SteamID.php
if( $Flags & 0x10 )
{
$a = $Buffer->GetUnsignedLong( );
$b = $Buffer->GetUnsignedLong( );
$SteamIDLower = $Buffer->GetUnsignedLong( );
$SteamIDInstance = $Buffer->GetUnsignedLong( ); // This gets shifted by 32 bits, which should be steamid instance
$SteamID = 0;
if( PHP_INT_SIZE === 4 )
{
if( extension_loaded( 'gmp' ) )
{
$a = gmp_abs( $a );
$b = gmp_abs( $b );
$SteamID = gmp_strval( gmp_or( $a, gmp_mul( $b, gmp_pow( 2, 32 ) ) ) );
$SteamIDLower = gmp_abs( $SteamIDLower );
$SteamIDInstance = gmp_abs( $SteamIDInstance );
$SteamID = gmp_strval( gmp_or( $SteamIDLower, gmp_mul( $SteamIDInstance, gmp_pow( 2, 32 ) ) ) );
}
else
{
@@ -329,12 +328,12 @@
}
else
{
$SteamID = $a | ( $b << 32 );
$SteamID = $SteamIDLower | ( $SteamIDInstance << 32 );
}
$Server[ 'SteamID' ] = $SteamID;
unset( $a, $b, $SteamID );
unset( $SteamIDLower, $SteamIDInstance, $SteamID );
}
// The spectator port and then the spectator server name