? byeblog.patch Index: modules/blog/blog.info =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.info,v retrieving revision 1.6 diff -u -p -r1.6 blog.info --- modules/blog/blog.info 18 Feb 2008 19:19:44 -0000 1.6 +++ modules/blog/blog.info 12 Mar 2008 15:34:19 -0000 @@ -1,6 +0,0 @@ -; $Id: blog.info,v 1.6 2008/02/18 19:19:44 dries Exp $ -name = Blog -description = Enables keeping easily and regularly updated user web pages or blogs. -package = Core - optional -version = VERSION -core = 7.x Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.299 diff -u -p -r1.299 blog.module --- modules/blog/blog.module 20 Feb 2008 13:46:38 -0000 1.299 +++ modules/blog/blog.module 12 Mar 2008 15:34:19 -0000 @@ -1,193 +1 @@ - array( - 'name' => t('Blog entry'), - 'module' => 'blog', - 'description' => t('A blog entry is a single post to an online journal, or blog.'), - ) - ); -} - -/** - * Implementation of hook_perm(). - */ -function blog_perm() { - return node_list_permissions('blog'); -} - -/** - * Implementation of hook_access(). - */ -function blog_access($op, $node, $account) { - switch ($op) { - case 'create': - // Anonymous users cannot post even if they have the permission. - return user_access('create blog content', $account) && $account->uid; - case 'update': - return user_access('edit any blog content', $account) || (user_access('edit own blog content', $account) && ($node->uid == $account->uid)); - case 'delete': - return user_access('delete any blog content', $account) || (user_access('delete own blog content', $account) && ($node->uid == $account->uid)); - } -} - -/** - * Implementation of hook_user(). - */ -function blog_user($type, &$edit, &$user) { - if ($type == 'view' && user_access('create blog content', $user)) { - $user->content['summary']['blog'] = array( - '#type' => 'user_profile_item', - '#title' => t('Blog'), - '#value' => l(t('View recent blog entries'), "blog/$user->uid", array('title' => t("Read @username's latest blog entries.", array('@username' => $user->name)))), - '#attributes' => array('class' => 'blog'), - ); - } -} - -/** - * Implementation of hook_help(). - */ -function blog_help($path, $arg) { - switch ($path) { - case 'admin/help#blog': - $output = '

'. t('The blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') .'

'; - $output .= '

'. t('There is an (optional) Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user\'s blog entries. The Blog entry menu item under Create content allows new blog entries to be created.') .'

'; - $output .= '

'. t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/build/block'))) .'

'; - $output .= '

'. t('When using the aggregator module an automatic blog it icon is displayed next to the items in a feed\'s latest items block. Clicking this icon populates a blog entry with a title (the title of the feed item) and body (a link to the source item on its original site and illustrative content suitable for use in a block quote). Blog authors can use this feature to easily comment on items of interest that appear in aggregator feeds from other sites. To use this feature, be sure to enable the aggregator module, add and configure a feed from another site, and position the feed\'s latest items block.', array('@modules' => url('admin/build/modules'), '@feeds' => url('admin/content/aggregator'), '@blocks' => url('admin/build/block'))) .'

'; - $output .= '

'. t('For more information, see the online handbook entry for Blog module.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) .'

'; - return $output; - } -} - -/** - * Implementation of hook_form(). - */ -function blog_form(&$node) { - global $nid; - $iid = isset($_GET['iid']) ? (int)$_GET['iid'] : 0; - $type = node_get_types('type', $node); - - - if (empty($node->body)) { - // If the user clicked a "blog it" link, we load the data from the - // database and quote it in the blog. - if ($nid && $blog = node_load($nid)) { - $node->body = ''. $blog->body .' ['. l($blog->name, "node/$nid") .']'; - } - - if ($iid && $item = db_fetch_object(db_query('SELECT i.*, f.title as ftitle, f.link as flink FROM {aggregator_item} i, {aggregator_feed} f WHERE i.iid = %d AND i.fid = f.fid', $iid))) { - $node->title = $item->title; - // Note: $item->description has been validated on aggregation. - $node->body = ''. check_plain($item->title) .' - '. $item->description .' ['. check_plain($item->ftitle) ."]\n"; - } - - } - - $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#required' => TRUE, '#default_value' => !empty($node->title) ? $node->title : NULL, '#weight' => -5); - $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count); - return $form; -} - -/** - * Implementation of hook_view(). - */ -function blog_view($node, $teaser = FALSE, $page = FALSE) { - if ($page) { - // Breadcrumb navigation - drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("@name's blog", array('@name' => $node->name)), 'blog/'. $node->uid))); - } - return node_prepare($node, $teaser); -} - -/** - * Implementation of hook_link(). - */ -function blog_link($type, $node = NULL, $teaser = FALSE) { - $links = array(); - - if ($type == 'node' && $node->type == 'blog') { - if (arg(0) != 'blog' || arg(1) != $node->uid) { - $links['blog_usernames_blog'] = array( - 'title' => t("@username's blog", array('@username' => $node->name)), - 'href' => "blog/$node->uid", - 'attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $node->name))) - ); - } - } - - return $links; -} - -/** - * Implementation of hook_menu(). - */ -function blog_menu() { - $items['blog'] = array( - 'title' => 'Blogs', - 'page callback' => 'blog_page_last', - 'access arguments' => array('access content'), - 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'blog.pages.inc', - ); - $items['blog/%user_current'] = array( - 'title' => 'My blog', - 'page callback' => 'blog_page_user', - 'page arguments' => array(1), - 'access callback' => 'user_access', - 'access arguments' => array('create blog content', 1), - 'file' => 'blog.pages.inc', - ); - $items['blog/%user/feed'] = array( - 'title' => 'Blogs', - 'page callback' => 'blog_feed_user', - 'page arguments' => array(1), - 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, - 'file' => 'blog.pages.inc', - ); - $items['blog/feed'] = array( - 'title' => 'Blogs', - 'page callback' => 'blog_feed_last', - 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, - 'file' => 'blog.pages.inc', - ); - - return $items; -} - -/** - * Implementation of hook_block(). - * - * Displays the most recent 10 blog titles. - */ -function blog_block($op = 'list', $delta = 0) { - global $user; - if ($op == 'list') { - $block[0]['info'] = t('Recent blog posts'); - return $block; - } - else if ($op == 'view') { - if (user_access('access content')) { - $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10); - if ($node_title_list = node_title_list($result)) { - $block['content'] = $node_title_list; - $block['content'] .= theme('more_link', url('blog'), t('Read the latest blog entries.')); - $block['subject'] = t('Recent blog posts'); - return $block; - } - } - } -} Index: modules/blog/blog.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v retrieving revision 1.7 diff -u -p -r1.7 blog.pages.inc --- modules/blog/blog.pages.inc 10 Feb 2008 18:58:28 -0000 1.7 +++ modules/blog/blog.pages.inc 12 Mar 2008 15:34:19 -0000 @@ -1,115 +0,0 @@ - $account->name))); - - $items = array(); - - if (($account->uid == $user->uid) && user_access('create blog entries')) { - $items[] = l(t('Post new blog entry.'), "node/add/blog"); - } - else if ($account->uid == $user->uid) { - $items[] = t('You are not allowed to post a new blog entry.'); - } - - $output = theme('item_list', $items); - - $result = pager_query(db_rewrite_sql("SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $account->uid); - $has_posts = FALSE; - - while ($node = db_fetch_object($result)) { - $output .= node_view(node_load($node->nid), 1); - $has_posts = TRUE; - } - - if ($has_posts) { - $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); - } - else { - if ($account->uid == $user->uid) { - drupal_set_message(t('You have not created any blog entries.')); - } - else { - drupal_set_message(t('!author has not created any blog entries.', array('!author' => theme('username', $account)))); - } - } - drupal_add_feed(url('blog/'. $account->uid .'/feed'), t('RSS - !title', array('!title' => $title))); - - return $output; -} - -/** - * Menu callback; displays a Drupal page containing recent blog entries of all users. - */ -function blog_page_last() { - global $user; - - $output = ''; - $items = array(); - - if (user_access('edit own blog')) { - $items[] = l(t('Create new blog entry.'), "node/add/blog"); - } - - $output = theme('item_list', $items); - - $result = pager_query(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10)); - $has_posts = FALSE; - - while ($node = db_fetch_object($result)) { - $output .= node_view(node_load($node->nid), 1); - $has_posts = TRUE; - } - - if ($has_posts) { - $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); - } - else { - drupal_set_message(t('No blog entries have been created.')); - } - drupal_add_feed(url('blog/feed'), t('RSS - blogs')); - - return $output; -} - -/** - * Menu callback; displays an RSS feed containing recent blog entries of a given user. - */ -function blog_feed_user($account) { - $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.created DESC"), $account->uid, 0, variable_get('feed_default_items', 10)); - $channel['title'] = $account->name ."'s blog"; - $channel['link'] = url('blog/'. $account->uid, array('absolute' => TRUE)); - - $items = array(); - while ($row = db_fetch_object($result)) { - $items[] = $row->nid; - } - node_feed($items, $channel); -} - -/** - * Menu callback; displays an RSS feed containing recent blog entries of all users. - */ -function blog_feed_last() { - $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, variable_get('feed_default_items', 10)); - $channel['title'] = variable_get('site_name', 'Drupal') .' blogs'; - $channel['link'] = url('blog', array('absolute' => TRUE)); - - $items = array(); - while ($row = db_fetch_object($result)) { - $items[] = $row->nid; - } - - node_feed($items, $channel); -}