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

Fix formatting

Browse Source
This commit is contained in:
Tim Düsterhus 2014-02-28 17:06:50 +01:00
parent 40bc1163f4
commit f4c294a77c
59 changed files with 101 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acptemplate/chatSuspensionList.tpl
View File

@ -163,5 +163,4 @@
<p class="info">{lang}wcf.global.noItems{/lang}</p>
{/if}
{include file='footer'}

1
acptemplate/messageLog.tpl
View File

@ -15,7 +15,6 @@
{/if}
{/if}
<header class="boxHeadline">
<h1>{lang}{@$pageTitle}{/lang}</h1>
</header>

1
acptemplate/roomList.tpl
View File

@ -27,6 +27,7 @@
</nav>
{/hascontent}
</div>
{if $objects|count}
<section id="roomList" class="container containerPadding sortableListContainer marginTop">
<ol class="sortableList" data-object-id="0">

1
contrib/build.php
View File

@ -1,6 +1,7 @@
#!/usr/bin/env php
<?php
namespace be\bastelstu\chat;
/**
* Builds the Chat
*

1
file/acp/be.bastelstu.chat.install.php
View File

@ -56,5 +56,6 @@ public function execute() {
));
}
}
$install = new Install();
$install->execute();

1
file/acp/be.bastelstu.chat.update.php
View File

@ -52,5 +52,6 @@ public function execute() {
}
}
}
$update = new Update();
$update->execute();

38
file/lib/data/message/MessageAction.class.php
View File

@ -167,22 +167,6 @@ public function send() {
return $returnValues['returnValues'];
}
/**
* Fetches messages in between the specified timestamps.
*
* @return array Array containing message table, containerID and information about an empty message table.
*/
public function getMessages() {
// read messages
$messages = ViewableMessageList::getMessagesBetween($this->parameters['room'], $this->parameters['start'], $this->parameters['end']);
return array(
'noMessages' => (count($messages) == 0) ? true : null,
'containerID' => $this->parameters['containerID'],
'template' => WCF::getTPL()->fetch('__messageLogTable', 'chat', array('messages' => $messages), true)
);
}
/**
* Validates getting messages.
*/
@ -200,6 +184,25 @@ public function validateGetMessages() {
if ($this->parameters['room'] === null) throw new \wcf\system\exception\IllegalLinkException();
}
/**
* Fetches messages in between the specified timestamps.
*
* @return array Array containing message table, containerID and information about an empty message table.
*/
public function getMessages() {
// read messages
$messages = ViewableMessageList::getMessagesBetween($this->parameters['room'], $this->parameters['start'], $this->parameters['end']);
return array(
'noMessages' => (count($messages) == 0) ? true : null,
'containerID' => $this->parameters['containerID'],
'template' => WCF::getTPL()->fetch('__messageLogTable', 'chat', array('messages' => $messages), true)
);
}
/**
* Validates setting an attachment.
*/
public function validateSendAttachment() {
// read user data
$this->parameters['userData']['color1'] = WCF::getUser()->chatColor1;
@ -243,6 +246,9 @@ public function validateSendAttachment() {
}
}
/**
* Creates a message linked to an attachment
*/
public function sendAttachment() {
$this->parameters['type'] = Message::TYPE_ATTACHMENT;
$this->parameters['text'] = '[attach]'. $this->parameters['objectID'] .'[/attach]';

4
file/lib/system/attachment/MessageAttachmentObjectType.class.php
View File

@ -48,10 +48,6 @@ public function canDownload($objectID) {
return false;
}
public function canPreview($objectID) {
return $this->canDownload($objectID);
}
/**
* @see wcf\system\attachment\IAttachmentObjectType::canUpload()
*/

2
template/chat.tpl
View File

@ -3,7 +3,7 @@
<head>
<title>{if $room}{$room} - {/if}{lang}chat.global.title{/lang} - {PAGE_TITLE|language}</title>
{include file='headInclude' sandbox=false}
{include file='headInclude'}
{if $room}
{include file='javascriptInclude' application='chat'}
<script data-relocate="true">

1
template/sidebar.tpl
View File

@ -6,6 +6,7 @@
</ul>
</div>
</fieldset>
<fieldset id="timsChatRoomListContainer">
<legend>{lang}chat.global.rooms{/lang}</legend>
<div id="timsChatRoomList">