Merge lp:planet-drupal/planet-5x into lp:planet-drupal

[Rocky Road]

[Rocky Road (m-baert)]

This is the CVS release tag DRUPAL-5--1-2,
base of 6.x branch, lp:~swe3tdave/drupal-planet/6.x
released on http://drupal.org/node/80702/release as follows:
---------------------------------------------------------
planet 5.x-1.2
5.x · New features
dllh - June 15, 2007 - 17:34
Official release from CVS tag: DRUPAL-5--1-2
First released: June 15, 2007 - 17:34
Download: planet-5.x-1.2.tar.gz
Size: 18.87 KB
md5_file hash: 62926edcff4e923997ad8e07b40a0ee2
Last updated: June 15, 2007 - 17:35
View usage statistics for this release

This release adds the ability to have planet nodes automatically redirect to the source link for a given planet item. This may be useful for people who aren't comfortable editing templates to use the $node->link attribute the module adds. It's also useful for feed links, which are generated using node_feed, which defaults to the node/$nid url. Rather than hacking a copy of node_feed into planet, administrators can toggle this option on in the planet settings and have both web site clicks and feed clicks forward to the originating link.

One possible liability of this addition is that with the option turned on, administrators will not be able to click to a planet item to get the edit tab for editing and deleting; these operations will have to be performed through administration menus.
---------------------------------------------------------

=== modified file 'CREDITS'
--- CREDITS	2009-06-04 09:16:03 +0000
+++ CREDITS	2009-06-04 14:37:33 +0000
@@ -1,5 +1,1 @@
 Written by Daryl Houston <[e-mail]>
-
-The core fetching and parsing of this module is lifted straight 
-out of the aggregator2 module, which presumably lifts from
-aggregator.

=== modified file 'planet.info'
--- planet.info	2009-06-04 08:45:43 +0000
+++ planet.info	2009-06-04 14:40:20 +0000
@@ -1,5 +1,10 @@
-; $Id: planet.info,v 1.1 2007/05/10 20:27:41 daryl Exp $
+; $Id: planet.info,v 1.2 2007/05/30 03:22:01 daryl Exp $
 name = Planet
 description = Planet blog aggregator
 package = Community - optional
 version = 0.1
+
+; Information added by drupal.org packaging script on 2007-05-10
+version = "5.x-1.0"
+project = "planet"
+

=== modified file 'planet.install'
--- planet.install	2009-06-04 08:45:43 +0000
+++ planet.install	2009-06-04 14:40:20 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: planet.install,v 1.1 2006/08/25 20:11:43 daryl Exp $
+// $Id: planet.install,v 1.3 2007/05/30 03:22:01 daryl Exp $
 
 /**
  * Implementation of hook_install()
@@ -31,6 +31,7 @@
         			fid int(10) unsigned zerofill,
         			nid int(10) unsigned zerofill,
         			guid varchar(120),
+				link varchar(180),
         			created int(11)
                			) /*!40100 DEFAULT CHARACTER SET utf8 */;");
 

=== modified file 'planet.module'
--- planet.module	2009-06-04 09:40:49 +0000
+++ planet.module	2009-06-04 15:45:25 +0000
@@ -3,8 +3,15 @@
 define('PLANET_ADMIN', 'administer planet');
 
 function planet_node_info() {
-        return array('planet' => array('name' => t('planet'), 'base' => 'planet'));
-} 
+  return array(
+    'planet' => array(
+      'name' => t('Planet Entry'),
+      'module' => 'planet',
+      'description' => t('Node to contain posts aggregated from various blogs.'),
+    )
+  );
+}
+
 
 function planet_perm() {
 	return array(PLANET_ADMIN);
@@ -20,15 +27,23 @@
 			$output .= '<li><strong>General Settings</strong>. The auto-publish value is a string that the module looks for in categories (if possible) or within a post itself. Posts that include the value will be auto-converted into blog entries. The role to select bloggers from lets you narrow the user list for when you\'re adding a feed and associating it with a user. A common setting will be to create a staff role and use this for planet.</li>';
 			$output .= '<li><strong>Feeds</strong>. This section lets you add a new feed. Give it a title, select an author, provide the feed url, and you\'re off. You\'ll have to manually refresh it or wait for a cron run for items to be imported.</li>';
 			$output .= '<li><strong>Feeds</strong>. This section lists current feeds, when they were last updated, how many items they have, and it allows you to edit, refresh, or freeze them. Freezing is a quick way to temporarily suspend updates from the given feed.</li>';
-			$output .= '</ul>';
 			return $output;
 		case 'admin/modules#description':
 			return t('Aggregates RSS feeds and faciliates their association with site users who belong to a given role.');
 	}
 }
 
