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

Changing Package Identifier to be.bastelstu.wcf.chat

Browse Source
This commit is contained in:
Tim Düsterhus 2012-03-12 17:18:15 +01:00
parent b3907daf8f
commit 24161a5939
42 changed files with 93 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acloptions.xml
View File

@ -3,30 +3,30 @@
<import>
<categories>
<category name="user">
<objecttype>timwolla.wcf.chat.room</objecttype>
<objecttype>be.bastelstu.wcf.chat.room</objecttype>
</category>
<category name="mod">
<objecttype>timwolla.wcf.chat.room</objecttype>
<objecttype>be.bastelstu.wcf.chat.room</objecttype>
</category>
</categories>
<options>
<option name="user.canEnter">
<objecttype>timwolla.wcf.chat.room</objecttype>
<objecttype>be.bastelstu.wcf.chat.room</objecttype>
<categoryname>user</categoryname>
</option>
<option name="user.canWrite">
<objecttype>timwolla.wcf.chat.room</objecttype>
<objecttype>be.bastelstu.wcf.chat.room</objecttype>
<categoryname>user</categoryname>
</option>
<option name="mod.canAlwaysEnter">
<objecttype>timwolla.wcf.chat.room</objecttype>
<objecttype>be.bastelstu.wcf.chat.room</objecttype>
<categoryname>mod</categoryname>
</option>
<option name="mod.canAlwaysWrite">
<objecttype>timwolla.wcf.chat.room</objecttype>
<objecttype>be.bastelstu.wcf.chat.room</objecttype>
<categoryname>mod</categoryname>
</option>
</options>

10
build.php
View File

@ -6,7 +6,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
*/
echo <<<EOT
Cleaning up
@ -18,7 +18,7 @@
if (file_exists('acptemplate.tar')) unlink('acptemplate.tar');
foreach (glob('file/js/*.js') as $jsFile) unlink($jsFile);
foreach (glob('file/style/*.css') as $cssFile) unlink($cssFile);
if (file_exists('timwolla.wcf.chat.tar')) unlink('timwolla.wcf.chat.tar');
if (file_exists('be.bastelstu.wcf.chat.tar')) unlink('be.bastelstu.wcf.chat.tar');
echo <<<EOT
Building JavaScript
@ -92,12 +92,12 @@
if ($code != 0) exit($code);
echo <<<EOT
Building timwolla.wcf.chat.tar
------------------------------
Building be.bastelstu.wcf.chat.tar
----------------------------------
EOT;
chdir('..');
passthru('tar cvf timwolla.wcf.chat.tar * --exclude=file --exclude=template --exclude=acptemplate --exclude=build.php', $code);
passthru('tar cvf be.bastelstu.wcf.chat.tar * --exclude=file --exclude=template --exclude=acptemplate --exclude=build.php', $code);
if ($code != 0) exit($code);
if (file_exists('file.tar')) unlink('file.tar');

4
eventListener.xml
View File

@ -2,11 +2,11 @@
<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/eventListener.xsd">
<import>
<eventlistener>
<eventclassname>wcf\system\request\RouteHandler</eventclassname>
<eventclassname>\wcf\system\request\RouteHandler</eventclassname>
<eventname>didInit</eventname>
<environment>user</environment>
<inherit>0</inherit>
<listenerclassname>wcf\system\event\listener\ChatRouteListener</listenerclassname>
<listenerclassname>\wcf\system\event\listener\ChatRouteListener</listenerclassname>
</eventlistener>
</import>
</data>

4
file/acp/timwolla.wcf.chat.update.php → file/acp/be.bastelstu.wcf.chat.update.php
View File

