| 1 |
#
|
| 2 |
# Patch applies to the contributed import.module
|
| 3 |
# - adds fusername field for adding a username to imported posts
|
| 4 |
# (field must be also manually added to database table)
|
| 5 |
#
|
| 6 |
# This patch actually modifies feed.module and item.module, which are
|
| 7 |
# part of the contributed import.module...
|
| 8 |
#
|
| 9 |
|
| 10 |
--- modules/feed.module.orig 2004-03-27 18:46:27.283295248 -0500
|
| 11 |
+++ modules/feed.module 2004-03-27 18:49:42.953593361 -0500
|
| 12 |
@@ -88,10 +88,10 @@ function feed_save($op, $node) {
|
| 13 |
|
| 14 |
if ($op == "create") {
|
| 15 |
if (user_access("administer news feeds")) {
|
| 16 |
- $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "url", "refresh", "link", "expire");
|
| 17 |
+ $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "url", "fusername", "refresh", "link", "expire");
|
| 18 |
}
|
| 19 |
else {
|
| 20 |
- $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "refresh", "link", "expire");
|
| 21 |
+ $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "fusername", "refresh", "link", "expire");
|
| 22 |
}
|
| 23 |
|
| 24 |
return array_merge($main_fields, $save_fields);
|
| 25 |
@@ -99,10 +99,10 @@ function feed_save($op, $node) {
|
| 26 |
|
| 27 |
if ($op == "update") {
|
| 28 |
if (user_access("administer news feeds")) {
|
| 29 |
- $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "url", "refresh", "link", "expire");
|
| 30 |
+ $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "url", "fusername", "refresh", "link", "expire");
|
| 31 |
}
|
| 32 |
else {
|
| 33 |
- $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "refresh", "link", "expire");
|
| 34 |
+ $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "fusername", "refresh", "link", "expire");
|
| 35 |
}
|
| 36 |
|
| 37 |
return array_merge($main_fields, $save_fields);
|
| 38 |
@@ -123,13 +123,13 @@ function _feed_pack_fields($node) {
|
| 39 |
function feed_insert($node) {
|
| 40 |
$data = _feed_pack_fields($node);
|
| 41 |
|
| 42 |
- db_query("INSERT INTO {feed} (nid, url, refresh, link, expire, data) VALUES('%d', '%s', '%d', '%s', '%d', '%s')", $node->nid, $node->url, $node->refresh, $node->link, $node->expire, $data);
|
| 43 |
+ db_query("INSERT INTO {feed} (nid, url, fusername, refresh, link, expire, data) VALUES('%d', '%s', '%d', '%s', '%d', '%s')", $node->nid, $node->url, $node->fusername, $node->refresh, $node->link, $node->expire, $data);
|
| 44 |
}
|
| 45 |
|
| 46 |
function feed_update($node) {
|
| 47 |
$data = _feed_pack_fields($node);
|
| 48 |
|
| 49 |
- db_query("UPDATE {feed} SET url = '%s', refresh = '%d', link = '%s', expire = '%d', data = '%s' WHERE nid = '%d'", $node->url, $node->refresh, $node->link, $node->expire, $data, $node->nid);
|
| 50 |
+ db_query("UPDATE {feed} SET url = '%s', fusername = '%s', refresh = '%d', link = '%s', expire = '%d', data = '%s' WHERE nid = '%d'", $node->url, $node->fusername, $node->refresh, $node->link, $node->expire, $data, $node->nid);
|
| 51 |
}
|
| 52 |
|
| 53 |
function feed_delete($node) {
|
| 54 |
@@ -143,7 +143,7 @@ function feed_delete($node) {
|
| 55 |
}
|
| 56 |
|
| 57 |
function feed_load($node) {
|
| 58 |
- $feed = db_fetch_object(db_query("SELECT url, refresh, link, expire, data FROM {feed} WHERE nid = '%d'", $node->nid));
|
| 59 |
+ $feed = db_fetch_object(db_query("SELECT url, fusername, refresh, link, expire, data FROM {feed} WHERE nid = '%d'", $node->nid));
|
| 60 |
|
| 61 |
$data = unserialize($feed->data);
|
| 62 |
|
| 63 |
@@ -218,6 +218,7 @@ function feed_form(&$node, &$help, &$err
|
| 64 |
if (function_exists("taxonomy_node_form")) {
|
| 65 |
$output .= implode("", taxonomy_node_form("feed", $node));
|
| 66 |
}
|
| 67 |
+ $output .= form_textfield(t("Username"), "fusername", $node->fusername, 60, 255, t("Username to assign to feed."));
|
| 68 |
$output .= form_textfield(t("Url"), "url", $node->url, 60, 255, t("The URL of the RSS feed."));
|
| 69 |
$output .= form_textfield(t("Site link"), "link", $node->link, 60, 255);
|
| 70 |
$output .= form_textarea(t("Description"), "body", $node->body, 55, 10, t("Phrase or sentence describing the channel."));
|
| 71 |
--- modules/item.module.orig 2004-03-28 00:03:13.168923665 -0500
|
| 72 |
+++ modules/item.module 2004-03-28 00:05:18.869598749 -0500
|
| 73 |
@@ -166,7 +166,8 @@ function item_link($type, $node = 0, $ma
|
| 74 |
function item_new($feed, $item) {
|
| 75 |
global $user;
|
| 76 |
|
| 77 |
- $title = $item["title"] ? $item["title"] : $feed->title;
|
| 78 |
+ $new_title = $feed->fusername .": ". $item["title"];
|
| 79 |
+ $title = $item["title"] ? $new_title : $feed->title;
|
| 80 |
$guid = $item["guid"] ? $item["guid"] : "";
|
| 81 |
$body = $item["description"] ? $item["description"] : "";
|
| 82 |
$created = $item["date"] ? $item["date"] : time();
|
| 83 |
@@ -205,7 +206,8 @@ function item_new($feed, $item) {
|
| 84 |
function item_find($feed, $item) {
|
| 85 |
global $user;
|
| 86 |
|
| 87 |
- $title = substr($item["title"] ? $item["title"] : $feed->title, 0, 128);
|
| 88 |
+ $new_title = $feed->fusername .": ". $item["title"];
|
| 89 |
+ $title = substr($item["title"] ? $new_title : $feed->title, 0, 128);
|
| 90 |
$guid = $item["guid"] ? $item["guid"] : "";
|
| 91 |
//$body = filter($item["description"] ? $item["description"] : "");
|
| 92 |
$body = $item["description"] ? $item["description"] : "";
|
| 93 |
@@ -230,7 +232,8 @@ function item_find($feed, $item) {
|
| 94 |
function item_renew($feed, $node, $item) {
|
| 95 |
global $user;
|
| 96 |
|
| 97 |
- $title = $item["title"] ? $item["title"] : $feed->title;
|
| 98 |
+ $new_title = $feed->fusername .": ". $item["title"];
|
| 99 |
+ $title = $item["title"] ? $new_title : $feed->title;
|
| 100 |
$guid = $item["guid"] ? $item["guid"] : "";
|
| 101 |
$body = $item["description"] ? $item["description"] : "";
|
| 102 |
$link = $item["link"] ? $item["link"] : $feed->link;
|
Parent Directory
| 
Revision Log
| 
Revision Graph