';
+ // Control data for the form
+ $form['control'] = array(
+ '#type' => 'fieldset',
+ '#attributes' => array('id' => 'edit-control-fieldset'),
+ );
+ $data = array('nid', 'ccid', 'last_cmid');
+ foreach ($data as $key) {
+ $form['control'][$key] = array(
+ '#type' => 'hidden',
+ '#value' => $chat->{$key},
+ );
+ }
+ $form['control']['control'] = array('#type' => 'hidden');
+ // The actual submit button. Not displayed so the user isn't troubled with a
+ // whole bunch of throbbers.
+ $form['control']['submit'] = array(
+ '#type' => 'submit',
+ '#name' => 'submit',
+ '#ahah' => array(
+ 'path' => 'chatroom/js',
+ 'wrapper' => 'chatroom-board',
+ 'method' => 'append',
+ ),
+ );
+ // Other form elements.
+ $form['message'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Type your message'),
+ '#size' => 50,
+ );
+ $form['away'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Show me as away.'),
+ '#name' => 'away',
+ );
+ if (variable_get('chatroom_alerts', FALSE)) {
+ $checked = variable_get('chatroom_alerts_default', FALSE) ? ' checked' : '';
+ $form['alerts'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Alert me if new messages are received.'),
+ '#name' => 'alert',
+ );
+ }
+ return $form;
+}
+
+/**
+ * Return a create chat form.
+ */
+function chatroom_create_chat_form(&$form_state, $room) {
+ $form['chatroom_create_chat'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Create a new chat'),
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
+ );
+ $form['chatroom_create_chat']['chat_name'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Chat name'),
+ '#size' => 30,
+ '#required' => TRUE,
+ '#description' => t('Enter the name for the chat'),
+ );
+ $form['chatroom_create_chat']['nid'] = array(
+ '#type' => 'hidden',
+ '#value' => $room->nid,
+ );
+ $form['chatroom_create_chat']['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Create chat'),
+ );
+ $form['#validate'][] = 'chatroom_create_chat_form_validate';
+ $form['#submit'][] = 'chatroom_create_chat_form_submit';
+ return $form;
+}
+
+/**
+ * Validate attempt to create chat - check if name is already in use.
+ */
+function chatroom_create_chat_form_validate($form, &$form_state) {
+ $nid = $form_state['values']['nid'];
+ $name = $form_state['values']['chat_name'];
+ $sql = "SELECT COUNT(ccid) FROM {chatroom_chat} WHERE crid = %d AND chatname = '%s' AND when_archived IS NULL";
+ if (db_result(db_query_range($sql, $nid, $name, 0, 1))) {
+ form_set_error('chatroom_chat_name', t('A chat called %name already exists.', array('%name' => $name)));
+ }
+}
+
+/**
+ * Create a chat.
+ */
+function chatroom_create_chat_form_submit($form, &$form_state) {
+ global $user;
+ $created = db_query("
+ INSERT INTO {chatroom_chat} (crid, uid, chatname, modified)
+ VALUES (%d, %d, '%s', %d)
+ ", $form_state['values']['nid'], $user->uid, $form_state['values']['chat_name'], time());
+ if (!$created) {
+ drupal_set_message(t("There was an error creating your chat"), 'error');
+ }
+ else {
+ cache_clear_all(TRUE, 'cache_block');
+ }
+}
+
+/**
+ * Form to delete an archived chat.
+ *
+ * @param integer $chat_id
+ * @return array
+ */
+function chatroom_delete_chat_form($ccid = NULL) {
+ $form = array();
+ $form['ccid'] = array(
+ '#type' => 'value',
+ '#value' => $chat_id,
+ );
+ $form['delete'] = array(
+ '#type' => 'submit',
+ '#value' => t('Delete this chat'),
+ );
+ return $form;
+}
+
+/**
+ * Delete an archived chat
+ *
+ * @param array $form_id
+ * @param array $form_values
+ * @return string
+ */
+function chatroom_delete_chat_form_submit($form, &$form_state) {
+ $chat = chatroom_chat_get_from_id($form_state['values']['chat_id']);
+ chatroom_chat_delete($form_state['values']['chat_id']);
+ $form_state['redirect'] = "node/$chat->nid";
+}
+
+/**
+ * form for archived chat view of open chat to archive that chat
+ *
+ * @param integer $chat_id
+ * @return array
+ */
+function chatroom_archive_chat_form($chat_id) {
+ $form['chat_id'] = array(
+ '#type' => 'value',
+ '#value' => $chat_id,
+ );
+ $form['delete'] = array(
+ '#type' => 'submit',
+ '#value' => t('Archive this chat'),
+ );
+ return $form;
+}
+
+/**
+ * Archive an open chat.
+ *
+ * @param array $form_id
+ * @param array $form_values
+ * @return string
+ */
+function chatroom_form_chat_archive_submit($form, &$form_state) {
+ chatroom_archive_chat($form_state['values']['chat_id']);
+ file_delete(_chatroom_get_cache_file('chat.'. $form_state['values']['chat_id']));
+ db_query("
+ INSERT INTO {chatroom_msg_archive} (cmid, ccid, uid, msg_type, msg, session_id, recipient, modified)
+ SELECT * FROM {chatroom_msg} WHERE ccid = %d
+ ", $form_state['values']['chat_id']);
+ $chat = chatroom_chat_get_from_id($form_state['values']['chat_id']);
+ cache_clear_all(TRUE, 'cache_block');
+}
diff -Naur chatroom/chatroom.info chatroom-6.x-dev/chatroom.info
--- chatroom/chatroom.info 2007-10-12 09:10:02.000000000 -0400
+++ chatroom-6.x-dev/chatroom.info 2008-10-18 21:14:27.000000000 -0400
@@ -1,9 +1,5 @@
-; $Id: chatroom.info,v 1.1.2.4 2007/06/28 12:09:20 darrenoh Exp $
+; $Id$
name = Chat Room
description = Enables the creation of rooms that provide access to chats and chat archives.
-
-; Information added by drupal.org packaging script on 2007-10-12
-version = "5.x-1.9"
-project = "chatroom"
-datestamp = "1192194602"
+core = 6.x
diff -Naur chatroom/chatroom.install chatroom-6.x-dev/chatroom.install
--- chatroom/chatroom.install 2007-10-11 11:28:29.000000000 -0400
+++ chatroom-6.x-dev/chatroom.install 2008-10-18 21:14:27.000000000 -0400
@@ -1,9 +1,225 @@
array(
+ 'nid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => t('Primary key: node ID of the chatroom.'),
+ ),
+ 'poll_freq' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 3000,
+ 'description' => t('Polling interval, in milliseconds, of the chat.'),
+ ),
+ 'idle_freq' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 60000,
+ 'description' => t('Idle interval, in milliseconds, of the chat.'),
+ ),
+ 'kicked_out_message' => array(
+ 'type' => 'text',
+ 'size' => 'big',
+ 'description' => t('Message sent to users kicked from the chat.'),
+ ),
+ 'banned_message' => array(
+ 'type' => 'text',
+ 'size' => 'big',
+ 'description' => t('Message sent to users banned from the chat.'),
+ ),
+ 'module' => array(
+ 'type' => 'varchar',
+ 'length' => '255',
+ 'default' => 'chatroom',
+ 'description' => t('Unknown.'),
+ ),
+ 'auto_archive' => array(
+ 'type' => 'int',
+ 'default' => 0,
+ 'description' => t('Unknown.'),
+ ),
+ 'old_msg_count' => array(
+ 'type' => 'int',
+ 'default' => 20,
+ 'description' => t('Unknown. Number of old messages?'),
+ ),
+ ),
+ 'primary key' => array('nid'),
+ );
+ $schema['chatroom_ban_list'] = array(
+ 'fields' => array(
+ 'nid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => t('Chatroom ID.'),
+ ),
+ 'uid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => t('ID of the banned user.'),
+ ),
+ 'admin_uid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => t('ID of the chatroom admin who imposed the ban.'),
+ ),
+ 'modified' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ 'description' => t('UNIX timestamp of when the ban was imposed.'),
+ ),
+ ),
+ 'primary key' => array('admin_uid', 'uid'),
+ );
+ $schema['chatroom_chat'] = array(
+ 'fields' => array(
+ 'ccid' => array(
+ 'type' => 'serial',
+ 'not null' => TRUE,
+ 'description' => t('Primary key: ID of the chat.'),
+ ),
+ 'crid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => t('ID of the chatroom the chat belongs to.'),
+ ),
+ 'uid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => t('ID of the user who created the chat.'),
+ ),
+ 'chatname' => array(
+ 'type' => 'varchar',
+ 'length' => '255',
+ 'description' => t('Name of the chat.'),
+ ),
+ 'modified' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ 'description' => t('UNIX timestamp of when the chat was last modified.'),
+ ),
+ 'when_archived' => array(
+ 'type' => 'int',
+ 'description' => t('UNIX timestamp of when the chat was last archived.'),
+ ),
+ ),
+ 'indexes' => array(
+ 'crid' => array('crid'),
+ 'modified' => array('modified'),
+ ),
+ 'primary key' => array('ccid'),
+ );
+ $schema['chatroom_msg'] = array(
+ 'fields' => array(
+ 'cmid' => array(
+ 'type' => 'serial',
+ 'not null' => TRUE,
+ ),
+ 'ccid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ ),
+ 'uid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ ),
+ 'msg_type' => array(
+ 'type' => 'varchar',
+ 'length' => '64',
+ 'not null' => TRUE,
+ ),
+ 'msg' => array(
+ 'type' => 'text',
+ 'size' => 'big',
+ ),
+ 'sid' => array(
+ 'type' => 'varchar',
+ 'length' => '64',
+ 'not null' => TRUE,
+ ),
+ 'recipient' => array(
+ 'type' => 'varchar',
+ 'length' => '255',
+ 'not null' => TRUE,
+ ),
+ 'archived' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ 'modified' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ ),
+ 'indexes' => array(
+ 'ccid' => array('ccid'),
+ 'modified' => array('modified'),
+ 'recipient' => array('recipient'),
+ 'sid' => array('sid')
+ ),
+ 'primary key' => array('cmid'),
+ );
+ $schema['chatroom_online_list'] = array(
+ 'fields' => array(
+ 'ccid' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'description' => t('Chat ID.'),
+ ),
+ 'sid' => array(
+ 'type' => 'varchar',
+ 'length' => '64',
+ 'not null' => TRUE,
+ 'description' => t('Session ID.'),
+ ),
+ 'guest_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 1,
+ 'description' => t('Unknown.'),
+ ),
+ 'away' => array(
+ 'type' => 'int',
+ 'default' => 0,
+ 'description' => t('Boolean: whether the user is away.'),
+ ),
+ 'is_admin' => array(
+ 'type' => 'int',
+ 'default' => 0,
+ 'description' => t('Boolean: whether the user is an admin.'),
+ ),
+ 'modified' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ 'description' => t('UNIX timestamp of when the user was last seen.'),
+ ),
+ ),
+ 'primary key' => array('ccid', 'sid'),
+ );
+ return $schema;
+}
/**
* Implementation of hook_requirements().
*/
+/*
function chatroom_requirements($phase) {
$requirements = array();
if ($GLOBALS['db_type'] == 'mysql' && version_compare(db_version(), '4.1') < 0) {
@@ -15,195 +231,28 @@
);
}
return $requirements;
-}
+}*/
/**
- * Implementation of hook_install()
+ * Implementation of hook_install().
*/
function chatroom_install() {
- $t = get_t();
- switch ($GLOBALS['db_type']) {
- case 'mysql':
- case 'mysqli':
- // check to see if we have mysql 4.1. if we do, then we want to
- // set the default charset to utf8. snippet taken from db_connect()
- // in includes/database.mysql.inc and utf8 declaration taken from
- // database/database.4.1.mysql
- $utf_declaration = '';
- if (version_compare(mysql_get_server_info(), '4.1.0', '>=')) {
- $utf_declaration = 'DEFAULT CHARACTER SET utf8';
- }
- global $active_db;
- $ok = db_query("CREATE TABLE {chatroom} (
- crid int(11) NOT NULL AUTO_INCREMENT,
- nid int(11) NOT NULL,
- poll_freq int(2) NOT NULL default '3000',
- idle_freq int(3) NOT NULL default '60000',
- kicked_out_message longtext,
- banned_message longtext,
- module varchar(255) default 'chatroom',
- auto_archive int(1) default '0',
- old_msg_count int(3) default '20',
- modified int(11) NOT NULL default '0',
- PRIMARY KEY (crid),
- KEY nid (nid)
- ) $utf_declaration;");
- $ok = $ok && db_query("CREATE TABLE {chatroom_chat} (
- ccid int(11) NOT NULL AUTO_INCREMENT,
- crid int(11) NOT NULL,
- uid int(11) NOT NULL,
- chatname varchar(255) NOT NULL,
- modified int(11) NOT NULL default '0',
- when_archived int(11) default NULL,
- PRIMARY KEY (ccid),
- KEY crid (crid),
- KEY modified (modified)
- ) $utf_declaration;");
- $ok = $ok && db_query("CREATE TABLE {chatroom_msg} (
- cmid int(11) NOT NULL AUTO_INCREMENT,
- ccid int(11) NOT NULL,
- uid int(11) NOT NULL,
- msg_type varchar(64) NOT NULL,
- msg longtext NOT NULL,
- session_id varchar(255) NOT NULL,
- recipient varchar(255) NOT NULL,
- modified int(11) NOT NULL default '0',
- PRIMARY KEY (cmid),
- KEY ccid (ccid),
- KEY session_id (session_id),
- KEY recipient (recipient),
- KEY modified (modified)
- ) $utf_declaration;");
- $ok = $ok && db_query("CREATE TABLE {chatroom_msg_archive} (
- cmid int(11) NOT NULL,
- ccid int(11) NOT NULL,
- uid int(11) NOT NULL,
- msg_type varchar(64) NOT NULL,
- msg varchar(512) NOT NULL,
- session_id varchar(255) NOT NULL,
- recipient varchar(255) NOT NULL,
- modified int(11) NOT NULL default '0',
- PRIMARY KEY (cmid),
- KEY ccid (ccid),
- KEY session_id (session_id),
- KEY recipient (recipient),
- KEY modified (modified)
- ) $utf_declaration;");
- $ok = $ok && db_query("CREATE TABLE {chatroom_ban_list} (
- crid int(11) NOT NULL AUTO_INCREMENT,
- uid int(11) NOT NULL,
- admin_uid int(11) NOT NULL,
- modified int(11) NOT NULL default '0',
- KEY crid_uid (crid,uid)
- ) $utf_declaration;");
- $ok = $ok && db_query("CREATE TABLE {chatroom_online_list} (
- coid int(11) NOT NULL AUTO_INCREMENT,
- ccid int(11) NOT NULL,
- uid int(11) NOT NULL,
- session_id varchar(255) NOT NULL,
- guest_id int(11) NOT NULL default '1',
- away int(1) default '0',
- is_admin int(1) default '0',
- modified int(11) NOT NULL default '0',
- PRIMARY KEY (coid),
- KEY update_time (ccid,uid,session_id)
- ) $utf_declaration;");
- break;
- case 'pgsql':
- $ok = db_query("CREATE TABLE {chatroom} (
- crid SERIAL NOT NULL,
- nid INTEGER NOT NULL,
- poll_freq INTEGER NOT NULL default 3000,
- idle_freq INTEGER NOT NULL default 60000,
- kicked_out_message TEXT,
- banned_message TEXT,
- module VARCHAR default 'chatroom',
- auto_archive INTEGER default 0,
- old_msg_count INTEGER default 20,
- modified INTEGER NOT NULL default '0',
- PRIMARY KEY (crid)
- );");
- $ok = $ok && db_query("CREATE TABLE {chatroom_chat} (
- ccid SERIAL NOT NULL,
- crid INTEGER NOT NULL,
- uid INTEGER NOT NULL,
- chatname VARCHAR NOT NULL,
- modified INTEGER NOT NULL default 0,
- when_archived INTEGER default NULL,
- PRIMARY KEY (ccid)
- );");
- $ok = $ok && db_query("CREATE TABLE {chatroom_msg} (
- cmid SERIAL NOT NULL,
- ccid INTEGER NOT NULL,
- uid INTEGER NOT NULL,
- msg_type VARCHAR NOT NULL,
- msg TEXT NOT NULL,
- session_id VARCHAR NOT NULL,
- recipient VARCHAR NOT NULL,
- modified INTEGER NOT NULL default 0,
- PRIMARY KEY (cmid)
- );");
- $ok = $ok && db_query("CREATE TABLE {chatroom_msg_archive} (
- cmid SERIAL NOT NULL,
- ccid INTEGER NOT NULL,
- uid INTEGER NOT NULL,
- msg_type VARCHAR NOT NULL,
- msg TEXT NOT NULL,
- session_id VARCHAR NOT NULL,
- recipient VARCHAR NOT NULL,
- modified INTEGER NOT NULL default '0',
- PRIMARY KEY (cmid)
- );");
- $ok = $ok && db_query("CREATE TABLE {chatroom_ban_list} (
- crid SERIAL NOT NULL,
- uid INTEGER NOT NULL,
- admin_uid INTEGER NOT NULL,
- modified INTEGER NOT NULL default '0',
- PRIMARY KEY (crid,uid)
- ) $utf_declaration;");
- $ok = $ok && db_query("CREATE TABLE {chatroom_online_list} (
- coid SERIAL NOT NULL,
- ccid INTEGER NOT NULL,
- uid INTEGER NOT NULL,
- session_id VARCHAR NOT NULL,
- guest_id INTEGER NOT NULL default '1',
- away INTEGER default '0',
- is_admin INTEGER default '0',
- modified INTEGER NOT NULL default '0',
- PRIMARY KEY (coid)
- );");
- break;
- }
- $error = FALSE;
- if (!$ok) {
- $error = $t('A database operation failed when setting up Chat Room.');
- db_query('DROP TABLE {chatroom}');
- db_query('DROP TABLE {chatroom_chat}');
- db_query('DROP TABLE {chatroom_msg}');
- db_query('DROP TABLE {chatroom_msg_archive}');
- db_query('DROP TABLE {chatroom_ban_list}');
- db_query('DROP TABLE {chatroom_online_list}');
- }
- if ($error) {
- $error .= $t('Please fix these errors and attempt to enable Chat Room again.');
- drupal_set_message($error, 'error');
- db_query("UPDATE {system} SET status = 0 WHERE name = 'chatroom'");
- }
- else {
- global $user;
- $themes = list_themes();
- $theme = $user->theme && $themes[$user->theme]->status ? $user->theme : variable_get('theme_default', 'garland');
- db_query("INSERT INTO {blocks} (status, weight, region, throttle, module, delta, theme) VALUES (1, -10, 'left', 0, 'chatroom', '2', '%s')", $theme);
- variable_set('comment_chatroom', variable_get('comment_chatroom', COMMENT_NODE_DISABLED));
- variable_set('chatroom_guest_user_prefix', $t('guest-'));
- drupal_set_message($t('Chat Room is ready to go.'));
+ drupal_install_schema('chatroom');
+
+ if (function_exists('block_rehash')) {
+ _block_rehash();
}
+
+ drupal_set_message(t('Chat room module enabled.'));
}
/**
* Implementation of hook_disable().
*/
function chatroom_disable() {
+
+ // Empty cache
+/*
$path = file_directory_temp();
if ($dir = @opendir($path .'/drupal.chatroom.'. session_name())) {
$path .= '/drupal.chatroom.'. session_name();
@@ -222,7 +271,7 @@
}
}
closedir($dir);
- }
+ }*/
}
/**
@@ -234,12 +283,10 @@
while ($room = db_fetch_object($rooms)) {
node_delete($room->nid);
}
- db_query('DROP TABLE {chatroom}');
- db_query('DROP TABLE {chatroom_chat}');
- db_query('DROP TABLE {chatroom_msg}');
- db_query('DROP TABLE {chatroom_msg_archive}');
- db_query('DROP TABLE {chatroom_ban_list}');
- db_query('DROP TABLE {chatroom_online_list}');
+
+ // Schema api
+ drupal_uninstall_schema('chatroom');
+
drupal_set_message($t('Chat room tables have been dropped from the database.'));
db_query("DELETE FROM {blocks} WHERE module = 'chatroom'");
$settings = db_query("SELECT name FROM {variable} WHERE name LIKE 'chatroom\_%'");
@@ -303,12 +350,12 @@
$nids = db_query("SELECT nid FROM {node} WHERE type = '%s'", 'chatroom');
$row = 0;
while ($nid = db_result($nids, $row++)) {
- if (db_num_rows(db_query("SELECT * FROM {chatroom} WHERE nid = %d", $nid)) == 0) {
+ if (db_result(db_query("SELECT COUNT(*) FROM {chatroom} WHERE nid = %d", $nid)) == 0) {
$ret[] = update_sql("INSERT INTO {chatroom} SET nid = %d", $nid);
}
}
$ret[] = update_sql("DELETE FROM {chatroom_chat} WHERE crid = %d", 0);
- $ret[] = update_sql('DROP TABLE {chatroom_chat_invites}');
+ db_drop_table($ret, 'chatroom_chat_invites');
return $ret;
}
@@ -326,12 +373,9 @@
function chatroom_update_4() {
$ret = array();
- switch ($GLOBALS['db_type']) {
- case 'mysql':
- case 'mysqli':
- $ret[] = update_sql('ALTER TABLE {chatroom_msg} CHANGE msg msg varchar(512) NOT NULL');
- break;
- }
+ db_change_field($ret, 'chatroom_msg', 'msg', 'msg', array(
+ 'type' => 'text', 'size' => 'big',
+ 'not null' => TRUE));
return $ret;
}
@@ -349,3 +393,7 @@
return array();
}
+function chatroom_update_6200() {
+ // TODO: schema updates from #5
+ return array();
+}
diff -Naur chatroom/chatroom.js chatroom-6.x-dev/chatroom.js
--- chatroom/chatroom.js 2007-10-10 11:07:05.000000000 -0400
+++ chatroom-6.x-dev/chatroom.js 2008-10-18 21:14:27.000000000 -0400
@@ -1,9 +1,223 @@
-// $Id: chatroom.js,v 1.48.2.33 2007/10/10 15:07:05 darrenoh Exp $
+// $Id$
+
+/**
+ * Client-side functionality for chatroom.module.
+ *
+ * Information about the chat is stored in one of three ways, depending on its
+ * use:
+ * * Values that are useful to chatroom_js() in processing AHAH requests (ccid
+ * of the chat; nid of the parent chatroom, cmid of the latest message) are
+ * stored as form elements so that they are automatically submitted with any
+ * AHAH request.
+ * * Values that are static and only affect the client-side behaviour (e.g.
+ * update and polling intervals) are stored in Drupal.settings.chatroom. See
+ * the PHP function chatroom_add_js().
+ * * Actual display content is generated in functions called by
+ * theme('chatroom_chat') (on page load) and chatroom_js() (on updates).
+ * These are enclosed in
s with id attributes that trigger functions in
+ * Drupal.behaviors.
+ *
+ * TODO: smileys interface
+ */
Drupal.chatroom = Drupal.chatroom || {};
Drupal.chatroom.chat = Drupal.chatroom.chat || {};
/**
+ * Initialize the chat.
+ *
+ * The chat form is given the class 'chatroom-processed' when this behaviour
+ * runs on page load, so that it is not triggered by AHAH requests.
+ */
+Drupal.behaviors.chatroom = function(context) {
+ var retval = $('#chatroom-chat-form:not(.chatroom-processed)', context).addClass(
+ 'chatroom-processed').each(function() {
+ // Alerts.
+// if ($('#edit-alerts')) {
+// soundManager.url = Drupal.settings.chatroom.sm2URL;
+// soundManager.waitForWindowLoad = true;
+// soundManager.onload = function() {
+// soundManager.createSound({
+// id: 'message',
+// url: Drupal.settings.chatroom.messageSound,
+// autoLoad: true,
+// autoPlay: false
+// });
+// soundManager.createSound({
+// id: 'user',
+// url: Drupal.settings.chatroom.userSound,
+// autoLoad: true,
+// autoPlay: false
+// });
+// }
+// }
+ // Periodic updates.
+ Drupal.chatroom.poll = setInterval("poll()", Drupal.settings.chatroom.pollInterval);
+ idleReset();
+ // Do not let the form submit unless some JavaScript code has set a control action.
+ $(this).submit(function() {
+ return $('#edit-control').html() != '';
+ });
+ // Actions that send a message.
+ $('#edit-message', context).keypress(function(event) {
+ if (event.keyCode == 13) {
+ sendMessage();
+ }
+ });
+ // Set a user as away.
+ $('#edit-away', context).change(sendStatus);
+ // Scroll to bottom of initial messages.
+ var boardOffset = $('#chatroom-board').offset().top;
+// var targetOffset = $('div.chatroom-msg:last').offset().top;
+ // var scrollAmount = targetOffset - boardOffset;
+ // $('#chatroom-board').animate({scrollTop: '+='+ scrollAmount +'px'}, 500);
+ });
+ return true;
+};
+
+/**
+ * Control.
+ *
+ * Updates from
+ *
.... The PHP function control_js() *always*
+ * includes this element, so this behaviour is triggered on every request.
+ */
+Drupal.behaviors.chatroomControl = function(context) {
+ var retval = $('#response-control', context).each(function() {
+ $('#edit-control').val($(this).html());
+ // Clean up any empty
s in the board (wrappers for previous requests).
+ $('#chatroom-board div:empty').remove();
+ }).remove();
+ return true;
+};
+
+/**
+ * Handle messages in AHAH response.
+ *
+ * Pulls new messages from
.... See
+ * http://www.learningjquery.com/2007/09/animated-scrolling-with-jquery-12 ,
+ * specifically http://www.learningjquery.com/js/scroll-element.js
+ */
+Drupal.behaviors.chatroomMessages = function(context) {
+ var retval = $('#response-messages', context).each(function() {
+ // Only process if there's some actual content.
+ if ($(this).html().length > 0) {
+ // Tag the first new message and append to the display.
+ $(this).children('.chatroom-msg:first').addClass('new-message');
+ $('#chatroom-board').append($(this).html());
+ // Scroll to first new message
+ var boardOffset = $('#chatroom-board').offset().top;
+ var targetOffset = $('div.new-message:last').offset().top;
+ var scrollAmount = targetOffset - boardOffset;
+ $('#chatroom-board').animate({scrollTop: '+='+ scrollAmount +'px'}, 500);
+ $('.new-message').removeClass('new-message');
+ // Play an alert
+ if ($('#edit-alerts:checked')) {
+// soundManager.play('message');
+ }
+ }
+ var afterProc = true;
+ }).remove();
+ return true;
+};
+
+/**
+ * Latest message ID.
+ *
+ * Updates from
+ *
.... This is sent with each AHAH request so
+ * messages are not fetched more than once.
+ */
+Drupal.behaviors.chatroomLastCmid = function(context) {
+ retval = $('#response-last-cmid', context).each(function() {
+ $('#edit-last-cmid').val($(this).html());
+ }).remove();
+ return true;
+};
+
+/**
+ * Userlist
+ */
+Drupal.behaviors.chatroomUserList = function(context) {
+ retval = $('#response-users', context).each(function() {
+ $('#chatroom-user-list:first').replaceWith($(this).html());
+ }).remove();
+ return true;
+};
+
+/**
+ * Poll for new information from the server.
+ */
+function poll() {
+ // Don't poll while away
+ if ($('#edit-away:checked').length == 0) {
+ $('#edit-control').val('poll');
+ // The AHAH-bound event for the submit button is 'mousedown', not 'click'.
+ // See http://api.drupal.org/api/function/form_expand_ahah/6 . Don't poll
+ // if a previous AHAH request is in progress.
+ $('#edit-submit:not(.progress-disabled)').triggerHandler('mousedown');
+ }
+}
+
+/**
+ * Idle the user if no action is performed for a while.
+ */
+function idle() {
+ $('#edit-away').checked = true;
+}
+
+/**
+ * Return the user from away and set the idle timer.
+ */
+function idleReset() {
+ $('#edit-away:checked').each(function() {
+ this.checked = false;
+ });
+ if (Drupal.chatroom.idle) {
+ clearInterval(Drupal.chatroom.idle);
+ }
+ Drupal.chatroom.idle = setInterval("idle()", Drupal.settings.chatroom.idleInterval);
+}
+
+/**
+ * Trigger the actual AHAH request when the 'Send' button is pressed.
+ */
+function sendMessage() {
+ if ($('#edit-submit.progress-disabled').length > 0) {
+ // Wait for an ongoing AHAH request to complete.
+ setTimeout("sendMessage()", 10);
+ }
+ else {
+ idleReset();
+ // Send the message.
+ $('#edit-control').val('message');
+ $('#edit-submit').triggerHandler('mousedown');
+ // Clear the send box.
+ $('#edit-message').val('');
+
+ }
+ // Prevent the event from bubbling.
+ return false;
+}
+
+/**
+ *
+ */
+function sendStatus(signal) {
+ if ($('#edit-submit.progress-disabled').length > 0) {
+ // Wait for an ongoing AHAH request to complete.
+ setTimeout("sendStatus()", 10);
+ }
+ else {
+ // Send the control message.
+ $('#edit-control').val('status');
+ $('#edit-submit').triggerHandler('mousedown');
+ }
+ // Prevent the event from bubbling.
+ return false;
+}
+
+/**
* function to add chatroom events handlers to the onscreen widgets
*/
Drupal.chatroom.chat.addEvents = function() {
@@ -14,17 +228,22 @@
return false;
}
);
- $('#chatroom-msg-input').keyup(
- function(e) {
- Drupal.chatroom.chat.inputOnkeyup(this, e);
- return true;
- }
- );
$('#chatroom-msg-away').click(
function() {
Drupal.chatroom.chat.setAway(this);
}
);
+ $('#edit-submit').click(
+ function() {
+ alert('edit-submit pressed');
+ Drupal.chatroom.chat.sendMessage();
+ return false;
+ }
+ );
+ $('#edit-submit').bind('mousedown', function(event) {
+ alert('edit-submit mousedown');
+ });
+
for (var i = 0; i < Drupal.settings.chatroom.chatUsers.length; i++) {
if (Drupal.settings.chatroom.chatUsers[i].self) {
$('#chatroom-msg-away').attr('checked', Drupal.settings.chatroom.chatUsers[i].away);
@@ -47,93 +266,13 @@
);
Drupal.chatroom.chat.getUpdates();
Drupal.chatroom.chat.updates = setInterval("Drupal.chatroom.chat.getUpdates()", Drupal.settings.chatroom.chatUpdateInterval);
- return;
-}
-/**
- * handles response from msg HTTP requests
- */
-Drupal.chatroom.chat.msgCallback = function(responseText) {
- if (responseText) {
- var response = eval('('+ responseText +')');
- if (typeof response == 'object') {
- if (response.cacheTimestamp != undefined) {
- Drupal.settings.chatroom.cacheTimestamp = response.cacheTimestamp;
- }
- if (response.msgs != undefined && response.msgs.length > 0) {
- Drupal.chatroom.chat.updateMsgList(response.msgs);
- }
- if (response.chatUsers != undefined) {
- Drupal.chatroom.chat.updateChatUsers(response.chatUsers);
- }
- }
- }
return;
}
/**
- * function to handle input to the message board
- */
-Drupal.chatroom.chat.inputOnkeyup = function(input, e) {
- if (!e) {
- e = window.event;
- }
- switch (e.keyCode) {
- case 13: // return/enter
- Drupal.chatroom.chat.sendMessage();
- break;
- }
-}
-
-/**
- * sends text of message to the server
- */
-Drupal.chatroom.chat.sendMessage = function() {
- var text = $('#chatroom-msg-input').val();
- if (text == '' || text.match(/^\s+$/)) {
- $('#chatroom-msg-input').val('');
- $('#chatroom-msg-input')[0].focus();
- return;
- }
- $('#chatroom-msg-input').val('');
- $('#chatroom-msg-input')[0].focus();
- if (text.search(/^\/(me|away|msg|back|kick|close|ban)/) != -1) {
- var msg = Drupal.chatroom.chat.getCommandMsg(text);
- if (!msg) {
- return;
- }
- }
- else {
- var msg = {chatroomMsg:text};
- }
- Drupal.settings.chatroom.skipUpdate = true;
- Drupal.settings.chatroom.updateCount++;
- $.post(Drupal.chatroom.chat.getUrl('write'), Drupal.chatroom.chat.prepareMsg(msg), Drupal.chatroom.chat.msgCallback);
-}
-
-/**
- * prepare a msg object
- */
-Drupal.chatroom.chat.prepareMsg = function(msg) {
- if (Drupal.settings.chatroom.smileysBase) {
- msg.smileys_base = Drupal.settings.chatroom.smileysBase;
- }
- msg.drupal_base = Drupal.settings.chatroom.drupalBase;
- msg.base_url = Drupal.settings.chatroom.baseUrl;
- msg.chatroom_base = Drupal.settings.chatroom.chatroomBase;
- msg.update_count = Drupal.settings.chatroom.updateCount;
- msg.user_base = Drupal.settings.chatroom.userBase;
- msg.chat_id = Drupal.settings.chatroom.chatId;
- msg.last_msg_id = Drupal.settings.chatroom.lastMsgId;
- msg.timezone = Drupal.settings.chatroom.timezone;
- msg.timestamp = Drupal.settings.chatroom.cacheTimestamp;
- msg.chat_cache_file = Drupal.settings.chatroom.chatCacheFile;
- return msg;
-}
-
-/**
* get a command msg object
- */
+ *
Drupal.chatroom.chat.getCommandMsg = function(text) {
var msg = {type:text.replace(/^\//, '').split(' ')[0]};
var args = text.replace(/^\//, '').split(' ').slice(1);
@@ -192,47 +331,9 @@
}
/**
- * Find a user by guest ID.
- */
-Drupal.chatroom.chat.findGuestId = function(guestId) {
- for (var i = 0; i < Drupal.settings.chatroom.chatUsers.length; i++) {
- if (Drupal.settings.chatroom.chatUsers[i].guestId == guestId) {
- return Drupal.settings.chatroom.chatUsers[i];
- }
- }
- return false;
-}
-
-/**
- * Find a user by user name.
- */
-Drupal.chatroom.chat.findName = function(name) {
- for (var i = 0; i < Drupal.settings.chatroom.chatUsers.length; i++) {
- if (Drupal.settings.chatroom.chatUsers[i].user == name) {
- return Drupal.settings.chatroom.chatUsers[i];
- }
- }
- return false;
-}
-
-/**
- * return the appropriate url
- */
-Drupal.chatroom.chat.getUrl = function(type) {
- switch (type) {
- case 'read':
- case 'write':
- case 'command':
- return Drupal.settings.chatroom.updateUrl;
- case 'user':
- return Drupal.settings.chatroom.userUrl;
- }
-}
-
-/**
* updates message list with response from server
* To do: Move msgs formating to php so things like using t() can be done
- */
+ *
Drupal.chatroom.chat.updateMsgList = function(msgs) {
var msgBoard = $('#chatroom-board');
var scroll = false;
@@ -344,76 +445,8 @@
}
/**
- * set a user as back if they send a message
- */
-Drupal.chatroom.chat.setAsBack = function(user) {
- for (var i = 0; i < Drupal.settings.chatroom.chatUsers.length; i++) {
- if (Drupal.settings.chatroom.chatUsers[i].user == user) {
- // update the online list
- Drupal.settings.chatroom.chatUsers[i].away = 0;
- var guestId = Drupal.settings.chatroom.chatUsers[i].guestId;
-
- // update on screen display
- var guestIdObj = $('#'+ guestId);
- if (guestIdObj.length > 0) {
- guestIdObj.removeClass('chatroom-user-away');
- }
-
- // make sure away box is unchecked
- if (Drupal.settings.chatroom.chatUsers[i].self) {
- $('#chatroom-msg-away').attr('checked', 0);
- }
- return;
- }
- }
-}
-
-/**
- * Process smileys in text and append text to node.
- */
-Drupal.chatroom.chat.addSmileys = function(node, text) {
- if (Drupal.settings.chatroom.smileysBase == undefined || text.indexOf(Drupal.settings.chatroom.smileysMarker) == -1) {
- node.append(text);
- }
- else {
- var bits = text.split(Drupal.settings.chatroom.smileysMarker);
- for (var i = 0; i < bits.length; i++) {
- var bit = $('#'+ bits[i]);
- if (bit.length > 0) {
- var smiley = bit.clone();
- smiley.removeAttr('title');
- smiley.removeAttr('id');
- bits[i] = smiley;
- }
- else {
- bits[i] = $(''+ bits[i] +'');
- }
- node.append(bits[i]);
- }
- }
- return node;
-}
-
-/**
- * Replace smileys markers with text smileys.
- */
-Drupal.chatroom.chat.removeSmileys = function(text) {
- if (Drupal.settings.chatroom.smileysBase != undefined && text.indexOf(Drupal.settings.chatroom.smileysMarker) != -1) {
- var bits = text.split(Drupal.settings.chatroom.smileysMarker);
- for (var i = 0; i < bits.length; i++) {
- var bit = $('#'+ bits[i]);
- if (bit.length > 0) {
- bits[i] = bit.attr('alt');
- }
- }
- text = bits.join('');
- }
- return text;
-}
-
-/**
* take a list of users and draw a whois online list
- */
+ *
Drupal.chatroom.chat.updateChatUsers = function(chatUsers) {
var chatUserList = $('#chatroom-online');
if (chatUserList.length > 0) {
@@ -483,7 +516,7 @@
/**
* Select a user to send a private message.
- */
+ *
Drupal.chatroom.chat.selectUser = function(userName) {
var input = $('#chatroom-msg-input');
input.val('/msg '+ userName + ' '+ input.val());
@@ -493,7 +526,7 @@
/**
* Write a system message to the chat.
- */
+ *
Drupal.chatroom.chat.writeSystemMsg = function(msgText, type) {
switch (type) {
case 'join':
@@ -539,18 +572,8 @@
}
/**
- * function that controls sets/clears Drupal.chatroom.chat.writeTime()'s timeout
- */
-Drupal.chatroom.chat.setWriteTime = function() {
- if (Drupal.settings.chatroom.writeMsgTimeId) {
- clearTimeout(Drupal.settings.chatroom.writeMsgTimeId);
- }
- Drupal.settings.chatroom.writeMsgTimeId = setTimeout('Drupal.chatroom.chat.writeTime()', Drupal.settings.chatroom.idleInterval);
-}
-
-/**
* function that writes a time to board when idle
- */
+ *
Drupal.chatroom.chat.writeTime = function() {
if (Drupal.settings.chatroom.lastMsgTime != undefined) {
var msgBoard = $('#chatroom-board');
@@ -566,31 +589,8 @@
}
/**
- * gets updates from the server for this chat
- */
-Drupal.chatroom.chat.getUpdates = function() {
- if (Drupal.settings.chatroom.skipUpdate) {
- Drupal.settings.chatroom.skipUpdate = false;
- return;
- }
- Drupal.settings.chatroom.updateCount++;
- $.post(Drupal.chatroom.chat.getUrl('read'), Drupal.chatroom.chat.prepareMsg({}), Drupal.chatroom.chat.msgCallback);
-}
-
-/**
- * update last seen message id
- */
-Drupal.chatroom.chat.updateLastMsg = function(msgId) {
- if (msgId > Drupal.settings.chatroom.lastMsgId) {
- Drupal.settings.chatroom.lastMsgId = msgId;
- return true;
- }
- return false;
-}
-
-/**
* Get the colour for a user.
- */
+ *
Drupal.chatroom.chat.getUserColour = function(user) {
for (var i = 0; i < Drupal.settings.chatroom.chatUsers.length; i++) {
if (Drupal.settings.chatroom.chatUsers[i].user == user) {
@@ -612,7 +612,7 @@
/**
* Set colours for users.
- */
+ *
Drupal.chatroom.chat.setUserColours = function() {
if ($('#chatroom-online').length > 0) {
for (var i = 0; i < Drupal.settings.chatroom.chatUsers.length; i++) {
@@ -625,7 +625,7 @@
/**
* onclick smileys insertion
- */
+ *
Drupal.chatroom.chat.smileyInsert = function(acronym) {
var msgInput = $('#chatroom-msg-input');
var text = msgInput.val();
@@ -636,7 +636,7 @@
/**
* toggle away status
- */
+ *
Drupal.chatroom.chat.setAway = function(obj) {
if (obj.checked) {
var msg = Drupal.chatroom.chat.getCommandMsg('/away');
@@ -649,7 +649,7 @@
/**
* Toggle message alert status.
- */
+ *
Drupal.chatroom.chat.setMsgAlerts = function(obj) {
if ($(obj).attr('checked')) {
Drupal.settings.chatroom.msgAlerts = true;
@@ -667,9 +667,6 @@
document.title = Drupal.settings.chatroom.pageTitle;
}
}
+*/
-// Global Killswitch
-if (Drupal.jsEnabled) {
- $(document).ready(Drupal.chatroom.chat.addEvents);
-}
diff -Naur chatroom/chatroom.module chatroom-6.x-dev/chatroom.module
--- chatroom/chatroom.module 2007-10-05 15:37:34.000000000 -0400
+++ chatroom-6.x-dev/chatroom.module 2008-10-18 21:14:27.000000000 -0400
@@ -1,5 +1,5 @@
';
}
@@ -19,13 +27,13 @@
/**
* Implementation of hook_access().
*/
-function chatroom_access($op, $node) {
- global $user;
+function chatroom_access($op, $node, $account) {
if ($op == 'create') {
- return user_access('create chat rooms');
+ return user_access('create chat rooms', $account);
}
+
if ($op == 'update' || $op == 'delete') {
- if (user_access('edit own chat rooms') && ($user->uid == $node->uid)) {
+ if (user_access('edit own chat rooms', $account) && ($account->uid == $node->uid)) {
return TRUE;
}
}
@@ -41,199 +49,51 @@
/**
* Implementation of hook_menu().
*/
-function chatroom_menu($may_cache) {
- $items = array();
- $items[] = array(
- 'path' => 'admin/settings/chatroom',
- 'callback' => 'drupal_get_form',
- 'callback arguments' => array('chatroom_admin_settings'),
- 'title' => t('Chat room'),
- 'description' => t('Configure chat rooms.'),
- 'access' => user_access('administer chat rooms')
- );
- $items[] = array(
- 'path' => 'chatrooms',
- 'callback' => 'chatroom_page',
- 'access' => user_access('access chat rooms'),
- 'title' => t('Chat rooms'),
- 'type' => MENU_SUGGESTED_ITEM
- );
- $items[] = array(
- 'path' => 'chatrooms/kicked',
- 'callback' => 'chatroom_chat_kicked_user',
- 'access' => user_access('access chat rooms'),
- 'type' => MENU_CALLBACK
- );
- $items[] = array(
- 'path' => 'chatrooms/chat',
- 'callback' => 'chatroom_chat',
- 'access' => user_access('access chat rooms'),
- 'type' => MENU_CALLBACK
- );
- $items[] = array(
- 'path' => 'chatrooms/archives',
- 'callback' => 'chatroom_chat_archive',
- 'access' => user_access('access chat rooms'),
- 'type' => MENU_CALLBACK
+function chatroom_menu() {
+ $items['admin/settings/chatroom'] = array(
+ 'title' => 'Chat room',
+ 'description' => t('Configure global settings for chat rooms and chats.'),
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('chatroom_admin_settings'),
+ 'access arguments' => array('administer chat rooms'),
+ );
+ $items['chatroom'] = array(
+ 'type' => MENU_SUGGESTED_ITEM,
+ 'title' => 'Chat rooms',
+ 'page callback' => 'chatroom_page',
+ 'access arguments' => array('access chat rooms'),
+ );
+ $items['chatroom/kicked'] = array(
+ 'type' => MENU_CALLBACK,
+ 'page callback' => 'chatroom_chat_kicked_user',
+ 'page arguments' => array(2),
+ 'access arguments' => array('access chat rooms'),
+ );
+ $items['chatroom/archive/%'] = array(
+ 'type' => MENU_CALLBACK,
+ 'page callback' => 'chatroom_view_chat',
+ 'page arguments' => array(2, TRUE),
+ 'access arguments' => array('access chat rooms'),
+ );
+ $items['chatroom/chat/%'] = array(
+ 'type' => MENU_CALLBACK,
+ 'page callback' => 'chatroom_view_chat',
+ 'page arguments' => array(2),
+ 'access arguments' => array('access chat rooms'),
+ );
+ $items['chatroom/js'] = array(
+ 'type' => MENU_CALLBACK,
+ 'page callback' => 'chatroom_js',
+ 'access arguments' => array('access chat rooms'),
);
return $items;
}
/**
- * Menu callback; display site-wide chat room settings.
+ * Implementation of hook_file_download().
*/
-function chatroom_admin_settings() {
- $form['chatroom_auto_archive'] = array(
- '#type' => 'checkbox',
- '#title' => t('Automatically archive old messages.'),
- '#description' => t('If there are a lot of old messages, archiving will improve chat performance.'),
- '#default_value' => variable_get('chatroom_auto_archive', FALSE),
- );
- $form['chatroom_block_update_interval'] = array(
- '#type' => 'textfield',
- '#title' => t('Chat room block update interval'),
- '#default_value' => variable_get('chatroom_block_update_interval', 5),
- '#description' => t('Determines how often blocks should update active chat rooms, active chats, and on-line users.'),
- '#size' => 2,
- '#validate' => array('_chatroom_element_numeric_unsigned' => array()),
- );
- $form['chatroom_guest_user_prefix'] = array(
- '#type' => 'textfield',
- '#title' => t('Guest user prefix'),
- '#description' => t('Prefixed to guest ID to provide user name for anonymous users.'),
- '#default_value' => variable_get('chatroom_guest_user_prefix', t('guest-')),
- '#size' => 20,
- );
- $form['chatroom_chat_date_format'] = array(
- '#type' => 'textfield',
- '#title' => t('Chat date format'),
- '#attributes' => array('class' => 'custom-format'),
- '#default_value' => variable_get('chatroom_chat_date_format', '* \S\e\n\t \a\t G:i'),
- '#description' => t('Format for system time messages in chats. See the PHP manual for available options. This format is currently set to display as %date.', array('@url' => 'http://php.net/manual/function.date.php', '%date' => format_date(time(), 'custom', variable_get('chatroom_chat_date_format', '* \S\e\n\t \a\t G:i')))),
- );
- if (function_exists('_smileys_list')) {
- $form['chatroom_smileys_support'] = array(
- '#type' => 'fieldset',
- '#title' => t('Smileys module support'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- $form['chatroom_smileys_support']['chatroom_smileys_enabled'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable Smileys module support.'),
- '#default_value' => variable_get('chatroom_smileys_enabled', FALSE),
- );
- $form['chatroom_smileys_support']['chatroom_smileys_showtextentry'] = array(
- '#type' => 'checkbox',
- '#title' => t('Show smileys in text entry box.'),
- '#default_value' => variable_get('chatroom_smileys_enabled', FALSE) && variable_get('chatroom_smileys_showtextentry', FALSE),
- '#disabled' => !variable_get('chatroom_smileys_enabled', FALSE),
- );
- }
- $form['chatroom_alerts'] = array(
- '#type' => 'fieldset',
- '#title' => t('Chat alerts'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- $form['chatroom_alerts']['chatroom_alerts'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable chat alerts.'),
- '#description' => t('Checking this box will allow users to turn on alerts for chat events.'),
- '#default_value' => variable_get('chatroom_alerts', FALSE),
- );
- $form['chatroom_alerts']['chatroom_alerts_default'] = array(
- '#type' => 'checkbox',
- '#title' => t('Turn alerts on by default.'),
- '#description' => t('Check this box if you want chats to open with alerts on.'),
- '#default_value' => variable_get('chatroom_alerts', FALSE) && variable_get('chatroom_alerts_default', FALSE),
- '#disabled' => !variable_get('chatroom_alerts', FALSE),
- );
- $form['chatroom_alerts']['chatroom_custom_sounds'] = array(
- '#type' => 'checkbox',
- '#title' => t('Use custom sounds for chat alerts.'),
- '#description' => t('Check this box if you want to replace default chat alert sounds with your own MP3s.'),
- '#default_value' => variable_get('chatroom_alerts', FALSE) && variable_get('chatroom_custom_sounds', FALSE),
- '#disabled' => !variable_get('chatroom_alerts', FALSE),
- );
- $path = file_directory_path() .'/chatroom';
- $js = array();
- if (file_exists("$path/message.mp3")) {
- $js['messageSound'] = file_create_url("$path/message.mp3");
- }
- if (file_exists("$path/user.mp3")) {
- $js['userSound'] = file_create_url("$path/user.mp3");
- }
- $form['chatroom_alerts']['chatroom_message_alert_upload'] = array(
- '#type' => 'file',
- '#title' => t('Custom new message sound'),
- '#description' => isset($js['messageSound']) ? t('Replace the custom new message sound with a new MP3. !Listen to current file.', array('!Listen' => l(t('Listen'), $js['messageSound'], array('id' => 'sound_message')))) : t('Replace the default new message sound with your own MP3.'),
- '#size' => 30,
- );
- $form['chatroom_alerts']['chatroom_user_alert_upload'] = array(
- '#type' => 'file',
- '#title' => t('Custom new user sound'),
- '#description' => isset($js['userSound']) ? t('Replace the custom new user sound with a new MP3. !Listen to current file.', array('!Listen' => l(t('Listen'), $js['userSound'], array('id' => 'sound_user')))) : t('Replace the default new user sound with your own MP3.'),
- '#size' => 30,
- );
- if (!empty($js)) {
- global $base_path;
- $js['basePath'] = $base_path;
- $js['chatroomBase'] = drupal_get_path('module', 'chatroom');
- drupal_add_js(array('chatroom' => $js), 'setting');
- drupal_add_js(drupal_get_path('module', 'chatroom') .'/soundmanager2.js');
- drupal_add_js('$("#sound_message").attr("href", "javascript:Drupal.chatroom.soundManager.play(\'message\')")', 'inline', 'footer');
- drupal_add_js('$("#sound_user").attr("href", "javascript:Drupal.chatroom.soundManager.play(\'user\')")', 'inline', 'footer');
- }
- $form['#attributes'] = array('enctype' => 'multipart/form-data');
- return system_settings_form($form);
-}
-
-function chatroom_admin_settings_validate($form_id, $form_values) {
- $path = file_directory_path();
- if (file_check_directory($path, FILE_CREATE_DIRECTORY)) {
- $path .= '/chatroom';
- if (file_check_directory($path, FILE_CREATE_DIRECTORY)) {
- if ($user_sound = file_check_upload('chatroom_user_alert_upload')) {
- if ($user_sound->filemime != 'audio/mpeg') {
- form_set_error('chatroom_alerts][chatroom_user_alert_upload', t('New user sound must be an MP3 file.'));
- }
- }
- if ($message_sound = file_check_upload('chatroom_message_alert_upload')) {
- if ($message_sound->filemime != 'audio/mpeg') {
- form_set_error('chatroom_alerts][chatroom_message_alert_upload', t('New message sound must be an MP3 file.'));
- }
- }
- }
- }
-}
-
-function chatroom_admin_settings_submit($form_id, $form_values) {
- $path = file_directory_path() .'/chatroom';
- if (file_check_upload('chatroom_user_alert_upload')) {
- file_save_upload('chatroom_user_alert_upload', "$path/user.mp3", FILE_EXISTS_REPLACE);
- }
- if (file_check_upload('chatroom_message_alert_upload')) {
- file_save_upload('chatroom_message_alert_upload', "$path/message.mp3", FILE_EXISTS_REPLACE);
- }
- system_settings_form_submit($form_id, $form_values);
-}
-
-function _chatroom_element_numeric_unsigned($element) {
- if (is_numeric($element['#value'])) {
- if ($element['#value'] == 0) {
- form_error($element, t('The block update interval cannot be zero.'));
- }
- elseif ($element['#value'] < 0) {
- form_error($element, t('The block update interval cannot be negative.'));
- }
- }
- else {
- form_error($element, t('The block update interval must be a number.'));
- }
-}
-
function chatroom_file_download($file) {
+ // Ensure downloaded sounds have the correct MIME type.
if (strpos($file, 'chatroom/') === 0 && pathinfo($file, PATHINFO_EXTENSION) == 'mp3') {
return array('Content-type: audio/mpeg');
}
@@ -253,130 +113,14 @@
}
/**
- * Implementation of hook_form().
- */
-function chatroom_form(&$node) {
- global $user;
- $form['title'] = array(
- '#type' => 'textfield',
- '#title' => t('Name'),
- '#default_value' => check_plain($node->title),
- '#required' => TRUE
- );
- $form['body_filter']['body'] = array(
- '#type' => 'textarea',
- '#title' => t('Description'),
- '#default_value' => $node->body,
- '#rows' => 3,
- '#description' => t('Describe your chat room so other people will know if they want to join.'),
- );
- $form['body_filter']['format'] = filter_form($node->format);
- $form['kicked_out_message'] = array(
- '#type' => 'textarea',
- '#title' => t('Chat room kicked out message'),
- '#default_value' => $node->chatroom->kicked_out_message,
- '#rows' => 3,
- '#description' => t('This text will appear on the page kicked out users are sent to. Defaults to, "You have been kicked out of %chat for misbehaving."', array('%chat' => t('chat-name'))),
- );
- $form['banned_message'] = array(
- '#type' => 'textarea',
- '#title' => t('Chat room banned message'),
- '#default_value' => $node->chatroom->banned_message,
- '#rows' => 3,
- '#description' => t('This text will appear on the page banned users are sent to. Defaults to, "You have been banned from %chatroom."', array('%chatroom' => t('chat-room'))),
- );
- if (!empty($node->chatroom->banned_users)) {
- $form['chatroom_banned_users'] = array(
- '#type' => 'fieldset',
- '#title' => t('Manage banned users'),
- '#collapsible' => TRUE,
- );
- foreach ($node->chatroom->banned_users as $banned_user) {
- $banned_users[$banned_user->uid] = check_plain($banned_user->name);
- }
- $form['chatroom_banned_users']['unban_list'] = array(
- '#type' => 'checkboxes',
- '#options' => $banned_users,
- '#description' => t('Check the users you would like to unban')
- );
- }
- $form['chat_settings'] = array(
- '#type' => 'fieldset',
- '#title' => t('Chat settings'),
- '#collapsible' => TRUE,
- );
- $form['chat_settings']['poll_freq'] = array(
- '#type' => 'select',
- '#title' => t('Update frequency'),
- '#default_value' => empty($node->chatroom->poll_freq) ? 1 : $node->chatroom->poll_freq / 1000,
- '#options' => drupal_map_assoc(range(1,10)),
- '#description' => t('How many seconds between each request for updates from the server.'),
- );
- $form['chat_settings']['idle_freq'] = array(
- '#type' => 'select',
- '#title' => t('Idle time'),
- '#default_value' => empty($node->chatroom->idle_freq) ? 60 : $node->chatroom->idle_freq / 1000,
- '#options' => drupal_map_assoc(array(20, 40, 60, 80, 100, 120, 140, 160, 180)),
- '#description' => t('How many seconds between each message before a last message time is shown in the chat.'),
- );
- $old_msg_range = array();
- for ($i = 1; $i <= 25; $i++) {
- $old_msg_range[$i] = $i * 10;
- }
- $form['chat_settings']['old_msg_count'] = array(
- '#type' => 'select',
- '#title' => t('Old messages'),
- '#description' => t('How many old messages to show when entering a chat.'),
- '#default_value' => empty($node->chatroom->old_msg_count) ? 20 : $node->chatroom->old_msg_count,
- '#options' => drupal_map_assoc($old_msg_range),
- );
- if (!empty($node->chatroom->chats)) {
- foreach ($node->chatroom->chats as $chat) {
- if ($chat->section != 'archives') {
- $chats[$chat->ccid] = check_plain($chat->chatname);
- }
- else {
- $closed_chats[$chat->ccid] = check_plain($chat->chatname);
- }
- }
- if (!empty($chats)) {
- $form['chatroom_chats'] = array(
- '#type' => 'fieldset',
- '#title' => t('Manage open chats'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- );
- $form['chatroom_chats']['chat_list'] = array(
- '#type' => 'checkboxes',
- '#options' => $chats,
- '#description' => t('Check the chats you would like to close')
- );
- }
- if (!empty($closed_chats)) {
- $form['closed_chats'] = array(
- '#type' => 'fieldset',
- '#title' => t('Manage archived chats'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- );
- $form['closed_chats']['closed_chat_list'] = array(
- '#type' => 'checkboxes',
- '#options' => $closed_chats,
- '#description' => t('Check the chats you would like to delete')
- );
- }
- }
- return $form;
-}
-
-/**
- * Implementation of hook_insert()
+ * Implementation of hook_insert().
*/
function chatroom_insert($node) {
$result = db_query("
INSERT INTO {chatroom}
- (nid, poll_freq, idle_freq, old_msg_count, kicked_out_message, banned_message, modified)
- VALUES (%d, %d, %d, %d, '%s', '%s', %d)
+ (nid, poll_freq, idle_freq, old_msg_count, kicked_out_message,
+ banned_message)
+ VALUES (%d, %d, %d, %d, '%s', '%s')
", array(
$node->nid,
1000 * $node->poll_freq,
@@ -384,15 +128,14 @@
$node->old_msg_count,
$node->kicked_out_message,
$node->banned_message,
- time()
));
if ($result) {
- chatroom_block_update_cache('chatrooms');
+ cache_clear_all(TRUE, 'cache_block');
}
}
/**
- * Implementation of hook_update()
+ * Implementation of hook_update().
*/
function chatroom_update($node) {
db_query("
@@ -403,7 +146,6 @@
old_msg_count = %d,
kicked_out_message = '%s',
banned_message = '%s',
- modified = %d
WHERE nid = %d
", array(
1000 * $node->poll_freq,
@@ -411,9 +153,9 @@
$node->old_msg_count,
$node->kicked_out_message,
$node->banned_message,
- time(),
$node->nid,
));
+ // Archive all open chats when the node is updated?
if (isset($node->chat_list)) {
foreach ($node->chat_list as $chat_id) {
if ($chat_id > 0) {
@@ -425,9 +167,9 @@
", $chat_id);
}
}
- chatroom_block_update_cache('chatrooms');
- chatroom_block_update_cache('chats');
+ cache_clear_all(TRUE, 'cache_block');
}
+ // Delete all archived chats when the node is updated?
if (isset($node->closed_chat_list)) {
foreach ($node->closed_chat_list as $chat_id) {
if (!empty($chat_id)) {
@@ -435,6 +177,7 @@
}
}
}
+ // Unban users?
if (isset($node->unban_list)) {
db_query('DELETE FROM {chatroom_ban_list} WHERE crid = %d AND uid IN (%s)', $node->chatroom->crid, implode(',', $node->unban_list));
}
@@ -445,125 +188,100 @@
*/
function chatroom_delete(&$node) {
db_query('DELETE FROM {chatroom} WHERE nid = %d', $node->nid);
- db_query("DELETE FROM {chatroom_chat} WHERE crid = %d", $node->chatroom->crid);
- db_query('DELETE FROM {chatroom_ban_list} WHERE crid = %d', $node->chatroom->crid);
- if (isset($node->chatroom) && !empty($node->chatroom->chats)) {
- $ccids = implode(',', array_keys($node->chatroom->chats));
+ db_query("DELETE FROM {chatroom_chat} WHERE crid = %d", $node->nid);
+ db_query('DELETE FROM {chatroom_ban_list} WHERE crid = %d', $node->nid);
+ //
+ if (!empty($node->chats)) {
+ $ccids = implode(',', array_keys($node->chats));
db_query('DELETE FROM {chatroom_msg} WHERE ccid IN (%s)', $ccids);
db_query('DELETE FROM {chatroom_online_list} WHERE ccid IN (%s)', $ccids);
db_query('DELETE FROM {chatroom_msg_archive} WHERE ccid IN (%s)', $ccids);
- foreach ($node->chatroom->chats as $chat_id => $name) {
- file_delete(_chatroom_get_cache_file("chat.$chat_id"));
- }
}
- chatroom_block_update_cache('chatrooms');
- chatroom_block_update_cache('chats');
+ cache_clear_all(TRUE, 'cache_block');
+ // Clear cache related to this chat.
+ // cache_clear_all(TRUE, 'cache_chat');
}
/**
* Implementation of hook_load().
*/
function chatroom_load($node) {
- $chatroom->chatroom = db_fetch_object(db_query('SELECT * FROM {chatroom} WHERE nid = %d', $node->nid));
- if (!empty($chatroom->chatroom)) {
- $chatroom->chatroom->banned_users = chatroom_get_banned_users($chatroom->chatroom->crid);
+ // Load room information.
+ $result = db_query('SELECT * FROM {chatroom} WHERE nid = %d', $node->nid);
+ $chatroom = db_fetch_object($result);
+ if (!empty($chatroom)) {
+ unset($chatroom->nid);
+ $chatroom->banned_users = chatroom_get_banned_users($node);
// If the user is banned, don't load chats.
- if (!chatroom_is_banned_user($chatroom->chatroom->crid)) {
- $chatroom->chatroom->chats = chatroom_get_room_summary($chatroom->chatroom->crid);
- }
- }
- return $chatroom;
-}
-
-/**
- * returns a the list of chats for a given room
- */
-function chatroom_get_room_summary($room_id) {
- $result = db_query("
- SELECT (
- SELECT COUNT(*) FROM {chatroom_msg}
- WHERE ccid = cc.ccid AND recipient = ''
- ) + (
- SELECT COUNT(*) FROM {chatroom_msg_archive}
- WHERE ccid = cc.ccid AND recipient = ''
- ) AS msg_count, MAX(cm.cmid) AS last_cmid, cc.ccid, cc.chatname, cc.when_archived
- FROM {chatroom} AS cr
- INNER JOIN {chatroom_chat} AS cc ON cc.crid = cr.crid
- LEFT JOIN {chatroom_msg} AS cm ON cm.ccid = cc.ccid AND cm.recipient = ''
- WHERE cr.crid = %d
- GROUP BY cc.ccid, cc.chatname, cc.when_archived
- ", $room_id, $room_id, $room_id);
- $chats = array();
- $msg_ids = array();
- while ($chat = db_fetch_object($result)) {
- if (isset($chat->when_archived)) {
- $chat->section = 'archives';
- $chat->msg_info = t('Archived on !date.', array('!date' => format_date($chat->when_archived, 'medium')));
+ if (chatroom_is_banned_user($node)) {
+ return $chatroom;
}
- else {
- $chat->section = 'chat';
- if ($chat->last_cmid) {
- $msg_ids[] = $chat->last_cmid;
+ // Load chats for current chatroom.
+ $chatroom->chats = array();
+ $cmids = array();
+ $result = db_query("
+ SELECT (SELECT COUNT(*) FROM {chatroom_msg} WHERE ccid = cc.ccid AND
+ recipient = '') AS msg_count, MAX(cm.cmid) AS last_cmid, cc.ccid,
+ cc.chatname, cc.when_archived
+ FROM {chatroom} cr
+ INNER JOIN {chatroom_chat} cc ON cc.crid = cr.nid
+ LEFT JOIN {chatroom_msg} cm ON cm.ccid = cc.ccid AND cm.recipient = ''
+ WHERE cr.nid = %d
+ GROUP BY cc.ccid, cc.chatname, cc.when_archived
+ ", $node->nid);
+ while ($chat = db_fetch_object($result)) {
+ if (isset($chat->when_archived)) {
+ $chat->section = 'archives';
+ $chat->msg_info = t('Archived on !date.', array('!date' => format_date($chat->when_archived, 'medium')));
}
else {
- $chat->msg_info = t('No messages');
+ $chat->section = 'chat';
+ if ($chat->last_cmid) {
+ $cmids[] = $chat->last_cmid;
+ }
+ else {
+ $chat->msg_info = t('No messages');
+ }
}
+ $chatroom->chats[$chat->ccid] = $chat;
}
- $chats[$chat->ccid] = $chat;
- }
- if (!empty($msg_ids)) {
- $result = db_query('
- SELECT cm.*, col.guest_id, u.name FROM {chatroom_msg} cm
- LEFT JOIN {chatroom_online_list} col ON col.session_id = cm.session_id
- LEFT JOIN {users} u ON u.uid = cm.uid
- WHERE cm.cmid IN (%s)
- ', implode(',', $msg_ids));
- while ($msg = db_fetch_object($result)) {
- foreach ($chats as $i => $chat) {
- if ($chat->last_cmid == $msg->cmid) {
- $chats[$i]->msg_info = chatroom_get_msg_info($msg);
- }
+ // Load information about the last message in each chatroom.
+ if (!empty($cmids)) {
+ $result = db_query("
+ SELECT cm.*, col.guest_id, u.name FROM {chatroom_msg} cm
+ LEFT JOIN {chatroom_online_list} col ON col.sid = cm.sid
+ LEFT JOIN {sessions} s ON s.sid = col.sid
+ LEFT JOIN {users} u ON u.uid = s.uid
+ WHERE cm.cmid IN (%s)
+ ", implode(',', $cmids));
+ while ($message = db_fetch_object($result)) {
+ $chatroom->chats[$message->ccid]->msg_info = theme('chatroom_last_message', $message);
}
}
}
- return $chats;
-}
-
-/**
- * Format a message for display in a summary table.
- */
-function chatroom_get_msg_info($msg) {
- if (function_exists('_smileys_list') && variable_get('chatroom_smileys_enabled', FALSE)) {
- $msg->msg = smileys_filter_process($msg->msg);
- }
- $output = $msg->msg .' ';
- $output .= t('Posted by !user on !date', array(
- '!user' => $msg->uid ? l($msg->name, "user/$msg->uid") : variable_get('chatroom_guest_user_prefix', t('guest-')) . $msg->guest_id,
- '!date' => format_date($msg->modified, 'medium'),
- ));
- return $output;
+ return $chatroom;
}
/**
* Gets a list of banned users for a given chat room.
*/
-function chatroom_get_banned_users($crid) {
- $sql = '
- SELECT cbl.uid, u.name FROM {chatroom_ban_list} cbl
- INNER JOIN {users} u ON u.uid = cbl.uid
- WHERE cbl.crid = %d
- ';
+function chatroom_get_banned_users($room) {
$banned_users = array();
- if ($result = db_query($sql, $crid)) {
- if ($banned_user = db_fetch_object($result)) {
- $banned_users[] = $banned_user;
- }
+ $result = db_query("
+ SELECT bl.uid, u.name FROM {chatroom_ban_list} bl
+ INNER JOIN {users} u ON u.uid = bl.uid
+ WHERE bl.nid = %d
+ ", $room->nid);
+ while ($user = db_fetch_object($result)) {
+ $banned_users[$user->uid] = $user;
}
return $banned_users;
}
/**
* Implementation of hook_view().
+ *
+ * List active and archived chats in a chatroom.
*/
function chatroom_view($node, $teaser = FALSE, $page = FALSE) {
$node = node_prepare($node);
@@ -577,23 +295,23 @@
}
if (!$teaser) {
// if the user is banned, just tell them why
- if (chatroom_is_banned_user($node->chatroom->crid)) {
- $node->content['body']['#value'] = !empty($node->chatroom->banned_message) ? $node->chatroom->banned_message : t('You have been banned from %chatroom.', array('%chatroom' => $node->title));
+ if (chatroom_is_banned_user($node)) {
+ $node->content['body']['#value'] = !empty($node->banned_message) ? $node->banned_message : t('You have been banned from %chatroom.', array('%chatroom' => $node->title));
}
else {
// if the user can create chats, show the form
if (user_access('create chats')) {
$node->content['add_chat'] = array(
- '#value' => drupal_get_form('chatroom_create_chat_form', $node->chatroom->crid),
+ '#value' => drupal_get_form('chatroom_create_chat_form', $node),
'#weight' => 1,
);
}
// if there are some chats, build some tables to display them
- if (!empty($node->chatroom->chats) > 0) {
- foreach ($node->chatroom->chats as $chat) {
+ if (!empty($node->chats) && is_array($node->chats)) {
+ foreach ($node->chats as $chat) {
$type = $chat->section == 'chat' ? 'open' : 'archived';
$rows[$type][] = array(
- array('data' => l($chat->chatname, "chatrooms/$chat->section/$chat->ccid")),
+ array('data' => l($chat->chatname, "chatroom/$chat->section/$chat->ccid")),
array('data' => $chat->msg_count),
array('data' => $chat->msg_info)
);
@@ -627,64 +345,6 @@
}
/**
- * returns a create chat form
- */
-function chatroom_create_chat_form($room_id) {
- $form['chatroom_create_chat'] = array(
- '#type' => 'fieldset',
- '#title' => t('Create a new chat'),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE
- );
- $form['chatroom_create_chat']['chat_name'] = array(
- '#type' => 'textfield',
- '#title' => t('Chat name'),
- '#size' => 30,
- '#required' => TRUE,
- '#description' => t('Enter the name for the chat'),
- );
- $form['chatroom_create_chat']['room_id'] = array(
- '#type' => 'hidden',
- '#value' => $room_id
- );
- $form['chatroom_create_chat']['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Create chat')
- );
- return $form;
-}
-
-/**
- * validates attempt to create chat - checks this name is not already in use
- */
-function chatroom_create_chat_form_validate($f_id, $f_values) {
- $crid = $f_values['room_id'];
- $name = $f_values['chat_name'];
- $sql = "SELECT ccid FROM {chatroom_chat} WHERE crid = %d AND chatname = '%s' AND when_archived IS NULL";
- if (db_num_rows(db_query_range($sql, $crid, $name, 0, 1))) {
- form_set_error('chatroom_chat_name', t('A chat called %name already exists.', array('%name' => $name)));
- }
-}
-
-/**
- * creates a chat
- */
-function chatroom_create_chat_form_submit($f_id, $f_values) {
- global $user;
- $created = db_query("
- INSERT INTO {chatroom_chat} (crid, uid, chatname, modified)
- VALUES (%d, %d, '%s', %d)
- ", $f_values['room_id'], $user->uid, $f_values['chat_name'], time());
- if (!$created) {
- drupal_set_message(t("There was an error creating your chat"), 'error');
- }
- else {
- chatroom_block_update_cache('chats');
- chatroom_block_update_cache('chatrooms');
- }
-}
-
-/**
* Archive old chat.
*/
function chatroom_archive_chat($chat_id) {
@@ -700,8 +360,7 @@
else {
db_query('UPDATE {chatroom_chat} SET when_archived = NULL WHERE ccid = %d', $chat_id);
}
- chatroom_block_update_cache('chats');
- chatroom_block_update_cache('chatrooms');
+ cache_clear_all(TRUE, 'cache_block');
return $result;
}
@@ -709,20 +368,37 @@
* Implementation of hook_block().
*/
function chatroom_block($op = 'list', $delta = 0, $edit = array()) {
- $types = array(
- array('chats', t('Chat Room: active chats')),
- array('chat_rooms', t('Chat Room: active chat rooms')),
- array('online_chat_users', t('Chat Room: chat on-line list')),
- array('online_site_users', t('Chat Room: site-wide on-line list')),
- array('command_list', t('Chat Room: chat commands')),
- );
+ $types = array('chats', 'rooms', 'chat_users', 'site_users', 'commands');
switch ($op) {
case 'list':
- $blocks[0]['info'] = $types[0][1];
- $blocks[1]['info'] = $types[1][1];
- $blocks[2]['info'] = $types[2][1];
- $blocks[3]['info'] = $types[3][1];
- $blocks[4]['info'] = $types[4][1];
+ $blocks[0] = array(
+ 'info' => t('Chat room: active chats'),
+ 'cache' => BLOCK_CACHE_GLOBAL,
+ 'visibility' => 0,
+ 'pages' => 'chatroom',
+ );
+ $blocks[1] = array(
+ 'info' => t('Chat room: active chat rooms'),
+ 'cache' => BLOCK_CACHE_GLOBAL,
+ 'visibility' => 0,
+ 'pages' => 'chatroom',
+ );
+ $blocks[2] = array(
+ 'info' => t('Chat room: chat user list'),
+ 'cache' => BLOCK_CACHE_PER_PAGE,
+ 'visibility' => 1,
+ 'pages' => 'chatroom/chat/*',
+ );
+ $blocks[3] = array(
+ 'info' => t('Chat room: site-wide user list'),
+ 'cache' => BLOCK_CACHE_GLOBAL,
+ );
+ $blocks[4] = array(
+ 'info' => t('Chat room: chat commands'),
+ 'cache' => BLOCK_CACHE_GLOBAL,
+ 'visibility' => 1,
+ 'pages' => 'chatroom/chat/*',
+ );
return $blocks;
case 'configure':
switch ($types[$delta][0]) {
@@ -746,87 +422,33 @@
break;
case 'view':
if (user_access('access chat rooms')) {
- if ($types[$delta][0] == 'command_list') {
- $block = theme('chatroom_block_commands');
+ return theme("chatroom_block_{$types[$delta][0]}");
+ switch ($types[$delta][0]) {
+ case 'command_list':
+ return theme('chatroom_block_commands');
+ case 'chats':
+ return theme('chatroom_block_chats');
+ case 'chat_rooms':
+ $block = theme('chatroom_block_rooms');
+ break;
+ case 'online_chat_users':
+ $block = theme('chatroom_block_chat_online_list');
+ break;
+ case 'online_site_users':
+ global $user;
+ $block = theme('chatroom_block_site_online_list', $user->uid);
+ break;
}
- else {
- // Hack to set up cache files - can't find a way to do this on
- // enable/disable of chat room blocks.
- if ($types[$delta][0] != 'online_chat_users' && !@file_exists(_chatroom_get_cache_file($types[$delta][0]))) {
- chatroom_block_update_cache($types[$delta][0]);
- }
- switch ($types[$delta][0]) {
- case 'chats':
- $block = theme('chatroom_block_chats');
- break;
- case 'chat_rooms':
- $block = theme('chatroom_block_rooms');
- break;
- case 'online_chat_users':
- $block = theme('chatroom_block_chat_online_list');
- break;
- case 'online_site_users':
- global $user;
- $block = theme('chatroom_block_site_online_list', $user->uid);
- break;
- }
- if (!empty($block['content'])) {
- chatroom_block_settings();
- }
+ if (!empty($block['content'])) {
+ chatroom_block_settings();
}
- return $block;
- }
- }
-}
-
-/**
- * List chat commands.
- */
-function theme_chatroom_block_commands() {
- if (preg_match('/^chatrooms\/chat\/(\d+)/', $_GET['q'], $matches)) {
- $content = '/msg '. t('username') .' '. t('message');
- if (user_access('administer chats')) {
- $content .= ' /kick '. t('username') .'';
- $content .= ' /ban '. t('username') .'';
- }
- $content .= ' /me '. t('message');
- $content .= ' /away';
- $content .= ' /back';
- return array(
- 'content' => $content,
- 'subject' => t('Chat commands'),
- );
- }
-}
-
-/**
- * List site-wide chats.
- */
-function theme_chatroom_block_chats() {
- if ($_GET['q'] != 'chatrooms') {
- $content = '
';
- $limit = chatroom_chat_old_msg_limit($chat->ccid);
- $html .= theme('pager', array(), $limit);
+ * @param &$chat
+ * The chat object to load messages into.
+ * @param $last_cmid
+ * Only load messages with cmids greater than this value. If nonzero, then
+ * $archived = FALSE and $limit = FALSE are assumed. Default: 0 (load all
+ * messages).
+ * @param $archived
+ * Include archived messages. Default: FALSE.
+ * @param $limit
+ * Limit the total number of messages to the old_msg_limit of the chatroom.
+ * Default: FALSE.
+ * @return
+ * The highest cmid of if any messages were loaded; FALSE if no messages were
+ * loaded.
+*/
+function chatroom_load_messages(&$chat, $last_cmid = 0, $archived = FALSE, $limit = FALSE) {
+ // Load the chatroom for relevant settings.
+ $chat->chatroom = node_load($chat->nid);
+ // Avoid multiple function calls.
+ $sid = session_id();
+ // Basic query.
+ $query = '
+ SELECT
+ cm.*,
+ col.guest_id,
+ u.name
+ FROM {chatroom_msg} cm
+ LEFT JOIN {chatroom_online_list} col
+ ON col.sid LIKE cm.sid AND col.ccid = cm.ccid
+ LEFT JOIN {users} u ON u.uid = cm.uid
+ WHERE cm.ccid = %d
+ ';
+ $query_args = array($chat->ccid);
+ // TODO: document what this does. What is the logic behind the below?
+ // Select:
+ // * Messages to everyone (no set recipient)
+ // * Messages from the current session
+ // * Messages to the current user?
+ // * Messages from the current user
+// $query .= "
+// AND (
+// cm.recipient LIKE ''
+// OR cm.sid LIKE '%s'
+// OR cm.recipient LIKE ANY (
+// SELECT guest_id FROM {chatroom_online_list} col
+// LEFT JOIN {sessions} s ON s.sid = col.sid
+// WHERE col.sid LIKE '%s' OR (s.uid = %d AND s.uid > 0)
+// )
+// OR (cm.uid = %d AND cm.uid > 0)
+// )
+// ";
+// array_push($query_args, $sid, $sid, $user->uid, $user->uid);
+ // Exclude archived messages.
+ if ($last_cmid != 0) {
+ $query .= ' AND cm.archived = 0 AND cm.cmid > %d';
+ $query_args[] = $last_cmid;
+ }
+ $query .= ' ORDER BY cmid DESC';
+ // Limit number of messages, e.g. on initial display of a chatroom.
+ if ($last_cmid == 0 && $limit) {
+ $query .= ' LIMIT %d';
+ $query_args[] = $chat->old_msg_count;
+ }
+ // Query and process results
+ $result = db_query($query, $query_args);
+ $messages = array();
+ $max_cmid = 0;
+ while ($message = db_fetch_object($result)) {
+ _chatroom_message_prepare($message);
+ $max_cmid = ($message->cmid > $max_cmid) ? $message->cmid : $max_cmid;
+ array_unshift($messages, $message);
+ }
+ // Assign any messages to the chat object and return.
+ if ($result !== FALSE && !empty($messages)) {
+ $chat->messages = $messages;
+ return $max_cmid;
}
else {
- $html .= '
'. t('This chat contains no messages.') .'
';
+ return FALSE;
}
- return $html;
}
/**
- * get all msgs for a given chat
+ * Load online users for the given chat.
*/
-function chatroom_get_all_msgs($chat_id) {
+function chatroom_load_users(&$chat) {
global $user;
- $msgs = FALSE;
- $limit = chatroom_chat_old_msg_limit($chat_id);
- if (!empty($limit)) {
- $query = "
- (
- SELECT cma.*, u.name, col.guest_id FROM {chatroom_msg_archive} cma
- LEFT JOIN {chatroom_online_list} col ON col.session_id = cma.session_id AND col.ccid = cma.ccid
- LEFT JOIN {users} u ON u.uid = cma.uid
- WHERE cma.ccid = %d AND (
- cma.recipient = '' OR cma.session_id = '%s' OR cma.recipient IN (
- SELECT guest_id FROM {chatroom_online_list}
- WHERE session_id = '%s' OR (uid = %d AND uid > 0)
- ) OR (cma.uid = %d AND cma.uid > 0)
- )
- )
- UNION
- (
- SELECT cm.*, u.name, col.guest_id FROM {chatroom_msg} cm
- LEFT JOIN {chatroom_online_list} col ON col.session_id = cm.session_id AND col.ccid = cm.ccid
- LEFT JOIN {users} u ON u.uid = cm.uid
- WHERE cm.ccid = %d AND (
- cm.recipient = '' OR cm.session_id = '%s' OR cm.recipient IN (
- SELECT guest_id FROM {chatroom_online_list}
- WHERE session_id = '%s' OR (uid = %d AND uid > 0)
- ) OR (cm.uid = %d AND cm.uid > 0)
- )
- )
- ORDER BY cmid ASC
- ";
- $count_query = "
- SELECT
- (
- SELECT COUNT(*) FROM {chatroom_msg_archive}
- WHERE ccid = %d AND (
- recipient = '' OR session_id = '%s' OR recipient IN (
- SELECT guest_id FROM {chatroom_online_list}
- WHERE session_id = '%s' OR (uid = %d AND uid > 0)
- ) OR (uid = %d AND uid > 0)
- )
- )
- +
- (
- SELECT COUNT(*) FROM {chatroom_msg}
- WHERE ccid = %d AND (
- recipient = '' OR session_id = '%s' OR recipient IN (
- SELECT guest_id FROM {chatroom_online_list}
- WHERE session_id = '%s' OR (uid = %d AND uid > 0)
- ) OR (uid = %d AND uid > 0)
- )
- )
- ";
- $arguments = array(
- $chat_id,
- session_id(),
- session_id(),
- $user->uid,
- $user->uid,
- $chat_id,
- session_id(),
- session_id(),
- $user->uid,
- $user->uid,
- );
- $result = pager_query($query, $limit, 0, $count_query, $arguments);
- $msgs = array();
- while ($message = db_fetch_object($result)) {
- if (function_exists('_smileys_list') && variable_get('chatroom_smileys_enabled', FALSE)) {
- $message->msg = smileys_filter_process($message->msg);
- }
- $msgs[] = $message;
+ // Time out users
+ $result = db_query("
+ DELETE FROM {chatroom_online_list}
+ WHERE
+ modified < %d - ((
+ SELECT cr.poll_freq
+ FROM {chatroom_chat} cc
+ JOIN {chatroom} cr ON cr.nid = cc.crid
+ WHERE cc.ccid = %d
+ )/100)
+ AND away = 0
+ AND ccid = %d
+ ", time(), $chat->ccid, $chat->ccid);
+ // Load users
+ $result = db_query("
+ SELECT
+ s.uid,
+ u.name,
+ col.guest_id
+ FROM {chatroom_online_list} col
+ JOIN {sessions} s ON s.sid = col.sid
+ LEFT JOIN {users} u ON u.uid = s.uid
+ WHERE col.ccid = %d
+ ORDER BY u.name ASC
+ ", $chat->ccid);
+ $users = array();
+ while ($u = db_fetch_object($result)) {
+ if (empty($u->uid)) {
+ $u->name = variable_get('chatroom_guest_user_prefix', 'guest-') . $u->guest_id;
+ }
+ if ($u->uid != $user->uid) {
+ array_unshift($users, $u);
+ }
+ else {
+ $users[] = $u;
}
}
- return $msgs;
-}
-
-/**
- * updates chat's cache file modified time
- */
-function chatroom_chat_update_cache($cache_file) {
- if (@touch($cache_file)) {
- return @filemtime($cache_file);
+ if ($result !== FALSE) {
+ $chat->users = $users;
+ }
+ else {
+ return FALSE;
}
- return FALSE;
}
/**
- * update a users online timestamp value
+ * Save a message to the database.
*/
-function chatroom_chat_update_online_time($chat_id) {
+function chatroom_save_message($chat, $message, $type = 'message', $recipient = '') {
global $user;
db_query("
- UPDATE {chatroom_online_list} SET modified = %d
- WHERE ccid = %d AND uid = %d AND session_id = '%s'
- ", time(), $chat_id, $user->uid, session_id());
+ INSERT INTO {chatroom_msg}
+ (ccid, uid, msg_type, msg, sid, recipient, modified)
+ VALUES (%d, %d, '%s', '%s', '%s', '%s', %d)
+ ", $chat->ccid, $user->uid, $type, $message, session_id(), $recipient, time());
}
/**
- * Get all messages for chat room after last message.
+ * Prepare a message to be themed.
+ *
+ * This function is analogous to but NOT an implementation of hook_prepare().
*/
-function chatroom_chat_get_latest_msgs($chat_id, $uid, $last_msg_id = 0, $timezone = 0, $smileys = FALSE) {
- global $user;
- $msgs = array();
- $limit = chatroom_chat_old_msg_limit($chat_id, $last_msg_id);
- if (!empty($limit)) {
- $result = db_query_range("
- SELECT cm.*, u.name, col.guest_id FROM {chatroom_msg} cm
- INNER JOIN {chatroom_online_list} col ON col.session_id = cm.session_id AND col.ccid = cm.ccid
- LEFT JOIN {users} u ON u.uid = cm.uid
- WHERE cm.ccid = %d AND (
- cm.recipient = '' OR cm.session_id = '%s' OR cm.recipient IN (
- SELECT guest_id FROM {chatroom_online_list}
- WHERE session_id = '%s' OR (uid = %d AND uid > 0)
- ) OR (cm.uid = %d AND cm.uid > 0)
- )
- ORDER BY cm.cmid DESC
- ", array(
- $chat_id,
- session_id(),
- session_id(),
- $user->uid,
- $user->uid,
- ), 0, $limit);
- while ($message = db_fetch_object($result)) {
- if ($smileys) {
- $message->msg = chatroom_smileys_filter_process($message->msg);
- }
- $name = empty($message->name) ? _chatroom_variable_get('chatroom_guest_user_prefix', 'guest-') . $message->guest_id : $message->name;
- $time = gmdate(_chatroom_variable_get('chatroom_chat_date_format', '* \S\e\n\t \a\t G:i'), $message->modified + $timezone);
- $msg = array(
- 'id' => (int) $message->cmid,
- 'text' => stripslashes(str_replace(array("\\", '"'), array("\\\\", '\"'), $message->msg)),
- 'user' => $name,
- 'time' => $time,
- 'recipient' => $message->recipient,
- 'type' => $message->msg_type,
- );
- $msgs[] = $msg;
- }
- $msgs = array_reverse($msgs);
+function _chatroom_message_prepare(&$message) {
+ // Array for display content.
+ $message->content = array();
+ if (empty($message->name)) {
+ // Guest name.
+ $message->name = variable_get('chatroom_guest_user_prefix', 'guest-') . $message->guest_id;
+ $message->content['user'] = $message->name;
+ }
+ else {
+ // Link to user profile.
+ $message->content['user'] = l($message->name, 'user/'. $message->uid);
}
- return $msgs;
+ // Date. TODO: use configurable date.
+ $message->content['timestamp'] = format_date($message->modified);
+ // Apply filters to message. TODO: determine if this includes smileys.
+ $message->content['message'] = check_markup($message->msg, FILTER_FORMAT_DEFAULT, FALSE);
}
/**
- * Get the number of old messages to show when entering a chat
+ * updates chat's cache file modified time
*/
-function chatroom_chat_old_msg_limit($chat_id, $last_msg_id = 0) {
- $limit = db_result(db_query('
- SELECT cr.old_msg_count FROM {chatroom} cr
- INNER JOIN {chatroom_chat} cc ON cc.crid = cr.crid
- WHERE cc.ccid = %d
- ', $chat_id));
- $count = db_result(db_query("SELECT COUNT(*) FROM {chatroom_msg} WHERE ccid = %d AND cmid > %d", $chat_id, $last_msg_id));
- $count += db_result(db_query("SELECT COUNT(*) FROM {chatroom_msg_archive} WHERE ccid = %d AND cmid > %d", $chat_id, $last_msg_id));
- return $count > $limit ? $limit : $count;
+function chatroom_chat_update_cache($cache_file) {
+ if (@touch($cache_file)) {
+ return @filemtime($cache_file);
+ }
+ return FALSE;
}
/**
- * Replacement for variable_get because configuration variables are not loaded in session bootstrap
+ * Update the online timestamp value for the current user
*/
-function _chatroom_variable_get($name, $default) {
- $result = db_query_range("SELECT value FROM {variable} WHERE name = '%s'", $name, 0, 1);
- if (db_num_rows($result)) {
- $default = unserialize(db_result($result));
- }
- return $default;
+function chatroom_update_online_time($chat, $away = FALSE) {
+ db_query("
+ UPDATE {chatroom_online_list}
+ SET modified = %d, away = %d
+ WHERE ccid = %d AND sid = '%s'
+ ", time(), $away, $chat->ccid, session_id());
}
/**
@@ -1727,7 +996,7 @@
* - because we don't want to send html, just data about image
*/
function chatroom_smileys_filter_process($text) {
- if (function_exists('_smileys_list') && _chatroom_variable_get('chatroom_smileys_enabled', FALSE)) {
+ if (function_exists('_smileys_list') && variable_get('chatroom_smileys_enabled', FALSE)) {
$text = ' '. $text .' ';
$list = _smileys_list();
$marker = '------';
@@ -1745,89 +1014,46 @@
}
}
}
- $text = substr($text, 1, -1);
+ $text = drupal_substr($text, 1, -1);
}
return $text;
}
/**
- * sets the chat's cache file by touching it
- */
-function chatroom_chat_set_cache($chat_id) {
- $chat_file = _chatroom_get_cache_file("chat.$chat_id");
- if (!file_exists($chat_file)) {
- @touch($chat_file);
- }
-}
-
-/**
- * Returns a chat room object for $chat_id.
+ * Returns a chat room object for $ccid.
*/
-function chatroom_chat_get_from_id($chat_id, $save_query = TRUE) {
- if ($chat_id !== FALSE) {
- global $user;
- $sql = "
+function chatroom_load_chat($ccid) {
+ if (is_numeric($ccid)) {
+ $result = db_query_range("
SELECT
cc.*,
n.title AS chatroom_name,
n.nid,
cr.poll_freq,
cr.idle_freq,
+ cr.old_msg_count,
cr.kicked_out_message,
cr.banned_message
FROM {chatroom_chat} cc
- INNER JOIN {chatroom} cr ON cr.crid = cc.crid
+ INNER JOIN {chatroom} cr ON cr.nid = cc.crid
INNER JOIN {node} n ON n.nid = cr.nid
WHERE cc.ccid = %d
- ";
- if ($save_query) {
- $sql = db_rewrite_sql($sql);
- variable_set("chatroom_chat_get_from_id_query_{$user->uid}", $sql);
- }
- else {
- $sql = _chatroom_variable_get("chatroom_chat_get_from_id_query_{$user->uid}", $sql);
- }
- $result = db_query_range($sql, $chat_id, 0, 1);
+ ", $ccid, 0, 1);
return db_fetch_object($result);
}
- return FALSE;
-}
-
-/**
- * updates a users online time
- */
-function chatroom_site_update_online_time($uid) {
- db_query('UPDATE {users} SET access = %d WHERE uid = %d', time(), $uid);
-}
-
-/**
- * updates a block cache file
- */
-function chatroom_block_update_cache($type) {
- @touch(_chatroom_get_cache_file($type));
-}
-
-/**
- * get block cache file
- */
-function _chatroom_get_cache_file($type) {
- $path = file_directory_temp() .'/drupal.chatroom.'. session_name();
- if (file_check_directory($path, TRUE)) {
- $path .= "/$type";
- }
else {
- $path .= ".$type";
+ return FALSE;
}
- return $path;
}
+
/**
* gets a list of online users, not including the current user
*/
function chatroom_get_site_online_list($uid) {
$users = array();
- $time_period = 2 * _chatroom_variable_get('chatroom_block_update_interval', 5);
- $result = db_query("SELECT uid, name FROM {users} WHERE access >= %d AND uid != 0", time() - $time_period);
+ $time_period = 2 * variable_get('chatroom_block_update_interval', 5);
+ $result = db_query("SELECT uid, name FROM {users} WHERE access >= %d AND uid <> 0", time() - $time_period);
while ($user = db_fetch_object($result)) {
if ($uid != $user->uid) {
$users[] = $user;
@@ -1837,45 +1063,40 @@
}
/**
- * Checks if the user is banned from the chat room - returns false if not.
+ * Check if the current user is banned from the chat room.
*/
-function chatroom_is_banned_user($crid) {
+function chatroom_is_banned_user($room) {
global $user;
- static $result = NULL;
- if (!is_null($result)) {
- return $result;
- }
- if ($user->uid == 0) {
- $result = FALSE;
+ // If the node is already loaded, check the ban list. Otherwise, query the
+ // database.
+ if (isset($room->banned_list) && is_array($room->banned_list)) {
+ return in_array($user->uid, array_keys($room->banned_list));
}
else {
- $result = db_num_rows(db_query_range("SELECT crid FROM {chatroom_ban_list} WHERE crid = %d AND uid = %d", $crid, $user->uid, 0, 1));
+ $result = db_query_range("
+ SELECT COUNT(nid) FROM {chatroom_ban_list}
+ WHERE nid = %d AND uid = %d
+ ", $room->nid, $user->uid, 0, 1);
+ return db_result($result);
}
- return $result;
}
/**
* returns the list of available chat rooms
*/
-function chatroom_get_chatroom_list($archived = FALSE, $start = NULL, $end = NULL, $save_query = TRUE) {
- global $user;
+function chatroom_get_room_list($archived = FALSE, $start = NULL, $end = NULL) {
$sql = '
- SELECT nr.*, COUNT(cc.ccid) AS chat_count FROM {chatroom} cr
- INNER JOIN {node_revisions} nr ON nr.nid = cr.nid
- INNER JOIN {node} n ON n.nid = nr.nid
- INNER JOIN {chatroom_chat} cc ON cc.crid = cr.crid
+ SELECT
+ cr.nid,
+ n.title,
+ COUNT(cc.ccid) AS chat_count
+ FROM {chatroom} cr
+ INNER JOIN {node} n ON n.nid = cr.nid
+ INNER JOIN {node_revisions} nr ON nr.nid = n.nid
+ LEFT JOIN {chatroom_chat} cc ON cc.crid = cr.nid
';
$sql .= $archived ? '' : ' WHERE cc.when_archived IS NULL';
- $sql .= ' GROUP BY cr.crid ORDER BY n.sticky DESC, nr.timestamp DESC';
- $variable = 'chatroom_get_chatroom_list_';
- $variable .= $archived ? "archived_query_{$user->uid}" : "query_{$user->uid}";
- if ($save_query) {
- $sql = db_rewrite_sql($sql);
- variable_set($variable, $sql);
- }
- else {
- $sql = _chatroom_variable_get($variable, $sql);
- }
+ $sql .= ' GROUP BY cr.nid, n.title, n.sticky, nr.timestamp ORDER BY n.sticky DESC, nr.timestamp DESC';
if (isset($start) && !empty($end)) {
$result = db_query_range($sql, $start, $end);
}
@@ -1883,61 +1104,61 @@
$result = db_query($sql);
}
$rooms = array();
- if (db_num_rows($result) > 0) {
- while ($room = db_fetch_object($result)) {
- $rooms[] = $room;
- }
+ while ($room = db_fetch_object($result)) {
+ $rooms[] = $room;
}
return $rooms;
}
/**
* Get a list of online users in a given chat.
- * Return the current user at the top of the list.
- * Users who do not update within five seconds after the last message is
- * sent are dropped from the online list.
+ *
+ * The current user is at the top of the returned list. Users who do not update
+ * within five seconds after the last message is sent are dropped from the
+ * online list.
*/
-function chatroom_chat_get_online_list($chat_id, $cache_timestamp, $update_count = 7) {
+function _chatroom_get_online_list($chat) {
$users = array();
- if ($chat = chatroom_chat_get_from_id($chat_id, FALSE) && !isset($chat->when_archived)) {
+ // No users in an archived chat.
+ if ($chat = chatroom_load_chat($ccid) && !isset($chat->when_archived)) {
+ // Update the 'modified' time of the chat to match the cache (???)
+/*
+ $cache_timestamp = empty($cache_timestamp) ? time() : $cache_timestamp;
if ($cache_timestamp < time() - 5) {
- db_query("UPDATE {chatroom_chat} SET modified = %d WHERE ccid = %d", $cache_timestamp, $chat_id);
+ db_query("UPDATE {chatroom_chat} SET modified = %d WHERE ccid = %d", $cache_timestamp, $ccid);
}
+*/
$result = db_query("
SELECT
- col.uid,
- col.session_id,
- col.guest_id,
- col.away,
+ col.sid, col.guest_id, col.away,
cc.chatname,
- du.name
+ u.uid, u.name
FROM {chatroom_online_list} col
INNER JOIN {chatroom_chat} cc ON cc.ccid = col.ccid
- LEFT JOIN {users} du ON du.uid = col.uid
+ INNER JOIN {sessions} s ON s.sid = col.sid
+ LEFT JOIN {users} u ON u.uid = s.uid
WHERE col.ccid = %d AND col.modified > cc.modified
- ", $chat_id);
- while ($row = db_fetch_object($result)) {
- $name = $row->name ? check_plain($row->name) : _chatroom_variable_get('chatroom_guest_user_prefix', 'guest-') . $row->guest_id;
- $user = array(
- 'user' => $name,
- 'uid' => $row->uid,
- 'guestId' => $row->guest_id,
- 'away' => (int) $row->away,
- );
- if ($row->session_id == session_id()) {
- $user['self'] = TRUE;
+ ", $chat->ccid);
+ while ($user = db_fetch_object($result)) {
+ // Format the user or guest name.
+ if (empty($user->name)) {
+ $user->name = variable_get('chatroom_guest_user_prefix', 'guest-') . $row->guest_id;
+ }
+ else {
+ $user->name = check_plain($user->name);
+ }
+ // Store the current user separately.
+ if ($user->sid == session_id()) {
$current_user = $user;
}
else {
$users[] = $user;
}
}
+ // Add the current user at the head of the list.
if (isset($current_user)) {
array_unshift($users, $current_user);
}
- if ($update_count < 7) {
- $users = array($current_user);
- }
}
return $users;
}
diff -Naur chatroom/chatroom.theme.inc chatroom-6.x-dev/chatroom.theme.inc
--- chatroom/chatroom.theme.inc 1969-12-31 19:00:00.000000000 -0500
+++ chatroom-6.x-dev/chatroom.theme.inc 2008-10-18 21:14:27.000000000 -0400
@@ -0,0 +1,399 @@
+ array());
+ $theme['chatroom_block_chats'] = array('arguments' => array());
+ $theme['chatroom_block_rooms'] = array('arguments' => array());
+ $theme['chatroom_block_chat_list'] = array('arguments' => array());
+ $theme['chatroom_block_site_list'] = array('arguments' => array());
+ // Message theming for display in an active chat.
+ $theme['chatroom_messages'] = array('arguments' => array('messages'));
+ $theme['chatroom_message'] = array('arguments' => array('message'));
+ // User list theming for display in an active chat.
+ $theme['chatroom_user_list'] = array('arguments' => array('users'));
+ // Information about the latest message, for use in a chat list.
+ $theme['chatroom_last_message'] = array('arguments' => array('message'));
+ $theme['chatroom_chat_kicked_user'] = array('arguments' => array('chat'));
+ $theme['chatroom_chat_banned_user'] = array('arguments' => array('chat'));
+ // List of all chatrooms.
+ $theme['chatroom_display'] = array('arguments' => array('tree'));
+ // List of chats in a chatroom.
+ $theme['chatroom_list'] = array('arguments' => array('tree'));
+ // Actual chats and archives.
+ $theme['chatroom_chat'] = array('arguments' => array('chat'));
+ $theme['chatroom_chat_archive'] = array('arguments' => array('chat'));
+ return $theme;
+}
+
+/**
+ * Theme the chat commands block.
+ *
+ * @ingroup themeable
+ */
+function theme_chatroom_block_commands() {
+ $content = '/msg '. t('username') .' '. t('message');
+ if (user_access('administer chats')) {
+ $content .= ' /kick '. t('username') .'';
+ $content .= ' /ban '. t('username') .'';
+ }
+ $content .= ' /me '. t('message');
+ $content .= ' /away';
+ $content .= ' /back';
+ $block = array('content' => $content, 'subject' => t('Chat commands'));
+ return $block;
+}
+
+/**
+ * Theme the site-wide chat list block.
+ *
+ * @ingroup themeable
+ */
+function theme_chatroom_block_chats() {
+ $content = '
';
+ }
+ return $html;
+}
diff -Naur chatroom/nbproject/private/private.xml chatroom-6.x-dev/nbproject/private/private.xml
--- chatroom/nbproject/private/private.xml 1969-12-31 19:00:00.000000000 -0500
+++ chatroom-6.x-dev/nbproject/private/private.xml 2008-10-18 21:14:27.000000000 -0400
@@ -0,0 +1,17 @@
+
+
+
+
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/CHANGELOG.txt
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/INSTALL.txt
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroom.block.js
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroom.forms.inc
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroom.info
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroom.install
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroom.js
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroom.module
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroom.theme.inc
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/chatroomread.php
+ file:/var/www/drupal-6.4/sites/all/modules/chatroom/soundmanager2.js
+
+
diff -Naur chatroom/nbproject/project.properties chatroom-6.x-dev/nbproject/project.properties
--- chatroom/nbproject/project.properties 1969-12-31 19:00:00.000000000 -0500
+++ chatroom-6.x-dev/nbproject/project.properties 2008-10-18 21:14:27.000000000 -0400
@@ -0,0 +1,8 @@
+copy.src.files=false
+copy.src.target=/var/www/chatroom
+include.path=${php.global.include.path}
+index.file=chatroomread.php
+run.as=LOCAL
+source.encoding=UTF-8
+src.dir=.
+url=http://localhost/drupal-6.4/?q=chatroom/
diff -Naur chatroom/nbproject/project.xml chatroom-6.x-dev/nbproject/project.xml
--- chatroom/nbproject/project.xml 1969-12-31 19:00:00.000000000 -0500
+++ chatroom-6.x-dev/nbproject/project.xml 2008-10-18 21:14:27.000000000 -0400
@@ -0,0 +1,9 @@
+
+
+ org.netbeans.modules.php.project
+
+
+ chatroom
+
+
+
diff -Naur chatroom/soundmanager2.js chatroom-6.x-dev/soundmanager2.js
--- chatroom/soundmanager2.js 2007-10-04 18:59:07.000000000 -0400
+++ chatroom-6.x-dev/soundmanager2.js 2008-10-18 21:14:27.000000000 -0400
@@ -1,16 +1,23 @@
-// $Id: soundmanager2.js,v 1.1.2.6 2007/10/04 22:59:07 darrenoh Exp $
-
-Drupal.chatroom = Drupal.chatroom || {};
-
-Drupal.chatroom.SoundManager = function(smURL,smID) {
- var self = this;
- this.version = 'V2.0b.20070415';
- this.url = Drupal.settings.chatroom.basePath + Drupal.settings.chatroom.chatroomBase +'/soundmanager2.swf';
-
- this.debugMode = false; // enable debugging output (div#soundmanager-debug, OR console if available + configured)
- this.useConsole = false; // use firebug/safari console.log()-type debug console if available
+/*
+ SoundManager 2: Javascript Sound for the Web
+ --------------------------------------------
+ http://schillmania.com/projects/soundmanager2/
+
+ Copyright (c) 2008, Scott Schiller. All rights reserved.
+ Code licensed under the BSD License:
+ http://schillmania.com/projects/soundmanager2/license.txt
+
+ V2.76a.20080808
+*/
+
+function SoundManager(smURL,smID) {
+
+ this.flashVersion = 8; // Version of flash to require, either 8 or 9. Some API features require Flash 9.
+ this.debugMode = true; // enable debugging output (div#soundmanager-debug, OR console if available + configured)
+ this.useConsole = true; // use firebug/safari console.log()-type debug console if available
this.consoleOnly = false; // if console is being used, do not create/write to #soundmanager-debug
- this.nullURL = 'data/null.mp3'; // path to "null" (empty) MP3 file, used to unload sounds
+ this.waitForWindowLoad = false; // force SM2 to wait for window.onload() before trying to call soundManager.onload()
+ this.nullURL = 'data/null.mp3'; // path to "null" (empty) MP3 file, used to unload sounds (Flash 8 only)
this.defaultOptions = {
'autoLoad': false, // enable automatic loading (otherwise .load() will be called on demand with .play(), the latter being nicer on bandwidth - if you want to .load yourself, you also can)
@@ -20,6 +27,8 @@
'onload': null, // callback function for "load finished"
'whileloading': null, // callback function for "download progress update" (X of Y bytes received)
'onplay': null, // callback for "play" start
+ 'onpause': null, // callback for "pause"
+ 'onresume': null, // callback for "resume" (pause toggle)
'whileplaying': null, // callback during play (position update)
'onstop': null, // callback for "user stop"
'onfinish': null, // callback function for "sound finished playing"
@@ -29,18 +38,32 @@
'onjustbeforefinish':null, // callback for [n] msec before end of current sound
'onjustbeforefinishtime':200, // [n] - if not using, set to 0 (or null handler) and event will not fire.
'multiShot': true, // let sounds "restart" or layer on top of each other when played multiple times, rather than one-shot/one at a time
+ 'position': null, // offset (milliseconds) to seek to within loaded sound data.
'pan': 0, // "pan" settings, left-to-right, -100 to 100
'volume': 100 // self-explanatory. 0-100, the latter being the max.
- }
+ };
- this.allowPolling = true; // allow flash to poll for status update (required for "while playing", "progress" etc. to work.)
+ this.flash9Options = { // FLASH 9-ONLY options, merged into defaultOptions if applicable
+ usePeakData: false, // enable left/right channel peak (level) data
+ useWaveformData: false, // enable sound spectrum (raw waveform data) - WARNING: CPU-INTENSIVE: may set CPUs on fire.
+ useEQData: false // enable sound EQ (frequency spectrum data) - WARNING: Also CPU-intensive.
+ };
+
+ this.allowPolling = true; // allow flash to poll for status update (required for "while playing", peak, sound spectrum functions to work.)
+
+ var self = this;
+ this.version = null;
+ this.versionNumber = 'V2.76a.20080808';
+ this.movieURL = null;
+ this.url = null;
+ this.swfLoaded = false;
this.enabled = false;
this.o = null;
this.id = (smID||'sm2movie');
this.oMC = null;
this.sounds = [];
this.soundIDs = [];
- this.isIE = (navigator.userAgent.match(/MSIE/));
+ this.isIE = (navigator.userAgent.match(/MSIE/i));
this.isSafari = (navigator.userAgent.match(/safari/i));
this.debugID = 'soundmanager-debug';
this._debugOpen = true;
@@ -48,15 +71,53 @@
this._appendSuccess = false;
this._didInit = false;
this._disabled = false;
+ this._windowLoaded = false;
this._hasConsole = (typeof console != 'undefined' && typeof console.log != 'undefined');
- this._debugLevels = !self.isSafari?['debug','info','warn','error']:['log','log','log','log'];
+ this._debugLevels = ['log','info','warn','error'];
+ this._defaultFlashVersion = 8;
+ this.features = {
+ peakData: false,
+ waveformData: false,
+ eqData: false
+ };
+ this.sandbox = {
+ 'type': null,
+ 'types': {
+ 'remote': 'remote (domain-based) rules',
+ 'localWithFile': 'local with file access (no internet access)',
+ 'localWithNetwork': 'local with network (internet access only, no local access)',
+ 'localTrusted': 'local, trusted (local + internet access)'
+ },
+ 'description': null,
+ 'noRemote': null,
+ 'noLocal': null
+ };
+ this._setVersionInfo = function() {
+ if (self.flashVersion != 8 && self.flashVersion != 9) {
+ alert('soundManager.flashVersion must be 8 or 9. "'+self.flashVersion+'" is invalid. Reverting to '+self._defaultFlashVersion+'.');
+ self.flashVersion = self._defaultFlashVersion;
+ }
+ self.version = self.versionNumber+(self.flashVersion==9?' (AS3/Flash 9)':' (AS2/Flash 8)');
+ self.movieURL = (self.flashVersion==8?'soundmanager2.swf':'soundmanager2_flash9.swf');
+ self.features.peakData = self.features.waveformData = self.features.eqData = (self.flashVersion==9);
+ }
+ this._overHTTP = (document.location?document.location.protocol.match(/http/i):null);
+ this._waitingforEI = false;
+ this._initPending = false;
+ this._tryInitOnFocus = (this.isSafari && typeof document.hasFocus == 'undefined');
+ this._isFocused = (typeof document.hasFocus != 'undefined'?document.hasFocus():null);
+ this._okToDisable = !this._tryInitOnFocus;
+ var flashCPLink = 'http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html';
// --- public methods ---
+
+ this.supported = function() {
+ return (self._didInit && !self._disabled);
+ };
this.getMovie = function(smID) {
- // return self.isIE?window[smID]:document[smID];
- return self.isIE?window[smID]:(self.isSafari?document[smID+'-embed']:document.getElementById(smID+'-embed'));
- }
+ return self.isIE?window[smID]:(self.isSafari?document.getElementById(smID)||document[smID]:document.getElementById(smID));
+ };
this.loadFromXML = function(sXmlUrl) {
try {
@@ -64,55 +125,68 @@
} catch(e) {
self._failSafely();
return true;
- }
- }
+ };
+ };
this.createSound = function(oOptions) {
- if (!self._didInit) throw new Error('Drupal.chatroom.soundManager.createSound(): Not loaded yet - wait for Drupal.chatroom.soundManager.onload() before calling sound-related methods');
+ if (!self._didInit) throw new Error('soundManager.createSound(): Not loaded yet - wait for soundManager.onload() before calling sound-related methods');
if (arguments.length==2) {
// function overloading in JS! :) ..assume simple createSound(id,url) use case
- oOptions = {'id':arguments[0],'url':arguments[1]}
- }
- var thisOptions = self._mergeObjects(oOptions);
- self._writeDebug('Drupal.chatroom.soundManager.createSound(): "'+thisOptions.id+'" ('+thisOptions.url+')',1);
+ oOptions = {'id':arguments[0],'url':arguments[1]};
+ };
+ var thisOptions = self._mergeObjects(oOptions); // inherit SM2 defaults
+ self._writeDebug('soundManager.createSound(): '+thisOptions.id+' ('+thisOptions.url+')',1);
if (self._idCheck(thisOptions.id,true)) {
- self._writeDebug('sound '+thisOptions.id+' already defined - exiting',2);
- return false;
- }
- self.sounds[thisOptions.id] = new Drupal.chatroom.SMSound(self,thisOptions);
+ self._writeDebug('soundManager.createSound(): '+thisOptions.id+' exists',1);
+ return self.sounds[thisOptions.id];
+ };
+ self.sounds[thisOptions.id] = new SMSound(self,thisOptions);
self.soundIDs[self.soundIDs.length] = thisOptions.id;
try {
- self.o._createSound(thisOptions.id,thisOptions.onjustbeforefinishtime);
+ // AS2:
+ if (self.flashVersion==8) {
+ self.o._createSound(thisOptions.id,thisOptions.onjustbeforefinishtime);
+ } else {
+ self.o._createSound(thisOptions.id,thisOptions.url,thisOptions.onjustbeforefinishtime,thisOptions.usePeakData,thisOptions.useWaveformData,thisOptions.useEQData);
+ }
} catch(e) {
self._failSafely();
return true;
- }
- if (thisOptions.autoLoad || thisOptions.autoPlay) self.sounds[thisOptions.id].load(thisOptions);
- if (thisOptions.autoPlay) self.sounds[thisOptions.id].playState = 1; // we can only assume this sound will be playing soon.
- }
+ };
+ if (thisOptions.autoLoad || thisOptions.autoPlay) window.setTimeout(function(){self.sounds[thisOptions.id].load(thisOptions);},20);
+ if (thisOptions.autoPlay) {
+ if (self.flashVersion == 8) {
+ self.sounds[thisOptions.id].playState = 1; // we can only assume this sound will be playing soon.
+ } else {
+ self.sounds[thisOptions.id].play();
+ }
+ }
+ return self.sounds[thisOptions.id];
+ };
this.destroySound = function(sID) {
// explicitly destroy a sound before normal page unload, etc.
if (!self._idCheck(sID)) return false;
- for (var i=self.soundIDs.length; i--;) {
+ for (var i=0; iWarning: Drupal.chatroom.soundManager.onload() is undefined.',2);
- }
+ // this is a stub - you can override this in your own external script, eg. soundManager.onload = function() {}
+ soundManager._writeDebug('Warning: soundManager.onload() is undefined.',2);
+ };
this.onerror = function() {
// stub for user handler, called when SM2 fails to load/init
- }
+ };
// --- "private" methods ---
@@ -218,43 +320,54 @@
this._disableObject = function(o) {
for (var oProp in o) {
- if (typeof o[oProp] == 'function' && typeof o[oProp]._protected == 'undefined') o[oProp] = function(){return false;}
- }
+ if (typeof o[oProp] == 'function' && typeof o[oProp]._protected == 'undefined') o[oProp] = function(){return false;};
+ };
oProp = null;
- }
+ };
this._failSafely = function() {
- // exception handler for "object doesn't support this property or method"
- var flashCPLink = 'http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html';
- var fpgssTitle = 'You may need to whitelist this location/domain eg. file:///C:/ or C:/ or mysite.com, or set ALWAYS ALLOW under the Flash Player Global Security Settings page. Note that this seems to apply only to file system viewing.';
+ // exception handler for "object doesn't support this property or method" or general failure
+ var fpgssTitle = 'You may need to whitelist this location/domain eg. file:///C:/ or C:/ or mysite.com, or set ALWAYS ALLOW under the Flash Player Global Security Settings page. The latter is probably less-secure.';
var flashCPL = 'view/edit';
var FPGSS = 'FPGSS';
if (!self._disabled) {
- self._writeDebug('soundManager: JS->Flash communication failed. Possible causes: flash/browser security restrictions ('+flashCPL+'), insufficient browser/plugin support, or .swf not found',2);
- self._writeDebug('Verify that the movie path of '+self.url+' is correct (test link)',1);
- if (self._didAppend) {
- if (!document.domain) {
- self._writeDebug('Loading from local file system? (document.domain appears to be null, this URL path may need to be added to \'trusted locations\' in '+FPGSS+')',1);
- self._writeDebug('Possible security/domain restrictions ('+flashCPL+'), should work when served by http on same domain',1);
- }
- // self._writeDebug('Note: Movie added via JS method, static object/embed in-page markup method may work instead.');
- }
+ self._writeDebug('soundManager: Failed to initialise.',2);
self.disable();
+ };
+ };
+
+ this._normalizeMovieURL = function(smURL) {
+ if (smURL) {
+ if (smURL.match(/\.swf/)) {
+ smURL = smURL.substr(0,smURL.lastIndexOf('.swf'));
+ }
+ if (smURL.lastIndexOf('/') != smURL.length-1) {
+ smURL = smURL+'/';
+ }
}
+ return(smURL && smURL.lastIndexOf('/')!=-1?smURL.substr(0,smURL.lastIndexOf('/')+1):'./')+self.movieURL;
}
this._createMovie = function(smID,smURL) {
if (self._didAppend && self._appendSuccess) return false; // ignore if already succeeded
if (window.location.href.indexOf('debug=1')+1) self.debugMode = true; // allow force of debug mode via URL
self._didAppend = true;
- var html = ['',''];
- var toggleElement = '
-
';
- var debugHTML = '';
- var appXHTML = 'Drupal.chatroom.soundManager._createMovie(): appendChild/innerHTML set failed. Serving application/xhtml+xml MIME type? Browser may be enforcing strict rules, not allowing write to innerHTML. (PS: If so, this means your commitment to XML validation is going to break stuff now, because this part isn\'t finished yet. ;))';
+
+ // safety check for legacy (change to Flash 9 URL)
+ self._setVersionInfo();
+ self.url = self._normalizeMovieURL(smURL?smURL:self.url);
+ smURL = self.url;
+
+ var htmlEmbed = '';
+ var htmlObject = '';
+ html = (!self.isIE?htmlEmbed:htmlObject);
- var sHTML = '
';
+ var debugHTML = '';
+ var appXHTML = 'soundManager._createMovie(): appendChild/innerHTML set failed. May be app/xhtml+xml DOM-related.';
+ var sHTML = '