harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In order to provide ajax chat accessible by remote visitors (xchans), we need to remove any core assumptions that userID is an int (which is a common centralised site assumption). Additionally we won't be able to provide guest logins, as this also assumes integer ID's; so that ability needs to be disabled by configuration.

Browse Source
This commit is contained in:
friendica 2014-01-27 15:55:08 -08:00
parent 24bac92acd
commit d9794b981d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/ajaxchat/chat/lib/class/AJAXChat.php
View File

@ -60,12 +60,12 @@ class AJAXChat {
function initRequestVars() { function initRequestVars() {
$this->_requestVars = array(); $this->_requestVars = array();
$this->_requestVars['ajax'] = isset($_REQUEST['ajax']) ? true : false; $this->_requestVars['ajax'] = isset($_REQUEST['ajax']) ? true : false;
$this->_requestVars['userID'] = isset($_REQUEST['userID']) ? (int)$_REQUEST['userID'] : null; $this->_requestVars['userID'] = isset($_REQUEST['userID']) ? $_REQUEST['userID'] : null;
$this->_requestVars['userName'] = isset($_REQUEST['userName']) ? $_REQUEST['userName'] : null; $this->_requestVars['userName'] = isset($_REQUEST['userName']) ? $_REQUEST['userName'] : null;
$this->_requestVars['channelID'] = isset($_REQUEST['channelID']) ? (int)$_REQUEST['channelID'] : null; $this->_requestVars['channelID'] = isset($_REQUEST['channelID']) ? $_REQUEST['channelID'] : null;
$this->_requestVars['channelName'] = isset($_REQUEST['channelName']) ? $_REQUEST['channelName'] : null; $this->_requestVars['channelName'] = isset($_REQUEST['channelName']) ? $_REQUEST['channelName'] : null;
$this->_requestVars['text'] = isset($_POST['text']) ? $_POST['text'] : null; $this->_requestVars['text'] = isset($_POST['text']) ? $_POST['text'] : null;
$this->_requestVars['lastID'] = isset($_REQUEST['lastID']) ? (int)$_REQUEST['lastID'] : 0; $this->_requestVars['lastID'] = isset($_REQUEST['lastID']) ? $_REQUEST['lastID'] : '';
$this->_requestVars['login'] = isset($_REQUEST['login']) ? true : false; $this->_requestVars['login'] = isset($_REQUEST['login']) ? true : false;
$this->_requestVars['logout'] = isset($_REQUEST['logout']) ? true : false; $this->_requestVars['logout'] = isset($_REQUEST['logout']) ? true : false;
$this->_requestVars['password'] = isset($_REQUEST['password']) ? $_REQUEST['password'] : null; $this->_requestVars['password'] = isset($_REQUEST['password']) ? $_REQUEST['password'] : null;
@ -3052,14 +3052,14 @@ class AJAXChat {
if($userID === null) { if($userID === null) {
$userID = $this->getUserID(); $userID = $this->getUserID();
} }
return $userID + $this->getConfig('privateChannelDiff'); return $userID . '.' . $this->getConfig('privateChannelDiff');
} }
function getPrivateMessageID($userID=null) { function getPrivateMessageID($userID=null) {
if($userID === null) { if($userID === null) {
$userID = $this->getUserID(); $userID = $this->getUserID();
} }
return $userID + $this->getConfig('privateMessageDiff'); return $userID . '.' . $this->getConfig('privateMessageDiff');
} }
function isAllowedToSendPrivateMessage() { function isAllowedToSendPrivateMessage() {