Index: modules/forum/forum.css =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.css,v retrieving revision 1.4 diff -u -p -r1.4 forum.css --- modules/forum/forum.css 27 May 2007 17:57:48 -0000 1.4 +++ modules/forum/forum.css 12 Jul 2007 15:32:49 -0000 @@ -19,6 +19,10 @@ #forum tr.new-topics td.forum { background-image: url(../../misc/forum-new.png); } +#forum div.indent { + margin-left: 20px; +} + .forum-topic-navigation { padding: 1em 0 0 3em; /* LTR */ border-top: 1px solid #888; Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.407 diff -u -p -r1.407 forum.module --- modules/forum/forum.module 2 Jul 2007 17:08:35 -0000 1.407 +++ modules/forum/forum.module 12 Jul 2007 15:32:50 -0000 @@ -34,20 +34,29 @@ function forum_help($path, $arg) { function forum_theme() { return array( 'forum_display' => array( + 'file' => 'forum_display', 'arguments' => array('forums' => NULL, 'topics' => NULL, 'parents' => NULL, 'tid' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL), ), 'forum_list' => array( + 'file' => 'forum_list', 'arguments' => array('forums' => NULL, 'parents' => NULL, 'tid' => NULL), ), 'forum_topic_list' => array( + 'file' => 'forum_topic_list', 'arguments' => array('tid' => NULL, 'topics' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL), ), 'forum_icon' => array( + 'file' => 'forum_icon', 'arguments' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0), ), 'forum_topic_navigation' => array( + 'file' => 'forum_topic_navigation', 'arguments' => array('node' => NULL), ), + 'forum_format_topic' => array( + 'file' => 'forum_format_topic', + 'arguments' => array('topic' => NULL), + ), ); } @@ -689,20 +698,6 @@ function forum_link_alter(&$links, $node } /** - * Formats a topic for display - * - * @TODO Give a better description. Not sure where this function is used yet. - */ -function _forum_format($topic) { - if ($topic && !empty($topic->timestamp)) { - return t('@time ago
by !author', array('@time' => format_interval(time() - $topic->timestamp), '!author' => theme('username', $topic))); - } - else { - return t('n/a'); - } -} - -/** * Returns a list of all forums for a given taxonomy id * * Forum objects contain the following fields @@ -868,11 +863,19 @@ function forum_page($tid = 0) { } /** - * Format the forum body. + * Process variables for forum_display.tpl.php * - * @ingroup themeable + * The $variables array contains the following arguments: + * - $forums + * - $topics + * - $parents + * - $tid + * - $sortby + * - $forum_per_page + * + * @see forum_display.tpl.php */ -function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_per_page) { +function template_preprocess_forum_display(&$variables) { global $user; // forum list, topics list, topic browser and 'add new topic' link @@ -882,14 +885,14 @@ function theme_forum_display($forums, $t // Breadcrumb navigation: $breadcrumb = array(); - if ($tid) { + if ($variables['tid']) { $breadcrumb[] = array('path' => 'forum', 'title' => $title); } - if ($parents) { - $parents = array_reverse($parents); - foreach ($parents as $p) { - if ($p->tid == $tid) { + if ($variables['parents']) { + $variables['parents'] = array_reverse($variables['parents']); + foreach ($variables['parents'] as $p) { + if ($p->tid == $variables['tid']) { $title = $p->name; } else { @@ -903,235 +906,213 @@ function theme_forum_display($forums, $t $breadcrumb[] = array('path' => $_GET['q']); menu_set_location($breadcrumb); - if (count($forums) || count($parents)) { - $output = '
'; - $output .= ''; + $variables['links'] = $forum_types; - $output .= theme('forum_list', $forums, $parents, $tid); + if (!empty($variables['forums'])) { + $variables['forums'] = theme('forum_list', $variables['forums'], $variables['parents'], $variables['tid']); + } - if ($tid && !in_array($tid, variable_get('forum_containers', array()))) { - $output .= theme('forum_topic_list', $tid, $topics, $sortby, $forum_per_page); - drupal_add_feed(url('taxonomy/term/'. $tid .'/0/feed'), 'RSS - '. $title); + if ($variables['tid'] && !in_array($variables['tid'], variable_get('forum_containers', array()))) { + $variables['topics'] = theme('forum_topic_list', $variables['tid'], $variables['topics'], $variables['sortby'], $variables['forum_per_page']); + drupal_add_feed(url('taxonomy/term/'. $variables['tid'] .'/0/feed'), 'RSS - '. $title); } - $output .= '
'; } else { drupal_set_title(t('No forums defined')); - $output = ''; } - - return $output; } /** - * Format the forum listing. + * Process variables to format a forum listing. * - * @ingroup themeable + * $variables contains the following information: + * - $forums + * - $parents + * - $tid + * + * @see forum_list.tpl.php */ -function theme_forum_list($forums, $parents, $tid) { +function template_preprocess_forum_list(&$variables) { global $user; - - if ($forums) { - - $header = array(t('Forum'), t('Topics'), t('Posts'), t('Last post')); - - foreach ($forums as $forum) { - if (!empty($forum->container)) { - $description = '
\n"; - $description .= '
'. l($forum->name, "forum/$forum->tid") ."
\n"; - - if (!empty($forum->description)) { - $description .= '
'. filter_xss_admin($forum->description) ."
\n"; - } - $description .= "
\n"; - - $rows[] = array(array('data' => $description, 'class' => 'container', 'colspan' => '4')); - } - else { - $new_topics = _forum_topics_unread($forum->tid, $user->uid); - $forum->old_topics = $forum->num_topics - $new_topics; - if (!$user->uid) { - $new_topics = 0; - } - - $description = '
\n"; - $description .= '
'. l($forum->name, "forum/$forum->tid") ."
\n"; - - if (!empty($forum->description)) { - $description .= '
'. filter_xss_admin($forum->description) ."
\n"; - } - $description .= "
\n"; - - $row = array( - 'data' => array( - array('data' => $description, 'class' => 'forum'), - array('data' => $forum->num_topics . ($new_topics ? '
'. l(format_plural($new_topics, '1 new', '@count new'), "forum/$forum->tid", array('fragment' => 'new')) : ''), 'class' => 'topics'), - array('data' => $forum->num_posts, 'class' => 'posts'), - array('data' => _forum_format($forum->last_post), 'class' => 'last-reply'), - ), - ); - if ($new_topics > 0) { - $row['class'] = 'new-topics'; - } - $rows[] = $row; + // Sanitize each forum so that the template can safely print the data. + foreach ($variables['forums'] as $id => $forum) { + $variables['forums'][$id]->description = !empty($forum->description) ? filter_xss_admin($forum->description) : ''; + $variables['forums'][$id]->link = url("forum/$forum->tid"); + $variables['forums'][$id]->name = check_plain($forum->name); + $variables['forums'][$id]->is_container = !empty($forum->container); + if ($user->uid) { + $variables['forums'][$id]->new_topics = _forum_topics_unread($forum->tid, $user->uid); + if ($variables['forums'][$id]->new_topics) { + $variables['forums'][$id]->new_text = format_plural($variables['forums'][$id]->new_topics, '1 new', '@count new'); + $variables['forums'][$id]->new_url = url("forum/$forum->tid", array('fragment' => 'new')); } + $variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics; } - - return theme('table', $header, $rows); - + else { + $variables['forums'][$id]->new_topics = 0; + $variables['forums'][$id]->old_topics = $forum->num_topics; + } + $variables['forums'][$id]->last_reply = theme('forum_format_topic', $forum->last_post); } - } /** - * Format the topic listing. + * Preprocess variables to format the topic listing. + * + * $variables contains the following data: + * - $tid + * - $topics + * - $sortby + * - $forum_per_page * - * @ingroup themeable + * @see forum_topic_list.tpl.php */ -function theme_forum_topic_list($tid, $topics, $sortby, $forum_per_page) { +function template_preprocess_forum_topic_list(&$variables) { global $forum_topic_list_header; - $rows = array(); - if ($topics) { - foreach ($topics as $topic) { - // folder is new if topic is new or there are new comments since last visit - if ($topic->tid != $tid) { - $rows[] = array( - array('data' => theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky), 'class' => 'icon'), - array('data' => check_plain($topic->title), 'class' => 'title'), - array('data' => l(t('This topic has been moved'), "forum/$topic->tid"), 'colspan' => '3') - ); + // Create the tablesorting header. + $ts = tablesort_init($forum_topic_list_header); + $header = ''; + foreach ($forum_topic_list_header as $cell) { + $cell = tablesort_header($cell, $forum_topic_list_header, $ts); + $header .= _theme_table_cell($cell, TRUE); + } + $variables['header'] = $header; + + $rows = array(); + if (!empty($variables['topics'])) { + foreach ($variables['topics'] as $id => $topic) { + $variables['topics'][$id]->icon = theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky); + + if ($topic->tid != $variables['tid']) { + $variables['topics'][$id]->moved = TRUE; + $variables['topics'][$id]->title = check_plain($topic->title); + $variables['topics'][$id]->description = l(t('This topic has been moved'), "forum/$topic->tid"); } else { - $rows[] = array( - array('data' => theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky), 'class' => 'icon'), - array('data' => l($topic->title, "node/$topic->nid"), 'class' => 'topic'), - array('data' => $topic->num_comments . ($topic->new_replies ? '
'. l(format_plural($topic->new_replies, '1 new', '@count new'), "node/$topic->nid", array('fragment' => 'new')) : ''), 'class' => 'replies'), - array('data' => _forum_format($topic), 'class' => 'created'), - array('data' => _forum_format(isset($topic->last_reply) ? $topic->last_reply : NULL), 'class' => 'last-reply') - ); + $variables['topics'][$id]->moved = FALSE; + $variables['topics'][$id]->title = l($topic->title, "node/$topic->nid"); + if ($topic->new_replies) { + $variables['topics'][$id]->new_text = format_plural($topic->new_replies, '1 new', '@count new'); + $variables['topics'][$id]->new_url = url("node/$topic->nid", array('fragment' => 'new')); + } + $variables['topics'][$id]->created = theme('forum_format_topic', $topic); + $variables['topics'][$id]->last_reply = theme('forum_format_topic', isset($topic->last_reply) ? $topic->last_reply : NULL); } } } + else { + // Make this safe for the template + $variables['topics'] = array(); + } - $output = theme('table', $forum_topic_list_header, $rows); - $output .= theme('pager', NULL, $forum_per_page, 0); - - return $output; + $variables['pager'] = theme('pager', NULL, $variables['forum_per_page'], 0); } /** - * Format the icon for each individual topic. + * Process variables to format the icon for each individual topic. * - * @ingroup themeable + * $variables contains the following data: + * - $new_posts + * - $num_posts = 0 + * - $comment_mode = 0 + * - $sticky = 0 + * + * @see forum_icon.tpl.php */ -function theme_forum_icon($new_posts, $num_posts = 0, $comment_mode = 0, $sticky = 0) { - - if ($num_posts > variable_get('forum_hot_topic', 15)) { - $icon = $new_posts ? 'hot-new' : 'hot'; +function template_preprocess_forum_icon(&$variables) { + $variables['hot_threshold'] = variable_get('forum_hot_topic', 15); + if ($variables['num_posts'] > $variables['hot_threshold']) { + $variables['icon'] = $variables['new_posts'] ? 'hot-new' : 'hot'; } else { - $icon = $new_posts ? 'new' : 'default'; - } - - if ($comment_mode == COMMENT_NODE_READ_ONLY || $comment_mode == COMMENT_NODE_DISABLED) { - $icon = 'closed'; + $variables['icon'] = $variables['new_posts'] ? 'new' : 'default'; } - if ($sticky == 1) { - $icon = 'sticky'; + if ($variables['comment_mode'] == COMMENT_NODE_READ_ONLY || $variables['comment_mode'] == COMMENT_NODE_DISABLED) { + $variables['icon'] = 'closed'; } - $output = theme('image', "misc/forum-$icon.png"); - - if ($new_posts) { - $output = "$output"; + if ($variables['sticky'] == 1) { + $variables['icon'] = 'sticky'; } - - return $output; } /** - * Format the next/previous forum topic navigation links. + * Preprocess variables to format the next/previous forum topic navigation links. + * + * $variables contains $node. * - * @ingroup themeable + * @see forum_topic_navigation.tpl.php */ -function theme_forum_topic_navigation($node) { +function template_preprocess_forum_topic_navigation(&$variables) { $output = ''; // get previous and next topic $sql = "SELECT n.nid, n.title, n.sticky, l.comment_count, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 ORDER BY n.sticky DESC, ". _forum_get_topic_order_sql(variable_get('forum_order', 1)); - $result = db_query(db_rewrite_sql($sql), isset($node->tid) ? $node->tid : 0); + $result = db_query(db_rewrite_sql($sql), isset($variables['node']->tid) ? $variables['node']->tid : 0); + + $stop = $variables['prev'] = $variables['next'] = 0; - $stop = 0; while ($topic = db_fetch_object($result)) { if ($stop == 1) { - $next = new stdClass(); - $next->nid = $topic->nid; - $next->title = $topic->title; + $variables['next'] = $topic->nid; + $variables['next_title'] = check_plain($topic->title); + $variables['next_url'] = url("node/$topic->nid"); break; } - if ($topic->nid == $node->nid) { + if ($topic->nid == $variables['node']->nid) { $stop = 1; } else { - $prev = new stdClass(); - $prev->nid = $topic->nid; - $prev->title = $topic->title; + $variables['prev'] = $topic->nid; + $variables['prev_title'] = check_plain($topic->title); + $variables['prev_url'] = url("node/$topic->nid"); } } +} - if (!empty($prev) || !empty($next)) { - $output .= '
'; - - if (!empty($prev)) { - $output .= l(t('‹ ') . $prev->title, 'node/'. $prev->nid, array('class' => 'topic-previous', 'title' => t('Go to previous forum topic'))); - } - if (!empty($prev) && !empty($next)) { - // Word break (a is an inline element) - $output .= ' '; - } - if (!empty($next)) { - $output .= l($next->title . t(' ›'), 'node/'. $next->nid, array('class' => 'topic-next', 'title' => t('Go to next forum topic'))); - } - - $output .= '
'; +/** + * Process variables to format a topic for display in the forum list and topic list. + * + * $variables will contain: $topic + * + * @see forum_format_topic.tpl.php + */ +function template_preprocess_forum_format_topic(&$variables) { + if (empty($variables['topic']) || empty($variables['topic']->timestamp)) { + $variables['topic'] = new stdClass(); + $variables['topic']->timestamp = 0; + } + else { + $variables['time'] = format_interval(time() - $variables['topic']->timestamp); + $variables['author'] = theme('username', $variables['topic']); } - - return $output; } function _forum_user_last_visit($nid) { Index: modules/forum/forum_display.tpl.php =================================================================== RCS file: modules/forum/forum_display.tpl.php diff -N modules/forum/forum_display.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/forum/forum_display.tpl.php 12 Jul 2007 15:32:50 -0000 @@ -0,0 +1,28 @@ + + + + +
+ + + +
+ + Index: modules/forum/forum_format_topic.tpl.php =================================================================== RCS file: modules/forum/forum_format_topic.tpl.php diff -N modules/forum/forum_format_topic.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/forum/forum_format_topic.tpl.php 12 Jul 2007 15:32:50 -0000 @@ -0,0 +1,26 @@ + +timestamp): ?> + by !author', array( + '@time' => $time, + '!author' => $author, + )); ?> + + + Index: modules/forum/forum_icon.tpl.php =================================================================== RCS file: modules/forum/forum_icon.tpl.php diff -N modules/forum/forum_icon.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/forum/forum_icon.tpl.php 12 Jul 2007 15:32:50 -0000 @@ -0,0 +1,23 @@ + + + + + + + + + + Index: modules/forum/forum_list.tpl.php =================================================================== RCS file: modules/forum/forum_list.tpl.php diff -N modules/forum/forum_list.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/forum/forum_list.tpl.php 12 Jul 2007 15:32:50 -0000 @@ -0,0 +1,76 @@ +is_container: Is TRUE if the forum can contain other forums. Is + * FALSE if the forum can contain only topics. + * - $forum->depth: How deep the forum is in the current hierarchy. + * - $forum->name: The name of the forum. + * - $forum->link: The URL to link to this forum. + * - $forum->description: The description of this forum. + * - $forum->new_topics: True if the forum contains unread posts. + * - $forum->new_url: A URL to the forum's unread posts. + * - $forum->new_text: Text for the above URL which tells how many new posts. + * - $forum->old_topics: A count of posts that have already been read. + * - $forum->num_posts: The total number of posts in the forum. + * - $forum->last_reply: Text representing the last time a forum was posted or + * commented in. + * + * @see template_preprocess_forum_list() + */ +?> + + + + + + + + + + + + + + > + is_container): ?> + + is_container): ?> + + + + + + + + + +
+ + + + + + depth; $i++): ?> +
+ '; ?> + +
name; ?>
+
description; ?>
+ +
+ num_topics ?> + new_topics): ?> +
+ new_text; ?> + + 		num_posts ?>last_reply ?>
Index: modules/forum/forum_topic_list.tpl.php =================================================================== RCS file: modules/forum/forum_topic_list.tpl.php diff -N modules/forum/forum_topic_list.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/forum/forum_topic_list.tpl.php 12 Jul 2007 15:32:50 -0000 @@ -0,0 +1,64 @@ +icon: The icon to display. + * - $topic->moved: A flag to indicate whether the topic has been moved to + * another forum. + * - $topic->title: The title of the topic. Safe to output. + * - $topic->description: If the topic has been moved, this contains an + * explanation and a link. + * - $topic->num_comments: The number of replies on this topic. + * - $topic->new_replies: A flag to indicate whether there are unread comments. + * - $topic->new_url: If there are unread replies, this is a link to them. + * - $topic->new_text: Text containing the translated, properly pluralized count. + * - $topic->created: An outputtable string represented when the topic was posted. + * - $topic->last_reply: An outputtable string representing when the topic was + * last replied to. + * - $topic->timestamp: The raw timestamp this topic was posted. + * + * @see template_preprocess_forum_topic_list() + */ +?> + + + + + + + + > + + + moved): ?> + + + + + + + +
icon; ?>title; ?>description; ?> + num_comments; ?> + new_replies): ?> +
+ new_text; ?> + + 		created; ?> + last_reply; ?> + +
+ + Index: modules/forum/forum_topic_navigation.tpl.php =================================================================== RCS file: modules/forum/forum_topic_navigation.tpl.php diff -N modules/forum/forum_topic_navigation.tpl.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/forum/forum_topic_navigation.tpl.php 12 Jul 2007 15:32:50 -0000 @@ -0,0 +1,33 @@ + + +
+ + ‹ + + + › + +
+ \ No newline at end of file