-function planet_node_name(){
-	return 'planet';
+function planet_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE){
+	if($page === true && variable_get('planet_redirect_page', 0) == 1){
+		$obj = db_fetch_object(db_query('SELECT * FROM {planet_items} WHERE nid = %d', $node->nid));
+		if($obj->nid == $node->nid && $obj->link != ''){
+			header('Location: ' . $obj->link);
+			exit;
+		}
+	}
+	else{
+		return node_prepare($node, $teaser);
+	}
 }
 
 function planet_access($op, $node){
@@ -39,7 +54,7 @@
 	}
 
 	if ($op == 'update' || $op == 'delete') {
-		if (user_access('edit own blog') && ($user->uid == $node->uid)) {
+		if (user_access('edit own blog') && ($user->uid == $node->uid) || user_access('administer nodes')) {
 			return TRUE;
 		}
 	}
@@ -105,8 +120,8 @@
 }
 
 function _planet_settings(){
-	if($_POST['edit']){	
-		$edit = $_POST['edit'];
+	if($_POST){	
+		$edit = $_POST;
 		
 		if($_POST['op'] == 'Delete' && intval($edit['fid']) > 0){
 			db_query('DELETE FROM {planet_feeds} WHERE fid = %d', intval($edit['fid']));
@@ -128,6 +143,12 @@
 				if($edit['planet_auto_publish']){
 					variable_set('planet_auto_publish', $edit['planet_auto_publish']);
 				}
+				if($edit['planet_redirect_page'] == 1){
+					variable_set('planet_redirect_page', $edit['planet_redirect_page']);
+				}
+				else{
+					variable_del('planet_redirect_page');
+				}
 				drupal_set_message('Edited general planet settings.');							
 			}			
 		}	
@@ -137,35 +158,21 @@
 		$fid = intval(arg(3));
 		if($fid > 0){			
 			$edit = db_fetch_array(db_query('SELECT * FROM {planet_feeds} WHERE fid = %d', $fid));
-			$output .= planet_feed_form($edit, true);
+			$output .= drupal_get_form('planet_feed_form', $edit, true);
 		}
 		else{
 		
-			$roles = array();
-
-			$result = db_query('SELECT rid, name FROM {role}');
-			while($role = db_fetch_object($result)){
-				$roles[$role->rid] = $role->name;
-			}
-
 			$output .= '<h2>Recent Items</h2>';
 			$output .= planet_queue();
-			
-			$form = array();
-
-			$form['general'] = array('#type' => 'fieldset', '#title' => t('General Settings'));
 		
-			$form['general']['planet_auto_publish'] = array('#type' => 'textfield', '#title' => t('Auto-publish text'), '#value' => variable_get('planet_auto_publish', ''), '#size' => 30, '#maxlength' => 30, '#description' => t('If this snippet appears in the aggregated item, it will be auto-published.'));
-			$form['general']['planet_author_roles'] = array('#type' => 'select', '#title' => 'Role to select authors from', '#options' => $roles, '#default_value' => variable_get('planet_author_roles', 2), '#description' =>t('Select the role from which blog authors should be selected on the feed creation screen.'));
-			$form['general']['submit'] = array('#type' => 'submit', '#value' => 'Adjust Settings');
-			
-			$output .= drupal_get_form('settings', $form);
+			$output .= drupal_get_form('planet_settings_form');	
+			//$output .= drupal_get_form('settings', $form);
 			//$output .= $form;
 
-			$output .= planet_feed_form($edit);
+			$output .= drupal_get_form('planet_feed_form', $edit);
 		
 			$result = db_query('SELECT *, (UNIX_TIMESTAMP(NOW()) - checked) _checked FROM {planet_feeds}');
-			$result = db_query('SELECT COUNT(f.uid) cnt, f.*, (UNIX_TIMESTAMP(NOW()) - checked) _checked FROM planet_feeds f LEFT OUTER JOIN planet_items i ON i.fid = f.fid GROUP BY f.uid;');
+			$result = db_query('SELECT COUNT(f.fid) cnt, f.*, (UNIX_TIMESTAMP(NOW()) - checked) _checked FROM {planet_feeds} f LEFT OUTER JOIN {planet_items} i ON i.fid = f.fid GROUP BY f.fid;');
 			$rows = array();
 			$headers = array('Feed', 'Items', 'Edit', 'Last checked', 'Refresh', 'Freeze');
 			while($feed = db_fetch_object($result)){
@@ -191,6 +198,24 @@
 	}
 }
 
+function planet_settings_form(){
+	$roles = array();
+
+	$result = db_query('SELECT rid, name FROM {role}');
+	while($role = db_fetch_object($result)){
+		$roles[$role->rid] = $role->name;
+	}
+
+	$form = array();
+	$form['general'] = array('#type' => 'fieldset', '#title' => t('General Settings'));
+	$form['general']['planet_auto_publish'] = array('#type' => 'textfield', '#title' => t('Auto-publish text'), '#value' => variable_get('planet_auto_publish', ''), '#size' => 30, '#maxlength' => 30, '#description' => t('If this snippet appears in the aggregated item, it will be auto-published.'));
+	$form['general']['planet_author_roles'] = array('#type' => 'select', '#title' => t('Role to select authors from'), '#options' => $roles, '#default_value' => variable_get('planet_author_roles', 2), '#description' =>t('Select the role from which blog authors should be selected on the feed creation screen.'));
+	$form['general']['planet_redirect_page'] = array('#type' => 'checkbox', '#title' => t('Redirect node?'), '#return_value' => 1, '#value' => (variable_get('planet_redirect_page', 0) == 1) ? 1 : null, '#description' => t('Check this if you want the node view to redirect to the original content link; this is useful if you want the feed to forward through instead of showing the planet node.'));
+	$form['general']['submit'] = array('#type' => 'submit', '#value' => 'Adjust Settings');
+	return $form;
+}
+		
+
 function planet_feed_form($edit = array(), $individual = false){
 	$uids = array();
 	$result = db_query('SELECT u.uid, u.name FROM {users} u, {role} r, {users_roles} ur WHERE u.uid = ur.uid AND ur.rid = r.rid AND r.rid = %d ORDER BY u.name ASC', variable_get('planet_author_roles',2));
@@ -200,18 +225,17 @@
 	
 	$form = array();
 	$form['feeds'] = array('#type' => 'fieldset', '#title' => 'Feeds');	
-	$form['feeds']['fid'] = array('#type' => 'hidden', '#value' => $edit['title']);
+	$form['feeds']['fid'] = array('#type' => 'hidden', '#value' => $edit['fid']);
 	$form['feeds']['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#value' => $edit['title'], '#size' => 40, '#maxlength' => 40);
 	$form['feeds']['uid'] = array('#type' => 'select', '#title' => t('Original author'), '#value' => $edit['uid'], '#options' => $uids, '#description' => t('Select a user to associate this feed with'));
 	$form['feeds']['link'] = array('#type' => 'textfield', '#title' => t('URL'), '#value' => $edit['link'], '#size' => 40, '#maxlength' => 80);
 	$form['feeds']['submit'] = array('#type' => 'submit', '#value' => $edit['fid'] > 0 ? 'Edit' : 'Add' . ' Feed');
-	$output .= drupal_get_form('settings',$form);
-	
+
 	if($individual){
-		$output .= planet_queue(intval($edit['uid']));
+		$form['queue'] = array('#type' => 'item', '#value' => planet_queue(intval($edit['uid'])));
 	}
 	
-	return $output;
+	return $form;
 }
 
 function planet_queue($uid = null){
@@ -873,7 +897,7 @@
 		// If title was "escaped" then it may still contain entities, becuase each & from entity was also escabet to &amp; before
 		// TODO: the same for content?
 		if ($item['TITLE'][0]['MODE'] == 'escaped') {
-			$title = feeds_replace_entities($title);
+			$title = planet_replace_entities($title);
 		}
 		$title = strip_tags($title);
 
@@ -988,7 +1012,7 @@
 		else {
 			$entry = db_fetch_object(db_query("SELECT ai.nid AS nid FROM {node} n, {planet_items} ai WHERE ai.fid = %d AND ai.nid = n.nid AND n.title = '%s'", $feed->fid, $title));
 		}
-		
+
 		//print $guid . '<br />';
 		//print $entry->nid . '<br />';
 		// Ignore items already existing in database and not allowed to be updated
@@ -999,6 +1023,7 @@
 		$entry->body = $body;
 		$entry->body = planet_convert_relative_urls($body, $link);
 		$entry->teaser = node_teaser($entry->body);		
+		$entry->revision = true;
 
 		// Check for an auto-publish string in the post and publish if applicable.
 		$has_category = false;
@@ -1016,8 +1041,9 @@
 
 		//Fields to set if it's a new item.		
 		if(!isset($entry->nid)){						
+			//print "Planet item " . $entry->title . "<br />";
 			$entry->type = 'planet';
-			if($has_category == true || preg_match('/' . $auto_publish . '/',$entry->body)){							
+			if($has_category == true || ($auto_publish != '' && preg_match('/' . $auto_publish . '/',$entry->body))){
 				$entry->type = 'blog';
 			}			
 
@@ -1029,8 +1055,9 @@
 			$entry->promote = in_array('promote', $options) ? 1 : 0;
 			$entry->sticky = in_array('sticky', $options) ? 1 : 0;
 			$entry->comment = in_array('comment', $options) ? 2 : 0;
-			$entry->format = 3;
+			$entry->format = 4; //TODO: probably need to make this an option.
 			$entry->created = strtotime($date);
+			$entry->revision = true;
 			
 			$terms = module_invoke('taxonomy', 'node_get_terms', $edit->nid, 'tid');
 			foreach ($terms as $tid => $term) {
@@ -1038,8 +1065,9 @@
 					$edit->taxonomy[] = $term->tid;
 				}
 			}
+			//print '<pre>' . print_r($entry, 1) . '</pre>';
 			node_save($entry);
-			db_query('INSERT INTO {planet_items} (fid, nid, guid, created) VALUES(%d, %d, "%s", UNIX_TIMESTAMP(NOW()))', $feed->fid, $entry->nid, $guid);							
+			db_query('INSERT INTO {planet_items} (fid, nid, guid, link, created) VALUES(%d, %d, "%s", "%s", UNIX_TIMESTAMP(NOW()))', $feed->fid, $entry->nid, $guid, $link);							
 			watchdog('planet', 'Adding ' . $title);
 			drupal_set_message('Adding ' . $title);
 		}	
@@ -1048,10 +1076,10 @@
 				if($has_category == true || preg_match('/' . $auto_publish . '/',$entry->body)){							
 					$entry->type = 'blog';
 				}
-				node_save($entry);
-				watchdog('planet', 'Updating ' . $title);
 				drupal_set_message('Updating ' . $title);
 			}
+			node_save($entry);
+			watchdog('planet', 'Updating ' . $title);
 		}
 	}
 
