drupal/modules/forum/forum.module

<?php
// $Id$

/**
 * @file
 * Enable threaded discussions about general topics.
 */

/**
 * Implementation of hook_help().
 */
function forum_help($section) {
  switch ($section) {
    case 'admin/help#forum':
      $output = '<p>'. t('The forum module lets you create threaded discussion forums for a particular topic on your site. This is similar to a message board system such as phpBB. Forums are very useful because they allow community members to discuss topics with one another, and they are archived for future reference.') .'</p>';
      $output .= '<p>'. t('Forums can be organized under what are called <em>containers</em>. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them. Forum topics can be moved by selecting a different forum and can be left in the existing forum by selecting <em>leave a shadow copy</em>. Forum topics can also have their own URL.') .'</p>';
      $output .= '<p>'. t('Forums module <strong>requires Taxonomy and Comments module</strong> be enabled.') .'</p>';
      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@forum">Forum page</a>.', array('@forum' => 'http://drupal.org/handbook/modules/forum/')) .'</p>';
      return $output;
    case 'admin/content/forum':
      return '<p>'. t('This is a list of existing containers and forums that you can edit. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.') .'</p>';
    case 'admin/content/forum/add/container':
      return '<p>'. t('Containers help you organize your forums. The job of a container is to hold, or contain, other forums that are related. For example, a container named "Food" might hold two forums named "Fruit" and "Vegetables".') .'</p>';
    case 'admin/content/forum/add/forum':
      return '<p>'. t('A forum holds discussion topics that are related. For example, a forum named "Fruit" might contain topics titled "Apples" and "Bananas".') .'</p>';
    case 'admin/content/forum/settings':
      return '<p>'. t('These settings provide the ability to fine tune the display of your forum topics.') .'</p>';
  }
}

/**
 * Implementation of hook_menu().
 */
function forum_menu() {
  $items['node/add/forum'] = array(
    'title' => t('Forum topic'),
    'access arguments' => array('create forum topics'),
  );
  $items['forum'] = array(
    'title' => t('Forums'),
    'page callback' => 'forum_page',
    'access arguments' => array('access content'),
    'type' => MENU_SUGGESTED_ITEM,
  );
  $items['admin/content/forum'] = array(
    'title' => t('Forums'),
    'description' => t('Control forums and their hierarchy and change forum settings.'),
    'page callback' => 'forum_overview',
    'access arguments' => array('administer forums'),
  );
  $items['admin/content/forum/list'] = array(
    'title' => t('List'),
    'type' => MENU_DEFAULT_LOCAL_TASK,
    'weight' => -10,
  );
  $items['admin/content/forum/add/container'] = array(
    'title' => t('Add container'),
    'page callback' => 'forum_form_main',
    'page arguments' => array('container'),
    'type' => MENU_LOCAL_TASK,
    'parent' => 'admin/content/forum',
  );
  $items['admin/content/forum/add/forum'] = array(
    'title' => t('Add forum'),
    'page callback' => 'forum_form_main',
    'page arguments' => array('forum'),
    'type' => MENU_LOCAL_TASK,
    'parent' => 'admin/content/forum',
  );
  $items['admin/content/forum/settings'] = array(
    'title' => t('Settings'),
    'page callback' => 'drupal_get_form',
    'page arguments' => array('forum_admin_settings'),
    'weight' => 5,
    'type' => MENU_LOCAL_TASK,
    'parent' => 'admin/content/forum',
  );
  $items['admin/content/forum/edit/%forum_term'] = array(
    'page callback' => 'forum_form_main',
    'type' => MENU_CALLBACK,
  );
  $items['admin/content/forum/edit/container/%forum_term'] = array(
    'title' => t('Edit container'),
    'page callback' => 'forum_form_main',
    'page arguments' => array('container', 5),
    'type' => MENU_CALLBACK,
  );
  $items['admin/content/forum/edit/forum/%forum_term'] = array(
    'title' => t('Edit forum'),
    'page callback' => 'forum_form_main',
    'page arguments' => array('forum', 5),
    'type' => MENU_CALLBACK,
  );
  return $items;
}

function forum_init() {
  drupal_add_css(drupal_get_path('module', 'forum') .'/forum.css');
}

function forum_term_load($tid) {
  return (array)taxonomy_get_term($tid);
}

/**
 * Implementation of hook_node_info().
 */
function forum_node_info() {
  return array(
    'forum' => array(
      'name' => t('Forum topic'),
      'module' => 'forum',
      'description' => t('Create a new topic for discussion in the forums.'),
      'title_label' => t('Subject'),
    )
  );
}

/**
 * Implementation of hook_access().
 */
function forum_access($op, $node) {
  global $user;

  if ($op == 'create') {
    return user_access('create forum topics');
  }

  if ($op == 'update' || $op == 'delete') {
    if (user_access('edit own forum topics') && ($user->uid == $node->uid)) {
      return TRUE;
    }
  }
}

/**
 * Implementation of hook_perm().
 */
function forum_perm() {
  return array('create forum topics', 'edit own forum topics', 'administer forums');
}

/**
 * Implementation of hook_nodeapi().
 */
function forum_nodeapi(&$node, $op, $teaser, $page) {
  switch ($op) {
    case 'delete revision':
      db_query('DELETE FROM {forum} WHERE vid = %d', $node->vid);
      break;
  }
}

/**
 * Implementation of hook_taxonomy().
 */
function forum_taxonomy($op, $type, $term = NULL) {
  if ($op == 'delete' && $term['vid'] == _forum_get_vid()) {
    switch ($type) {
      case 'term':
        $results = db_query('SELECT f.nid FROM {forum} f WHERE f.tid = %d', $term['tid']);
        while ($node = db_fetch_object($results)) {
          // node_delete will also remove any association with non-forum vocabularies.
          node_delete($node->nid);
        }

        // For containers, remove the tid from the forum_containers variable.
        $containers = variable_get('forum_containers', array());
        $key = array_search($term['tid'], $containers);
        if ($key !== FALSE) {
          unset($containers[$key]);
        }
        variable_set('forum_containers', $containers);
        break;
      case 'vocabulary':
        variable_del('forum_nav_vocabulary');
    }
  }
}

function forum_admin_settings() {
  $form = array();
  $number = drupal_map_assoc(array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500));
  $form['forum_hot_topic'] = array('#type' => 'select',
    '#title' => t('Hot topic threshold'),
    '#default_value' => variable_get('forum_hot_topic', 15),
    '#options' => $number,
    '#description' => t('The number of posts a topic must have to be considered hot.'),
  );
  $number = drupal_map_assoc(array(10, 25, 50, 75, 100));
  $form['forum_per_page'] = array('#type' => 'select',
    '#title' => t('Topics per page'),
    '#default_value' => variable_get('forum_per_page', 25),
    '#options' => $number,
    '#description' => t('The default number of topics displayed per page; links to browse older messages are automatically being displayed.'),
  );
  $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4=> t('Posts - least active first'));
  $form['forum_order'] = array('#type' => 'radios',
    '#title' => t('Default order'),
    '#default_value' => variable_get('forum_order', '1'),
    '#options' => $forder,
    '#description' => t('The default display order for topics.'),
  );
  return system_settings_form($form);
}

/**
 * Implementation of hook_form_alter().
 */
function forum_form_alter($form_id, &$form) {
  // hide critical options from forum vocabulary
  if ($form_id == 'taxonomy_form_vocabulary') {
    if ($form['vid']['#value'] == _forum_get_vid()) {
      $form['help_forum_vocab'] = array(
        '#value' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
        '#weight' => -1,
      );
      $form['nodes']['forum'] = array('#type' => 'checkbox', '#value' => 1, '#title' => t('forum topic'), '#attributes' => array('disabled' => '' ), '#description' => t('forum topic is affixed to the forum vocabulary.'));
      $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
      unset($form['relations']);
      unset($form['tags']);
      unset($form['multiple']);
      $form['required'] = array('#type' => 'value', '#value' => 1);
    }
    else {
      unset($form['nodes']['forum']);
    }
  }
}

/**
 * Implementation of hook_load().
 */
function forum_load($node) {
  $forum = db_fetch_object(db_query('SELECT * FROM {forum} WHERE vid = %d', $node->vid));

  return $forum;
}

/**
 * Implementation of hook_block().
 *
 * Generates a block containing the currently active forum topics and the
 * most recently added forum topics.
 */
function forum_block($op = 'list', $delta = 0, $edit = array()) {
  switch ($op) {
    case 'list':
      $blocks[0]['info'] = t('Active forum topics');
      $blocks[1]['info'] = t('New forum topics');
      return $blocks;

    case 'configure':
      $form['forum_block_num_'. $delta] = array('#type' => 'select', '#title' => t('Number of topics'), '#default_value' => variable_get('forum_block_num_'. $delta, '5'), '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
      return $form;

    case 'save':
      variable_set('forum_block_num_'. $delta, $edit['forum_block_num_'. $delta]);
      break;

    case 'view':
      if (user_access('access content')) {
        switch ($delta) {
          case 0:
            $title = t('Active forum topics');
            $sql = db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND n.type = 'forum' ORDER BY l.last_comment_timestamp DESC");
            $result = db_query_range($sql, 0, variable_get('forum_block_num_0', '5'));
            if (db_num_rows($result)) {
              $content = node_title_list($result);
            }
            break;

          case 1:
            $title = t('New forum topics');
            $sql = db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.type = 'forum' AND n.status = 1 ORDER BY n.nid DESC");
            $result = db_query_range($sql, 0, variable_get('forum_block_num_1', '5'));
            if (db_num_rows($result)) {
              $content = node_title_list($result);
            }
            break;
        }

        if ($content) {
          $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
        }

        $block['subject'] = $title;
        $block['content'] = $content;

        return $block;
      }
  }
}

/**
 * Implementation of hook_view().
 */
function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
  if ($page) {
    $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
    // Breadcrumb navigation
    $breadcrumb = array();
    $breadcrumb[] = array('path' => 'forum', 'title' => $vocabulary->name);
    if ($parents = taxonomy_get_parents_all($node->tid)) {
      $parents = array_reverse($parents);
      foreach ($parents as $p) {
        $breadcrumb[] = array('path' => 'forum/'. $p->tid, 'title' => $p->name);
      }
    }
    $breadcrumb[] = array('path' => 'node/'. $node->nid);
    menu_set_location($breadcrumb);
  }

  $node = node_prepare($node, $teaser);
  if (!$teaser) {
    $node->content['forum_navigation'] = array(
      '#value' => theme('forum_topic_navigation', $node),
      '#weight' => 100,
    );
  }
  return $node;
}

/**
 * Implementation of hook_submit().
 *
 * Check in particular that only a "leaf" term in the associated taxonomy
 * vocabulary is selected, not a "container" term.
 */
function forum_submit(&$node) {
  // Make sure all fields are set properly:
  $node->icon = $node->icon ? $node->icon : '';

  if ($node->taxonomy) {
    // Get the forum terms from the (cached) tree
    $tree = taxonomy_get_tree(_forum_get_vid());
    if ($tree) {
      foreach ($tree as $term) {
        $forum_terms[] = $term->tid;
      }
    }
    foreach ($node->taxonomy as $term) {
      if (in_array($term, $forum_terms)) {
        $node->tid = $term;
      }
    }
    $old_tid = db_result(db_query_range("SELECT tid FROM {forum} WHERE nid = %d ORDER BY vid DESC", $node->nid, 0,1));
    if ($old_tid) {
      if (($node->tid != $old_tid) && $node->shadow) {
        // A shadow copy needs to be created. Retain new term and add old term.
        $node->taxonomy[] = $old_tid;
      }
    }
  }
}

/**
 * Implementation of hook_validate().
 *
 * Check in particular that only a "leaf" term in the associated taxonomy
 * vocabulary is selected, not a "container" term.
 */
function forum_validate($node) {
  if ($node->taxonomy) {
    // Extract the node's proper topic ID.
    $vocabulary = variable_get('forum_nav_vocabulary', '');
    $containers = variable_get('forum_containers', array());
    foreach ($node->taxonomy as $term) {
      if (db_result(db_query('SELECT COUNT(*) FROM {term_data} WHERE tid = %d AND vid = %d', $term, $vocabulary))) {
        if (in_array($term, $containers)) {
          $term = taxonomy_get_term($term);
          form_set_error('taxonomy', t('The item %forum is only a container for forums. Please select one of the forums below it.', array('%forum' => $term->name)));
        }
      }
    }
  }
}

/**
 * Implementation of hook_update().
 */
function forum_update($node) {
  if ($node->revision) {
    db_query("INSERT INTO {forum} (nid, vid, tid) VALUES (%d, %d, %d)", $node->nid, $node->vid, $node->tid);
  }
  else {
    db_query('UPDATE {forum} SET tid = %d WHERE vid = %d', $node->tid, $node->vid);
  }
}

/**
 * Implementation of hook_form().
 */
function forum_form(&$node) {
  $type = node_get_types('type', $node);
  $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#default_value' => !empty($node->title) ? $node->title : '', '#required' => TRUE, '#weight' => -5);

  if (!empty($node->nid)) {
    $forum_terms = taxonomy_node_get_terms_by_vocabulary(_forum_get_vid(), $node);
    // if editing, give option to leave shadows
    $shadow = (count($forum_terms) > 1);
    $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.'));
  }

  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => check_plain($type->body_label), '#default_value' => !empty($node->body) ? $node->body : '', '#rows' => 20, '#required' => TRUE);
  $form['body_filter']['format'] = filter_form($node->format);

  return $form;
}

/**
 * Implementation of hook_prepare; assign forum taxonomy when adding a topic from within a forum.
 */
function forum_prepare(&$node) {
  if (empty($node->nid)) {
    // new topic
    $node->taxonomy[arg(3)]->vid = _forum_get_vid();
    $node->taxonomy[arg(3)]->tid = arg(3);
  }
}

/**
 * Implementation of hook_insert().
 */
function forum_insert($node) {
  db_query('INSERT INTO {forum} (nid, vid, tid) VALUES (%d, %d, %d)', $node->nid, $node->vid, $node->tid);
}

/**
 * Implementation of hook_delete().
 */
function forum_delete(&$node) {
  db_query('DELETE FROM {forum} WHERE nid = %d', $node->nid);
}

/**
 * Returns a form for adding a container to the forum vocabulary
 *
 * @param $edit Associative array containing a container term to be added or edited.
 */
function forum_form_container($edit = array()) {
  // Handle a delete operation.
  $form['name'] = array(
    '#title' => t('Container name'),
    '#type' => 'textfield',
    '#default_value' => $edit['name'],
    '#maxlength' => 255,
    '#description' => t('The container name is used to identify related forums.'),
    '#required' => TRUE
  );

  $form['description'] = array(
    '#type' => 'textarea',
    '#title' => t('Description'),
    '#default_value' => $edit['description'],
    '#description' => t('The container description can give users more information about the forums it contains.')
  );
  $form['parent']['#tree'] = TRUE;
  $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'container');
  $form['weight'] = array('#type' => 'weight',
    '#title' => t('Weight'),
    '#default_value' => $edit['weight'],
    '#description' => t('When listing containers, those with with light (small) weights get listed before containers with heavier (larger) weights. Containers with equal weights are sorted alphabetically.')
  );

  $form['vid'] = array('#type' => 'hidden',
    '#value' => _forum_get_vid());
  $form['submit'] = array(
    '#type' => 'submit',
    '#value' => t('Submit')
  );
  if ($edit['tid']) {
    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
    $form['tid'] = array('#type' => 'value', '#value' => $edit['tid']);
  }
  $form['#base'] = 'forum_form';

  return $form;
}

function forum_form_main($type, $edit = array()) {
  if ($_POST['op'] == t('Delete') || $_POST['confirm']) {
    return drupal_get_form('forum_confirm_delete', $edit['tid']);
  }
  switch ($type) {
    case 'forum':
      return drupal_get_form('forum_form_forum', $edit);
      break;
    case 'container':
      return drupal_get_form('forum_form_container', $edit);
      break;
  }
}

/**
 * Returns a form for adding a forum to the forum vocabulary
 *
 * @param $edit Associative array containing a forum term to be added or edited.
 */
function forum_form_forum($edit = array()) {
  $form['name'] = array('#type' => 'textfield',
    '#title' => t('Forum name'),
    '#default_value' => $edit['name'],
    '#maxlength' => 255,
    '#description' => t('The forum name is used to identify related discussions.'),
    '#required' => TRUE,
  );
  $form['description'] = array('#type' => 'textarea',
    '#title' => t('Description'),
    '#default_value' => $edit['description'],
    '#description' => t('The forum description can give users more information about the discussion topics it contains.'),
  );
  $form['parent']['#tree'] = TRUE;
  $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'forum');
  $form['weight'] = array('#type' => 'weight',
    '#title' => t('Weight'),
    '#default_value' => $edit['weight'],
    '#description' => t('When listing forums, those with lighter (smaller) weights get listed before containers with heavier (larger) weights. Forums with equal weights are sorted alphabetically.'),
  );

  $form['vid'] = array('#type' => 'hidden', '#value' => _forum_get_vid());
  $form['submit' ] = array('#type' => 'submit', '#value' => t('Submit'));
  if ($edit['tid']) {
    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
    $form['tid'] = array('#type' => 'hidden', '#value' => $edit['tid']);
  }
  $form['#base'] = 'forum_form';

  return $form;
}

