summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/aggregator.module43
-rw-r--r--modules/aggregator/aggregator.module43
-rw-r--r--modules/block.module6
-rw-r--r--modules/block/block.module6
-rw-r--r--modules/import.module43
5 files changed, 83 insertions, 58 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 55f21aef4..22cb55939 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -105,27 +105,30 @@ function import_block($op, $delta) {
if ($op == "list") {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
- $block[$bundle->bid]["info"] = "$bundle->title bundle";
+ $block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
}
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
- $block[$feed->fid]["info"] = "$feed->title feed";
+ $block["feed:$feed->fid"]["info"] = "$feed->title feed";
}
return $block;
}
else {
- $feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%d'", $delta));
- if ($feed) {
- $block["subject"] = $feed->title;
- $block["content"] = import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
- }
- else {
- // it was a bundle. this is NOT elegant
- $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%d'", $delta));
- $block["subject"] = $bundle->title;
- $block["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ list($type, $id) = split(":", $delta);
+ switch ($type) {
+ case "feed":
+ $feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%d'", $id));
+ $block["subject"] = $feed->title;
+ $block["content"] .= import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
+ break;
+
+ case "bundle":
+ $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%d'", $id));
+ $block["subject"] = $bundle->title;
+ $block["content"] .= import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ break;
}
return $block;
@@ -138,9 +141,11 @@ function import_get_bundles($attributes = 0) {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
- $block[$bundle->bid]["subject"] = $bundle->title;
- $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
- $block[$bundle->bid]["info"] = "$bundle->title bundle";
+ $block["bundle:$bundle->bid"]["subject"] = $bundle->title;
+ $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">".
+ l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news.")))
+ ."</div>";
+ $block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
}
return $block;
@@ -152,9 +157,11 @@ function import_get_feeds($attributes = 0) {
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
- $block[$feed->fid]["subject"] = $feed->title;
- $block[$feed->fid]["content"] = import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
- $block[$feed->fid]["info"] = "$feed->title feed";
+ $block["feed:$feed->fid"]["subject"] = $feed->title;
+ $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div align=\"right\">".
+ l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news.")))
+ ."</div>";
+ $block["feed:$feed->fid"]["info"] = "$feed->title feed";
}
return $block;
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 55f21aef4..22cb55939 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -105,27 +105,30 @@ function import_block($op, $delta) {
if ($op == "list") {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
- $block[$bundle->bid]["info"] = "$bundle->title bundle";
+ $block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
}
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
- $block[$feed->fid]["info"] = "$feed->title feed";
+ $block["feed:$feed->fid"]["info"] = "$feed->title feed";
}
return $block;
}
else {
- $feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%d'", $delta));
- if ($feed) {
- $block["subject"] = $feed->title;
- $block["content"] = import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
- }
- else {
- // it was a bundle. this is NOT elegant
- $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%d'", $delta));
- $block["subject"] = $bundle->title;
- $block["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ list($type, $id) = split(":", $delta);
+ switch ($type) {
+ case "feed":
+ $feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%d'", $id));
+ $block["subject"] = $feed->title;
+ $block["content"] .= import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
+ break;
+
+ case "bundle":
+ $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%d'", $id));
+ $block["subject"] = $bundle->title;
+ $block["content"] .= import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ break;
}
return $block;
@@ -138,9 +141,11 @@ function import_get_bundles($attributes = 0) {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
- $block[$bundle->bid]["subject"] = $bundle->title;
- $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
- $block[$bundle->bid]["info"] = "$bundle->title bundle";
+ $block["bundle:$bundle->bid"]["subject"] = $bundle->title;
+ $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">".
+ l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news.")))
+ ."</div>";
+ $block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
}
return $block;
@@ -152,9 +157,11 @@ function import_get_feeds($attributes = 0) {
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
- $block[$feed->fid]["subject"] = $feed->title;
- $block[$feed->fid]["content"] = import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
- $block[$feed->fid]["info"] = "$feed->title feed";
+ $block["feed:$feed->fid"]["subject"] = $feed->title;
+ $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div align=\"right\">".
+ l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news.")))
+ ."</div>";
+ $block["feed:$feed->fid"]["info"] = "$feed->title feed";
}
return $block;
diff --git a/modules/block.module b/modules/block.module
index ff8793ef4..38835cabe 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -77,7 +77,8 @@ function block_block($op = "list", $delta = 0) {
function block_admin_save($edit) {
foreach ($edit as $module => $blocks) {
foreach ($blocks as $delta => $block) {
- db_query("UPDATE blocks SET region = '%s', status = '%d', custom = '%d', path = '%s', weight = '%d' WHERE module = '%s' AND delta = '%d'", $block["region"], $block["status"], $block["custom"], $block["path"], $block["weight"], $module, $delta);
+ db_query("UPDATE blocks SET region = '%s', status = '%d', custom = '%d', path = '%s', weight = '%d' WHERE module = '%s' AND delta = '%s'",
+ $block["region"], $block["status"], $block["custom"], $block["path"], $block["weight"], $module, $delta);
}
}
@@ -118,7 +119,8 @@ function _block_rehash($order_by = array("weight")) {
}
// reinsert blocks into table
- db_query("INSERT INTO blocks (module, delta, status, weight, region, path, custom) VALUES ('%s', '%d', '%d', '%d', '%d', '%s', '%d')", $block["module"], $block["delta"], $block["status"], $block["weight"], $block["region"], $block["path"], $block["custom"]);
+ db_query("INSERT INTO blocks (module, delta, status, weight, region, path, custom) VALUES ('%s', '%s', '%d', '%d', '%d', '%s', '%d')",
+ $block["module"], $block["delta"], $block["status"], $block["weight"], $block["region"], $block["path"], $block["custom"]);
$blocks[] = $block;
diff --git a/modules/block/block.module b/modules/block/block.module
index ff8793ef4..38835cabe 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -77,7 +77,8 @@ function block_block($op = "list", $delta = 0) {
function block_admin_save($edit) {
foreach ($edit as $module => $blocks) {
foreach ($blocks as $delta => $block) {
- db_query("UPDATE blocks SET region = '%s', status = '%d', custom = '%d', path = '%s', weight = '%d' WHERE module = '%s' AND delta = '%d'", $block["region"], $block["status"], $block["custom"], $block["path"], $block["weight"], $module, $delta);
+ db_query("UPDATE blocks SET region = '%s', status = '%d', custom = '%d', path = '%s', weight = '%d' WHERE module = '%s' AND delta = '%s'",
+ $block["region"], $block["status"], $block["custom"], $block["path"], $block["weight"], $module, $delta);
}
}
@@ -118,7 +119,8 @@ function _block_rehash($order_by = array("weight")) {
}
// reinsert blocks into table
- db_query("INSERT INTO blocks (module, delta, status, weight, region, path, custom) VALUES ('%s', '%d', '%d', '%d', '%d', '%s', '%d')", $block["module"], $block["delta"], $block["status"], $block["weight"], $block["region"], $block["path"], $block["custom"]);
+ db_query("INSERT INTO blocks (module, delta, status, weight, region, path, custom) VALUES ('%s', '%s', '%d', '%d', '%d', '%s', '%d')",
+ $block["module"], $block["delta"], $block["status"], $block["weight"], $block["region"], $block["path"], $block["custom"]);
$blocks[] = $block;
diff --git a/modules/import.module b/modules/import.module
index 55f21aef4..22cb55939 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -105,27 +105,30 @@ function import_block($op, $delta) {
if ($op == "list") {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
- $block[$bundle->bid]["info"] = "$bundle->title bundle";
+ $block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
}
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
- $block[$feed->fid]["info"] = "$feed->title feed";
+ $block["feed:$feed->fid"]["info"] = "$feed->title feed";
}
return $block;
}
else {
- $feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%d'", $delta));
- if ($feed) {
- $block["subject"] = $feed->title;
- $block["content"] = import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
- }
- else {
- // it was a bundle. this is NOT elegant
- $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%d'", $delta));
- $block["subject"] = $bundle->title;
- $block["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ list($type, $id) = split(":", $delta);
+ switch ($type) {
+ case "feed":
+ $feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = '%d'", $id));
+ $block["subject"] = $feed->title;
+ $block["content"] .= import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
+ break;
+
+ case "bundle":
+ $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%d'", $id));
+ $block["subject"] = $bundle->title;
+ $block["content"] .= import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ break;
}
return $block;
@@ -138,9 +141,11 @@ function import_get_bundles($attributes = 0) {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
- $block[$bundle->bid]["subject"] = $bundle->title;
- $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
- $block[$bundle->bid]["info"] = "$bundle->title bundle";
+ $block["bundle:$bundle->bid"]["subject"] = $bundle->title;
+ $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">".
+ l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news.")))
+ ."</div>";
+ $block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
}
return $block;
@@ -152,9 +157,11 @@ function import_get_feeds($attributes = 0) {
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
- $block[$feed->fid]["subject"] = $feed->title;
- $block[$feed->fid]["content"] = import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
- $block[$feed->fid]["info"] = "$feed->title feed";
+ $block["feed:$feed->fid"]["subject"] = $feed->title;
+ $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div align=\"right\">".
+ l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news.")))
+ ."</div>";
+ $block["feed:$feed->fid"]["info"] = "$feed->title feed";
}
return $block;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 01:36:24 +0000