diff options
| author | Philip Nicolcev <frugen@gmail.com> | 2016-05-03 22:32:55 -0400 |
|---|---|---|
| committer | Philip Nicolcev <frugen@gmail.com> | 2016-05-03 22:32:55 -0400 |
| commit | 0fe32ab65d4731c9b07f60b1a52bfb21093add60 (patch) | |
| tree | b4662fe9da5e1da0644bff1854b9c08eff8b6ba1 | |
| parent | d6289eab170b278b911a9622a8e7ccdc04fd7de2 (diff) | |
| download | AJAX-Chat-0fe32ab65d4731c9b07f60b1a52bfb21093add60.zip AJAX-Chat-0fe32ab65d4731c9b07f60b1a52bfb21093add60.tar.gz AJAX-Chat-0fe32ab65d4731c9b07f60b1a52bfb21093add60.tar.bz2 | |
cs, whitespace tabs
| -rw-r--r-- | chat/js/chat.js | 4 | ||||
| -rw-r--r-- | chat/lib/class/AJAXChat.php | 4 | ||||
| -rw-r--r-- | chat/lib/template/loggedIn.html | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/chat/js/chat.js b/chat/js/chat.js index ca0461d..7ec82de 100644 --- a/chat/js/chat.js +++ b/chat/js/chat.js @@ -120,7 +120,7 @@ var ajaxChat = { }, initConfig: function(config) { - this.token = config["token"]; + this.token = config["token"]; this.loginChannelID = config['loginChannelID']; this.loginChannelName = config['loginChannelName']; this.timerRate = config['timerRate']; @@ -2742,8 +2742,6 @@ var ajaxChat = { }, replaceBBCodeImage: function(url) { - // prevent embeding chat logout URL in images by stripping it from url - url = url.replace("?logout=true", ""); var regExpUrl, maxWidth, maxHeight, link; if(this.settings['bbCodeImages']) { regExpUrl = new RegExp( diff --git a/chat/lib/class/AJAXChat.php b/chat/lib/class/AJAXChat.php index fb1168c..62cf24d 100644 --- a/chat/lib/class/AJAXChat.php +++ b/chat/lib/class/AJAXChat.php @@ -82,7 +82,7 @@ class AJAXChat { $this->_requestVars['getInfos'] = isset($_REQUEST['getInfos']) ? $_REQUEST['getInfos'] : null; $this->_requestVars['lang'] = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : null; $this->_requestVars['delete'] = isset($_REQUEST['delete']) ? (int)$_REQUEST['delete'] : null; - $this->_requestVars['token'] = isset($_REQUEST['token']) ? $_REQUEST['token'] : null; + $this->_requestVars['token'] = isset($_REQUEST['token']) ? $_REQUEST['token'] : null; // Initialize custom request variables: $this->initCustomRequestVars(); @@ -133,7 +133,7 @@ class AJAXChat { $this->startSession(); if($this->isLoggedIn()) { -// Logout if the Session IP is not the same when logged in and ipCheck is enabled: + // Logout if the Session IP is not the same when logged in and ipCheck is enabled: if($this->getConfig('ipCheck') && ($this->getSessionIP() === null || $this->getSessionIP() != $_SERVER['REMOTE_ADDR'])) { $this->logout('IP'); return; diff --git a/chat/lib/template/loggedIn.html b/chat/lib/template/loggedIn.html index dcca486..d02ce02 100644 --- a/chat/lib/template/loggedIn.html +++ b/chat/lib/template/loggedIn.html @@ -172,8 +172,8 @@ document.getElementById('blinkIntervalSetting').value = ajaxChat.getSetting('blinkInterval'); document.getElementById('blinkIntervalNumberSetting').value = ajaxChat.getSetting('blinkIntervalNumber'); } - - ajaxChatConfig.token = '[TOKEN/]'; + + ajaxChatConfig.token = '[TOKEN/]'; ajaxChatConfig.loginChannelID = parseInt('[LOGIN_CHANNEL_ID/]'); ajaxChatConfig.sessionName = '[SESSION_NAME/]'; ajaxChatConfig.cookieExpiration = parseInt('[COOKIE_EXPIRATION/]'); |