From 14e0a69ed618007ec3b62341a61ca6f2c0a5bc54 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 5 Jun 2018 10:35:14 +0200 Subject: [PATCH] 1.0.2.4 + added customSet and customDelete function + added reason message to serverStop and serverProcessStop ~ fixed error in readChatMessage when you're in the default channel and want to read text from it ~ channelEdit comment embellished - removed CLIENT_ICON_ID from clientdbinfo --- CHANGELOG | 11 +- composer.json | 2 +- docs/manual/annotated.html | 2 +- docs/manual/classes.html | 2 +- docs/manual/classts3admin.html | 130 ++++++++++++++++-- .../dir_10a6f60a3f69272b5db7ea1b7bf5dbe7.html | 2 +- .../dir_2efd5a1bd54080b406def48476f5ebfa.html | 2 +- .../dir_516e7709f2195dc55b84d083c8c936b3.html | 2 +- .../dir_5e8b704f3f6c02a2a30269a1c43b2cb8.html | 2 +- docs/manual/files.html | 2 +- docs/manual/functions.html | 12 +- docs/manual/functions_func.html | 12 +- docs/manual/index.html | 2 +- docs/manual/search/all_2.js | 4 +- docs/manual/search/all_c.js | 4 +- docs/manual/search/functions_2.js | 4 +- docs/manual/search/functions_c.js | 4 +- docs/manual/ts3admin_8class_8php.html | 6 +- lib/ts3admin.class.php | 75 +++++++--- 19 files changed, 225 insertions(+), 55 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8f301d3..21825d1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,15 @@ -Tested compatibility to version: 3.0.13.8 x64 +Tested compatibility to version: 3.2.0 x64 __________________________________________ +Version: 1.0.2.4 - Tue, 05 Jun 2018 + ++ added customSet and customDelete function ++ added reason message to serverStop and serverProcessStop +~ fixed error in readChatMessage when you're in the default channel and want to read text from it +~ channelEdit comment embellished +- removed CLIENT_ICON_ID from clientdbinfo + + Version: 1.0.2.3 - Thu, 02 Nov 2017 ~ changed description of clientEdit (Thanks to Ibrahim for the hint) diff --git a/composer.json b/composer.json index 6094be4..1eebe81 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "keywords": ["ts3","ts3admin","admin","teamspeak","teamspeak3"], "homepage": "https://github.com/par0noid/ts3admin.class", "type": "library", - "version": "1.0.2.1", + "version": "1.0.2.4", "require": { "php": ">=5.0.0" }, diff --git a/docs/manual/annotated.html b/docs/manual/annotated.html index 41b759f..3bd2f09 100644 --- a/docs/manual/annotated.html +++ b/docs/manual/annotated.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
diff --git a/docs/manual/classes.html b/docs/manual/classes.html index 2c9330a..9b05ddd 100644 --- a/docs/manual/classes.html +++ b/docs/manual/classes.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
diff --git a/docs/manual/classts3admin.html b/docs/manual/classts3admin.html index 262fdd7..cfedf69 100644 --- a/docs/manual/classts3admin.html +++ b/docs/manual/classts3admin.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
@@ -206,10 +206,14 @@    convertSecondsToStrTime ($seconds)   + customDelete ($cldbid, $ident) +   customInfo ($cldbid)    customSearch ($ident, $pattern)   + customSet ($cldbid, $ident, $value) +   execOwnCommand ($mode, $command)    ftCreateDir ($cid, $cpw=null, $dirname) @@ -338,8 +342,8 @@    serverNotifyUnregister ()   - serverProcessStop () -  + serverProcessStop ($reasonMessage=null) +   serverRequestConnectionInfo ()    serverSnapshotCreate () @@ -348,8 +352,8 @@    serverStart ($sid)   - serverStop ($sid) -  + serverStop ($sid, $reasonMessage=null) +   serverTempPasswordAdd ($pw, $duration, $desc='none', $tcid=0, $tcpw=null)    serverTempPasswordDel ($pw) @@ -2360,7 +2364,6 @@