/**
 * Process forum form and container form submissions.
 */
function forum_form_submit($form_id, $form_values) {
  if ($form_id == 'forum_form_container') {
    $container = TRUE;
    $type = t('forum container');
  }
  else {
    $container = FALSE;
    $type = t('forum');
  }

  $status = taxonomy_save_term($form_values);
  switch ($status) {
    case SAVED_NEW:
      if ($container) {
        $containers = variable_get('forum_containers', array());
        $containers[] = $form_values['tid'];
        variable_set('forum_containers', $containers);
      }
      drupal_set_message(t('Created new @type %term.', array('%term' => $form_values['name'], '@type' => $type)));
      break;
    case SAVED_UPDATED:
      drupal_set_message(t('The @type %term has been updated.', array('%term' => $form_values['name'], '@type' => $type)));
      break;
  }
  return 'admin/content/forum';
}

/**
 * Returns a confirmation page for deleting a forum taxonomy term.
 *
 * @param $tid ID of the term to be deleted
 */
function forum_confirm_delete($tid) {
  $term = taxonomy_get_term($tid);

  $form['tid'] = array('#type' => 'value', '#value' => $tid);
  $form['name'] = array('#type' => 'value', '#value' => $term->name);

  return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/content/forum', t('Deleting a forum or container will delete all sub-forums and associated posts as well. This action cannot be undone.'), t('Delete'), t('Cancel'));
}

/**
 * Implementation of forms api _submit call. Deletes a forum after confirmation.
 */
function forum_confirm_delete_submit($form_id, $form_values) {
  taxonomy_del_term($form_values['tid']);
  drupal_set_message(t('The forum %term and all sub-forums and associated posts have been deleted.', array('%term' => $form_values['name'])));
  watchdog('content', t('forum: deleted %term and all its sub-forums and associated posts.', array('%term' => $form_values['name'])));

  return 'admin/content/forum';
}

/**
 * Returns an overview list of existing forums and containers
 */
function forum_overview() {
  $header = array(t('Name'), t('Operations'));

  $tree = taxonomy_get_tree(_forum_get_vid());
  if ($tree) {
    foreach ($tree as $term) {
      if (in_array($term->tid, variable_get('forum_containers', array()))) {
        $rows[] = array(str_repeat(' -- ', $term->depth) .' '. l($term->name, 'forum/'. $term->tid), l(t('edit container'), 'admin/content/forum/edit/container/'. $term->tid));
      }
      else {
        $rows[] = array(str_repeat(' -- ', $term->depth) .' '. l($term->name, 'forum/'. $term->tid), l(t('edit forum'), 'admin/content/forum/edit/forum/'. $term->tid));
       }

    }
  }
  else {
    $rows[] = array(array('data' => '<em>' . t('There are no existing containers or forums. You may add some on the <a href="@container">add container</a> or <a href="@forum">add forum</a> pages.', array('@container' => url('admin/content/forum/add/container'), '@forum' => url('admin/content/forum/add/forum'))) . '</em>', 'colspan' => 2));
  }
  return theme('table', $header, $rows);
}

/**
 * Returns a select box for available parent terms
 *
 * @param $tid ID of the term which is being added or edited
 * @param $title Title to display the select box with
 * @param $child_type Whether the child is forum or container
 */
function _forum_parent_select($tid, $title, $child_type) {

  $parents = taxonomy_get_parents($tid);
  if ($parents) {
    $parent = array_shift($parents);
    $parent = $parent->tid;
  }
  else {
    $parent = 0;
  }

  $children = taxonomy_get_tree(_forum_get_vid(), $tid);

  // A term can't be the child of itself, nor of its children.
  foreach ($children as $child) {
    $exclude[] = $child->tid;
  }
  $exclude[] = $tid;

  $tree = taxonomy_get_tree(_forum_get_vid());
  $options[0] = '<'. t('root') .'>';
  if ($tree) {
    foreach ($tree as $term) {
      if (!in_array($term->tid, $exclude)) {
        $options[$term->tid] = str_repeat(' -- ', $term->depth) . $term->name;
      }
    }
  }
  if ($child_type == 'container') {
    $description = t('Containers are usually placed at the top (root) level of your forum but you can also place a container inside a parent container or forum.');
  }
  else if ($child_type == 'forum') {
    $description = t('You may place your forum inside a parent container or forum, or at the top (root) level of your forum.');
  }

  return array('#type' => 'select', '#title' => $title, '#default_value' => $parent, '#options' => $options, '#description' => $description, '#required' => TRUE);
}

function forum_link_alter(&$node, &$links) {
  foreach ($links as $module => $link) {
    if (strstr($module, 'taxonomy_term')) {
      // Link back to the forum and not the taxonomy term page. We'll only
      // do this if the taxonomy term in question belongs to forums.
      $tid = str_replace('taxonomy/term/', '', $link['href']);
      $term = taxonomy_get_term($tid);
      if ($term->vid == _forum_get_vid()) {
        $links[$module]['href'] = str_replace('taxonomy/term', 'forum', $link['href']);
      }
    }
  }
}

/**
 * Returns the vocabulary id for forum navigation.
 */
function _forum_get_vid() {
  $vid = variable_get('forum_nav_vocabulary', '');
  if (empty($vid)) {
    // Check to see if a forum vocabulary exists
    $vid = db_result(db_query("SELECT vid FROM {vocabulary} WHERE module = '%s'", 'forum'));
    if (!$vid) {
      // Create the forum vocabulary. Assign the vocabulary a low weight so
      // it will appear first in forum topic create and edit forms.
      $edit = array('name' => t('Forums'), 'multiple' => 0, 'required' => 1, 'hierarchy' => 1, 'relations' => 0, 'module' => 'forum', 'weight' => -10, 'nodes' => array('forum' => 1));
      taxonomy_save_vocabulary($edit);
      $vid = $edit['vid'];
    }
    variable_set('forum_nav_vocabulary', $vid);
  }

  return $vid;
}

/**
 * Formats a topic for display
 *
 * @TODO Give a better description. Not sure where this function is used yet.
 */
function _forum_format($topic) {
  if ($topic && $topic->timestamp) {
    return t('@time ago<br />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
 * -num_topics Number of topics in the forum
 * -num_posts Total number of posts in all topics
 * -last_post Most recent post for the forum
 *
 * @param $tid
 *   Taxonomy ID of the vocabulary that holds the forum list.
 * @return
 *   Array of object containing the forum information.
 */
function forum_get_forums($tid = 0) {

  $forums = array();
  $_forums = taxonomy_get_tree(variable_get('forum_nav_vocabulary', ''), $tid);

  if (count($_forums)) {

    $counts = array();

    $sql = "SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.nid = r.nid WHERE n.status = 1 AND n.type = 'forum' GROUP BY r.tid";
    $sql = db_rewrite_sql($sql);
    $_counts = db_query($sql, $forum->tid);
    while ($count = db_fetch_object($_counts)) {
      $counts[$count->tid] = $count;
    }
  }

  foreach ($_forums as $forum) {
    if (in_array($forum->tid, variable_get('forum_containers', array()))) {
      $forum->container = 1;
    }

    if ($counts[$forum->tid]) {
      $forum->num_topics = $counts[$forum->tid]->topic_count;
      $forum->num_posts = $counts[$forum->tid]->topic_count + $counts[$forum->tid]->comment_count;
    }
    else {
      $forum->num_topics = 0;
      $forum->num_posts = 0;
    }

    // This query does not use full ANSI syntax since MySQL 3.x does not support
    // table1 INNER JOIN table2 INNER JOIN table3 ON table2_criteria ON table3_criteria
    // used to join node_comment_statistics to users.
    $sql = "SELECT ncs.last_comment_timestamp, IF (ncs.last_comment_uid != 0, u2.name, ncs.last_comment_name) AS last_comment_name, ncs.last_comment_uid FROM {node} n INNER JOIN {users} u1 ON n.uid = u1.uid INNER JOIN {term_node} tn ON n.nid = tn.nid INNER JOIN {node_comment_statistics} ncs ON n.nid = ncs.nid INNER JOIN {users} u2 ON ncs.last_comment_uid=u2.uid WHERE n.status = 1 AND n.type='forum' AND tn.tid = %d ORDER BY ncs.last_comment_timestamp DESC";
    $sql = db_rewrite_sql($sql);
    $topic = db_fetch_object(db_query_range($sql, $forum->tid, 0, 1));

    $last_post = new stdClass();
    $last_post->timestamp = $topic->last_comment_timestamp;
    $last_post->name = $topic->last_comment_name;
    $last_post->uid = $topic->last_comment_uid;
    $forum->last_post = $last_post;

    $forums[$forum->tid] = $forum;
  }

  return $forums;
}

/**
 * Calculate the number of nodes the user has not yet read and are newer
 * than NODE_NEW_LIMIT.
 */
function _forum_topics_unread($term, $uid) {
  $sql = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = 'forum' AND n.created > %d AND h.nid IS NULL";
  $sql = db_rewrite_sql($sql);
  return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT));
}

function forum_get_topics($tid, $sortby, $forum_per_page) {
  global $user, $forum_topic_list_header;

  $forum_topic_list_header = array(
    array('data' => '&nbsp;', 'field' => NULL),
    array('data' => t('Topic'), 'field' => 'n.title'),
    array('data' => t('Replies'), 'field' => 'l.comment_count'),
    array('data' => t('Created'), 'field' => 'n.created'),
    array('data' => t('Last reply'), 'field' => 'l.last_comment_timestamp'),
  );

  $order = _forum_get_topic_order($sortby);
  for ($i = 0; $i < count($forum_topic_list_header); $i++) {
    if ($forum_topic_list_header[$i]['field'] == $order['field']) {
      $forum_topic_list_header[$i]['sort'] = $order['sort'];
    }
  }

  $term = taxonomy_get_term($tid);

  $sql = db_rewrite_sql("SELECT n.nid, f.tid, n.title, n.sticky, u.name, u.uid, n.created AS timestamp, n.comment AS comment_mode, l.last_comment_timestamp, IF(l.last_comment_uid != 0, cu.name, l.last_comment_name) AS last_comment_name, l.last_comment_uid, l.comment_count AS num_comments FROM {node_comment_statistics} l, {users} cu, {term_node} r, {users} u, {forum} f, {node} n WHERE n.status = 1 AND l.last_comment_uid = cu.uid AND n.nid = l.nid AND n.nid = r.nid AND r.tid = %d AND n.uid = u.uid AND n.vid = f.vid");
  $sql .= tablesort_sql($forum_topic_list_header, 'n.sticky DESC,');
  $sql .= ', n.created DESC';  // Always add a secondary sort order so that the news forum topics are on top.

  $sql_count = db_rewrite_sql("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum'");

  $result = pager_query($sql, $forum_per_page, 0, $sql_count, $tid);

  while ($topic = db_fetch_object($result)) {
    if ($user->uid) {
      // folder is new if topic is new or there are new comments since last visit
      if ($topic->tid != $tid) {
        $topic->new = 0;
      }
      else {
        $history = _forum_user_last_visit($topic->nid);
        $topic->new_replies = comment_num_new($topic->nid, $history);
        $topic->new = $topic->new_replies || ($topic->timestamp > $history);
      }
    }
    else {
      // Do not track "new replies" status for topics if the user is anonymous.
      $topic->new_replies = 0;
      $topic->new = 0;
    }

    if ($topic->num_comments > 0) {
      $last_reply = new stdClass();
      $last_reply->timestamp = $topic->last_comment_timestamp;
      $last_reply->name = $topic->last_comment_name;
      $last_reply->uid = $topic->last_comment_uid;
      $topic->last_reply = $last_reply;
    }
    $topics[] = $topic;
  }

  return $topics;
}

/**
 * Finds the first unread node for a given forum.
 */
function _forum_new($tid) {
  global $user;

  $sql = "SELECT n.nid FROM {node} n LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum' AND h.nid IS NULL AND n.created > %d ORDER BY created";
  $sql = db_rewrite_sql($sql);
  $nid = db_result(db_query_range($sql, $user->uid, $tid, NODE_NEW_LIMIT, 0, 1));

  return $nid ? $nid : 0;
}

/**
 * Menu callback; prints a forum listing.
 */
function forum_page($tid = 0) {
  if (module_exists('taxonomy') && module_exists('comment')) {
    $forum_per_page = variable_get('forum_per_page', 25);
    $sortby = variable_get('forum_order', 1);

    $forums = forum_get_forums($tid);
    $parents = taxonomy_get_parents_all($tid);
    if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
      $topics = forum_get_topics($tid, $sortby, $forum_per_page);
    }

    return theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
  }
  else {
    drupal_set_message(t('The forum module requires both the taxonomy module and the comment module to be enabled and configured.'), 'error');
    return ' ';
  }
}

/**
 * Format the forum body.
 *
 * @ingroup themeable
 */
function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_per_page) {
  global $user;
  // forum list, topics list, topic browser and 'add new topic' link

  $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
  $title = $vocabulary->name;

  // Breadcrumb navigation:
  $breadcrumb = array();
  if ($tid) {
    $breadcrumb[] = array('path' => 'forum', 'title' => $title);
  }

  if ($parents) {
    $parents = array_reverse($parents);
    foreach ($parents as $p) {
      if ($p->tid == $tid) {
        $title = $p->name;
      }
      else {
        $breadcrumb[] = array('path' => 'forum/'. $p->tid, 'title' => $p->name);
      }
    }
  }

  drupal_set_title(check_plain($title));

  $breadcrumb[] = array('path' => $_GET['q']);
  menu_set_location($breadcrumb);

  if (count($forums) || count($parents)) {
    $output  = '<div id="forum">';
    $output .= '<ul>';

    if (user_access('create forum topics')) {
      $output .= '<li>'. l(t('Post new forum topic.'), "node/add/forum/$tid") .'</li>';
    }
    else if ($user->uid) {
      $output .= '<li>'. t('You are not allowed to post a new forum topic.') .'</li>';
    }
    else {
      $output .= '<li>'. t('<a href="@login">Login</a> to post a new forum topic.', array('@login' => url('user/login', array('query' => drupal_get_destination())))) .'</li>';
    }
    $output .= '</ul>';

    $output .= theme('forum_list', $forums, $parents, $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);
    }
    $output .= '</div>';
  }
  else {
    drupal_set_title(t('No forums defined'));
    $output = '';
  }

  return $output;
}

/**
 * Format the forum listing.
 *
 * @ingroup themeable
 */
function theme_forum_list($forums, $parents, $tid) {
  global $user;

  if ($forums) {

    $header = array(t('Forum'), t('Topics'), t('Posts'), t('Last post'));

    foreach ($forums as $forum) {
      if ($forum->container) {
        $description  = '<div style="margin-left: '. ($forum->depth * 30) ."px;\">\n";
        $description .= ' <div class="name">'. l($forum->name, "forum/$forum->tid") ."</div>\n";

        if ($forum->description) {
          $description .= ' <div class="description">'. filter_xss_admin($forum->description) ."</div>\n";
        }
        $description .= "</div>\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  = '<div style="margin-left: '. ($forum->depth * 30) ."px;\">\n";
        $description .= ' <div class="name">'. l($forum->name, "forum/$forum->tid") ."</div>\n";

        if ($forum->description) {
          $description .= ' <div class="description">'. filter_xss_admin($forum->description) ."</div>\n";
        }
        $description .= "</div>\n";

        $row = array(
          'data' => array(
            array('data' => $description, 'class' => 'forum'),
            array('data' => $forum->num_topics . ($new_topics ? '<br />'. 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;
      }
    }

    return theme('table', $header, $rows);

  }

}

/**
 * Format the topic listing.
 *
 * @ingroup themeable
 */
function theme_forum_topic_list($tid, $topics, $sortby, $forum_per_page) {
  global $forum_topic_list_header;

  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')
        );
      }
      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 ? '<br />'. 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')
        );
      }
    }
  }

  $output = theme('table', $forum_topic_list_header, $rows);
  $output .= theme('pager', NULL, $forum_per_page, 0);

  return $output;
}

/**
 * Format the icon for each individual topic.
 *
 * @ingroup themeable
 */
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';
  }
  else {
    $icon = $new_posts ? 'new' : 'default';
  }

  if ($comment_mode == COMMENT_NODE_READ_ONLY || $comment_mode == COMMENT_NODE_DISABLED) {
    $icon = 'closed';
  }

  if ($sticky == 1) {
    $icon = 'sticky';
  }

  $output = theme('image', "misc/forum-$icon.png");

  if ($new_posts) {
    $output = "<a name=\"new\">$output</a>";
  }

  return $output;
}

/**
 * Format the next/previous forum topic navigation links.
 *
 * @ingroup themeable
 */
