Merged in Geels/join_shardphp-edited-online-with-bitbuck-1410094877054 (pull request #1)
Function split() is deprecated
This commit is contained in:
commit
e2e4f028cf
1 changed files with 5 additions and 5 deletions
|
@ -53,10 +53,10 @@ class JoinShardCb extends CRingSessionManagerWeb
|
||||||
global $getShardListCallback;
|
global $getShardListCallback;
|
||||||
|
|
||||||
$onlineShardsBySessionId = array();
|
$onlineShardsBySessionId = array();
|
||||||
$resultArray = split(';', $resultStr);
|
$resultArray = explode(';', $resultStr);
|
||||||
foreach ($resultArray as $shardInfo)
|
foreach ($resultArray as $shardInfo)
|
||||||
{
|
{
|
||||||
$shardAttr = split(',', $shardInfo);
|
$shardAttr = explode(',', $shardInfo);
|
||||||
if (isset($shardAttr[1]))
|
if (isset($shardAttr[1]))
|
||||||
$onlineShardsBySessionId[$shardAttr[0]] = $shardAttr[1];
|
$onlineShardsBySessionId[$shardAttr[0]] = $shardAttr[1];
|
||||||
}
|
}
|
||||||
|
@ -120,7 +120,7 @@ function joinShardFromIdPost( $destSessionId )
|
||||||
function joinShardFromId( $userId, $domainId, $destSessionId )
|
function joinShardFromId( $userId, $domainId, $destSessionId )
|
||||||
{
|
{
|
||||||
$domainInfo = getDomainInfo($domainId);
|
$domainInfo = getDomainInfo($domainId);
|
||||||
$addr = split(":", $domainInfo["session_manager_address"]);
|
$addr = explode(":", $domainInfo["session_manager_address"]);
|
||||||
$RSMHost = $addr[0];
|
$RSMHost = $addr[0];
|
||||||
$RSMPort = $addr[1];
|
$RSMPort = $addr[1];
|
||||||
|
|
||||||
|
@ -148,7 +148,7 @@ function joinShardFromId( $userId, $domainId, $destSessionId )
|
||||||
function getShardList($userId, $domainId)
|
function getShardList($userId, $domainId)
|
||||||
{
|
{
|
||||||
$domainInfo = getDomainInfo($domainId);
|
$domainInfo = getDomainInfo($domainId);
|
||||||
$addr = split(":", $domainInfo["session_manager_address"]);
|
$addr = explode(":", $domainInfo["session_manager_address"]);
|
||||||
$RSMHost = $addr[0];
|
$RSMHost = $addr[0];
|
||||||
$RSMPort = $addr[1];
|
$RSMPort = $addr[1];
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ function displayAllShards(&$onlineShardsBySessionId)
|
||||||
function joinMainland($userId, $domainId)
|
function joinMainland($userId, $domainId)
|
||||||
{
|
{
|
||||||
$domainInfo = getDomainInfo($domainId);
|
$domainInfo = getDomainInfo($domainId);
|
||||||
$addr = split(":", $domainInfo["session_manager_address"]);
|
$addr = explode(":", $domainInfo["session_manager_address"]);
|
||||||
$RSMHost = $addr[0];
|
$RSMHost = $addr[0];
|
||||||
$RSMPort = $addr[1];
|
$RSMPort = $addr[1];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue