/[drupal]/contributions/modules/recent_changes/recent_changes.module

Diff of /contributions/modules/recent_changes/recent_changes.module

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.5.2.1,
Thu Feb 21 00:27:54 2008 UTC
+revision 1.5.2.2,
Fri Feb 22 15:11:05 2008 UTC
 Line 1
  <?php
- // $Id: recent_changes.module,v 1.1.2.5 2008/02/20 23:45:22 roetzi Exp $
+ // $Id: recent_changes.module,v 1.5.2.1 2008/02/21 00:27:54 roetzi Exp $
  /**
   * @file
 Line 41 
 function recent_changes_menu() {
    return $items;
  }
  /**
   * Settings form
   */
-Line 139 
 function recent_changes_admin_settings()
+Line 138 
 function recent_changes_admin_settings()
      '#type' => 'checkbox',
      '#title' => t('Show diffs in feeds'),
      '#return_value' => 1,
-     '#default_value' => variable_get('recent_changes_show_diffs', TRUE),
+     '#default_value' => variable_get('recent_changes_show_diff', TRUE),
      '#description' => t('When the diff module is installed and the length of XML items (see below) is set to \'Full text\', the difference between a revision of a node and its predecessor can be shown. Check this box to enable this feature.'),
    );
    $form['feed_settings']['recent_changes_feed_default_items'] = array(
-Line 161 
 function recent_changes_admin_settings()
+Line 160 
 function recent_changes_admin_settings()
    return system_settings_form($form);
  }
  /**
   * Menu callback.
   */
-Line 175 
 function recent_changes_view() {
+Line 173 
 function recent_changes_view() {
    }
  }
  /**
   * Page display of recent changes.
   */
-Line 186 
 function recent_changes_page() {
+Line 183 
 function recent_changes_page() {
    if ($_POST['op'] === t('Filter')) {
      unset($_GET['page']);
    }
    // Initialize
    $output = '';
    $day = -1;
-Line 203 
 function recent_changes_page() {
+Line 200 
 function recent_changes_page() {
    else {
      drupal_add_feed(url('recent_changes/feed', array('absolute' => TRUE)), t('Recent changes of !site', array('!site' => variable_get('site_name', 'drupal'))));
    }
    // Show filter if enabled
    $output .= (variable_get('recent_changes_show_filter', TRUE)) ? drupal_get_form('recent_changes_filter_form') : '';
-Line 213 
 function recent_changes_page() {
+Line 210 
 function recent_changes_page() {
    // SQL results provided by pager implementation
    list($sql, $count_sql) = _recent_changes_query($node_types, user_access('view revisions'));
    $sql_results = pager_query($sql, variable_get('recent_changes_entries_per_page', 50), 0, $count_sql);
    // put database results in $results
    $results = array();
    while ($db_item = db_fetch_object($sql_results)) {
      $results[] = $db_item;
    }
    // parse results into items
    $items = _recent_changes_parse_results($results);
    foreach ($items as $item) {
      // Check if day of week changed and if yes output the new day.
      $current_day = format_date($item->timestamp, 'custom', 'z');
-Line 240 
 function recent_changes_page() {
+Line 237 
 function recent_changes_page() {
      // Add the items
      $rows[] = array(
        $item->op_link,
        format_date($item->timestamp, 'custom', 'H:i'),
        $item->node_type_name,
        '<span class="change-flag">' . $item->flag . '</span> ' . call_user_func_array('l', array_merge(array($item->item_title), $item->link_array)) . (($item->item_title_add) ? '<br>'. $item->item_title_add : ''),
        $item->user_link,
-Line 249 
 function recent_changes_page() {
+Line 246 
 function recent_changes_page() {
    }
    // Print table and pager
    $output .= theme('table', $header, $rows, array('class' => 'recent-changes'));
    $output .= theme('pager', NULL, variable_get('recent_changes_entries_per_page', 50), 0);
    return($output);
  }
  /**
   * RSS feed of recent changes.
   */
-Line 306 
 function recent_changes_feed($node_types
+Line 302 
 function recent_changes_feed($node_types
      // load node or comment body text
      if ($load_node_text) {
        if ($is_comment) {
          $body_text = $item->comment_text;
          $teaser_text = node_teaser($body_text, $node->format);
          $node->body = check_markup($body_text, $node->format, FALSE);
          $node->teaser = check_markup($teaser_text, $node->format, FALSE);
          $node->readmore = ($teaser && (strlen($teaser_text) < strlen($body_text)));
-Line 355 
 function recent_changes_feed($node_types
+Line 351 
 function recent_changes_feed($node_types
      // put in normal extra information
      $extra = array_merge($extra,
        array(
          array('key' => 'pubDate', 'value' =>  date('r', $item->timestamp)),
          array('key' => 'dc:creator', 'value' => $item->user_name),
          array('key' => 'guid', 'value' => $item->nid .' at '. $base_url . (($is_comment) ? ' comment '.$item->cid : ' revision '.$item->vid), 'attributes' => array('isPermaLink' => 'false')),
        )
      );
-Line 370 
 function recent_changes_feed($node_types
+Line 366 
 function recent_changes_feed($node_types
        }
      }
    }
    // RSS channel information
    $single_node_type = count($node_types) == 1;
    $filter_text = ($single_node_type) ? ' filtered by '. _recent_changes_node_type_name($node_types[0]) : '';
-Line 389 
 function recent_changes_feed($node_types
+Line 385 
 function recent_changes_feed($node_types
    $output .= "</rss>\n";
    // Set MIME type in HTML header
    drupal_set_header('Content-Type: application/rss+xml; charset=utf-8');
    // Print feed text
    print $output;
  }
  /**
   * Parsing of recent changes results
   */
-Line 414 
 function _recent_changes_parse_results($
+Line 409 
 function _recent_changes_parse_results($
    // get previous revisions
    $all_node_nid = implode(", ", array_keys($nids, TRUE));
    $where_nid = ($all_node_nid) ? "WHERE n.nid IN ($all_node_nid)" : "WHERE FALSE";
    $revisions_result = db_query("SELECT n.nid, n.vid AS curr_vid, p.vid, p.title FROM {node_revisions} n LEFT JOIN {node_revisions} p ON ((n.nid = p.nid) AND (n.vid > p.vid)) $where_nid ORDER BY p.vid DESC");
    while ($revision = db_fetch_object($revisions_result)) {
      $curr_vid = $revision->curr_vid;
      if(is_null($revision->vid)) {
-Line 425 
 function _recent_changes_parse_results($
+Line 420 
 function _recent_changes_parse_results($
      $has_revisions[$revision->nid] = TRUE;
      $prev_revisions[$curr_vid] = (!isset($prev_revisions[$curr_vid])) ? $revision : $prev_revisions[$curr_vid];
    }
    // parse results
    foreach ($results as $result) {
      $is_comment = ($result->cid != 0);
-     $prev_revision = $prev_revisions[$result->vid];
+     if (isset($prev_revisions[$result->vid])) {
+       $prev_revision = $prev_revisions[$result->vid];
+     }
+     else {
+       $prev_revision = new stdClass();
+       $prev_revision->vid = 0;
+       $prev_revision->title = '';
+     }
      // the owner is the user specified in the {node} table (also called "author" in drupal terminology)
      $owner_user->uid = $result->uid;
      $owner_user->name = $result->name;
      // the active user is the user that performed the update, or posted the revision or comment
      $active_user->uid = $result->auid;
      $active_user->name = $result->aname;
      $is_current_revision = $result->vid == $result->cvid;
-     $show_revisions = $access_revisions && $has_revisions[$result->nid];
+     $show_revisions = $access_revisions && isset($has_revisions[$result->nid]) && $has_revisions[$result->nid];
      $show_diff_link = $prev_revision->vid && $exists_diff && $access_revisions;
      $moved = !$is_comment && $prev_revision->vid && ($prev_revision->title !== $result->title);
      $flags = array(
        'comment' => $is_comment,
-Line 459 
 function _recent_changes_parse_results($
+Line 461 
 function _recent_changes_parse_results($
      $result_title = ($is_comment) ? $result->subject : $result->title;
      $result_link = array("node/$result->nid" . (($is_comment || $is_current_revision) ? '' : "/revisions/$result->vid/view"), array('fragment' => ($is_comment) ? "comment-$result->cid" : NULL));
      $result_url =  array("node/$result->nid" . (($is_comment || $is_current_revision) ? '' : "/revisions/$result->vid/view"), array('fragment' => ($is_comment) ? "comment-$result->cid" : NULL ));
      $owner_intro_text = ($moved && $access_revisions) ? ', ' . t('from') . ' ' : t('author') . ': ';
      $result_title_add = ($moved && $access_revisions) ? t('source: ') . l($prev_revision->title, "node/$result->nid/revisions/$prev_revision->vid/view") : '';
      $result_title_add .= (!$is_comment && ($result->uid != $result->auid)) ? $owner_intro_text . theme('username', $owner_user) : '';
-Line 489 
 function _recent_changes_parse_results($
+Line 491 
 function _recent_changes_parse_results($
    return($items);
  }
  /**
   * Build SQL query depending on node type filter and comments filter.
   * Inaccessible node types should already have been filtered out by this stage.
   * If the load_revisions is false, only the recent changes from the {node} table are used, otherwise older revisions might also show up if they were recently changed.
  */
  function _recent_changes_query($node_types, $load_revisions) {
    // show comments
    $comment_index = array_search('comment', $node_types);
    $show_comments = (!is_bool($comment_index) && !is_null($comment_index));
    // if only comments is selected, show comments for all allowed node types
    $comments_only = (count($node_types) == 1 && $node_types[0] === 'comment');
    $node_types = $comments_only ? _recent_changes_parse_node_types() : $node_types;
    // construct node type query (note that leading and trailing single quotes (') need to be added later)
    $where_type = implode("', '", $node_types);
-Line 511 
 function _recent_changes_query($node_typ
+Line 512 
 function _recent_changes_query($node_typ
    $node_where = ($where_type && !$comments_only && !$load_revisions) ? "WHERE n.type IN ('$where_type')" : "WHERE FALSE";
    $revision_where = ($where_type && !$comments_only && $load_revisions) ? "WHERE n.type IN ('$where_type')" : "WHERE FALSE";
    $comment_where = ($where_type && $show_comments) ? "WHERE n.type IN ('$where_type')" : "WHERE FALSE";
    // queries to get the selected nodes, comments and revisions for the selected node types
    $nodes_query     = "SELECT n.nid, n.vid, n.vid AS cvid, n.uid, u.name, r.title, '' AS log, n.created,              r.timestamp, n.type, 0 AS cid, '' AS subject, '' AS comment, r.uid AS auid, a.name AS aname FROM {node} n LEFT JOIN {node_revisions} r ON n.vid = r.vid LEFT JOIN {users} u ON n.uid = u.uid LEFT JOIN {users} a ON r.uid = a.uid $node_where AND n.status >= 1";
    $revisions_query = "SELECT r.nid, r.vid, n.vid AS cvid, n.uid, u.name, r.title, r.log,     n.created,              r.timestamp, n.type, 0 AS cid, '' AS subject, '' AS comment, r.uid AS auid, a.name AS aname FROM {node_revisions} r LEFT JOIN {node} n ON r.nid = n.nid LEFT JOIN {users} u ON n.uid = u.uid LEFT JOIN {users} a ON r.uid = a.uid $revision_where AND n.status >= 1";
-Line 521 
 function _recent_changes_query($node_typ
+Line 522 
 function _recent_changes_query($node_typ
    $node_count = "SELECT COUNT(*) FROM {node} n $node_where AND n.status >= 1";
    $revision_count = "SELECT COUNT(*) FROM {node_revisions} r JOIN {node} n ON r.nid = n.nid $revision_where AND n.status >= 1";
    $comment_count = "SELECT COUNT(*) FROM {comments} c LEFT JOIN {node} n ON c.nid = n.nid $comment_where AND n.status >= 1";
    // unify queries
    $sql = "($nodes_query) UNION ALL ($revisions_query) UNION ALL ($comments_query) ORDER BY timestamp DESC";
    $sql_count = "SELECT ($node_count) + ($revision_count) + ($comment_count)";
    return(array($sql, $sql_count));
  }
  /**
   * Form for input filter.
   */
 Line 543 
 function recent_changes_filter_form() {
    foreach ($node_types AS $type) {
      $node_names[$type] = _recent_changes_node_type_name($type);
    }
    // content types have no weights, so we can safely sort them here
    asort($node_names);
    // add "All content types" if only single selection is allowed
    $node_names = ($allow_multiple) ? $node_names : array_merge(array(FALSE => t('All content types')), $node_names);
    $form = array();
    $form['#attributes'] = array('class' => 'inline');
    $form['recent_changes_filter_node_types'] = array(
      '#type' => 'select',
      '#title' => t('Filter content type'),
 Line 566 
 function recent_changes_filter_form() {
      '#type' => 'button',
      '#value' => t('Filter')
    );
    return $form;
  }
+ /**
- /*
+  * Interface with the diff module. Returns a table with the differences between $node and $prev_revision
- * Interface with the diff module. Returns a table with the differences between $node and $prev_revision
+  */
- */
  function _recent_changes_get_diff($node, $prev_revision) {
-   $item_text  = '<table style="width:100%">';
+   // Check for diff module
-   $item_text .= '<thead><tr><th></th><th>Revision of '. format_date($prev_revision->revision_timestamp) .'</th><th></th><th>Revision of '. format_date($node->revision_timestamp) .'</th></tr></thead>';
+   if (!module_exists('diff')) {
-   $item_text .= _diff_table_body($prev_revision, $node);
+     return '';
-   $item_text .= '</table>';
+   }
+   // Crete diff
+   $rows = _diff_body_rows($prev_revision, $node);
+   $cols = _diff_default_cols();
+   $header = array();
+   $item_text = theme('diff_table', $header, $rows, array('class' => 'diff'), NULL, $cols);
    // Replace css classes from diff with actual style elements since we cannot reference a css file from the rss feed.
    $patterns = array(
+     '/class=["\']diff-marker["\']/',
+     '/class=["\']diff-content["\']/',
      '/class=["\']diff-section-title["\']/',
      '/class=["\']diff-deletedline["\']/',
      '/class=["\']diff-addedline["\']/',
-Line 590 
 function _recent_changes_get_diff($node,
+Line 597 
 function _recent_changes_get_diff($node,
    );
    $replacements = array(
+     'style="width:1.4em;"',
+     'style="width:50%;"',
      'style="background-color: #f0f0ff;"',
      'style="background-color: #ffa;width: 50%"',
      'style="background-color: #afa;width: 50%"',
-Line 600 
 function _recent_changes_get_diff($node,
+Line 609 
 function _recent_changes_get_diff($node,
    $item_text = preg_replace($patterns, $replacements, $item_text);
    $item_text .= "<hr/>\n";
-   return($item_text);
+   return $item_text;
  }
+ /**
- /*
+  * Removes the node types to which the user has no access
- * Removes the node types to which the user has no access
+  */
- */
  function _recent_changes_access_check($node_types) {
    // Check for each node type (and comments) whether current user has 'view' access to it
    foreach ($node_types as $key=>$type) {
      $access = FALSE;
      if ($type == 'comment') {
-Line 622 
 function _recent_changes_access_check($n
+Line 630 
 function _recent_changes_access_check($n
        }
        else {
          // this would be the right way to implement access checks, but unfortunately most modules don't implement it
- // This is not correct as the 'view' parameter also needs that a node object is passed.
+         // This is not correct as the 'view' parameter also needs that a node object is passed.
- // Only for 'create' parameters it is sufficent to pass a node type
+         // Only for 'create' parameters it is sufficent to pass a node type
  //        $access = module_invoke($module, 'access', 'view', NULL);
          $access = NULL;
          // If $access is empty, we try it another way:
-         // First we request all possible permissions, then we check the first one with the word 'access' in it with the user_access command. If there is no permission with the word access in it, user_access('access content') is used. This works most of the time.
+         // First we request all possible permissions, then we check the first one with the word 'access' in it with
+         // the user_access command. If there is no permission with the word access in it, user_access('access content')
+         // is used. This works most of the time.
          if (is_null($access)) {
            $perms = module_invoke($module, 'perm');
            $pattern = "/(?m)^access.*$/";
-Line 644 
 function _recent_changes_access_check($n
+Line 654 
 function _recent_changes_access_check($n
        unset($node_types[$key]);
      }
    }
    return($node_types);
  }
  /**
   * Return allowed node types, including a 'comments' option
   */
  function _recent_changes_get_allowed_node_types() {
    $allowed_node_types = variable_get('recent_changes_allowed_node_types', array());
    $allowed_node_types = ($allowed_node_types) ? $allowed_node_types : array_keys(node_get_types('names'));
    // add comments option
    $allowed_node_types = (variable_get('recent_changes_show_comments', TRUE)) ? array_merge(array('comment'), $allowed_node_types) : $allowed_node_types;
    return $allowed_node_types;
  }
  /**
   * Parse (and cache) node types, and perform access check
   */
  function _recent_changes_parse_node_types($node_types = NULL) {
    // do some caching in case node_types is NULL
    static $all_parsed_node_types;
    $parse_all_node_types = is_null($node_types);
    // return cached version if available
    if ($parse_all_node_types && isset($all_parsed_node_types)) {
      return $all_parsed_node_types;
    }
    // put content types in an array, and use allowed_content_types if node_types was empty
    $node_types = _recent_changes_array_node_types($node_types);
    // perform access check
    $node_types = _recent_changes_access_check($node_types);
    // cache all parsed node types if all node types were requested
    if ($parse_all_node_types) {
      $all_parsed_node_types = $node_types;
-Line 691 
 function _recent_changes_parse_node_type
+Line 699 
 function _recent_changes_parse_node_type
    return($node_types);
  }
  /**
   * Given an array or of node types or a single node type, this function returns the node types that are also in allowed node types
   * If the input argument $node_types is NULL, all allowed node types are returned
   * Note that no access checking is performed here!
   */
  function _recent_changes_array_node_types($node_types = NULL) {
    $allowed_node_types = _recent_changes_get_allowed_node_types();

 Legend:



Removed from v.1.5.2.1
 


changed lines


 
Added in v.1.5.2.2
 Legend:



Removed from v.1.5.2.1
 


changed lines


 
Added in v.1.5.2.2
-Removed from v.1.5.2.1
+Added in v.1.5.2.2

	ViewVC Help
Powered by ViewVC 1.1.2