function theme_forum_topic_navigation($node) {
  $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 AND n.type = 'forum' ORDER BY n.sticky DESC, ". _forum_get_topic_order_sql(variable_get('forum_order', 1));
  $result = db_query(db_rewrite_sql($sql), $node->tid);

  $stop = 0;
  while ($topic = db_fetch_object($result)) {
    if ($stop == 1) {
      $next = new stdClass();
      $next->nid = $topic->nid;
      $next->title = $topic->title;
      break;
    }
    if ($topic->nid == $node->nid) {
      $stop = 1;
    }
    else {
      $prev = new stdClass();
      $prev->nid = $topic->nid;
      $prev->title = $topic->title;
    }
  }

  if ($prev || $next) {
    $output .= '<div class="forum-topic-navigation clear-block">';

    if ($prev) {
      $output .= l(t('‹ ') . $prev->title, 'node/'. $prev->nid, array('class' => 'topic-previous', 'title' => t('Go to previous forum topic')));
    }
    if ($prev && $next) {
      // Word break (a is an inline element)
      $output .= ' ';
    }
    if ($next) {
      $output .= l($next->title . t(' ›'), 'node/'. $next->nid, array('class' => 'topic-next', 'title' => t('Go to next forum topic')));
    }

    $output .= '</div>';
  }

  return $output;
}

function _forum_user_last_visit($nid) {
  global $user;
  static $history = array();

  if (empty($history)) {
    $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = %d', $user->uid);
    while ($t = db_fetch_object($result)) {
      $history[$t->nid] = $t->timestamp > NODE_NEW_LIMIT ? $t->timestamp : NODE_NEW_LIMIT;
    }
  }
  return isset($history[$nid]) ? $history[$nid] : NODE_NEW_LIMIT;
}

function _forum_get_topic_order($sortby) {
  switch ($sortby) {
    case 1:
      return array('field' => 'l.last_comment_timestamp', 'sort' => 'desc');
      break;
    case 2:
      return array('field' => 'l.last_comment_timestamp', 'sort' => 'asc');
      break;
    case 3:
      return array('field' => 'l.comment_count', 'sort' => 'desc');
      break;
    case 4:
      return array('field' => 'l.comment_count', 'sort' => 'asc');
      break;
  }
}

function _forum_get_topic_order_sql($sortby) {
  $order = _forum_get_topic_order($sortby);
  return $order['field'] .' '. $order['sort'];
}
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								<?php
 								// $Id$
-- Patch by JonBob: for consistency and readability, add brief descriptions of each source file inside the @file comment block at the head of the file. This helps with Doxygen indexing, and also allows neophytes to see what a file does immediately on opening the source, regardless of the organization of the hooks.

											
										
										
											2004-08-21 06:42:38 +00:00
