Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00
Code Issues Releases Wiki Activity

Redirect to correct room if there is no id given

Browse Source 
Additionally pass rooms to template
This commit is contained in:
Tim Düsterhus 2011-11-26 17:56:51 +01:00
parent aba9a07a3c
commit 74464ff83b
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
file/lib/data/chat/room/ChatRoom.class.php
View File

@ -11,7 +11,7 @@
* @package timwolla.wcf.chat * @package timwolla.wcf.chat
* @subpackage data.chat.room * @subpackage data.chat.room
*/ */
class ChatRoom extends \wcf\data\DatabaseObject { class ChatRoom extends \wcf\data\DatabaseObject implements \wcf\system\request\IRouteController {
/** /**
* @see wcf\data\DatabaseObject::$databaseTableName * @see wcf\data\DatabaseObject::$databaseTableName
*/ */
@ -46,11 +46,27 @@ public static function getCache() {
} }
/** /**
* Returns the name of this chat-room. * @see \wcf\data\chat\room\ChatRoom::getTitle();
*
* @return string
*/ */
public function __tostring() { public function __tostring() {
return $this->getTitle;
}
/**
* Returns the name of this chat-room.
*
* @see \wcf\system\request\IRouteController
*/
public function getTitle() {
return $this->title; return $this->title;
} }
/**
* Returns the ID of this chat-room.
*
* @see \wcf\system\request\RRouteHandler
*/
public function getID() {
return $this->roomID;
}
} }

11
file/lib/page/ChatPage.class.php
View File

@ -26,7 +26,9 @@ public function assignVariables() {
parent::assignVariables(); parent::assignVariables();
WCF::getTPL()->assign(array( WCF::getTPL()->assign(array(
'roomID' => $this->roomID 'room' => $this->room,
'roomID' => $this->roomID,
'rooms' => $this->rooms
)); ));
} }
@ -36,6 +38,13 @@ public function assignVariables() {
public function readData() { public function readData() {
parent::readData(); parent::readData();
$this->rooms = chat\room\ChatRoom::getCache(); $this->rooms = chat\room\ChatRoom::getCache();
if ($this->roomID === 0) {
$this->rooms->seek(0);
\wcf\util\HeaderUtil::redirect(\wcf\system\request\LinkHandler::getInstance()->getLink('Chat', array(
'object' => $this->rooms->search($this->rooms->key())
)));
exit;
}
$this->room = $this->rooms->search($this->roomID); $this->room = $this->rooms->search($this->roomID);
if (!$this->room) throw new \wcf\system\exception\IllegalLinkException(); if (!$this->room) throw new \wcf\system\exception\IllegalLinkException();