@@ -1189,12 +1217,16 @@
  */
 function planet_user($type, &$edit, &$user) {
   if ($type == 'view' && user_access('edit own blog', $user)) {
-    $items[] = array('title' => t('Planet'),
-      'value' => l(t('view recent planet entries'), "planet/$user->uid", array('title' => t("Read %username's latest planet entries.", array('%username' => $user->name)))),
-      'class' => 'planet',
+    $items[] = array('title' => t('Blog'),
+      'value' => l(t('view recent blog entries'), "planet/$user->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $user->name)))),
+      'class' => 'blog',
     );
     return array(t('History') => $items);
   }
+  if($type == 'load'){
+    $obj = db_fetch_object(db_query('SELECT link FROM {planet_feeds} WHERE uid = %d', $user->uid));
+    $user->planet_feed = $obj->link;
+  }
 }
 
 /**
@@ -1251,7 +1283,7 @@
 }
 
 function planet_load($node){
-	$additions = db_fetch_object(db_query('SELECT guid FROM {planet_items} WHERE nid = %d', $node->nid));
+	$additions = db_fetch_object(db_query('SELECT link, guid FROM {planet_items} WHERE nid = %d', $node->nid));
 	return $additions;
 }
 

=== removed file 'planet.sql'
--- planet.sql	2009-06-04 08:45:43 +0000
+++ planet.sql	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-CREATE TABLE planet_feeds(
-	fid int(10) unsigned zerofill not null primary key auto_increment,
-	uid int(10) unsigned zerofill,
-	title varchar(50),
-	link varchar(80),
-	image varchar(120),
-	checked int(11)
-);
-
-CREATE TABLE planet_items(
-	id int(10) unsigned zerofill not null primary key auto_increment,
-	fid int(10) unsigned zerofill,
-	nid int(10) unsigned zerofill,
-	guid varchar(120),
-	created int(11)
-);
\ No newline at end of file