+								/**
 								 * @file
 								 * Enable threaded discussions about general topics.
 								 */
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
 								 * Implementation of hook_help().
 								 */
 								function forum_help($section) {
-Patch 5287 by Stefan: multiline help texts should become inside a single $output.

											
										
										
											2004-01-23 18:42:43 +00:00
+								  switch ($section) {
-												- Patch #26139 by webchick / Kieran / documentation team: improved admin help of core modules! /

											
										
										
											2005-11-01 10:17:34 +00:00
+								    case 'admin/help#forum':
 								      $output = '<p>'. t('The forum module lets you create threaded discussion forums for a particular topic on your site. This is similar to a message board system such as phpBB. Forums are very useful because they allow community members to discuss topics with one another, and they are archived for future reference.') .'</p>';
-												#61802 by Zen, Double spaced sentences clean up

											
										
										
											2006-05-07 00:08:36 +00:00
+								      $output .= '<p>'. t('Forums can be organized under what are called <em>containers</em>. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them. Forum topics can be moved by selecting a different forum and can be left in the existing forum by selecting <em>leave a shadow copy</em>. Forum topics can also have their own URL.') .'</p>';
-												- Patch #26139 by webchick / Kieran / documentation team: improved admin help of core modules! /

											
										
										
											2005-11-01 10:17:34 +00:00
+								      $output .= '<p>'. t('Forums module <strong>requires Taxonomy and Comments module</strong> be enabled.') .'</p>';
-												#76802: Introduce placeholder magic into t()
See: http://drupal.org/node/64279#t-placeholders

											
										
										
											2006-08-18 12:17:00 +00:00
+								      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@forum">Forum page</a>.', array('@forum' => 'http://drupal.org/handbook/modules/forum/')) .'</p>';
-												- Patch #26139 by webchick / Kieran / documentation team: improved admin help of core modules! /

											
										
										
											2005-11-01 10:17:34 +00:00
+								      return $output;
-												- Patch #72079 by Earl et al: give Drupal an overall administration page ... :-)

											
										
										
											2006-07-31 11:25:55 +00:00
+								    case 'admin/content/forum':
-												#97824 by Gurpartap. Move enclosing elements outside of their t().

											
										
										
											2006-11-26 02:20:01 +00:00
+								      return '<p>'. t('This is a list of existing containers and forums that you can edit. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.') .'</p>';
-												- Patch #72079 by Earl et al: give Drupal an overall administration page ... :-)

											
										
										
											2006-07-31 11:25:55 +00:00
+								    case 'admin/content/forum/add/container':
-												#97824 by Gurpartap. Move enclosing elements outside of their t().

											
										
										
											2006-11-26 02:20:01 +00:00
+								      return '<p>'. t('Containers help you organize your forums. The job of a container is to hold, or contain, other forums that are related. For example, a container named "Food" might hold two forums named "Fruit" and "Vegetables".') .'</p>';
-												- Patch #72079 by Earl et al: give Drupal an overall administration page ... :-)

											
										
										
											2006-07-31 11:25:55 +00:00
+								    case 'admin/content/forum/add/forum':
-												#97824 by Gurpartap. Move enclosing elements outside of their t().

											
										
										
											2006-11-26 02:20:01 +00:00
+								      return '<p>'. t('A forum holds discussion topics that are related. For example, a forum named "Fruit" might contain topics titled "Apples" and "Bananas".') .'</p>';
-												- Patch #99948 by neclimdul: added some help text.

											
										
										
											2006-11-28 09:48:45 +00:00
+								    case 'admin/content/forum/settings':
 								      return '<p>'. t('These settings provide the ability to fine tune the display of your forum topics.') .'</p>';
-Patch 5287 by Stefan: multiline help texts should become inside a single $output.

											
										
										
											2004-01-23 18:42:43 +00:00
+								  }
 								}
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								/**
 								 * Implementation of hook_menu().
 								 */
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								function forum_menu() {
 								  $items['node/add/forum'] = array(
 								    'title' => t('Forum topic'),
 								    'access arguments' => array('create forum topics'),
 								  );
 								  $items['forum'] = array(
 								    'title' => t('Forums'),
 								    'page callback' => 'forum_page',
 								    'access arguments' => array('access content'),
 								    'type' => MENU_SUGGESTED_ITEM,
 								  );
 								  $items['admin/content/forum'] = array(
 								    'title' => t('Forums'),
 								    'description' => t('Control forums and their hierarchy and change forum settings.'),
 								    'page callback' => 'forum_overview',
 								    'access arguments' => array('administer forums'),
 								  );
 								  $items['admin/content/forum/list'] = array(
 								    'title' => t('List'),
 								    'type' => MENU_DEFAULT_LOCAL_TASK,
 								    'weight' => -10,
 								  );
 								  $items['admin/content/forum/add/container'] = array(
 								    'title' => t('Add container'),
 								    'page callback' => 'forum_form_main',
 								    'page arguments' => array('container'),
 								    'type' => MENU_LOCAL_TASK,
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-01-31 21:26:56 +00:00
+								    'parent' => 'admin/content/forum',
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								  );
 								  $items['admin/content/forum/add/forum'] = array(
 								    'title' => t('Add forum'),
 								    'page callback' => 'forum_form_main',
 								    'page arguments' => array('forum'),
 								    'type' => MENU_LOCAL_TASK,
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-01-31 21:26:56 +00:00
+								    'parent' => 'admin/content/forum',
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								  );
 								  $items['admin/content/forum/settings'] = array(
 								    'title' => t('Settings'),
 								    'page callback' => 'drupal_get_form',
 								    'page arguments' => array('forum_admin_settings'),
 								    'weight' => 5,
 								    'type' => MENU_LOCAL_TASK,
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-01-31 21:26:56 +00:00
+								    'parent' => 'admin/content/forum',
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								  );
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								  $items['admin/content/forum/edit/%forum_term'] = array(
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								    'page callback' => 'forum_form_main',
 								    'type' => MENU_CALLBACK,
 								  );
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								  $items['admin/content/forum/edit/container/%forum_term'] = array(
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								    'title' => t('Edit container'),
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								    'page callback' => 'forum_form_main',
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								    'page arguments' => array('container', 5),
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								    'type' => MENU_CALLBACK,
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								  );
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								  $items['admin/content/forum/edit/forum/%forum_term'] = array(
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								    'title' => t('Edit forum'),
 								    'page callback' => 'forum_form_main',
 								    'page arguments' => array('forum', 5),
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								    'type' => MENU_CALLBACK,
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								  );
 								  return $items;
 								}
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								function forum_init() {
 								  drupal_add_css(drupal_get_path('module', 'forum') .'/forum.css');
 								}
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								function forum_term_load($tid) {
-												- Patch #34755 by chx et al: faster menu system.  HEAD is temporary broken and there is no upgrade path yet.

											
										
										
											2007-01-24 14:48:36 +00:00
+								  return (array)taxonomy_get_term($tid);
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
-												- Renamed _node() to _node_info()!  We reserve _node for _nodeapi.

											
										
										
											2005-08-29 19:58:49 +00:00
+								 * Implementation of hook_node_info().
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								 */
-												- Renamed _node() to _node_info()!  We reserve _node for _nodeapi.

											
										
										
											2005-08-29 19:58:49 +00:00
+								function forum_node_info() {
-												#62340 by chx, webchick, Jaza, Eaton, mathieu, and myself. Configurable node types.

											
										
										
											2006-08-06 23:00:42 +00:00
+								  return array(
 								    'forum' => array(
-												#84146: Use 'Sentence capitalization' for menu items, page titles, form items, etc

											
										
										
											2006-10-22 08:28:47 +00:00
+								      'name' => t('Forum topic'),
-												#62340 by chx, webchick, Jaza, Eaton, mathieu, and myself. Configurable node types.

											
										
										
											2006-08-06 23:00:42 +00:00
+								      'module' => 'forum',
 								      'description' => t('Create a new topic for discussion in the forums.'),
 								      'title_label' => t('Subject'),
 								    )
 								  );
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
 								 * Implementation of hook_access().
 								 */
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								function forum_access($op, $node) {
-- Patch #11427: added 'edit own forum topics' permission.

											
										
										
											2004-11-07 19:28:24 +00:00
+								  global $user;
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								  if ($op == 'create') {
 								    return user_access('create forum topics');
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  }
-- Patch #11427: added 'edit own forum topics' permission.

											
										
										
											2004-11-07 19:28:24 +00:00
 								  if ($op == 'update' || $op == 'delete') {
 								    if (user_access('edit own forum topics') && ($user->uid == $node->uid)) {
 								      return TRUE;
 								    }
 								  }
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
 								 * Implementation of hook_perm().
 								 */
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								function forum_perm() {
-												- Patch #10425 by ccourtne and walkah: added admin screens to maintain forums instead of forcing the user to add a taxonomy.

											
										
										
											2005-01-28 15:47:03 +00:00
+								  return array('create forum topics', 'edit own forum topics', 'administer forums');
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
-- Improved teaser handling.

											
										
										
											2001-12-06 12:31:21 +00:00
-												- Patch #31323 by Gerhard: delete extra data when a revision is deleted.

											
										
										
											2005-12-05 16:07:18 +00:00
+								/**
 								 * Implementation of hook_nodeapi().
 								 */
 								function forum_nodeapi(&$node, $op, $teaser, $page) {
 								  switch ($op) {
-												- Patch 42591 by Simon/me: fixed problem with deleting forum and book revisions.

											
										
										
											2005-12-31 13:04:40 +00:00
+								    case 'delete revision':
-												- Patch #31323 by Gerhard: delete extra data when a revision is deleted.

											
										
										
											2005-12-05 16:07:18 +00:00
+								      db_query('DELETE FROM {forum} WHERE vid = %d', $node->vid);
 								      break;
 								  }
 								}
-												- Patch #10425 by ccourtne and walkah: added admin screens to maintain forums instead of forcing the user to add a taxonomy.

											
										
										
											2005-01-28 15:47:03 +00:00
+								/**
 								 * Implementation of hook_taxonomy().
 								 */
-												#54910, Forum and taxonomy term delete work only superficially, patch by Zen

											
										
										
											2006-03-23 21:46:35 +00:00
+								function forum_taxonomy($op, $type, $term = NULL) {
-												- #57523: Make taxonomy delete vocabulary consistent with other taxonomy hook ops

											
										
										
											2006-04-06 04:21:12 +00:00
+								  if ($op == 'delete' && $term['vid'] == _forum_get_vid()) {
-												#54910, Forum and taxonomy term delete work only superficially, patch by Zen

											
										
										
											2006-03-23 21:46:35 +00:00
+								    switch ($type) {
 								      case 'term':
-												- #57523: Make taxonomy delete vocabulary consistent with other taxonomy hook ops

											
										
										
											2006-04-06 04:21:12 +00:00
+								        $results = db_query('SELECT f.nid FROM {forum} f WHERE f.tid = %d', $term['tid']);
-												#54910, Forum and taxonomy term delete work only superficially, patch by Zen

											
										
										
											2006-03-23 21:46:35 +00:00
+								        while ($node = db_fetch_object($results)) {
 								          // node_delete will also remove any association with non-forum vocabularies.
 								          node_delete($node->nid);
 								        }
 								        // For containers, remove the tid from the forum_containers variable.
 								        $containers = variable_get('forum_containers', array());
-												- Patch #62350 by hunmonk: fixed problem with deleting forum containers.

											
										
										
											2006-05-08 15:16:16 +00:00
+								        $key = array_search($term['tid'], $containers);
 								        if ($key !== FALSE) {
-												#54910, Forum and taxonomy term delete work only superficially, patch by Zen

											
										
										
											2006-03-23 21:46:35 +00:00
+								          unset($containers[$key]);
 								        }
 								        variable_set('forum_containers', $containers);
 								        break;
 								      case 'vocabulary':
 								        variable_del('forum_nav_vocabulary');
-- Made sure the taxonomy module doesn't display warning/error messages
  when the taxonomy module is disabled.  Reported by kyvinh.

- Improved forum documentation.  Modified version of Kjartan's patch.

TODO:

- Updating a forum topic through the admin interface, results in a
  duplicate (and incomplete) forum topic.  Also note that "Leave
  shadow?" function is annoying; the status of the checkbox is lost
  when clicking preview.  Also, I think it should be disabled be
  default.

											
										
										
											2002-12-18 21:43:03 +00:00
+								    }
-												- Patch #10425 by ccourtne and walkah: added admin screens to maintain forums instead of forcing the user to add a taxonomy.

											
										
										
											2005-01-28 15:47:03 +00:00
+								  }
 								}
-- Made sure the taxonomy module doesn't display warning/error messages
  when the taxonomy module is disabled.  Reported by kyvinh.

- Improved forum documentation.  Modified version of Kjartan's patch.

TODO:

- Updating a forum topic through the admin interface, results in a
  duplicate (and incomplete) forum topic.  Also note that "Leave
  shadow?" function is annoying; the status of the checkbox is lost
  when clicking preview.  Also, I think it should be disabled be
  default.

											
										
										
											2002-12-18 21:43:03 +00:00
-												- Patch #72284 by me:
   + reorganized ?q=admin/settings
   + deprecated the _settings hook

											
										
										
											2006-07-10 19:27:52 +00:00
+								function forum_admin_settings() {
-												- Patch #29465: new form API by Adrian et al.

  TODO:
  + The contact.module was broken; a new patch for contact.module is needed.
  + Documentation is needed.
  + The most important modules need to be updated ASAP.

											
										
										
											2005-10-07 06:11:12 +00:00
+								  $form = array();
-												- Make forum_hot_topic scale a bit more logical

											
										
										
											2006-04-06 04:18:30 +00:00
+								  $number = drupal_map_assoc(array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								  $form['forum_hot_topic'] = array('#type' => 'select',
 								    '#title' => t('Hot topic threshold'),
 								    '#default_value' => variable_get('forum_hot_topic', 15),
 								    '#options' => $number,
 								    '#description' => t('The number of posts a topic must have to be considered hot.'),
 								  );
-												- Patch #10425 by ccourtne and walkah: added admin screens to maintain forums instead of forcing the user to add a taxonomy.

											
										
										
											2005-01-28 15:47:03 +00:00
+								  $number = drupal_map_assoc(array(10, 25, 50, 75, 100));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								  $form['forum_per_page'] = array('#type' => 'select',
 								    '#title' => t('Topics per page'),
 								    '#default_value' => variable_get('forum_per_page', 25),
 								    '#options' => $number,
 								    '#description' => t('The default number of topics displayed per page; links to browse older messages are automatically being displayed.'),
 								  );
-												- Patch #10425 by ccourtne and walkah: added admin screens to maintain forums instead of forcing the user to add a taxonomy.

											
										
										
											2005-01-28 15:47:03 +00:00
+								  $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4=> t('Posts - least active first'));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								  $form['forum_order'] = array('#type' => 'radios',
 								    '#title' => t('Default order'),
 								    '#default_value' => variable_get('forum_order', '1'),
 								    '#options' => $forder,
 								    '#description' => t('The default display order for topics.'),
 								  );
-												- Patch #77919 by chx, eaton, moshe, et al: enable programmaticaly submitted forms via the pull model.

											
										
										
											2006-08-18 18:58:47 +00:00
+								  return system_settings_form($form);
-												- Patch #10425 by ccourtne and walkah: added admin screens to maintain forums instead of forcing the user to add a taxonomy.

											
										
										
											2005-01-28 15:47:03 +00:00
+								}
-												#28625, Forum vocabulary does not handle standard vocabulary features correctly, removed these features by means of formapi, patch by profix898, with some love by dopry and chx

											
										
										
											2006-03-31 06:43:46 +00:00
+								/**
 								 * Implementation of hook_form_alter().
 								 */
 								function forum_form_alter($form_id, &$form) {
 								  // hide critical options from forum vocabulary
 								  if ($form_id == 'taxonomy_form_vocabulary') {
 								    if ($form['vid']['#value'] == _forum_get_vid()) {
 								      $form['help_forum_vocab'] = array(
 								        '#value' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
 								        '#weight' => -1,
 								      );
 								      $form['nodes']['forum'] = array('#type' => 'checkbox', '#value' => 1, '#title' => t('forum topic'), '#attributes' => array('disabled' => '' ), '#description' => t('forum topic is affixed to the forum vocabulary.'));
 								      $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
 								      unset($form['relations']);
 								      unset($form['tags']);
 								      unset($form['multiple']);
 								      $form['required'] = array('#type' => 'value', '#value' => 1);
 								    }
 								    else {
 								      unset($form['nodes']['forum']);
 								    }
 								  }
 								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
 								 * Implementation of hook_load().
 								 */
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								function forum_load($node) {
-												- Patch #7582 by Gerhard: improved node revisions!

All node revisions were stored in a serialized field in the node table and retrieved for _each_ page view although they are rarely needed. We created a separate revisions table which would be in principle identical to the node table, only that it could have several old copies of the same node.  This also allows us to revision-related information, and to provide log entries to non-book pages when a new revision is being created.

TODO:

1. Provide upgrade instructions for node module maintainers!
2. Upgrade modules that implement node types.
3. Provide an upgarde path for revisions.  Dependency on the upgrade system.

											
										
										
											2005-08-30 15:22:29 +00:00
+								  $forum = db_fetch_object(db_query('SELECT * FROM {forum} WHERE vid = %d', $node->vid));
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
 								  return $forum;
 								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
 								 * Implementation of hook_block().
 								 *
 								 * Generates a block containing the currently active forum topics and the
 								 * most recently added forum topics.
 								 */
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								function forum_block($op = 'list', $delta = 0, $edit = array()) {
 								  switch ($op) {
 								    case 'list':
-- Patch #16829 by kbahey: separated the forum block for sake of consistency with other blocks.

											
										
										
											2005-02-10 19:14:50 +00:00
+								      $blocks[0]['info'] = t('Active forum topics');
 								      $blocks[1]['info'] = t('New forum topics');
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								      return $blocks;
-- Tracker and forum module improvements!

  Note: the CSS of the tracker page has changed.  Some CSS files still have
  to be updated.

											
										
										
											2004-03-20 13:23:34 +00:00
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								    case 'configure':
-												- Patch #33752 by chx, adrian, et al: another batch of form API changes/fixes.

											
										
										
											2005-10-11 19:44:35 +00:00
+								      $form['forum_block_num_'. $delta] = array('#type' => 'select', '#title' => t('Number of topics'), '#default_value' => variable_get('forum_block_num_'. $delta, '5'), '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
-												- Patch #29465: new form API by Adrian et al.

  TODO:
  + The contact.module was broken; a new patch for contact.module is needed.
  + Documentation is needed.
  + The most important modules need to be updated ASAP.

											
										
										
											2005-10-07 06:11:12 +00:00
+								      return $form;
-- Fixed glitch in block module: the admin links were not composed
  correctly.  Patch by Stefan.

- Added missing t() functions and improved the %x directives for
  better readability and to ease the process of translating your
  site.  Patches by Stefan.

- Made two small additions to the 'code-clean.sh' script; it will
  now remove patch related junk.

NOTES:

- I removed the &middot; related bits.  Let's tackle these later on
  in a separate patch after we got some sort of consensus.

- I removed the 'module_exist("drupal")' check in the user module;
  I *think* it is incomplete and therefore incorrect.

- Stefan, try using quotes in your translations and check whether
  everything still works.  Example: translate the "Create account"
  button to "Create \"haha\" account \'hihi\'" and see if you can
  still create new accounts.  Maybe automate this using a quick
  hack in the locale module ...

											
										
										
											2002-11-01 10:47:20 +00:00
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								    case 'save':
-												- Modified patch #18328 by Neil: currently the two forum topic blocks share a number of topics in block setting. This is a bit confusing since configuring one blockshould not affect another block.  Fixed some indentation as well.

											
										
										
											2005-03-03 20:02:07 +00:00
+								      variable_set('forum_block_num_'. $delta, $edit['forum_block_num_'. $delta]);
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								      break;
-* Added Jeremy's pager:

 "This is a simple, generic pager for Drupal-CVS.  It is designed to be
  easily themeable and expandable.  The code is highly-commented to
  enhance readability."

 "Pagers are constructed by combining the provided pieces (all of which
  can be easily modified to display the text or image you prefer) into
  your custom pager."

* Statistics module fixes by Jeremy:

 - removed superfluous check for existence of watchdog()
 - saving changes in admin page displays status and returns same page
 - no longer return 1971/01/01 in "view statistics" table
 - switched from "!=" to "<>" in SQL queries for ANSI-SQL compliance
 - switched from "MAX(timestamp) as timestamp" to "MAX(timestamp) as
   max_timestamp" moving towards ANSI-SQL compliance.

* Added a "theme_item_list" function to format itemized lists.  Also
  changed a couple of modules to take advantage of it.  Makes for a
  more consistent UI.

											
										
										
											2002-11-09 13:59:36 +00:00
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								    case 'view':
 								      if (user_access('access content')) {
-- Patch #16829 by kbahey: separated the forum block for sake of consistency with other blocks.

											
										
										
											2005-02-10 19:14:50 +00:00
+								        switch ($delta) {
 								          case 0:
-												- Modified patch #18328 by Neil: currently the two forum topic blocks share a number of topics in block setting. This is a bit confusing since configuring one blockshould not affect another block.  Fixed some indentation as well.

											
										
										
											2005-03-03 20:02:07 +00:00
+								            $title = t('Active forum topics');
-												- Patch #47868 by wtanaka: performance improvement: active topics block selects an unused column.

											
										
										
											2006-02-04 09:56:04 +00:00
+								            $sql = db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND n.type = 'forum' ORDER BY l.last_comment_timestamp DESC");
-												- #23014: Only show forum blocks if there are topics to list.

											
										
										
											2005-05-25 03:59:38 +00:00
+								            $result = db_query_range($sql, 0, variable_get('forum_block_num_0', '5'));
 								            if (db_num_rows($result)) {
 								              $content = node_title_list($result);
 								            }
-												- Modified patch #18328 by Neil: currently the two forum topic blocks share a number of topics in block setting. This is a bit confusing since configuring one blockshould not affect another block.  Fixed some indentation as well.

											
										
										
											2005-03-03 20:02:07 +00:00
+								            break;
-- Patch #16829 by kbahey: separated the forum block for sake of consistency with other blocks.

											
										
										
											2005-02-10 19:14:50 +00:00
 								          case 1:
-												- Modified patch #18328 by Neil: currently the two forum topic blocks share a number of topics in block setting. This is a bit confusing since configuring one blockshould not affect another block.  Fixed some indentation as well.

											
										
										
											2005-03-03 20:02:07 +00:00
+								            $title = t('New forum topics');
 								            $sql = db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.type = 'forum' AND n.status = 1 ORDER BY n.nid DESC");
-												- #23014: Only show forum blocks if there are topics to list.

											
										
										
											2005-05-25 03:59:38 +00:00
+								            $result = db_query_range($sql, 0, variable_get('forum_block_num_1', '5'));
 								            if (db_num_rows($result)) {
 								              $content = node_title_list($result);
 								            }
-												- Modified patch #18328 by Neil: currently the two forum topic blocks share a number of topics in block setting. This is a bit confusing since configuring one blockshould not affect another block.  Fixed some indentation as well.

											
										
										
											2005-03-03 20:02:07 +00:00
+								            break;
-- Patch #16829 by kbahey: separated the forum block for sake of consistency with other blocks.

											
										
										
											2005-02-10 19:14:50 +00:00
+								        }
-- Small improvement to the forum module block.

											
										
										
											2002-10-16 18:23:39 +00:00
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								        if ($content) {
-												- Patch #38854 by wtanaka: fixed XHTML validation problem.

											
										
										
											2005-11-26 19:45:31 +00:00
+								          $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								        }
-- Patch #16829 by kbahey: separated the forum block for sake of consistency with other blocks.

											
										
										
											2005-02-10 19:14:50 +00:00
+								        $block['subject'] = $title;
-												- Patch #11875 by Neil Drumm: block module configuration improvements.

The primary goal of this patch is to take the 'custom' and 'path' columns of the block overview page and make them into something understandable. As of Drupal 4.5 'custom' lacked an explanation which wasn't buried in help text and path required dealing with regular expressions.

Every block now has a configuration page to control these options. This gives more space to make form controls which do not require a lengthy explanation. This page also gives modules a chance to put their block configuration options in a place that makes sense using new operations in the block hook.

The only required changes to modules implementing hook_block() is to be careful about what is returned. Do not return anything if $op is not 'list' or 'view'. Once this change is made, modules will still be compatible with Drupal 4.5. Required changes to core modules are included in this path.

An additional optional change to modules is to implement the additional $op options added. 'configure' should return a string containing the configuration form for the block with the appropriate $delta. 'configure save' will come with an additional $edit argument, which will contain the submitted form data for saving. These changes to core modules are also included in this patch.

											
										
										
											2004-10-31 07:34:47 +00:00
+								        $block['content'] = $content;
 								        return $block;
 								      }
 								  }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
 								 * Implementation of hook_view().
 								 */
-- Patch #5347 by JonBob:

Here's a new patch that unifies the node/52 and book/view/52 paths for nodes. It involves a small change to hook_view(), which is discussed first:

Currently hook_view() expects node modules to return a themed node. However, each module does this the same way; they modify $node as necessary, then call theme('node', $node) and return the result. We can refactor this so that the calling function node_view() calls theme('node') instead. By doing this, it becomes possible for hook_nodeapi('view') to be called after hook_view() where the node contents are filtered, and before theme('node') where the body is enclosed in other HTML. This way the book module can insert its navigation into the body right before the theming.

Advantages of this refactoring:
- I can use it for book.module to remove the extra viewing path.
- The function of hook_nodeapi('view') becomes more like hook_view(), as neither will expect a return value.
- We more closely follow the flow of other nodeapi calls, which usually directly follow their corresponding specific node type hooks (instead of preceding them).
- The attachment.module people could use it to append their attachments in a list after the node.
- Gabor could use it instead of his filter perversion for his "articles in a series" module.
- A little less code in each view hook.
- The content hook is no longer needed, so that means even less code.

Disadvantages:
- Any modules written to use nodeapi('view') could be affected (but these would all be post-4.4 modules).
- Implementations of hook_view() would need to be updated (but return values would be ignored, so most would work without updates anyway).

Now the patch takes advantage of this API shift to inject its navigation at the end of all book nodes, regardless of the viewing path. In fact, since the paths become identical, I've removed the book/view handler entirely. We should probably provide an .htaccess rewrite for this (one is still needed for node/view/nn anyway). At the same time, there is a check in book_block() that shows the block appropriately on these pages.

											
										
										
											2004-07-30 13:37:26 +00:00
+								function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
-- Committed phase 4 of JonBob's menu system changes.

											
										
										
											2003-11-25 19:26:21 +00:00
+								  if ($page) {
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								    $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
-- Committed Nick's _content improvements.

											
										
										
											2003-09-20 15:11:41 +00:00
+								    // Breadcrumb navigation
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								    $breadcrumb = array();
 								    $breadcrumb[] = array('path' => 'forum', 'title' => $vocabulary->name);
-- Made it possible to assing taxonomy terms to forum nodes.  Tidied up the
  forum module code a bit.

											
										
										
											2004-01-25 21:11:01 +00:00
+								    if ($parents = taxonomy_get_parents_all($node->tid)) {
-- Fixed the breadcrumb trail of nested forums.  Patch by Goba.

											
										
										
											2003-12-24 15:09:43 +00:00
+								      $parents = array_reverse($parents);
 								      foreach ($parents as $p) {
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								        $breadcrumb[] = array('path' => 'forum/'. $p->tid, 'title' => $p->name);
-- Fixed the breadcrumb trail of nested forums.  Patch by Goba.

											
										
										
											2003-12-24 15:09:43 +00:00
+								      }
 								    }
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								    $breadcrumb[] = array('path' => 'node/'. $node->nid);
 								    menu_set_location($breadcrumb);
-												- removed next/prev links when forum node is shown on main page.
- title is no longer modified when shown on main page.
- commented out a chunk of code in forum_view that is no in use.
- coding sytle fixes.

											
										
										
											2002-11-08 13:23:29 +00:00
+								  }
-- Reworked 404 (page not found) handling.  Patch by walkah.  You can specify a
  custom 404 page in the administration page.  As a result, error.php could be
  removed.

											
										
										
											2003-12-16 21:06:34 +00:00
-												- Patch #11879 by Moshe: deprecated the _content hook.

  TODO:
   + Update Doxygen hook list (if required).
   + Document this in the developer's upgrade section.

											
										
										
											2004-10-23 17:18:23 +00:00
+								  $node = node_prepare($node, $teaser);
-												- Patch #104882 by dww: fixing forum topic teasers.

											
										
										
											2006-12-23 19:30:46 +00:00
+								  if (!$teaser) {
 								    $node->content['forum_navigation'] = array(
 								      '#value' => theme('forum_topic_navigation', $node),
 								      '#weight' => 100,
 								    );
 								  }
-												- Patch #74326 by Eaton, Royboy, chx, et al: building $node->body with arrays like FAPI for viewing.

  Once again, we're paving the path for CCK in core ... :)

											
										
										
											2006-08-10 15:42:33 +00:00
+								  return $node;
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
-												- Rollback of patch #68418: clean up node submit hooks.  Needs more thinkering.
  Restores the old node API.

											
										
										
											2006-08-31 21:58:36 +00:00
+								 * Implementation of hook_submit().
 								 *
 								 * Check in particular that only a "leaf" term in the associated taxonomy
 								 * vocabulary is selected, not a "container" term.
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								 */
-												- Rollback of patch #68418: clean up node submit hooks.  Needs more thinkering.
  Restores the old node API.

											
										
										
											2006-08-31 21:58:36 +00:00
+								function forum_submit(&$node) {
-												- Renamed "form.admin" to "form admin".
- Added node_admin_settings() to let users set node defaults.
    * Added _nodeapi("conf")
- Modified form_checkbox() to unset options. (Modified the patch from Ax.)
- Removed the _save() hook.
- Fixed a logical flaw in field_get() and field_set() which would break
  moderation.
- Moved some admin menus around and cleaned up some typos.

											
										
										
											2003-03-07 22:11:44 +00:00
+								  // Make sure all fields are set properly:
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								  $node->icon = $node->icon ? $node->icon : '';
-- Made it possible to assing taxonomy terms to forum nodes.  Tidied up the
  forum module code a bit.

											
										
										
											2004-01-25 21:11:01 +00:00
-												- Rollback of patch #68418: clean up node submit hooks.  Needs more thinkering.
  Restores the old node API.

											
										
										
											2006-08-31 21:58:36 +00:00
+								  if ($node->taxonomy) {
-												#76339 by pwolanin, allow non-forum category changes while leaving a shadow copy

											
										
										
											2006-08-05 01:42:56 +00:00
+								    // Get the forum terms from the (cached) tree
 								    $tree = taxonomy_get_tree(_forum_get_vid());
 								    if ($tree) {
 								      foreach ($tree as $term) {
 								        $forum_terms[] = $term->tid;
 								      }
 								    }
-- Made it possible to assing taxonomy terms to forum nodes.  Tidied up the
  forum module code a bit.

											
										
										
											2004-01-25 21:11:01 +00:00
+								    foreach ($node->taxonomy as $term) {
-												#76339 by pwolanin, allow non-forum category changes while leaving a shadow copy

											
										
										
											2006-08-05 01:42:56 +00:00
+								      if (in_array($term, $forum_terms)) {
-												#36791: node_validate was called twice

											
										
										
											2005-11-12 02:54:13 +00:00
+								        $node->tid = $term;
-- Made it possible to assing taxonomy terms to forum nodes.  Tidied up the
  forum module code a bit.

											
										
										
											2004-01-25 21:11:01 +00:00
+								      }
-												- Renamed "form.admin" to "form admin".
- Added node_admin_settings() to let users set node defaults.
    * Added _nodeapi("conf")
- Modified form_checkbox() to unset options. (Modified the patch from Ax.)
- Removed the _save() hook.
- Fixed a logical flaw in field_get() and field_set() which would break
  moderation.
- Moved some admin menus around and cleaned up some typos.

											
										
										
											2003-03-07 22:11:44 +00:00
+								    }
-												#76339 by pwolanin, allow non-forum category changes while leaving a shadow copy

											
										
										
											2006-08-05 01:42:56 +00:00
+								    $old_tid = db_result(db_query_range("SELECT tid FROM {forum} WHERE nid = %d ORDER BY vid DESC", $node->nid, 0,1));
-												- Patch #77422 by timcn: corrected various paths in the documentation.

											
										
										
											2006-08-07 15:04:16 +00:00
+								    if ($old_tid) {
-												#76339 by pwolanin, allow non-forum category changes while leaving a shadow copy

											
										
										
											2006-08-05 01:42:56 +00:00
+								      if (($node->tid != $old_tid) && $node->shadow) {
 								        // A shadow copy needs to be created. Retain new term and add old term.
 								        $node->taxonomy[] = $old_tid;
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								      }
 								    }
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								  }
-												- Rollback of patch #68418: clean up node submit hooks.  Needs more thinkering.
  Restores the old node API.

											
										
										
											2006-08-31 21:58:36 +00:00
+								}
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
-												- Rollback of patch #68418: clean up node submit hooks.  Needs more thinkering.
  Restores the old node API.

											
										
										
											2006-08-31 21:58:36 +00:00
+								/**
 								 * Implementation of hook_validate().
 								 *
 								 * Check in particular that only a "leaf" term in the associated taxonomy
 								 * vocabulary is selected, not a "container" term.
 								 */
 								function forum_validate($node) {
 								  if ($node->taxonomy) {
 								    // Extract the node's proper topic ID.
 								    $vocabulary = variable_get('forum_nav_vocabulary', '');
 								    $containers = variable_get('forum_containers', array());
 								    foreach ($node->taxonomy as $term) {
 								      if (db_result(db_query('SELECT COUNT(*) FROM {term_data} WHERE tid = %d AND vid = %d', $term, $vocabulary))) {
 								        if (in_array($term, $containers)) {
 								          $term = taxonomy_get_term($term);
 								          form_set_error('taxonomy', t('The item %forum is only a container for forums. Please select one of the forums below it.', array('%forum' => $term->name)));
 								        }
 								      }
 								    }
 								  }
-												#36791: node_validate was called twice

											
										
										
											2005-11-12 02:54:13 +00:00
+								}
-												- Rollback of patch #68418: clean up node submit hooks.  Needs more thinkering.
  Restores the old node API.

											
										
										
											2006-08-31 21:58:36 +00:00
+								/**
 								 * Implementation of hook_update().
 								 */
 								function forum_update($node) {
 								  if ($node->revision) {
-												- Patch #7582 by Gerhard: improved node revisions!

All node revisions were stored in a serialized field in the node table and retrieved for _each_ page view although they are rarely needed. We created a separate revisions table which would be in principle identical to the node table, only that it could have several old copies of the same node.  This also allows us to revision-related information, and to provide log entries to non-book pages when a new revision is being created.

TODO:

1. Provide upgrade instructions for node module maintainers!
2. Upgrade modules that implement node types.
3. Provide an upgarde path for revisions.  Dependency on the upgrade system.

											
										
										
											2005-08-30 15:22:29 +00:00
+								    db_query("INSERT INTO {forum} (nid, vid, tid) VALUES (%d, %d, %d)", $node->nid, $node->vid, $node->tid);
 								  }
 								  else {
 								    db_query('UPDATE {forum} SET tid = %d WHERE vid = %d', $node->tid, $node->vid);
 								  }
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
 								 * Implementation of hook_form().
 								 */
-- Patch by Steven and me: refactored the form handling of nodes. The node system is now using form_set_error() and friends like the rest of Drupal does. This makes for both a consistent user experience and consistent code. It simplifies the forms and validation code, however, it does change the node API slightly:

    * The _validate hook and the _nodeapi('validate') hook of the node API (1) no longer take an 'error' parameter and (2) should no longer return an error array. To set an error, call form_set_error().

    * The _form hook of the node module no longer takes a form hook and should not worry about displaying errors. Ditto for _nodeapi('form_post') and _nodeapi('form_pre').

											
										
										
											2004-07-04 16:50:02 +00:00
+								function forum_form(&$node) {
-												#62340 by chx, webchick, Jaza, Eaton, mathieu, and myself. Configurable node types.

											
										
										
											2006-08-06 23:00:42 +00:00
+								  $type = node_get_types('type', $node);
-												- Patch #112715 by chx, webchick, asimmonds, et al: fixing E_ALL notices.  Thanks.

											
										
										
											2007-01-31 15:49:26 +00:00
+								  $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#default_value' => !empty($node->title) ? $node->title : '', '#required' => TRUE, '#weight' => -5);
-												- Patch #10056: allow the node title forms to be customized.

											
										
										
											2005-09-23 08:47:13 +00:00
-												- Patch #112715 by chx, webchick, asimmonds, et al: fixing E_ALL notices.  Thanks.

											
										
										
											2007-01-31 15:49:26 +00:00
+								  if (!empty($node->nid)) {
-												- Patch #115667 by rotzi: added versioning support to node terms.

											
										
										
											2007-02-12 17:47:08 +00:00
+								    $forum_terms = taxonomy_node_get_terms_by_vocabulary(_forum_get_vid(), $node);
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								    // if editing, give option to leave shadows
-												- Patch #39598 by Gerhard: fixed problem with taxonomy terms not being selected.

											
										
										
											2005-12-06 12:20:24 +00:00
+								    $shadow = (count($forum_terms) > 1);
-												#36791: node_validate was called twice

											
										
										
											2005-11-12 02:54:13 +00:00
+								    $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.'));
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								  }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-												- Patch #112715 by chx, webchick, asimmonds, et al: fixing E_ALL notices.  Thanks.

											
										
										
											2007-01-31 15:49:26 +00:00
+								  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => check_plain($type->body_label), '#default_value' => !empty($node->body) ? $node->body : '', '#rows' => 20, '#required' => TRUE);
-												- Patch #45530 by Morbus: filter_form shouldn't default to #weight 0

When a form element doesn't specify a #weight, it is assumed internally as #weight 0. However, to ensure that our form elements display visually *as they were defined in the array* we, in form_builder, count the number of elements, divide by 1000, and set that as the weight:

# Assign a decimal placeholder weight to preserve original array order
if (!isset($form[$key]['#weight'])) {
  $form[$key]['#weight'] = $count/1000;
}

The above code will set the #weights of elements that have not defined a weight to something like 0 (first element in array definition), 0.001, 0.002, and so on. However, anytime a form element *explicitly* defines a #weight of 0, that #weight is kept at exactly 0, which would cause that form element to appear BEFORE the elements that didn't have a #weight defined (and thus received a #weight such as 0.002).

Consider the following pseudo example:

$form['game_title'] = array(
    '#type' => 'textfield',
    ...
    );
$form['game_description'] = array(
    '#type' => 'textarea',
    ...
    );
$form['game_format'] = filter_form(variable_get('game_format', NULL));
return $form;

Here, we're not definiing weights on our two textfields. We then add an filter_form. The second parameter of the filter_form is $weight, which defaults to 0. After this $form hits form_builder, we have weights 0 (game_title), 0.001 (game_description), and 0 (filter_form) respectively. This is then sorted by weight, which causes filter_form (the third element in the array) to appear BEFORE game_description (0 is lighter than 0.001).

The short lesson is: explicitly defining #weight 0 for a form element is probably a bad idea. This patch changes the default #weight of filter_form to NULL, instead of 0, and also removes any other explicit setting of #weight to 0 in core.

											
										
										
											2006-01-20 09:04:34 +00:00
+								  $form['body_filter']['format'] = filter_form($node->format);
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
-												- Patch #29465: new form API by Adrian et al.

  TODO:
  + The contact.module was broken; a new patch for contact.module is needed.
  + Documentation is needed.
  + The most important modules need to be updated ASAP.

											
										
										
											2005-10-07 06:11:12 +00:00
+								  return $form;
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								}
-												- Patch #40664 by Gerhard: assign default forum when adding a forum topic from within a forum.

											
										
										
											2005-12-10 19:58:40 +00:00
+								/**
 								 * Implementation of hook_prepare; assign forum taxonomy when adding a topic from within a forum.
 								 */
 								function forum_prepare(&$node) {
-												- Patch #112715 by chx, webchick, asimmonds, et al: fixing E_ALL notices.  Thanks.

											
										
										
											2007-01-31 15:49:26 +00:00
+								  if (empty($node->nid)) {
-												- Patch #40664 by Gerhard: assign default forum when adding a forum topic from within a forum.

											
										
										
											2005-12-10 19:58:40 +00:00
+								    // new topic
-												#40664, adding new forum topic, forum not pre-selected in pull down menu., fix by Jonas Kvarnstrom, patch by drumm

											
										
										
											2006-04-06 18:36:57 +00:00
+								    $node->taxonomy[arg(3)]->vid = _forum_get_vid();
 								    $node->taxonomy[arg(3)]->tid = arg(3);
-												- Patch #40664 by Gerhard: assign default forum when adding a forum topic from within a forum.

											
										
										
											2005-12-10 19:58:40 +00:00
+								  }
 								}
-												- Rollback of patch #68418: clean up node submit hooks.  Needs more thinkering.
  Restores the old node API.

											
										
										
											2006-08-31 21:58:36 +00:00
+								/**
 								 * Implementation of hook_insert().
 								 */
 								function forum_insert($node) {
 								  db_query('INSERT INTO {forum} (nid, vid, tid) VALUES (%d, %d, %d)', $node->nid, $node->vid, $node->tid);
 								}
 								/**
 								 * Implementation of hook_delete().
 								 */
 								function forum_delete(&$node) {
 								  db_query('DELETE FROM {forum} WHERE nid = %d', $node->nid);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								/**
 								 * Returns a form for adding a container to the forum vocabulary
 								 *
 								 * @param $edit Associative array containing a container term to be added or edited.
 								 */
 								function forum_form_container($edit = array()) {
 								  // Handle a delete operation.
 								  $form['name'] = array(
 								    '#title' => t('Container name'),
 								    '#type' => 'textfield',
 								    '#default_value' => $edit['name'],
-												- Rollback of E_ALL patch.  Too much extra breakage.

											
										
										
											2007-01-25 22:14:06 +00:00
+								    '#maxlength' => 255,
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								    '#description' => t('The container name is used to identify related forums.'),
 								    '#required' => TRUE
 								  );
 								  $form['description'] = array(
 								    '#type' => 'textarea',
 								    '#title' => t('Description'),
 								    '#default_value' => $edit['description'],
 								    '#description' => t('The container description can give users more information about the forums it contains.')
 								  );
 								  $form['parent']['#tree'] = TRUE;
 								  $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'container');
 								  $form['weight'] = array('#type' => 'weight',
 								    '#title' => t('Weight'),
 								    '#default_value' => $edit['weight'],
 								    '#description' => t('When listing containers, those with with light (small) weights get listed before containers with heavier (larger) weights. Containers with equal weights are sorted alphabetically.')
 								  );
 								  $form['vid'] = array('#type' => 'hidden',
 								    '#value' => _forum_get_vid());
 								  $form['submit'] = array(
 								    '#type' => 'submit',
 								    '#value' => t('Submit')
 								  );
 								  if ($edit['tid']) {
 								    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
 								    $form['tid'] = array('#type' => 'value', '#value' => $edit['tid']);
 								  }
-												- Patch #77919 by chx, eaton, moshe, et al: enable programmaticaly submitted forms via the pull model.

											
										
										
											2006-08-18 18:58:47 +00:00
+								  $form['#base'] = 'forum_form';
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
-												- Patch #77919 by chx, eaton, moshe, et al: enable programmaticaly submitted forms via the pull model.

											
										
										
											2006-08-18 18:58:47 +00:00
+								  return $form;
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								}
-												#84076 by edkwh. Interim fix for being able to delete forums and forum containers.

											
										
										
											2006-09-23 08:10:40 +00:00
+								function forum_form_main($type, $edit = array()) {
 								  if ($_POST['op'] == t('Delete') || $_POST['confirm']) {
 								    return drupal_get_form('forum_confirm_delete', $edit['tid']);
 								  }
 								  switch ($type) {
 								    case 'forum':
 								      return drupal_get_form('forum_form_forum', $edit);
 								      break;
 								    case 'container':
 								      return drupal_get_form('forum_form_container', $edit);
 								      break;
 								  }
 								}
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								/**
 								 * Returns a form for adding a forum to the forum vocabulary
 								 *
 								 * @param $edit Associative array containing a forum term to be added or edited.
 								 */
 								function forum_form_forum($edit = array()) {
 								  $form['name'] = array('#type' => 'textfield',
 								    '#title' => t('Forum name'),
 								    '#default_value' => $edit['name'],
-												- Rollback of E_ALL patch.  Too much extra breakage.

											
										
										
											2007-01-25 22:14:06 +00:00
+								    '#maxlength' => 255,
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								    '#description' => t('The forum name is used to identify related discussions.'),
 								    '#required' => TRUE,
 								  );
 								  $form['description'] = array('#type' => 'textarea',
 								    '#title' => t('Description'),
 								    '#default_value' => $edit['description'],
 								    '#description' => t('The forum description can give users more information about the discussion topics it contains.'),
 								  );
 								  $form['parent']['#tree'] = TRUE;
 								  $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'forum');
 								  $form['weight'] = array('#type' => 'weight',
 								    '#title' => t('Weight'),
 								    '#default_value' => $edit['weight'],
 								    '#description' => t('When listing forums, those with lighter (smaller) weights get listed before containers with heavier (larger) weights. Forums with equal weights are sorted alphabetically.'),
 								  );
 								  $form['vid'] = array('#type' => 'hidden', '#value' => _forum_get_vid());
 								  $form['submit' ] = array('#type' => 'submit', '#value' => t('Submit'));
 								  if ($edit['tid']) {
 								    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
 								    $form['tid'] = array('#type' => 'hidden', '#value' => $edit['tid']);
 								  }
-												- Patch #77919 by chx, eaton, moshe, et al: enable programmaticaly submitted forms via the pull model.

											
										
										
											2006-08-18 18:58:47 +00:00
+								  $form['#base'] = 'forum_form';
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
-												- Patch #77919 by chx, eaton, moshe, et al: enable programmaticaly submitted forms via the pull model.

											
										
										
											2006-08-18 18:58:47 +00:00
+								  return $form;
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								}
 								/**
 								 * Process forum form and container form submissions.
 								 */
 								function forum_form_submit($form_id, $form_values) {
 								  if ($form_id == 'forum_form_container') {
 								    $container = TRUE;
 								    $type = t('forum container');
 								  }
 								  else {
-												- Patch #72204 by nedjo: upper-cased all TRUE/FALSE/NULL constants.

											
										
										
											2006-07-05 11:45:51 +00:00
+								    $container = FALSE;
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								    $type = t('forum');
 								  }
 								  $status = taxonomy_save_term($form_values);
 								  switch ($status) {
 								    case SAVED_NEW:
 								      if ($container) {
 								        $containers = variable_get('forum_containers', array());
 								        $containers[] = $form_values['tid'];
 								        variable_set('forum_containers', $containers);
 								      }
-												#76802: Introduce placeholder magic into t()
See: http://drupal.org/node/64279#t-placeholders

											
										
										
											2006-08-18 12:17:00 +00:00
+								      drupal_set_message(t('Created new @type %term.', array('%term' => $form_values['name'], '@type' => $type)));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								      break;
 								    case SAVED_UPDATED:
-												#76802: Introduce placeholder magic into t()
See: http://drupal.org/node/64279#t-placeholders

											
										
										
											2006-08-18 12:17:00 +00:00
+								      drupal_set_message(t('The @type %term has been updated.', array('%term' => $form_values['name'], '@type' => $type)));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								      break;
 								  }
-												- Patch #72079 by Earl et al: give Drupal an overall administration page ... :-)

											
										
										
											2006-07-31 11:25:55 +00:00
+								  return 'admin/content/forum';
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								}
 								/**
 								 * Returns a confirmation page for deleting a forum taxonomy term.
 								 *
 								 * @param $tid ID of the term to be deleted
 								 */
-												- Patch #77919 by chx, eaton, moshe, et al: enable programmaticaly submitted forms via the pull model.

											
										
										
											2006-08-18 18:58:47 +00:00
+								function forum_confirm_delete($tid) {
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								  $term = taxonomy_get_term($tid);
 								  $form['tid'] = array('#type' => 'value', '#value' => $tid);
 								  $form['name'] = array('#type' => 'value', '#value' => $term->name);
-												#84076 by edkwh. Interim fix for being able to delete forums and forum containers.

											
										
										
											2006-09-23 08:10:40 +00:00
+								  return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/content/forum', t('Deleting a forum or container will delete all sub-forums and associated posts as well. This action cannot be undone.'), t('Delete'), t('Cancel'));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								}
 								/**
 								 * Implementation of forms api _submit call. Deletes a forum after confirmation.
 								 */
 								function forum_confirm_delete_submit($form_id, $form_values) {
 								  taxonomy_del_term($form_values['tid']);
-												#76802: Introduce placeholder magic into t()
See: http://drupal.org/node/64279#t-placeholders

											
										
										
											2006-08-18 12:17:00 +00:00
+								  drupal_set_message(t('The forum %term and all sub-forums and associated posts have been deleted.', array('%term' => $form_values['name'])));
 								  watchdog('content', t('forum: deleted %term and all its sub-forums and associated posts.', array('%term' => $form_values['name'])));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
-												- Patch #72079 by Earl et al: give Drupal an overall administration page ... :-)

											
										
										
											2006-07-31 11:25:55 +00:00
+								  return 'admin/content/forum';
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								}
 								/**
 								 * Returns an overview list of existing forums and containers
 								 */
 								function forum_overview() {
 								  $header = array(t('Name'), t('Operations'));
 								  $tree = taxonomy_get_tree(_forum_get_vid());
 								  if ($tree) {
 								    foreach ($tree as $term) {
 								      if (in_array($term->tid, variable_get('forum_containers', array()))) {
-												- Patch #112563 by webchick: prevent double-escaping.

											
										
										
											2007-01-25 21:49:32 +00:00
+								        $rows[] = array(str_repeat(' -- ', $term->depth) .' '. l($term->name, 'forum/'. $term->tid), l(t('edit container'), 'admin/content/forum/edit/container/'. $term->tid));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								      }
 								      else {
-												- Patch #112563 by webchick: prevent double-escaping.

											
										
										
											2007-01-25 21:49:32 +00:00
+								        $rows[] = array(str_repeat(' -- ', $term->depth) .' '. l($term->name, 'forum/'. $term->tid), l(t('edit forum'), 'admin/content/forum/edit/forum/'. $term->tid));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								       }
 								    }
 								  }
 								  else {
-												#76802: Introduce placeholder magic into t()
See: http://drupal.org/node/64279#t-placeholders

											
										
										
											2006-08-18 12:17:00 +00:00
+								    $rows[] = array(array('data' => '<em>' . t('There are no existing containers or forums. You may add some on the <a href="@container">add container</a> or <a href="@forum">add forum</a> pages.', array('@container' => url('admin/content/forum/add/container'), '@forum' => url('admin/content/forum/add/forum'))) . '</em>', 'colspan' => 2));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								  }
 								  return theme('table', $header, $rows);
 								}
 								/**
 								 * Returns a select box for available parent terms
 								 *
 								 * @param $tid ID of the term which is being added or edited
 								 * @param $title Title to display the select box with
 								 * @param $child_type Whether the child is forum or container
 								 */
 								function _forum_parent_select($tid, $title, $child_type) {
 								  $parents = taxonomy_get_parents($tid);
 								  if ($parents) {
 								    $parent = array_shift($parents);
 								    $parent = $parent->tid;
 								  }
 								  else {
 								    $parent = 0;
 								  }
 								  $children = taxonomy_get_tree(_forum_get_vid(), $tid);
 								  // A term can't be the child of itself, nor of its children.
 								  foreach ($children as $child) {
 								    $exclude[] = $child->tid;
 								  }
 								  $exclude[] = $tid;
 								  $tree = taxonomy_get_tree(_forum_get_vid());
 								  $options[0] = '<'. t('root') .'>';
 								  if ($tree) {
 								    foreach ($tree as $term) {
 								      if (!in_array($term->tid, $exclude)) {
-												#56093 by webchick. Fix forums.

											
										
										
											2006-08-25 08:55:04 +00:00
+								        $options[$term->tid] = str_repeat(' -- ', $term->depth) . $term->name;
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								      }
 								    }
 								  }
 								  if ($child_type == 'container') {
 								    $description = t('Containers are usually placed at the top (root) level of your forum but you can also place a container inside a parent container or forum.');
 								  }
 								  else if ($child_type == 'forum') {
 								    $description = t('You may place your forum inside a parent container or forum, or at the top (root) level of your forum.');
 								  }
 								  return array('#type' => 'select', '#title' => $title, '#default_value' => $parent, '#options' => $options, '#description' => $description, '#required' => TRUE);
 								}
-												- Patch #18260 by Ber, m3averck et al: allow overriding of links returned by modules

											
										
										
											2006-05-18 14:58:57 +00:00
+								function forum_link_alter(&$node, &$links) {
-												#71925 by Steven, remove # prefix from link array keys.

											
										
										
											2006-07-04 08:59:05 +00:00
+								  foreach ($links as $module => $link) {
-												- Patch #18260 by Ber, m3averck et al: allow overriding of links returned by modules

											
										
										
											2006-05-18 14:58:57 +00:00
+								    if (strstr($module, 'taxonomy_term')) {
-												- Patch #18260 by Morbus: fixed taxonomy links.

											
										
										
											2006-05-29 12:58:19 +00:00
+								      // Link back to the forum and not the taxonomy term page. We'll only
 								      // do this if the taxonomy term in question belongs to forums.
-												#71925 by Steven, remove # prefix from link array keys.

											
										
										
											2006-07-04 08:59:05 +00:00
+								      $tid = str_replace('taxonomy/term/', '', $link['href']);
-												- Patch #18260 by Morbus: fixed taxonomy links.

											
										
										
											2006-05-29 12:58:19 +00:00
+								      $term = taxonomy_get_term($tid);
 								      if ($term->vid == _forum_get_vid()) {
-												#71925 by Steven, remove # prefix from link array keys.

											
										
										
											2006-07-04 08:59:05 +00:00
+								        $links[$module]['href'] = str_replace('taxonomy/term', 'forum', $link['href']);
-												- Patch #18260 by Morbus: fixed taxonomy links.

											
										
										
											2006-05-29 12:58:19 +00:00
+								      }
-												- Patch #18260 by Ber, m3averck et al: allow overriding of links returned by modules

											
										
										
											2006-05-18 14:58:57 +00:00
+								    }
 								  }
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								}
 								/**
 								 * Returns the vocabulary id for forum navigation.
 								 */
 								function _forum_get_vid() {
 								  $vid = variable_get('forum_nav_vocabulary', '');
 								  if (empty($vid)) {
 								    // Check to see if a forum vocabulary exists
 								    $vid = db_result(db_query("SELECT vid FROM {vocabulary} WHERE module = '%s'", 'forum'));
 								    if (!$vid) {
-												- Patch #67146 by webchick: make sure that the forum vocabulary shows up first.

											
										
										
											2006-06-06 15:35:39 +00:00
+								      // Create the forum vocabulary. Assign the vocabulary a low weight so
 								      // it will appear first in forum topic create and edit forms.
-												- Patch #113286 by maynich: added missing t() function.

											
										
										
											2007-02-01 21:44:36 +00:00
+								      $edit = array('name' => t('Forums'), 'multiple' => 0, 'required' => 1, 'hierarchy' => 1, 'relations' => 0, 'module' => 'forum', 'weight' => -10, 'nodes' => array('forum' => 1));
-												- Patch #52850 by Zen: fapi conversion + minor fixes
    * converts forum_admin to fapi.
    * handles invalid terms in hook_menu
    * adds comments, fixes typos etc.
    * reorganises functions a little bit - moves hook_menu to the top.. groups hooks together and forms together

											
										
										
											2006-03-07 19:03:02 +00:00
+								      taxonomy_save_vocabulary($edit);
 								      $vid = $edit['vid'];
 								    }
 								    variable_set('forum_nav_vocabulary', $vid);
 								  }
 								  return $vid;
 								}
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								/**
 								 * Formats a topic for display
 								 *
-												- Patch #11728 by Uwe Hermann: fixed some typos in the code comments, Doxygen documentation and screen output.

  Uwe: I dropped the 'iff' chunks as 'iff' stands for 'if and only if'.

											
										
										
											2004-10-19 18:02:31 +00:00
+								 * @TODO Give a better description. Not sure where this function is used yet.
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								 */
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								function _forum_format($topic) {
-												- Bug #8898 by Morbus: fixed incorrect date being displayed in the forum overview when a topic has no comments yet.

											
										
										
											2004-06-29 20:35:58 +00:00
+								  if ($topic && $topic->timestamp) {
-												#76802: Introduce placeholder magic into t()
See: http://drupal.org/node/64279#t-placeholders

											
										
										
											2006-08-18 12:17:00 +00:00
+								    return t('@time ago<br />by !author', array('@time' => format_interval(time() - $topic->timestamp), '!author' => theme('username', $topic)));
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  }
 								  else {
-												- Patch #61893 by timnc: remove message_na().

											
										
										
											2006-07-29 17:56:41 +00:00
+								    return t('n/a');
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  }
 								}
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								/**
 								 * Returns a list of all forums for a given taxonomy id
 								 *
-												- Patch #11728 by Uwe Hermann: fixed some typos in the code comments, Doxygen documentation and screen output.

  Uwe: I dropped the 'iff' chunks as 'iff' stands for 'if and only if'.

											
										
										
											2004-10-19 18:02:31 +00:00
+								 * Forum objects contain the following fields
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								 * -num_topics Number of topics in the forum
 								 * -num_posts Total number of posts in all topics
 								 * -last_post Most recent post for the forum
 								 *
 								 * @param $tid
 								 *   Taxonomy ID of the vocabulary that holds the forum list.
 								 * @return
 								 *   Array of object containing the forum information.
 								 */
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								function forum_get_forums($tid = 0) {
-												- Modified patch #15122 by killes: fixed some PHP5 problems.

											
										
										
											2005-01-04 20:54:23 +00:00
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								  $forums = array();
 								  $_forums = taxonomy_get_tree(variable_get('forum_nav_vocabulary', ''), $tid);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								  if (count($_forums)) {
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    $counts = array();
-- Patch #14731 by chx: made it possible to rewrite node queries.

											
										
										
											2005-01-16 18:44:49 +00:00
+								    $sql = "SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.nid = r.nid WHERE n.status = 1 AND n.type = 'forum' GROUP BY r.tid";
-												- Patch #16111 by chx: generalized node_rewrite_query to db_rewrite_query.

											
										
										
											2005-01-29 22:02:37 +00:00
+								    $sql = db_rewrite_sql($sql);
-- Patch #14731 by chx: made it possible to rewrite node queries.

											
										
										
											2005-01-16 18:44:49 +00:00
+								    $_counts = db_query($sql, $forum->tid);
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    while ($count = db_fetch_object($_counts)) {
 								      $counts[$count->tid] = $count;
 								    }
-- Fixed bug related to recent cache changes.

											
										
										
											2002-12-14 23:23:35 +00:00
+								  }
-- Patch by Goba: added form descriptions where appropriate and removed some
  duplicated code from the comment module.

											
										
										
											2004-01-31 21:16:42 +00:00
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								  foreach ($_forums as $forum) {
 								    if (in_array($forum->tid, variable_get('forum_containers', array()))) {
 								      $forum->container = 1;
 								    }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    if ($counts[$forum->tid]) {
 								      $forum->num_topics = $counts[$forum->tid]->topic_count;
 								      $forum->num_posts = $counts[$forum->tid]->topic_count + $counts[$forum->tid]->comment_count;
 								    }
 								    else {
 								      $forum->num_topics = 0;
 								      $forum->num_posts = 0;
 								    }
 								    // This query does not use full ANSI syntax since MySQL 3.x does not support
 								    // table1 INNER JOIN table2 INNER JOIN table3 ON table2_criteria ON table3_criteria
-- Patch 13180 by chx: renamed check_query() to db_escape_string() and implemtented it properly per database backend.

  Read the manual for pg_escape_string:  "Use of this function is recommended instead of addslashes()." Or read sqlite_escape_string: "addslashes() should NOT be used to quote your strings for SQLite queries; it will lead to strange results when retrieving your data."

											
										
										
											2004-11-21 08:25:17 +00:00
+								    // used to join node_comment_statistics to users.
-												#70660 by pwolanin. Forum last post time was considering non-forum items.

											
										
										
											2006-08-26 00:19:02 +00:00
+								    $sql = "SELECT ncs.last_comment_timestamp, IF (ncs.last_comment_uid != 0, u2.name, ncs.last_comment_name) AS last_comment_name, ncs.last_comment_uid FROM {node} n INNER JOIN {users} u1 ON n.uid = u1.uid INNER JOIN {term_node} tn ON n.nid = tn.nid INNER JOIN {node_comment_statistics} ncs ON n.nid = ncs.nid INNER JOIN {users} u2 ON ncs.last_comment_uid=u2.uid WHERE n.status = 1 AND n.type='forum' AND tn.tid = %d ORDER BY ncs.last_comment_timestamp DESC";
-												- Patch #16111 by chx: generalized node_rewrite_query to db_rewrite_query.

											
										
										
											2005-01-29 22:02:37 +00:00
+								    $sql = db_rewrite_sql($sql);
-- Patch #14731 by chx: made it possible to rewrite node queries.

											
										
										
											2005-01-16 18:44:49 +00:00
+								    $topic = db_fetch_object(db_query_range($sql, $forum->tid, 0, 1));
-												- Modified patch #15122 by killes: fixed some PHP5 problems.

											
										
										
											2005-01-04 20:54:23 +00:00
-												#107015: Code consistency, capitalization of class names.

											
										
										
											2007-01-05 05:32:23 +00:00
+								    $last_post = new stdClass();
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    $last_post->timestamp = $topic->last_comment_timestamp;
 								    $last_post->name = $topic->last_comment_name;
 								    $last_post->uid = $topic->last_comment_uid;
 								    $forum->last_post = $last_post;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    $forums[$forum->tid] = $forum;
 								  }
 								  return $forums;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
-												- Patch #47691 by wtanaka: performance improvement for _forum_topics_read.

											
										
										
											2006-02-09 08:09:55 +00:00
+								/**
 								 * Calculate the number of nodes the user has not yet read and are newer
 								 * than NODE_NEW_LIMIT.
 								 */
 								function _forum_topics_unread($term, $uid) {
-												- Patch #47691 by Cvbge: quickfix postgresql

											
										
										
											2006-02-09 08:52:03 +00:00
+								  $sql = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = 'forum' AND n.created > %d AND h.nid IS NULL";
-												- Patch #16111 by chx: generalized node_rewrite_query to db_rewrite_query.

											
										
										
											2005-01-29 22:02:37 +00:00
+								  $sql = db_rewrite_sql($sql);
-												- Patch #47691 by wtanaka: performance improvement for _forum_topics_read.

											
										
										
											2006-02-09 08:09:55 +00:00
+								  return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT));
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								function forum_get_topics($tid, $sortby, $forum_per_page) {
-- Applied Moshe's tablesort patch!  Note that I changed the arrow images
  because those of Moshe where not identical.

											
										
										
											2003-08-21 15:47:50 +00:00
+								  global $user, $forum_topic_list_header;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Applied Moshe's tablesort patch!  Note that I changed the arrow images
  because those of Moshe where not identical.

											
										
										
											2003-08-21 15:47:50 +00:00
+								  $forum_topic_list_header = array(
-												#47692 by Wesley Tanaka. Clean up some PHP notices.

											
										
										
											2006-10-04 06:07:05 +00:00
+								    array('data' => '&nbsp;', 'field' => NULL),
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								    array('data' => t('Topic'), 'field' => 'n.title'),
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    array('data' => t('Replies'), 'field' => 'l.comment_count'),
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								    array('data' => t('Created'), 'field' => 'n.created'),
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    array('data' => t('Last reply'), 'field' => 'l.last_comment_timestamp'),
-- Applied Moshe's tablesort patch!  Note that I changed the arrow images
  because those of Moshe where not identical.

											
										
										
											2003-08-21 15:47:50 +00:00
+								  );
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Patch #9884 by Bart Jansens:
  + The 'previous topic' / 'next topic' links skipped topic without comments (changed one inner join back to a left join).
  + The default order setting in admin/settings/forum had no effect.
  + The 'first new topic' link jumped to the first unread topic ever instead of the first unread topic since NODE_NEW_LIMIT.
  + This also removes the unused $offset param from theme_forum_display and theme_forum_topic_list, so any themes using these functions should be updated (i checked the core themes but none of them used these functions).

											
										
										
											2004-08-09 18:54:49 +00:00
+								  $order = _forum_get_topic_order($sortby);
-- Help system improvements: eliminated the _system hook.  Patch by Michael.

- Bloggerapi module fixes.  Patch by Kjartan.

- Coding style fixes.  Patch by Michael.

											
										
										
											2003-10-07 18:16:41 +00:00
+								  for ($i = 0; $i < count($forum_topic_list_header); $i++) {
-- Patch #9884 by Bart Jansens:
  + The 'previous topic' / 'next topic' links skipped topic without comments (changed one inner join back to a left join).
  + The default order setting in admin/settings/forum had no effect.
  + The 'first new topic' link jumped to the first unread topic ever instead of the first unread topic since NODE_NEW_LIMIT.
  + This also removes the unused $offset param from theme_forum_display and theme_forum_topic_list, so any themes using these functions should be updated (i checked the core themes but none of them used these functions).

											
										
										
											2004-08-09 18:54:49 +00:00
+								    if ($forum_topic_list_header[$i]['field'] == $order['field']) {
 								      $forum_topic_list_header[$i]['sort'] = $order['sort'];
-- Applied Moshe's tablesort patch!  Note that I changed the arrow images
  because those of Moshe where not identical.

											
										
										
											2003-08-21 15:47:50 +00:00
+								    }
 								  }
 								  $term = taxonomy_get_term($tid);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-												- Patch #46864 by stmind: fixed problem with node-level permissions and forums.

											
										
										
											2006-02-01 14:19:44 +00:00
+								  $sql = db_rewrite_sql("SELECT n.nid, f.tid, n.title, n.sticky, u.name, u.uid, n.created AS timestamp, n.comment AS comment_mode, l.last_comment_timestamp, IF(l.last_comment_uid != 0, cu.name, l.last_comment_name) AS last_comment_name, l.last_comment_uid, l.comment_count AS num_comments FROM {node_comment_statistics} l, {users} cu, {term_node} r, {users} u, {forum} f, {node} n WHERE n.status = 1 AND l.last_comment_uid = cu.uid AND n.nid = l.nid AND n.nid = r.nid AND r.tid = %d AND n.uid = u.uid AND n.vid = f.vid");
-- Patch #8603 by TDobes: added support for sticky forum topics to the blog
  and forum module.

											
										
										
											2004-06-27 16:02:31 +00:00
+								  $sql .= tablesort_sql($forum_topic_list_header, 'n.sticky DESC,');
-												- Patch #32459 by beardedstoat and tostinni: always add a secondary sort order so the newest comments are on top.

											
										
										
											2005-10-01 13:30:06 +00:00
+								  $sql .= ', n.created DESC';  // Always add a secondary sort order so that the news forum topics are on top.
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
-												- Patch #16111 by chx: generalized node_rewrite_query to db_rewrite_query.

											
										
										
											2005-01-29 22:02:37 +00:00
+								  $sql_count = db_rewrite_sql("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum'");
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-												- The real code fixes ;)

											
										
										
											2005-01-17 19:00:03 +00:00
+								  $result = pager_query($sql, $forum_per_page, 0, $sql_count, $tid);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
 								  while ($topic = db_fetch_object($result)) {
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								    if ($user->uid) {
 								      // folder is new if topic is new or there are new comments since last visit
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								      if ($topic->tid != $tid) {
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								        $topic->new = 0;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      }
 								      else {
-- Patch #9884 by Bart Jansens:
  + The 'previous topic' / 'next topic' links skipped topic without comments (changed one inner join back to a left join).
  + The default order setting in admin/settings/forum had no effect.
  + The 'first new topic' link jumped to the first unread topic ever instead of the first unread topic since NODE_NEW_LIMIT.
  + This also removes the unused $offset param from theme_forum_display and theme_forum_topic_list, so any themes using these functions should be updated (i checked the core themes but none of them used these functions).

											
										
										
											2004-08-09 18:54:49 +00:00
+								        $history = _forum_user_last_visit($topic->nid);
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								        $topic->new_replies = comment_num_new($topic->nid, $history);
-												- Modified node and comments to not be marked as new when they are 30 days old.

											
										
										
											2004-01-29 22:00:31 +00:00
+								        $topic->new = $topic->new_replies || ($topic->timestamp > $history);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      }
-												- Modified node and comments to not be marked as new when they are 30 days old.

											
										
										
											2004-01-29 22:00:31 +00:00
+								    }
 								    else {
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								      // Do not track "new replies" status for topics if the user is anonymous.
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								      $topic->new_replies = 0;
 								      $topic->new = 0;
-												- Modified node and comments to not be marked as new when they are 30 days old.

											
										
										
											2004-01-29 22:00:31 +00:00
+								    }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								    if ($topic->num_comments > 0) {
-												#107015: Code consistency, capitalization of class names.

											
										
										
											2007-01-05 05:32:23 +00:00
+								      $last_reply = new stdClass();
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								      $last_reply->timestamp = $topic->last_comment_timestamp;
 								      $last_reply->name = $topic->last_comment_name;
 								      $last_reply->uid = $topic->last_comment_uid;
 								      $topic->last_reply = $last_reply;
 								    }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								    $topics[] = $topic;
 								  }
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								  return $topics;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								/**
 								 * Finds the first unread node for a given forum.
 								 */
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								function _forum_new($tid) {
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  global $user;
-- Patch #14731 by chx: made it possible to rewrite node queries.

											
										
										
											2005-01-16 18:44:49 +00:00
+								  $sql = "SELECT n.nid FROM {node} n LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum' AND h.nid IS NULL AND n.created > %d ORDER BY created";
-												- Patch #16111 by chx: generalized node_rewrite_query to db_rewrite_query.

											
										
										
											2005-01-29 22:02:37 +00:00
+								  $sql = db_rewrite_sql($sql);
-- Patch #14731 by chx: made it possible to rewrite node queries.

											
										
										
											2005-01-16 18:44:49 +00:00
+								  $nid = db_result(db_query_range($sql, $user->uid, $tid, NODE_NEW_LIMIT, 0, 1));
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
 								  return $nid ? $nid : 0;
 								}
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								/**
-												- Code improvements by JonBob.  Thanks.

											
										
										
											2004-05-17 22:00:06 +00:00
+								 * Menu callback; prints a forum listing.
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								 */
-												- Removed some dead code.

											
										
										
											2004-11-06 11:54:09 +00:00
+								function forum_page($tid = 0) {
-												#79601: module_exist() -> module_exists()

											
										
										
											2006-08-20 05:57:41 +00:00
+								  if (module_exists('taxonomy') && module_exists('comment')) {
-												- Removed some dead code.

											
										
										
											2004-11-06 11:54:09 +00:00
+								    $forum_per_page = variable_get('forum_per_page', 25);
 								    $sortby = variable_get('forum_order', 1);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-												- Removed some dead code.

											
										
										
											2004-11-06 11:54:09 +00:00
+								    $forums = forum_get_forums($tid);
 								    $parents = taxonomy_get_parents_all($tid);
 								    if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
 								      $topics = forum_get_topics($tid, $sortby, $forum_per_page);
-- Made sure the taxonomy module doesn't display warning/error messages
  when the taxonomy module is disabled.  Reported by kyvinh.

- Improved forum documentation.  Modified version of Kjartan's patch.

TODO:

- Updating a forum topic through the admin interface, results in a
  duplicate (and incomplete) forum topic.  Also note that "Leave
  shadow?" function is annoying; the status of the checkbox is lost
  when clicking preview.  Also, I think it should be disabled be
  default.

											
										
										
											2002-12-18 21:43:03 +00:00
+								    }
-												- Removed some dead code.

											
										
										
											2004-11-06 11:54:09 +00:00
-- Patch 20910 by chx: centralize print theme page.

											
										
										
											2005-04-24 16:34:36 +00:00
+								    return theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								  }
 								  else {
-												- Usablity improvement: check whether the comment module is enabled.  If not,
  show an error message.

											
										
										
											2005-09-06 19:38:56 +00:00
+								    drupal_set_message(t('The forum module requires both the taxonomy module and the comment module to be enabled and configured.'), 'error');
 								    return ' ';
-- Removed Windows line feeds ...

											
										
										
											2001-12-05 18:46:24 +00:00
+								  }
 								}
-- Committed stage 2 of the theme system improvements!  Patch by CodeMonkeyX.

											
										
										
											2003-11-09 23:27:22 +00:00
+								/**
-- Tidied up the DoxyGen comments.  Patch by Kjartan.

											
										
										
											2003-12-08 06:32:19 +00:00
+								 * Format the forum body.
 								 *
-- Patch #10663 by JonBob: documentation improvements: fixed some typos and improved consistency to the use of Doxygen/api.module commands in the comments.

											
										
										
											2004-09-09 05:51:08 +00:00
+								 * @ingroup themeable
-- Tidied up the DoxyGen comments.  Patch by Kjartan.

											
										
										
											2003-12-08 06:32:19 +00:00
+								 */
-- Patch #9884 by Bart Jansens:
  + The 'previous topic' / 'next topic' links skipped topic without comments (changed one inner join back to a left join).
  + The default order setting in admin/settings/forum had no effect.
  + The 'first new topic' link jumped to the first unread topic ever instead of the first unread topic since NODE_NEW_LIMIT.
  + This also removes the unused $offset param from theme_forum_display and theme_forum_topic_list, so any themes using these functions should be updated (i checked the core themes but none of them used these functions).

											
										
										
											2004-08-09 18:54:49 +00:00
+								function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_per_page) {
-- Tracker and forum module improvements!

  Note: the CSS of the tracker page has changed.  Some CSS files still have
  to be updated.

											
										
										
											2004-03-20 13:23:34 +00:00
+								  global $user;
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								  // forum list, topics list, topic browser and 'add new topic' link
-- Everything is using theme("function") now instead of $theme->function().

											
										
										
											2003-02-15 11:39:56 +00:00
-												 - Patch #113603 by chx: first crack at re-implementing tabs.

											
										
										
											2007-02-11 09:30:51 +00:00
+								  $vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', ''));
-												- Patch #18927 by Periastron: as one navigates down through the forum taxonomy, the title used to change to the current term, but now it always just displays the vocabulary name. I have attached a patch that restores the previous behaviour. It looks like the regression may have been introduced in some changes to theme_forum_display.

											
										
										
											2005-03-16 21:07:59 +00:00
+								  $title = $vocabulary->name;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								  // Breadcrumb navigation:
 								  $breadcrumb = array();
-- Committed phase 4 of JonBob's menu system changes.

											
										
										
											2003-11-25 19:26:21 +00:00
+								  if ($tid) {
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								    $breadcrumb[] = array('path' => 'forum', 'title' => $title);
-- Committed phase 4 of JonBob's menu system changes.

											
										
										
											2003-11-25 19:26:21 +00:00
+								  }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
 								  if ($parents) {
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								    $parents = array_reverse($parents);
 								    foreach ($parents as $p) {
-												- Removed left-overs from the rating module.  Patch by Gerhard.  Updated the
  PostgreSQL and MSSQL database scheme as well.

- Made sure the update script updates the correct tables when database
  prefixing is enabled.  Patch by Bart Jansens.

- Improved the breadcrumb navigation of the book and the forum module as per
  Keith Instone's suggestions.

- Updated page titles (or block titles) and links to match.  Suggested by
  Keith Instone.

- Added missing 'thread' field to the comment table of the MySQL database scheme.
  Fixes bug #2590.

											
										
										
											2003-08-22 17:06:44 +00:00
+								      if ($p->tid == $tid) {
 								        $title = $p->name;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      }
 								      else {
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								        $breadcrumb[] = array('path' => 'forum/'. $p->tid, 'title' => $p->name);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      }
 								    }
 								  }
-												- Patch #18927 by Periastron: as one navigates down through the forum taxonomy, the title used to change to the current term, but now it always just displays the vocabulary name. I have attached a patch that restores the previous behaviour. It looks like the regression may have been introduced in some changes to theme_forum_display.

											
										
										
											2005-03-16 21:07:59 +00:00
-												- Always check the username.

											
										
										
											2007-01-10 15:17:51 +00:00
+								  drupal_set_title(check_plain($title));
-												- Patch #18927 by Periastron: as one navigates down through the forum taxonomy, the title used to change to the current term, but now it always just displays the vocabulary name. I have attached a patch that restores the previous behaviour. It looks like the regression may have been introduced in some changes to theme_forum_display.

											
										
										
											2005-03-16 21:07:59 +00:00
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								  $breadcrumb[] = array('path' => $_GET['q']);
 								  menu_set_location($breadcrumb);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-- Bugfix: PostgreSQL problem with locale module.   Fixed bug #3900.  Patch #139
  by Gerhard.

- Forum module improvements.  Patch #138 by Ax.

											
										
										
											2003-11-05 17:40:41 +00:00
+								  if (count($forums) || count($parents)) {
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								    $output  = '<div id="forum">';
 								    $output .= '<ul>';
-- Tracker and forum module improvements!

  Note: the CSS of the tracker page has changed.  Some CSS files still have
  to be updated.

											
										
										
											2004-03-20 13:23:34 +00:00
 								    if (user_access('create forum topics')) {
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								      $output .= '<li>'. l(t('Post new forum topic.'), "node/add/forum/$tid") .'</li>';
-- Tracker and forum module improvements!

  Note: the CSS of the tracker page has changed.  Some CSS files still have
  to be updated.

											
										
										
											2004-03-20 13:23:34 +00:00
+								    }
 								    else if ($user->uid) {
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								      $output .= '<li>'. t('You are not allowed to post a new forum topic.') .'</li>';
-- Tracker and forum module improvements!

  Note: the CSS of the tracker page has changed.  Some CSS files still have
  to be updated.

											
										
										
											2004-03-20 13:23:34 +00:00
+								    }
 								    else {
-												- Patch #111347 by Steven: refactor url() and l().

											
										
										
											2007-02-15 11:40:19 +00:00
+								      $output .= '<li>'. t('<a href="@login">Login</a> to post a new forum topic.', array('@login' => url('user/login', array('query' => drupal_get_destination())))) .'</li>';
-- Tracker and forum module improvements!

  Note: the CSS of the tracker page has changed.  Some CSS files still have
  to be updated.

											
										
										
											2004-03-20 13:23:34 +00:00
+								    }
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								    $output .= '</ul>';
-- Tracker and forum module improvements!

  Note: the CSS of the tracker page has changed.  Some CSS files still have
  to be updated.

											
										
										
											2004-03-20 13:23:34 +00:00
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								    $output .= theme('forum_list', $forums, $parents, $tid);
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								    if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
-- Patch #9884 by Bart Jansens:
  + The 'previous topic' / 'next topic' links skipped topic without comments (changed one inner join back to a left join).
  + The default order setting in admin/settings/forum had no effect.
  + The 'first new topic' link jumped to the first unread topic ever instead of the first unread topic since NODE_NEW_LIMIT.
  + This also removes the unused $offset param from theme_forum_display and theme_forum_topic_list, so any themes using these functions should be updated (i checked the core themes but none of them used these functions).

											
										
										
											2004-08-09 18:54:49 +00:00
+								      $output .= theme('forum_topic_list', $tid, $topics, $sortby, $forum_per_page);
-												- Patch #66569 by m3avrck: Consolidate the drupal_add_link() calls.

											
										
										
											2006-08-23 07:23:09 +00:00
+								      drupal_add_feed(url('taxonomy/term/'. $tid .'/0/feed'), 'RSS - '. $title);
-- Bugfix: PostgreSQL problem with locale module.   Fixed bug #3900.  Patch #139
  by Gerhard.

- Forum module improvements.  Patch #138 by Ax.

											
										
										
											2003-11-05 17:40:41 +00:00
+								    }
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								    $output .= '</div>';
-- Bugfix: PostgreSQL problem with locale module.   Fixed bug #3900.  Patch #139
  by Gerhard.

- Forum module improvements.  Patch #138 by Ax.

											
										
										
											2003-11-05 17:40:41 +00:00
+								  }
 								  else {
-												- Patch #13907 by Neil: less ways to set the page title.
   * Less logic in theme code.
   * Encourages use of the menu system.
   * Easier to find where a title or breadcrumb comes from in other people's code because there are less places to look. Look in menu and then grep for the appropriate set function. Looking for calls to theme_page() is hard because there are too many of them.
   * Very slightly more efficient.

											
										
										
											2004-12-15 21:19:42 +00:00
+								    drupal_set_title(t('No forums defined'));
-- Bugfix: PostgreSQL problem with locale module.   Fixed bug #3900.  Patch #139
  by Gerhard.

- Forum module improvements.  Patch #138 by Ax.

											
										
										
											2003-11-05 17:40:41 +00:00
+								    $output = '';
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								  }
-												- Patch #15978 by Drumm: code improvement: theme_forum_display() has no business calling theme_page(). Lets have it return the output and then forum_page() can put it in a page.

											
										
										
											2005-01-22 08:38:25 +00:00
+								  return $output;
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								}
-- Committed stage 2 of the theme system improvements!  Patch by CodeMonkeyX.

											
										
										
											2003-11-09 23:27:22 +00:00
+								/**
-- Tidied up the DoxyGen comments.  Patch by Kjartan.

											
										
										
											2003-12-08 06:32:19 +00:00
+								 * Format the forum listing.
 								 *
-- Patch #10663 by JonBob: documentation improvements: fixed some typos and improved consistency to the use of Doxygen/api.module commands in the comments.

											
										
										
											2004-09-09 05:51:08 +00:00
+								 * @ingroup themeable
-- Tidied up the DoxyGen comments.  Patch by Kjartan.

											
										
										
											2003-12-08 06:32:19 +00:00
+								 */
-- Committed stage 2 of the theme system improvements!  Patch by CodeMonkeyX.

											
										
										
											2003-11-09 23:27:22 +00:00
+								function theme_forum_list($forums, $parents, $tid) {
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								  global $user;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  if ($forums) {
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								    $header = array(t('Forum'), t('Topics'), t('Posts'), t('Last post'));
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
 								    foreach ($forums as $forum) {
-- Improvement: reintroduced forum containers as promised.  Should work as the
  changes are taken from Drupal 4.2.0.  Patch by Jeremy.

											
										
										
											2003-10-20 17:32:48 +00:00
+								      if ($forum->container) {
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								        $description  = '<div style="margin-left: '. ($forum->depth * 30) ."px;\">\n";
 								        $description .= ' <div class="name">'. l($forum->name, "forum/$forum->tid") ."</div>\n";
-- Forum module improvements.

											
										
										
											2004-01-21 18:34:18 +00:00
 								        if ($forum->description) {
-												- #55898: Generic, permissive admin XSS/HTML filtering for mission/footer/...
- Clean up some raw output

											
										
										
											2006-04-07 15:32:17 +00:00
+								          $description .= ' <div class="description">'. filter_xss_admin($forum->description) ."</div>\n";
-- Forum module improvements.

											
										
										
											2004-01-21 18:34:18 +00:00
+								        }
 								        $description .= "</div>\n";
-- Patch #12783 by Stefan: various small consistency/usability improvements.

											
										
										
											2004-11-15 11:16:39 +00:00
+								        $rows[] = array(array('data' => $description, 'class' => 'container', 'colspan' => '4'));
-												- removed next/prev links when forum node is shown on main page.
- title is no longer modified when shown on main page.
- commented out a chunk of code in forum_view that is no in use.
- coding sytle fixes.

											
										
										
											2002-11-08 13:23:29 +00:00
+								      }
-- Improvement: reintroduced forum containers as promised.  Should work as the
  changes are taken from Drupal 4.2.0.  Patch by Jeremy.

											
										
										
											2003-10-20 17:32:48 +00:00
+								      else {
-												- Patch #47691 by wtanaka: performance improvement for _forum_topics_read.

											
										
										
											2006-02-09 08:09:55 +00:00
+								        $new_topics = _forum_topics_unread($forum->tid, $user->uid);
 								        $forum->old_topics = $forum->num_topics - $new_topics;
 								        if (!$user->uid) {
-- Forum module improvements.

											
										
										
											2004-01-21 18:34:18 +00:00
+								          $new_topics = 0;
 								        }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-												- Patch #7577 by JonBob: code improvements to the book, forum, page and poll module.

											
										
										
											2004-05-09 19:28:43 +00:00
+								        $description  = '<div style="margin-left: '. ($forum->depth * 30) ."px;\">\n";
 								        $description .= ' <div class="name">'. l($forum->name, "forum/$forum->tid") ."</div>\n";
-- Improvement: reintroduced forum containers as promised.  Should work as the
  changes are taken from Drupal 4.2.0.  Patch by Jeremy.

											
										
										
											2003-10-20 17:32:48 +00:00
-- Forum module improvements.

											
										
										
											2004-01-21 18:34:18 +00:00
+								        if ($forum->description) {
-												- #55898: Generic, permissive admin XSS/HTML filtering for mission/footer/...
- Clean up some raw output

											
										
										
											2006-04-07 15:32:17 +00:00
+								          $description .= ' <div class="description">'. filter_xss_admin($forum->description) ."</div>\n";
-- Forum module improvements.

											
										
										
											2004-01-21 18:34:18 +00:00
+								        }
 								        $description .= "</div>\n";
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
-												- Patch #40575 by Wesley: made it easier to theme the forum overview page.

											
										
										
											2007-01-31 16:01:17 +00:00
+								        $row = array(
 								          'data' => array(
 								            array('data' => $description, 'class' => 'forum'),
-												- Patch #111347 by Steven: refactor url() and l().

											
										
										
											2007-02-15 11:40:19 +00:00
+								            array('data' => $forum->num_topics . ($new_topics ? '<br />'. l(format_plural($new_topics, '1 new', '@count new'), "forum/$forum->tid", array('fragment' => 'new')) : ''), 'class' => 'topics'),
-												- Patch #40575 by Wesley: made it easier to theme the forum overview page.

											
										
										
											2007-01-31 16:01:17 +00:00
+								            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;
-- Forum module improvements.

											
										
										
											2004-01-21 18:34:18 +00:00
+								      }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								    }
-- Patch #11426: the forum module generated an empty table for forums with no child forums.

											
										
										
											2004-10-09 17:15:55 +00:00
 								    return theme('table', $header, $rows);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  }
 								}
-- Committed stage 2 of the theme system improvements!  Patch by CodeMonkeyX.

											
										
										
											2003-11-09 23:27:22 +00:00
+								/**
-- Tidied up the DoxyGen comments.  Patch by Kjartan.

											
										
										
											2003-12-08 06:32:19 +00:00
+								 * Format the topic listing.
 								 *
-- Patch #10663 by JonBob: documentation improvements: fixed some typos and improved consistency to the use of Doxygen/api.module commands in the comments.

											
										
										
											2004-09-09 05:51:08 +00:00
+								 * @ingroup themeable
-- Tidied up the DoxyGen comments.  Patch by Kjartan.

											
										
										
											2003-12-08 06:32:19 +00:00
+								 */
-- Patch #9884 by Bart Jansens:
  + The 'previous topic' / 'next topic' links skipped topic without comments (changed one inner join back to a left join).
  + The default order setting in admin/settings/forum had no effect.
  + The 'first new topic' link jumped to the first unread topic ever instead of the first unread topic since NODE_NEW_LIMIT.
  + This also removes the unused $offset param from theme_forum_display and theme_forum_topic_list, so any themes using these functions should be updated (i checked the core themes but none of them used these functions).

											
										
										
											2004-08-09 18:54:49 +00:00
+								function theme_forum_topic_list($tid, $topics, $sortby, $forum_per_page) {
 								  global $forum_topic_list_header;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
 								  if ($topics) {
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								    foreach ($topics as $topic) {
 								      // folder is new if topic is new or there are new comments since last visit
-												Patch by Marco:

- forum: fixed link to new topic
- forum: new topic shows default forum correctly
- forum: first_new is back; the anchor didn't consider multiple pages
- forum: use standard pager, needed some changes/fixes to pager.inc
- forum: some cleanup
- forum: taxonomy hook
- renamed first_new to simply new
- added an optional parameter to pager_query for the count query
- used the optional count param for paging forum topics
- internal change: moving a topic doesn't duplicate the node anymore but just
  changes the forum (term); no change in functionality, and shadow still
  works (suggested by Dries).  This probably also made some queries somewhat
  lighter.
- bug fixed: anonymous users always saw "n (n new)" in the replies column
- updated pager help and moved from _help to phpdoc

											
										
										
											2003-01-15 23:01:42 +00:00
+								      if ($topic->tid != $tid) {
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								        $rows[] = array(
-												- Modified patch #40534: improved themability of forum icons (makes it possible to use animated gifs) + removed forum setting.

											
										
										
											2005-12-11 12:44:39 +00:00
+								          array('data' => theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky), 'class' => 'icon'),
-												- #18817: Clean up plain-text checking (see drupal-devel!)

											
										
										
											2005-03-31 09:25:33 +00:00
+								          array('data' => check_plain($topic->title), 'class' => 'title'),
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								          array('data' => l(t('This topic has been moved'), "forum/$topic->tid"), 'colspan' => '3')
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								        );
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      }
 								      else {
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								        $rows[] = array(
-												- Modified patch #40534: improved themability of forum icons (makes it possible to use animated gifs) + removed forum setting.

											
										
										
											2005-12-11 12:44:39 +00:00
+								          array('data' => theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky), 'class' => 'icon'),
-Tabs patch!

CHANGES
-------

 + Introduced tabs. First, we extended the menu system to support tabs. Next, a tab was added for every link that was (1) an administrative action other than the implicit 'view' (2) relevant to that particular page only. This is illustrated by the fact that all tabs are verbs and that clicking a page's tab leads you to a subpage of that page.

 + Flattened the administration menu. The tabs helped simplify the navigation menu as I could separate 'actions' from 'navigation'. In addition, I removed the 'administer > configuration'-menu, renamed 'blocks' to 'sidebars' which I hope is a bit more descriptive, and made a couple more changes. Earlier, we already renamed 'taxonomy' to 'categorization' and we move 'statistics' under 'logs'.

 + Grouped settings. All settings have been grouped under 'administer > settings'.

TODO
----

 + Update core themes: only Xtemplate default supports tabs and even those look ugly.  Need help.

 + Update contributed modules.  The menu() hook changed drastically.  Updating your code adhere the new menu() function should be 90% of the work.  Moreover, ensure that your modue's admin links are still valid and that URLs to node get updated to the new scheme ('node/view/x' -> 'node/x').

											
										
										
											2004-06-18 15:04:37 +00:00
+								          array('data' => l($topic->title, "node/$topic->nid"), 'class' => 'topic'),
-												- Patch #111347 by Steven: refactor url() and l().

											
										
										
											2007-02-15 11:40:19 +00:00
+								          array('data' => $topic->num_comments . ($topic->new_replies ? '<br />'. l(format_plural($topic->new_replies, '1 new', '@count new'), "node/$topic->nid", array('fragment' => 'new')) : ''), 'class' => 'replies'),
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								          array('data' => _forum_format($topic), 'class' => 'created'),
-												#47692 by Wesley Tanaka. Clean up some PHP notices.

											
										
										
											2006-10-04 06:07:05 +00:00
+								          array('data' => _forum_format(isset($topic->last_reply) ? $topic->last_reply : NULL), 'class' => 'last-reply')
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								        );
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      }
 								    }
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
+								  }
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-												#47692 by Wesley Tanaka. Clean up some PHP notices.

											
										
										
											2006-10-04 06:07:05 +00:00
+								  $output = theme('table', $forum_topic_list_header, $rows);
-												#5371, drupal_get_destination, pager and tablesort array handling, patch by Steven

											
										
										
											2006-04-13 08:25:27 +00:00
+								  $output .= theme('pager', NULL, $forum_per_page, 0);
-) Bugfix: changed INNER JOIN to LEFT JOIN to make forum topics with no comments show on the topic overview page.

2) Beautified the forum module views; rewritten to use the table() rendering functions, X HTML-ified the emitted code, added additional CSS tags, and removed hard-coded markup.  This improves themeabality; it should be able to mimic the view and color scheme of, say, http://www.phpbb.com/.

3) Reorganized forms and links (interactive elements) to improve usability.  Also ensured that the link names and page titles match.

4) Temporary removed container functionality: this simplified the work and eliminated some usability issues.

											
										
										
											2003-08-15 15:17:23 +00:00
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  return $output;
 								}
