diff options
| -rw-r--r-- | chat/js/chat.js | 2 | ||||
| -rw-r--r-- | chat/lib/class/AJAXChat.php | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/chat/js/chat.js b/chat/js/chat.js index a4bc466..730e655 100644 --- a/chat/js/chat.js +++ b/chat/js/chat.js @@ -848,9 +848,9 @@ var ajaxChat = { }, startRetryTimer: function() { - console.log('startRetryTimer'); var retryTimerDelay = (this.inactiveTimeout*6000 - this.timerRate)/4 + this.timerRate; this.clearRetryTimer(); + console.log('startRetryTimer'); this.retryTimer = setTimeout(this.forceNewRequest, retryTimerDelay); }, diff --git a/chat/lib/class/AJAXChat.php b/chat/lib/class/AJAXChat.php index 5d9cac3..0ad4ce2 100644 --- a/chat/lib/class/AJAXChat.php +++ b/chat/lib/class/AJAXChat.php @@ -834,7 +834,7 @@ class AJAXChat { } } else { // Insert /privaction command if /describe is used: - $command = ($textParts[0] == '/describe') ? '/privaction' : '/privmsg'; + $command = ($textParts[0] == '/describe') ? '/privaction' : '/privmsg'; // Copy of private message to current User: $this->insertCustomMessage( $this->getUserID(), @@ -842,7 +842,7 @@ class AJAXChat { $this->getUserRole(), $this->getPrivateMessageID(), $command.'to '.$textParts[1].' '.implode(' ', array_slice($textParts, 2)) - ); + ); // Private message to requested User: $this->insertCustomMessage( $this->getUserID(), @@ -890,7 +890,7 @@ class AJAXChat { '/invite '.$this->getUserName().' '.$invitationChannelName ); } - } + } } else { $this->insertChatBotMessage( $this->getPrivateMessageID(), @@ -913,7 +913,7 @@ class AJAXChat { $this->getPrivateMessageID(), '/error UserNameNotFound '.$textParts[1] ); - } else { + } else { // Remove the invitation from the database: $this->removeInvitation($toUserID); $invitationChannelName = $this->getChannelNameFromChannelID($this->getChannel()); @@ -921,19 +921,19 @@ class AJAXChat { $this->insertChatBotMessage( $this->getPrivateMessageID(), '/uninviteto '.$textParts[1].' '.$invitationChannelName - ); + ); // Uninvitation to requested User: $this->insertChatBotMessage( $this->getPrivateMessageID($toUserID), '/uninvite '.$this->getUserName().' '.$invitationChannelName ); } - } + } } else { $this->insertChatBotMessage( $this->getPrivateMessageID(), '/error UninviteNotAllowed' - ); + ); } } @@ -1891,6 +1891,7 @@ class AJAXChat { } function sendXMLMessages() { + $httpHeader = new AJAXChatHTTPHeader('UTF-8', 'text/xml'); // Send HTTP header: |