Returns
string strTime
+ + + +

◆ customDelete()

+ +
+
+ + + + + + + + + + + + + + + + + + +
customDelete ( $cldbid,
 $ident 
)
+
+

customDelete

+

Removes a custom property from a client specified by the cldbid.

+
Author
Stefan Zehnpfennig
+
Parameters
+ + + +
string$cldbidclientDBID
string$identcustomIdent
+
+
+
Returns
boolean success
+
@@ -3419,6 +3461,52 @@

Returns
array customSearchInfos
+ + + +

◆ customSet()

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
customSet ( $cldbid,
 $ident,
 $value 
)
+
+

customSet

+

Creates or updates a custom property for client specified by the cldbid. Ident and value can be any value, and are the key value pair of the custom property.

+
Author
Stefan Zehnpfennig
+
Parameters
+ + + + +
string$cldbidclientDBID
string$identcustomIdent
string$valuecustomValue
+
+
+
Returns
boolean success
+
@@ -6174,8 +6262,8 @@

-

◆ serverProcessStop()

+ +

◆ serverProcessStop()

@@ -6183,7 +6271,8 @@

serverProcessStop ( - ) +   + $reasonMessage = null) @@ -6191,6 +6280,12 @@

Author
Stefan Zehnpfennig
+
Parameters
+ + +
string$reasonMessagereasonMessage [optional]
+
+
Returns
boolean success

@@ -6326,8 +6421,8 @@

-

◆ serverStop()

+ +

◆ serverStop()

@@ -6336,8 +6431,18 @@

serverStop (   - $sid) + $sid, + + + +   + $reasonMessage = null  + + + + ) +

@@ -6347,6 +6452,7 @@

Parameters
+
integer$sidserverID
string$reasonMessagereasonMessage [optional]
diff --git a/docs/manual/dir_10a6f60a3f69272b5db7ea1b7bf5dbe7.html b/docs/manual/dir_10a6f60a3f69272b5db7ea1b7bf5dbe7.html index 33d20c3..d5c6b89 100644 --- a/docs/manual/dir_10a6f60a3f69272b5db7ea1b7bf5dbe7.html +++ b/docs/manual/dir_10a6f60a3f69272b5db7ea1b7bf5dbe7.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
diff --git a/docs/manual/dir_2efd5a1bd54080b406def48476f5ebfa.html b/docs/manual/dir_2efd5a1bd54080b406def48476f5ebfa.html index 0d948cf..9ec7d00 100644 --- a/docs/manual/dir_2efd5a1bd54080b406def48476f5ebfa.html +++ b/docs/manual/dir_2efd5a1bd54080b406def48476f5ebfa.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
diff --git a/docs/manual/dir_516e7709f2195dc55b84d083c8c936b3.html b/docs/manual/dir_516e7709f2195dc55b84d083c8c936b3.html index e89677f..f83464a 100644 --- a/docs/manual/dir_516e7709f2195dc55b84d083c8c936b3.html +++ b/docs/manual/dir_516e7709f2195dc55b84d083c8c936b3.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
diff --git a/docs/manual/dir_5e8b704f3f6c02a2a30269a1c43b2cb8.html b/docs/manual/dir_5e8b704f3f6c02a2a30269a1c43b2cb8.html index 6ba7c30..ff9ac5e 100644 --- a/docs/manual/dir_5e8b704f3f6c02a2a30269a1c43b2cb8.html +++ b/docs/manual/dir_5e8b704f3f6c02a2a30269a1c43b2cb8.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
diff --git a/docs/manual/files.html b/docs/manual/files.html index da2238b..972ca6d 100644 --- a/docs/manual/files.html +++ b/docs/manual/files.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
diff --git a/docs/manual/functions.html b/docs/manual/functions.html index 3cf2eaa..63566d0 100644 --- a/docs/manual/functions.html +++ b/docs/manual/functions.html @@ -23,7 +23,7 @@ Logo
ts3admin.class -  1.0.2.3 +  1.0.2.4
The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
@@ -270,12 +270,18 @@