-												- Modified patch #40534: improved themability of forum icons (makes it possible to use animated gifs) + removed forum setting.

											
										
										
											2005-12-11 12:44:39 +00:00
+								/**
 								 * Format the icon for each individual topic.
 								 *
 								 * @ingroup themeable
 								 */
 								function theme_forum_icon($new_posts, $num_posts = 0, $comment_mode = 0, $sticky = 0) {
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
-												- Modified patch #40534: improved themability of forum icons (makes it possible to use animated gifs) + removed forum setting.

											
										
										
											2005-12-11 12:44:39 +00:00
+								  if ($num_posts > variable_get('forum_hot_topic', 15)) {
 								    $icon = $new_posts ? 'hot-new' : 'hot';
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  }
 								  else {
-												- Modified patch #40534: improved themability of forum icons (makes it possible to use animated gifs) + removed forum setting.

											
										
										
											2005-12-11 12:44:39 +00:00
+								    $icon = $new_posts ? 'new' : 'default';
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								  }
-- Replaced the 'active post' and 'recent post' by better integrated and
  easier to understand 'new' links.   The 'new' links are clickable both
  at the forum overview (to get to the new forum topics) and at the topic
  overview (to get to the new comments).

											
										
										
											2004-01-28 22:10:34 +00:00
-												- Modified patch #40534: improved themability of forum icons (makes it possible to use animated gifs) + removed forum setting.

											
										
										
											2005-12-11 12:44:39 +00:00
+								  if ($comment_mode == COMMENT_NODE_READ_ONLY || $comment_mode == COMMENT_NODE_DISABLED) {
 								    $icon = 'closed';
 								  }
 								  if ($sticky == 1) {
 								    $icon = 'sticky';
 								  }
 								  $output = theme('image', "misc/forum-$icon.png");
-- Replaced the 'active post' and 'recent post' by better integrated and
  easier to understand 'new' links.   The 'new' links are clickable both
  at the forum overview (to get to the new forum topics) and at the topic
  overview (to get to the new comments).

											
										
										
											2004-01-28 22:10:34 +00:00
+								  if ($new_posts) {
 								    $output = "<a name=\"new\">$output</a>";
 								  }
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
+								  return $output;
 								}
 								/**
 								 * Format the next/previous forum topic navigation links.
 								 *
 								 * @ingroup themeable
 								 */
 								function theme_forum_topic_navigation($node) {
 								  $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 AND n.type = 'forum' ORDER BY n.sticky DESC, ". _forum_get_topic_order_sql(variable_get('forum_order', 1));
 								  $result = db_query(db_rewrite_sql($sql), $node->tid);
-												#73884 by RobRoy, various code cleanup.

											
										
										
											2006-08-05 00:26:36 +00:00
+								  $stop = 0;
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
+								  while ($topic = db_fetch_object($result)) {
 								    if ($stop == 1) {
-												#107015: Code consistency, capitalization of class names.

											
										
										
											2007-01-05 05:32:23 +00:00
+								      $next = new stdClass();
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
+								      $next->nid = $topic->nid;
 								      $next->title = $topic->title;
 								      break;
 								    }
 								    if ($topic->nid == $node->nid) {
 								      $stop = 1;
 								    }
 								    else {
-												#107015: Code consistency, capitalization of class names.

											
										
										
											2007-01-05 05:32:23 +00:00
+								      $prev = new stdClass();
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
+								      $prev->nid = $topic->nid;
 								      $prev->title = $topic->title;
 								    }
 								  }
 								  if ($prev || $next) {
-												#72467 by m3avrck. Better display for long book page and forum topic titles.

											
										
										
											2006-11-14 06:30:10 +00:00
+								    $output .= '<div class="forum-topic-navigation clear-block">';
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
 								    if ($prev) {
-												- Patch #46743 by Morbus: fixed double encoding issue.

											
										
										
											2006-02-15 20:47:35 +00:00
+								      $output .= l(t('‹ ') . $prev->title, 'node/'. $prev->nid, array('class' => 'topic-previous', 'title' => t('Go to previous forum topic')));
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
+								    }
-												#49299 by wtanaka, properly break words

											
										
										
											2006-07-11 07:04:34 +00:00
+								    if ($prev && $next) {
 								      // Word break (a is an inline element)
 								      $output .= ' ';
 								    }
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
+								    if ($next) {
-												- Patch #46743 by Morbus: fixed double encoding issue.

											
										
										
											2006-02-15 20:47:35 +00:00
+								      $output .= l($next->title . t(' ›'), 'node/'. $next->nid, array('class' => 'topic-next', 'title' => t('Go to next forum topic')));
-												- Patch #46743 by m3avrck: clean up forum topic navigation.  Bring it in line with book.module.

											
										
										
											2006-02-10 05:05:44 +00:00
+								    }
 								    $output .= '</div>';
 								  }
-- Replaced the 'active post' and 'recent post' by better integrated and
  easier to understand 'new' links.   The 'new' links are clickable both
  at the forum overview (to get to the new forum topics) and at the topic
  overview (to get to the new comments).

											
										
										
											2004-01-28 22:10:34 +00:00
+								  return $output;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
 								function _forum_user_last_visit($nid) {
 								  global $user;
-												- Modified node and comments to not be marked as new when they are 30 days old.

											
										
										
											2004-01-29 22:00:31 +00:00
+								  static $history = array();
 								  if (empty($history)) {
-- Replaced a bunch of double quotes by single quotes.

											
										
										
											2004-02-01 21:32:01 +00:00
+								    $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = %d', $user->uid);
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								    while ($t = db_fetch_object($result)) {
-												- Modified node and comments to not be marked as new when they are 30 days old.

											
										
										
											2004-01-29 22:00:31 +00:00
+								      $history[$t->nid] = $t->timestamp > NODE_NEW_LIMIT ? $t->timestamp : NODE_NEW_LIMIT;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								    }
 								  }
-												#47692 by Wesley Tanaka. Clean up some PHP notices.

											
										
										
											2006-10-04 06:07:05 +00:00
+								  return isset($history[$nid]) ? $history[$nid] : NODE_NEW_LIMIT;
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								}
 								function _forum_get_topic_order($sortby) {
 								  switch ($sortby) {
 								    case 1:
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								      return array('field' => 'l.last_comment_timestamp', 'sort' => 'desc');
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      break;
 								    case 2:
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								      return array('field' => 'l.last_comment_timestamp', 'sort' => 'asc');
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      break;
 								    case 3:
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								      return array('field' => 'l.comment_count', 'sort' => 'desc');
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      break;
 								    case 4:
-- Patch #10308 by Bart Jansens/ccourtne: fixed shadow copies.

- Patch #10308 by ccourtne: performance improvements: comment statistics are now cached in a new SQL table which significantly improves performance of the forum block and the forum pages.  These pages are about 3 times faster now!

											
										
										
											2004-09-14 05:48:02 +00:00
+								      return array('field' => 'l.comment_count', 'sort' => 'asc');
-- Commited Marco's new comment module and forum module!!!

											
										
										
											2002-09-15 13:00:12 +00:00
+								      break;
 								  }
 								}
-- Patch #9884 by Bart Jansens:
  + The 'previous topic' / 'next topic' links skipped topic without comments (changed one inner join back to a left join).
  + The default order setting in admin/settings/forum had no effect.
  + The 'first new topic' link jumped to the first unread topic ever instead of the first unread topic since NODE_NEW_LIMIT.
  + This also removes the unused $offset param from theme_forum_display and theme_forum_topic_list, so any themes using these functions should be updated (i checked the core themes but none of them used these functions).

											
										
										
											2004-08-09 18:54:49 +00:00
+								function _forum_get_topic_order_sql($sortby) {
 								  $order = _forum_get_topic_order($sortby);
 								  return $order['field'] .' '. $order['sort'];
 								}
-												- Patch #29385 by chx: no ?> add end of files.

											
										
										
											2005-08-25 21:14:17 +00:00