@ -1,5 +1,5 @@
<?php
namespace timwolla\wcf\chat;
namespace be\bastelstu\wcf\chat;
/**
* Handles updates.
@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
*/
final class Update {
private $rooms = null;

1
file/icon/chat.svg
View File

@ -4,6 +4,7 @@
@author Maximilian Mader
@copyright 2011 Tim Düsterhus
@license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
@package be.bastelstu.wcf.chat
-->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">
<title>Chat</title>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

1
file/icon/chat1.svg
View File

@ -4,6 +4,7 @@
@author Maximilian Mader
@copyright 2011 Tim Düsterhus
@license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
@package be.bastelstu.wcf.chat
-->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">
<title>Chat</title>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

36
file/js/TimWolla.WCF.Chat.coffee → file/js/be.bastelstu.WCF.Chat.coffee
View File

@ -1,14 +1,16 @@
###
# TimWolla.WCF.Chat
# be.bastelstu.WCF.Chat
#
# @author Tim Düsterhus
# @copyright 2010-2012 Tim Düsterhus
# @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
# @package timwolla.wcf.chat
# @package be.bastelstu.wcf.chat
###
TimWolla ?= {}
TimWolla.WCF ?= {}
be ?= {}
be.bastelstu ?= {}
be.bastelstu.WCF ?= {}
consoleMock = console
consoleMock ?=
log: () ->,
@ -16,7 +18,7 @@ consoleMock ?=
error: () ->
(($, window, console) ->
TimWolla.WCF.Chat =
be.bastelstu.WCF.Chat =
# Tims Chat stops loading when this reaches zero
# TODO: We need an explosion animation
shields: 3
@ -45,7 +47,7 @@ consoleMock ?=
refreshRoomList: null
fish: null
init: () ->
console.log '[TimWolla.WCF.Chat] Initializing'
console.log '[be.bastelstu.WCF.Chat Initializing'
@bindEvents()
@events.newMessage.add $.proxy @notify, @
@ -54,7 +56,7 @@ consoleMock ?=
@refreshRoomList()
@getMessages()
console.log '[TimWolla.WCF.Chat] Finished initializing - Shields at 104 percent'
console.log '[be.bastelstu.WCF.Chat Finished initializing - Shields at 104 percent'
###
# Autocompletes a username
###
@ -120,7 +122,7 @@ consoleMock ?=
firstChars = @autocompleteValue.substring(@autocompleteValue.lastIndexOf(' ')+1)
console.log '[TimWolla.WCF.Chat] Autocompleting "' + firstChars + '"'
console.log '[be.bastelstu.WCF.Chat Autocompleting "' + firstChars + '"'
return if firstChars.length is 0
# Insert name and increment offset
@ -217,7 +219,7 @@ consoleMock ?=
###
freeTheFish: () ->
return if $.wcfIsset 'fish'
console.warn '[TimWolla.WCF.Chat] Freeing the fish'
console.warn '[be.bastelstu.WCF.Chat Freeing the fish'
fish = $ '<div id="fish">' + WCF.String.escapeHTML('><((((\u00B0>') + '</div>'
fish.css
position: 'absolute'
@ -256,12 +258,12 @@ consoleMock ?=
@handleUsers(data.users)
, @)
error: $.proxy((jqXHR, textStatus, errorThrown) ->
console.error '[TimWolla.WCF.Chat] Battle Station hit - shields at ' + (--@shields / 3 * 104) + ' percent'
console.error '[be.bastelstu.WCF.Chat Battle Station hit - shields at ' + (--@shields / 3 * 104) + ' percent'
if @shields is 0
@pe.refreshRoomList.stop()
@pe.getMessages.stop()
@freeTheFish()
console.error '[TimWolla.WCF.Chat] We got destroyed, but could free our friend the fish before he was killed as well. Have a nice life in freedom!'
console.error '[be.bastelstu.WCF.Chat We got destroyed, but could free our friend the fish before he was killed as well. Have a nice life in freedom!'
alert 'herp i cannot load messages'
, @)
###
@ -308,12 +310,12 @@ consoleMock ?=
# Move the user to the correct position
if element[0]
console.log '[TimWolla.WCF.Chat] Moving User: "' + user.username + '"'
console.log '[be.bastelstu.WCF.Chat Moving User: "' + user.username + '"'
element = element.detach()
$('#timsChatUserList').append element
# Insert the user
else
console.log '[TimWolla.WCF.Chat] Inserting User: "' + user.username + '"'
console.log '[be.bastelstu.WCF.Chat Inserting User: "' + user.username + '"'
li = $ '<li></li>'
li.attr 'id', id
li.addClass 'timsChatUser'
@ -339,7 +341,7 @@ consoleMock ?=
# Remove users that were not found
$('.timsChatUser').each () ->
if typeof foundUsers[$(@).attr('id')] is 'undefined'
console.log '[TimWolla.WCF.Chat] Removing User: "' + $(@).data('username') + '"'
console.log '[be.bastelstu.WCF.Chat Removing User: "' + $(@).data('username') + '"'
$(@).remove();
@ -380,7 +382,7 @@ consoleMock ?=
if typeof window.webkitNotifications isnt 'undefined'
if window.webkitNotifications.checkPermission() is 0
title = WCF.Language.get 'wcf.chat.newMessages'
icon = WCF.Icon.get 'timwolla.wcf.chat.chat'
icon = WCF.Icon.get 'be.bastelstu.wcf.chat.chat'
content = message.username + message.separator + ' ' + message.message
notification = window.webkitNotifications.createNotification icon, title, content
notification.show()
@ -391,7 +393,7 @@ consoleMock ?=
# Refreshes the room-list.
###
refreshRoomList: () ->
console.log '[TimWolla.WCF.Chat] Refreshing the roomlist'
console.log '[be.bastelstu.WCF.Chat Refreshing the roomlist'
$('#toggleRooms a').addClass 'ajaxLoad'
$.ajax $('#toggleRooms a').data('refreshUrl'),
@ -414,7 +416,7 @@ consoleMock ?=
@changeRoom $ event.target
, @
console.log '[TimWolla.WCF.Chat] Found ' + data.length + ' rooms'
console.log '[be.bastelstu.WCF.Chat Found ' + data.length + ' rooms'
, @)
###
# Handles submitting of messages.