- c -

@@ -509,7 +515,7 @@

- s -

    : ts3admin
  • serverProcessStop() -: ts3admin +: ts3admin
  • serverRequestConnectionInfo() : ts3admin @@ -524,7 +530,7 @@

    - s -

      : ts3admin
    • serverStop() -: ts3admin +: ts3admin
    • serverTempPasswordAdd() : ts3admin diff --git a/docs/manual/functions_func.html b/docs/manual/functions_func.html index 7a4cbe5..32d9dc3 100644 --- a/docs/manual/functions_func.html +++ b/docs/manual/functions_func.html @@ -23,7 +23,7 @@ Logo
      ts3admin.class -  1.0.2.3 +  1.0.2.4
      The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
      @@ -270,12 +270,18 @@

      - c -

      @@ -509,7 +515,7 @@

      - s -

        : ts3admin
      • serverProcessStop() -: ts3admin +: ts3admin
      • serverRequestConnectionInfo() : ts3admin @@ -524,7 +530,7 @@

        - s -

          : ts3admin
        • serverStop() -: ts3admin +: ts3admin
        • serverTempPasswordAdd() : ts3admin diff --git a/docs/manual/index.html b/docs/manual/index.html index 00d74b0..6b2d7a8 100644 --- a/docs/manual/index.html +++ b/docs/manual/index.html @@ -23,7 +23,7 @@ Logo
          ts3admin.class -  1.0.2.3 +  1.0.2.4
          The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
          diff --git a/docs/manual/search/all_2.js b/docs/manual/search/all_2.js index d69ea6d..c912940 100644 --- a/docs/manual/search/all_2.js +++ b/docs/manual/search/all_2.js @@ -55,6 +55,8 @@ var searchData= ['connect',['connect',['../classts3admin.html#a78572828d11dcdf2a498497d9001d557',1,'ts3admin']]], ['convertsecondstoarraytime',['convertSecondsToArrayTime',['../classts3admin.html#a33d0cc13d576ead9c9760bfe8661d29f',1,'ts3admin']]], ['convertsecondstostrtime',['convertSecondsToStrTime',['../classts3admin.html#a1ad0f3286df821838537792aece007cd',1,'ts3admin']]], + ['customdelete',['customDelete',['../classts3admin.html#a905d3d15efaa2c6fce77495de054936f',1,'ts3admin']]], ['custominfo',['customInfo',['../classts3admin.html#afac57d9d3a4f382259dd2cdc64de20f4',1,'ts3admin']]], - ['customsearch',['customSearch',['../classts3admin.html#af810e67182f54282eadc89ce2d315a1e',1,'ts3admin']]] + ['customsearch',['customSearch',['../classts3admin.html#af810e67182f54282eadc89ce2d315a1e',1,'ts3admin']]], + ['customset',['customSet',['../classts3admin.html#a06f265842054b2e949874d037c4afd2e',1,'ts3admin']]] ]; diff --git a/docs/manual/search/all_c.js b/docs/manual/search/all_c.js index 002fba5..45b1d13 100644 --- a/docs/manual/search/all_c.js +++ b/docs/manual/search/all_c.js @@ -24,12 +24,12 @@ var searchData= ['serverinfo',['serverInfo',['../classts3admin.html#a403eff6de16fadd41ddc4155d6dbd09c',1,'ts3admin']]], ['serverlist',['serverList',['../classts3admin.html#a4cfaf5e6abe8e670f244b6bba1430654',1,'ts3admin']]], ['servernotifyunregister',['serverNotifyUnregister',['../classts3admin.html#aa1529066962ffd827bb5e1a4643b6271',1,'ts3admin']]], - ['serverprocessstop',['serverProcessStop',['../classts3admin.html#a86eded728c736bba1bb0acd4ce30fe9a',1,'ts3admin']]], + ['serverprocessstop',['serverProcessStop',['../classts3admin.html#a968ac6eab7aae32765448cdb1627078d',1,'ts3admin']]], ['serverrequestconnectioninfo',['serverRequestConnectionInfo',['../classts3admin.html#a93690221d106d8fe1036cdd15f26e68e',1,'ts3admin']]], ['serversnapshotcreate',['serverSnapshotCreate',['../classts3admin.html#acf7df58cf320de421ec9e6d449744558',1,'ts3admin']]], ['serversnapshotdeploy',['serverSnapshotDeploy',['../classts3admin.html#a8065ebacfa736a38d2372eb76633c71b',1,'ts3admin']]], ['serverstart',['serverStart',['../classts3admin.html#a706a655f5fe22b36037e5b854d133ed2',1,'ts3admin']]], - ['serverstop',['serverStop',['../classts3admin.html#a63a61ec480156f0f7f0d022a8366bb53',1,'ts3admin']]], + ['serverstop',['serverStop',['../classts3admin.html#a6fa8d5c65b54f892d0a9895ff846b37e',1,'ts3admin']]], ['servertemppasswordadd',['serverTempPasswordAdd',['../classts3admin.html#a8f66a1266bc7481716ee4d4adeb04366',1,'ts3admin']]], ['servertemppassworddel',['serverTempPasswordDel',['../classts3admin.html#aab92759de2f4ae6dd067f8940705447a',1,'ts3admin']]], ['servertemppasswordlist',['serverTempPasswordList',['../classts3admin.html#af7cffcc18fc865e3ef5a7ea863ba4682',1,'ts3admin']]], diff --git a/docs/manual/search/functions_2.js b/docs/manual/search/functions_2.js index d69ea6d..c912940 100644 --- a/docs/manual/search/functions_2.js +++ b/docs/manual/search/functions_2.js @@ -55,6 +55,8 @@ var searchData= ['connect',['connect',['../classts3admin.html#a78572828d11dcdf2a498497d9001d557',1,'ts3admin']]], ['convertsecondstoarraytime',['convertSecondsToArrayTime',['../classts3admin.html#a33d0cc13d576ead9c9760bfe8661d29f',1,'ts3admin']]], ['convertsecondstostrtime',['convertSecondsToStrTime',['../classts3admin.html#a1ad0f3286df821838537792aece007cd',1,'ts3admin']]], + ['customdelete',['customDelete',['../classts3admin.html#a905d3d15efaa2c6fce77495de054936f',1,'ts3admin']]], ['custominfo',['customInfo',['../classts3admin.html#afac57d9d3a4f382259dd2cdc64de20f4',1,'ts3admin']]], - ['customsearch',['customSearch',['../classts3admin.html#af810e67182f54282eadc89ce2d315a1e',1,'ts3admin']]] + ['customsearch',['customSearch',['../classts3admin.html#af810e67182f54282eadc89ce2d315a1e',1,'ts3admin']]], + ['customset',['customSet',['../classts3admin.html#a06f265842054b2e949874d037c4afd2e',1,'ts3admin']]] ]; diff --git a/docs/manual/search/functions_c.js b/docs/manual/search/functions_c.js index 002fba5..45b1d13 100644 --- a/docs/manual/search/functions_c.js +++ b/docs/manual/search/functions_c.js @@ -24,12 +24,12 @@ var searchData= ['serverinfo',['serverInfo',['../classts3admin.html#a403eff6de16fadd41ddc4155d6dbd09c',1,'ts3admin']]], ['serverlist',['serverList',['../classts3admin.html#a4cfaf5e6abe8e670f244b6bba1430654',1,'ts3admin']]], ['servernotifyunregister',['serverNotifyUnregister',['../classts3admin.html#aa1529066962ffd827bb5e1a4643b6271',1,'ts3admin']]], - ['serverprocessstop',['serverProcessStop',['../classts3admin.html#a86eded728c736bba1bb0acd4ce30fe9a',1,'ts3admin']]], + ['serverprocessstop',['serverProcessStop',['../classts3admin.html#a968ac6eab7aae32765448cdb1627078d',1,'ts3admin']]], ['serverrequestconnectioninfo',['serverRequestConnectionInfo',['../classts3admin.html#a93690221d106d8fe1036cdd15f26e68e',1,'ts3admin']]], ['serversnapshotcreate',['serverSnapshotCreate',['../classts3admin.html#acf7df58cf320de421ec9e6d449744558',1,'ts3admin']]], ['serversnapshotdeploy',['serverSnapshotDeploy',['../classts3admin.html#a8065ebacfa736a38d2372eb76633c71b',1,'ts3admin']]], ['serverstart',['serverStart',['../classts3admin.html#a706a655f5fe22b36037e5b854d133ed2',1,'ts3admin']]], - ['serverstop',['serverStop',['../classts3admin.html#a63a61ec480156f0f7f0d022a8366bb53',1,'ts3admin']]], + ['serverstop',['serverStop',['../classts3admin.html#a6fa8d5c65b54f892d0a9895ff846b37e',1,'ts3admin']]], ['servertemppasswordadd',['serverTempPasswordAdd',['../classts3admin.html#a8f66a1266bc7481716ee4d4adeb04366',1,'ts3admin']]], ['servertemppassworddel',['serverTempPasswordDel',['../classts3admin.html#aab92759de2f4ae6dd067f8940705447a',1,'ts3admin']]], ['servertemppasswordlist',['serverTempPasswordList',['../classts3admin.html#af7cffcc18fc865e3ef5a7ea863ba4682',1,'ts3admin']]], diff --git a/docs/manual/ts3admin_8class_8php.html b/docs/manual/ts3admin_8class_8php.html index 0c4951e..d9f4599 100644 --- a/docs/manual/ts3admin_8class_8php.html +++ b/docs/manual/ts3admin_8class_8php.html @@ -23,7 +23,7 @@ Logo
          ts3admin.class -  1.0.2.3 +  1.0.2.4
          The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!
          @@ -81,8 +81,8 @@

          Detailed Description

          The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds!

          Author
          Stefan Zehnpfennig
          -
          Copyright
          Copyright (c) 2017, Stefan Zehnpfennig
          -
          Version
          1.0.2.3
          +
          Copyright
          Copyright (c) 2018, Stefan Zehnpfennig
          +
          Version
          1.0.2.4
diff --git a/lib/ts3admin.class.php b/lib/ts3admin.class.php index 115ef6f..7f10578 100644 --- a/lib/ts3admin.class.php +++ b/lib/ts3admin.class.php @@ -3,10 +3,10 @@ * ts3admin.class.php * ------------------ * created : 18. December 2009 - * last modified : 02. November 2017 - * version : 1.0.2.3 + * last modified : 05. June 2018 + * version : 1.0.2.4 * website : http://ts3admin.info - * copyright : (C) 2017 Stefan Zehnpfennig + * copyright : (C) 2018 Stefan Zehnpfennig * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,8 +26,8 @@ * The ts3admin.class is a powerful api for communication with Teamspeak 3 Servers from your website! Your creativity knows no bounds! * * @author Stefan Zehnpfennig - * @copyright Copyright (c) 2017, Stefan Zehnpfennig - * @version 1.0.2.3 + * @copyright Copyright (c) 2018, Stefan Zehnpfennig + * @version 1.0.2.4 * @package ts3admin * */ @@ -593,12 +593,12 @@ function channelDelPerm($cid, $permissions) { * Changes a channels configuration using given properties. Note that this command accepts multiple properties which means that you're able to change all settings of the channel specified with cid at once. * * Input-Array like this: - 
-	$data = array();
-		
-	$data['setting'] = 'value';
-	$data['setting'] = 'value';
-
+ * 
+  *	$data = array();
+  *		
+  *	$data['setting'] = 'value';
+  *	$data['setting'] = 'value';
+  *
* * Possible properties: Take a look at channelCreate function * @@ -1462,7 +1462,6 @@ function clientDbFind($pattern, $uid = false) { * [client_month_bytes_downloaded] => 0 * [client_total_bytes_uploaded] => 0 * [client_total_bytes_downloaded] => 0 - * [client_icon_id] => 0 * [client_base64HashClientUID] => jneilbgomklpfnkjclkoggokfdmdlhnbbpmdpagh * [client_lastip] => 127.0.0.1 * } @@ -2041,6 +2040,22 @@ function complainList($tcldbid = null) { return $this->getData('multi', 'complainlist'.$tcldbid); } +/** + * customDelete + * + * Removes a custom property from a client specified by the cldbid. + * + * + * @author Stefan Zehnpfennig + * @param string $cldbid clientDBID + * @param string $ident customIdent + * @return boolean success + */ + function customDelete($cldbid, $ident) { + if(!$this->runtime['selected']) { return $this->checkSelected(); } + return $this->getData('boolean', 'customdelete cldbid='.$cldbid.' ident='.$this->escapeText($ident)); + } + /** * customInfo @@ -2108,6 +2123,23 @@ function customSearch($ident, $pattern) { return $this->getData('multi', 'customsearch ident='.$this->escapeText($ident).' pattern='.$this->escapeText($pattern)); } +/** + * customSet + * + * Creates or updates a custom property for client specified by the cldbid. Ident and value can be any value, and are the key value pair of the custom property. + * + * + * @author Stefan Zehnpfennig + * @param string $cldbid clientDBID + * @param string $ident customIdent + * @param string $value customValue + * @return boolean success + */ + function customSet($cldbid, $ident, $value) { + if(!$this->runtime['selected']) { return $this->checkSelected(); } + return $this->getData('boolean', 'customset cldbid='.$cldbid.' ident='.$this->escapeText($ident).' value='.$this->escapeText($value)); + } + /** * execOwnCommand * @@ -4004,17 +4036,19 @@ function serverInfo() { function serverList($options = NULL) { return $this->getData('multi', 'serverlist'.(!empty($options) ? ' '.$options : '')); } - + + /** * serverProcessStop * * Stops the entire TeamSpeak 3 Server instance by shutting down the process. * * @author Stefan Zehnpfennig + * @param string $reasonMessage reasonMessage [optional] * @return boolean success */ - function serverProcessStop() { - return $this->getData('boolean', 'serverprocessstop'); + function serverProcessStop($reasonMessage = null) { + return $this->getData('boolean', 'serverprocessstop'.($reasonMessage != null && !empty($reasonMessage) ? " reasonmsg=".$this->escapeText($reasonMessage) : "")); } /** @@ -4102,10 +4136,11 @@ function serverStart($sid) { * * @author Stefan Zehnpfennig * @param integer $sid serverID + * @param string $reasonMessage reasonMessage [optional] * @return boolean success */ - function serverStop($sid) { - return $this->getdata('boolean', 'serverstop sid='.$sid); + function serverStop($sid, $reasonMessage = null) { + return $this->getdata('boolean', 'serverstop sid='.$sid.($reasonMessage != null && !empty($reasonMessage) ? " reasonmsg=".$this->escapeText($reasonMessage) : "")); } /** @@ -4771,7 +4806,11 @@ public function readChatMessage($type = 'textchannel', $keepalive = false, $cid if(!$this->runtime['selected']) { return $this->checkSelected(); } - if($type == 'textchannel') + $whoami = $this->whoami(); + + if(!$whoami['success']) { return $whoami; } + + if($type == 'textchannel' && $whoami['data']['client_channel_id'] != $cid) { $this->clientMove($this->getQueryClid(), $cid); }