4
file/lib/acp/form/ChatRoomAddForm.class.php
View File

@ -10,7 +10,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage acp.form
*/
class ChatRoomAddForm extends ACPForm {
@ -42,7 +42,7 @@ class ChatRoomAddForm extends ACPForm {
* @see \wcf\page\AbstractPage::__construct()
*/
public function __construct() {
$this->objectTypeID = \wcf\system\acl\ACLHandler::getInstance()->getObjectTypeID('timwolla.wcf.chat.room');
$this->objectTypeID = \wcf\system\acl\ACLHandler::getInstance()->getObjectTypeID('be.bastelstu.wcf.chat.room');
parent::__construct();
}

2
file/lib/acp/form/ChatRoomEditForm.class.php
View File

@ -9,7 +9,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage acp.form
*/
class ChatRoomEditForm extends ChatRoomAddForm {

2
file/lib/acp/page/ChatRoomListPage.class.php
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage acp.page
*/
class ChatRoomListPage extends \wcf\page\MultipleLinkPage {

2
file/lib/action/ChatLeaveAction.class.php
View File

@ -9,7 +9,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage action
*/
class ChatLeaveAction extends AbstractAction {

2
file/lib/data/chat/message/ChatMessage.class.php
View File

@ -8,7 +8,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.message
*/
class ChatMessage extends \wcf\data\DatabaseObject {

2
file/lib/data/chat/message/ChatMessageAction.class.php
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.message
*/
class ChatMessageAction extends \wcf\data\AbstractDatabaseObjectAction {

2
file/lib/data/chat/message/ChatMessageEditor.class.php
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.message
*/
class ChatMessageEditor extends \wcf\data\DatabaseObjectEditor {

2
file/lib/data/chat/message/ChatMessageList.class.php
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.room
*/
class ChatMessageList extends \wcf\data\DatabaseObjectList {

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

@ -9,7 +9,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.room
*/
class ChatRoom extends \wcf\data\DatabaseObject implements \wcf\system\request\IRouteController {

2
file/lib/data/chat/room/ChatRoomAction.class.php
View File

@ -8,7 +8,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.room
*/
class ChatRoomAction extends \wcf\data\AbstractDatabaseObjectAction {

2
file/lib/data/chat/room/ChatRoomEditor.class.php
View File

@ -8,7 +8,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.room
*/
class ChatRoomEditor extends \wcf\data\DatabaseObjectEditor implements \wcf\data\IEditableCachedObject {

2
file/lib/data/chat/room/ChatRoomList.class.php
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage data.chat.room
*/
class ChatRoomList extends \wcf\data\DatabaseObjectList {

2
file/lib/form/ChatForm.class.php
View File

@ -11,7 +11,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage form
*/
class ChatForm extends AbstractForm {

2
file/lib/page/ChatCopyrightPage.class.php
View File

@ -8,7 +8,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage page
*/
class ChatCopyrightPage extends AbstractPage {

2
file/lib/page/ChatMessagePage.class.php
View File

@ -9,7 +9,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage page
*/
class ChatMessagePage extends AbstractPage {

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

@ -10,7 +10,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage page
*/
class ChatPage extends AbstractPage {
@ -51,7 +51,7 @@ public function readChatVersion() {
);
$packages = CacheHandler::getInstance()->get('packages');
foreach ($packages as $package) {
if ($package->package != 'timwolla.wcf.chat') continue;
if ($package->package != \wcf\util\ChatUtil::PACKAGE_IDENTIFIER) continue;
$this->chatVersion = $package->packageVersion;
return;
}

2
file/lib/page/ChatRefreshRoomListPage.class.php
View File

@ -10,7 +10,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage page
*/
class ChatRefreshRoomListPage extends AbstractPage {

4
file/lib/system/cache/builder/ChatPermissionCacheBuilder.class.php vendored
View File

@ -8,7 +8,7 @@
* @author Tim Düsterhus, Marcel Werk
* @copyright 2010-2012 WoltLab GmbH
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.cache.builder
*/
class ChatPermissionCacheBuilder implements ICacheBuilder {
@ -23,7 +23,7 @@ public function getData(array $cacheResource) {
if (count($groupIDs)) {
$conditionBuilder = new \wcf\system\database\util\PreparedStatementConditionBuilder();
$conditionBuilder->add('acl_option.packageID IN (?)', array(\wcf\system\package\PackageDependencyHandler::getInstance()->getDependencies()));
$conditionBuilder->add('acl_option.objectTypeID = ?', array(\wcf\system\acl\ACLHandler::getInstance()->getObjectTypeID('timwolla.wcf.chat.room')));
$conditionBuilder->add('acl_option.objectTypeID = ?', array(\wcf\system\acl\ACLHandler::getInstance()->getObjectTypeID('be.bastelstu.wcf.chat.room')));
$conditionBuilder->add('option_to_group.optionID = acl_option.optionID');
$conditionBuilder->add('option_to_group.groupID IN (?)', array($groupIDs));
$sql = "SELECT option_to_group.groupID, option_to_group.objectID AS roomID, option_to_group.optionValue,

2
file/lib/system/cache/builder/ChatRoomCacheBuilder.class.php vendored
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.cache.builder
*/
class ChatRoomCacheBuilder implements ICacheBuilder {

2
file/lib/system/chat/commands/ChatCommandHandler.class.php
View File

@ -8,7 +8,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.chat.commands
*/
class ChatCommandHandler {

4
file/lib/system/chat/permission/ChatPermissionHandler.class.php
View File

@ -11,7 +11,7 @@
* @author Tim Düsterhus, Marcel Werk
* @copyright 2010-2012 WoltLab GmbH
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.chat.permissions
*/
class ChatPermissionHandler extends \wcf\system\SingletonFactory {
@ -50,7 +50,7 @@ protected function init() {
$conditionBuilder = new \wcf\system\database\util\PreparedStatementConditionBuilder();
$conditionBuilder->add('acl_option.packageID IN (?)', array(PackageDependencyHandler::getInstance()->getDependencies()));
$conditionBuilder->add('acl_option.objectTypeID = ?', array(ACLHandler::getInstance()->getObjectTypeID('timwolla.wcf.chat.room')));
$conditionBuilder->add('acl_option.objectTypeID = ?', array(ACLHandler::getInstance()->getObjectTypeID('be.bastelstu.wcf.chat.room')));
$conditionBuilder->add('option_to_user.optionID = acl_option.optionID');
$conditionBuilder->add('option_to_user.userID = ?', array(WCF::getUser()->userID));
$sql = "SELECT option_to_user.objectID AS roomID, option_to_user.optionValue,

2
file/lib/system/cronjob/ChatCleanupCronjob.class.php
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.cronjob
*/
class ChatCleanupCronjob implements ICronjob {

2
file/lib/system/event/listener/ChatRouteListener.class.php
View File

@ -7,7 +7,7 @@
* @author Maximilian Mader
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.event.listener
*/
class ChatRouteListener implements \wcf\system\event\IEventListener {

2
file/lib/system/menu/page/ChatPageMenuItemProvider.class.php
View File

@ -8,7 +8,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.menu.page
*/
class ChatPageMenuItemProvider extends DefaultPageMenuItemProvider {

2
file/lib/system/option/TimeIntervalOptionType.class.php
View File

@ -7,7 +7,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage system.option
*/
class TimeIntervalOptionType extends TextOptionType {

4
file/lib/util/ChatUtil.class.php
View File

@ -10,7 +10,7 @@
* @author Tim Düsterhus
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
* @subpackage util
*/
class ChatUtil {
@ -27,7 +27,7 @@ class ChatUtil {
*
* @var string
*/
const PACKAGE_IDENTIFIER = 'timwolla.wcf.chat';
const PACKAGE_IDENTIFIER = 'be.bastelstu.wcf.chat';
public static $serialize = array('color' => true);

4
file/style/timwolla.wcf.chat.scss → file/style/be.bastelstu.wcf.chat.scss
View File

@ -1,10 +1,10 @@
/**
* Chat-Styles
* Styles for Tims Chat
*
* @author Tim Düsterhus, Maximilian Mader
* @copyright 2010-2012 Tim Düsterhus
* @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
* @package timwolla.wcf.chat
* @package be.bastelstu.wcf.chat
*/
#timsChatRoomContent {

9
install.sql
View File

@ -1,3 +1,12 @@
----
-- Database Structure for Tims Chat
--
-- @author Tim Düsterhus
-- @copyright 2010-2012 Tim Düsterhus
-- @license Creative Commons Attribution-NonCommercial-ShareAlike <http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode>
-- @package be.bastelstu.wcf.chat
----
DROP TABLE IF EXISTS wcf1_chat_message;
CREATE TABLE wcf1_chat_message (
messageID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,

2
language/de.xml
View File

@ -42,7 +42,7 @@
<item name="wcf.chat.protocol"><![CDATA[Protokoll]]></item>
<item name="wcf.chat.rooms"><![CDATA[Räume]]></item>
<item name="wcf.chat.users"><![CDATA[Nutzer]]></item>
<item name="wcf.chat.copyright"><![CDATA[<a href="http://timwolla.wbbaddons.de">Chat: <strong>Tims Chat</strong>{if CHAT_SHOW_VERSION} {$chatVersion}{/if}, entwickelt von <strong>TimWolla</strong></a>]]></item>
<item name="wcf.chat.copyright"><![CDATA[<a href="http://tims.bastelstu.be">Chat: <strong>Tims Chat</strong>{if CHAT_SHOW_VERSION} {$chatVersion}{/if}, entwickelt von <strong>TimWolla</strong></a>]]></item>
<item name="wcf.chat.submit.default"><![CDATA[Zum Senden Enter drücken]]></item>
<item name="wcf.chat.scroll"><![CDATA[Scrollen]]></item>

2
objectType.xml
View File

@ -2,7 +2,7 @@
<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/object-type.xsd">
<import>
<type>
<name>timwolla.wcf.chat.room</name>
<name>be.bastelstu.wcf.chat.room</name>
<definitionname>com.woltlab.wcf.acl</definitionname>
</type>
</import>

4
package.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<package name="timwolla.wcf.chat" xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/package.xsd">
<package name="be.bastelstu.wcf.chat" xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/package.xsd">
<packageinformation>
<packagename><![CDATA[Tims Chat]]></packagename>
<packagedescription><![CDATA[Chat for WoltLab Community Framework™]]></packagedescription>
@ -49,6 +49,6 @@
<instruction type="aclOption">acloptions.xml</instruction>
<instruction type="acpMenu">acpMenu.xml</instruction>
<instruction type="userGroupOption">userGroupOption.xml</instruction>
<instruction type="script">acp/timwolla.wcf.chat.update.php</instruction>
<instruction type="script">acp/be.bastelstu.wcf.chat.update.php</instruction>
</instructions>
</package>

2
pagemenu.xml
View File

@ -4,7 +4,7 @@
<pagemenuitem name="wcf.header.menu.chat">
<link>index.php/Chat</link>
<position>header</position>
<classname>wcf\system\menu\page\ChatPageMenuItemProvider</classname>
<classname>\wcf\system\menu\page\ChatPageMenuItemProvider</classname>
</pagemenuitem>
</import>
</data>

14
template/chat.tpl
View File

@ -5,7 +5,7 @@
{include file='headInclude' sandbox=false}
<style type="text/css">
@import url("{@$__wcf->getPath('wcf')}style/timwolla.wcf.chat.css");
@import url("{@$__wcf->getPath('wcf')}style/be.bastelstu.chat.css");
#timsChatCopyrightDialog {
background-image: url("{link controller='Chat' action='Copyright' sheep=1}{/link}");
background-position: right 45px;
@ -109,12 +109,12 @@
//<![CDATA[
(function ($, window) {
// populate templates
TimWolla.WCF.Chat.titleTemplate = (new WCF.Template('{ldelim}$title} - {'wcf.chat.title'|language|encodeJS} - {PAGE_TITLE|language|encodeJS}')).compile();
be.bastelstu.WCF.Chat.titleTemplate = (new WCF.Template('{ldelim}$title} - {'wcf.chat.title'|language|encodeJS} - {PAGE_TITLE|language|encodeJS}')).compile();
{capture assign='chatMessageTemplate'}{include file='chatMessage'}{/capture}
TimWolla.WCF.Chat.messageTemplate = (new WCF.Template('{@$chatMessageTemplate|encodeJS}')).compile();
be.bastelstu.WCF.Chat.messageTemplate = (new WCF.Template('{@$chatMessageTemplate|encodeJS}')).compile();
// populate config
TimWolla.WCF.Chat.config = {
be.bastelstu.WCF.Chat.config = {
reloadTime: {@CHAT_RELOADTIME},
unloadURL: '{link controller='Chat' action='Leave'}{/link}'
}
@ -126,15 +126,15 @@
'wcf.chat.newMessages': '{lang}wcf.chat.newMessages{/lang}'
});
WCF.Icon.addObject({
'timwolla.wcf.chat.chat': '{icon size='L'}chat1{/icon}'
'be.bastelstu.wcf.chat.chat': '{icon size='L'}chat1{/icon}'
});
{event name='shouldInit'}
// Boot the chat
TimWolla.WCF.Chat.init();
be.bastelstu.WCF.Chat.init();
{event name='didInit'}
// show the last X messages
TimWolla.WCF.Chat.handleMessages([
be.bastelstu.WCF.Chat.handleMessages([
{implode from=$newestMessages item='message'}
{@$message->jsonify()}
{/implode}

4
template/chatCopyright.tpl
View File

@ -1,7 +1,7 @@
{if $templateName == 'chat'}<address id="timsChatCopyright" class="copyright">{lang}wcf.chat.copyright{/lang}</address>
{elseif $templateName == 'chatCopyright'}
<dl><dt>Project-Leader</dt><dd><ul><li><a href="http://timwolla.wbbaddons.de/">Tim Düsterhus</a></li></ul></dd></dl>
<dl><dt>Developer</dt><dd><ul><li><a href="http://timwolla.wbbaddons.de/">Tim Düsterhus</a></li><li><a href="https://github.com/max-m">Maximilian Mader</a></li></ul></dd></dl>
<dl><dt>Project-Leader</dt><dd><ul><li><a href="http://tims.bastelstu.be/">Tim Düsterhus</a></li></ul></dd></dl>
<dl><dt>Developer</dt><dd><ul><li><a href="http://tims.bastelstu.be/">Tim Düsterhus</a></li><li><a href="https://github.com/max-m">Maximilian Mader</a></li></ul></dd></dl>
<dl><dt>Graphics</dt><dd><ul><li><a href="http://www.cls-design.com/">Tom</a></li></ul></dd></dl>
<dl><dt>Translation</dt><dd><ul><li>Riccardo Vianello (it)</li></ul></dd></dl>
<dl><dt>Thanks</dt><dd><ul><li><a href="http://www.wbbaddons.de/user/2020-noone/">-noone-</a></li><li><a href="https://github.com/dtdesign">Alexander Ebert</a></li><li>Gabi</li><li><a href="https://github.com/Leon-">Stefan Hahn</a></li><li><a href="http://packageforge.de">Oliver Kliebisch</a></li><li>Christian Kubandt</li><li><a href="http://www.wbbaddons.de">Martin Schwendowius</a></li></ul></dd></dl>

2
template/chatJavascriptInclude.tpl
View File

@ -1,2 +1,2 @@
<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/TimWolla.WCF.Chat.js{if $chatVersion|isset}?version={$chatVersion|urlencode}{/if}"></script>
<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/be.bastelstu.WCF.Chat.js{if $chatVersion|isset}?version={$chatVersion|urlencode}{/if}"></script>
<script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/jCounter.jQuery.js"></script>