summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/book.module55
-rw-r--r--modules/book/book.module55
-rw-r--r--modules/poll.module8
-rw-r--r--modules/poll/poll.module8
-rw-r--r--modules/story.module3
-rw-r--r--modules/story/story.module3
6 files changed, 74 insertions, 58 deletions
diff --git a/modules/book.module b/modules/book.module
index 757b63a03..1c877b685 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -25,39 +25,44 @@ function book_location($node, $nodes = array()) {
function book_view($node, $main = 0) {
global $status, $theme;
- if ($node->nid && $node->parent) {
- $list = book_parent_query($node->parent);
- $next = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight > '$node->weight' ORDER BY b.weight ASC"));
- $prev = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight < '$node->weight' ORDER BY b.weight DESC"));
+ if ($main) {
+ $theme->node($node, $main);
}
+ else {
+ if ($node->nid && $node->parent) {
+ $list = book_parent_query($node->parent);
+ $next = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight > '$node->weight' ORDER BY b.weight ASC"));
+ $prev = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight < '$node->weight' ORDER BY b.weight DESC"));
+ }
- $output .= "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" WIDTH=\"100%\">\n";
+ $output .= "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" WIDTH=\"100%\">\n";
- if ($node->title) {
- foreach (book_location($node) as $level) {
- $location .= "$indent <A HREF=\"node.php?id=$level->nid\">$level->title</A><BR>";
- $indent .= "-";
- }
+ if ($node->title) {
+ foreach (book_location($node) as $level) {
+ $location .= "$indent <A HREF=\"node.php?id=$level->nid\">$level->title</A><BR>";
+ $indent .= "-";
+ }
- $output .= " <TR><TD COLSPAN=\"2\">$location</TD><TD ALIGN=\"right\">". node_control($node) ."</TD></TR>\n";
- $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
- $output .= " <TR><TD COLSPAN=\"3\"><B><BIG>". check_output($node->title) ."</BIG></B>". ($node->body ? "<BR><SMALL><I>Last updated by ". format_username($node->userid) ." on ". format_date($node->timestamp) ."</I></SMALL> " : "") ."</TD></TR>\n";
- }
+ $output .= " <TR><TD COLSPAN=\"2\">$location</TD><TD ALIGN=\"right\">". node_control($node) ."</TD></TR>\n";
+ $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
+ $output .= " <TR><TD COLSPAN=\"3\"><B><BIG>". check_output($node->title) ."</BIG></B>". ($node->body ? "<BR><SMALL><I>Last updated by ". format_username($node->userid) ." on ". format_date($node->timestamp) ."</I></SMALL> " : "") ."</TD></TR>\n";
+ }
- if ($node->body) {
- $output .= " <TR><TD COLSPAN=\"3\"><BR>". check_output($node->body, 1) ."</TD></TR>";
- }
+ if ($node->body) {
+ $output .= " <TR><TD COLSPAN=\"3\"><BR>". check_output($node->body, 1) ."</TD></TR>";
+ }
- if ($node->nid) {
- $output .= " <TR><TD COLSPAN=\"3\"><BR>". book_tree($node->nid) ."</TD></TR>";
- }
+ if ($node->nid) {
+ $output .= " <TR><TD COLSPAN=\"3\"><BR>". book_tree($node->nid) ."</TD></TR>";
+ }
- $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
- $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<A HREF=\"node.php?id=$prev->nid\">". t("previous") ."</A>" : t("previous")) ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\"><A HREF=\"module.php?mod=book\">index</A></TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<A HREF=\"node.php?id=$next->nid\">". t("next") ."</A>" : t("next")) ."</TD></TR>\n";
- $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<SMALL>". check_output($prev->title) ."</SMALL>" : "&nbsp;") ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\">". ($node->parent ? "<A HREF=\"node.php?id=$node->parent\">". t("up") ."</A>" : t("up")) ."</TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<SMALL>". check_output($next->title) ."</SMALL>" : "&nbsp;") ."</TD></TR>\n";
- $output .= "</TABLE>\n";
+ $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
+ $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<A HREF=\"node.php?id=$prev->nid\">". t("previous") ."</A>" : t("previous")) ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\"><A HREF=\"module.php?mod=book\">index</A></TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<A HREF=\"node.php?id=$next->nid\">". t("next") ."</A>" : t("next")) ."</TD></TR>\n";
+ $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<SMALL>". check_output($prev->title) ."</SMALL>" : "&nbsp;") ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\">". ($node->parent ? "<A HREF=\"node.php?id=$node->parent\">". t("up") ."</A>" : t("up")) ."</TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<SMALL>". check_output($next->title) ."</SMALL>" : "&nbsp;") ."</TD></TR>\n";
+ $output .= "</TABLE>\n";
- $theme->box(t("Handbook"), $output);
+ $theme->box(t("Handbook"), $output);
+ }
}
function book_search($keys) {
diff --git a/modules/book/book.module b/modules/book/book.module
index 757b63a03..1c877b685 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -25,39 +25,44 @@ function book_location($node, $nodes = array()) {
function book_view($node, $main = 0) {
global $status, $theme;
- if ($node->nid && $node->parent) {
- $list = book_parent_query($node->parent);
- $next = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight > '$node->weight' ORDER BY b.weight ASC"));
- $prev = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight < '$node->weight' ORDER BY b.weight DESC"));
+ if ($main) {
+ $theme->node($node, $main);
}
+ else {
+ if ($node->nid && $node->parent) {
+ $list = book_parent_query($node->parent);
+ $next = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight > '$node->weight' ORDER BY b.weight ASC"));
+ $prev = db_fetch_object(db_query("SELECT n.nid, n.title FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.status = '$status[posted]' AND $list AND b.weight < '$node->weight' ORDER BY b.weight DESC"));
+ }
- $output .= "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" WIDTH=\"100%\">\n";
+ $output .= "<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\" WIDTH=\"100%\">\n";
- if ($node->title) {
- foreach (book_location($node) as $level) {
- $location .= "$indent <A HREF=\"node.php?id=$level->nid\">$level->title</A><BR>";
- $indent .= "-";
- }
+ if ($node->title) {
+ foreach (book_location($node) as $level) {
+ $location .= "$indent <A HREF=\"node.php?id=$level->nid\">$level->title</A><BR>";
+ $indent .= "-";
+ }
- $output .= " <TR><TD COLSPAN=\"2\">$location</TD><TD ALIGN=\"right\">". node_control($node) ."</TD></TR>\n";
- $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
- $output .= " <TR><TD COLSPAN=\"3\"><B><BIG>". check_output($node->title) ."</BIG></B>". ($node->body ? "<BR><SMALL><I>Last updated by ". format_username($node->userid) ." on ". format_date($node->timestamp) ."</I></SMALL> " : "") ."</TD></TR>\n";
- }
+ $output .= " <TR><TD COLSPAN=\"2\">$location</TD><TD ALIGN=\"right\">". node_control($node) ."</TD></TR>\n";
+ $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
+ $output .= " <TR><TD COLSPAN=\"3\"><B><BIG>". check_output($node->title) ."</BIG></B>". ($node->body ? "<BR><SMALL><I>Last updated by ". format_username($node->userid) ." on ". format_date($node->timestamp) ."</I></SMALL> " : "") ."</TD></TR>\n";
+ }
- if ($node->body) {
- $output .= " <TR><TD COLSPAN=\"3\"><BR>". check_output($node->body, 1) ."</TD></TR>";
- }
+ if ($node->body) {
+ $output .= " <TR><TD COLSPAN=\"3\"><BR>". check_output($node->body, 1) ."</TD></TR>";
+ }
- if ($node->nid) {
- $output .= " <TR><TD COLSPAN=\"3\"><BR>". book_tree($node->nid) ."</TD></TR>";
- }
+ if ($node->nid) {
+ $output .= " <TR><TD COLSPAN=\"3\"><BR>". book_tree($node->nid) ."</TD></TR>";
+ }
- $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
- $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<A HREF=\"node.php?id=$prev->nid\">". t("previous") ."</A>" : t("previous")) ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\"><A HREF=\"module.php?mod=book\">index</A></TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<A HREF=\"node.php?id=$next->nid\">". t("next") ."</A>" : t("next")) ."</TD></TR>\n";
- $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<SMALL>". check_output($prev->title) ."</SMALL>" : "&nbsp;") ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\">". ($node->parent ? "<A HREF=\"node.php?id=$node->parent\">". t("up") ."</A>" : t("up")) ."</TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<SMALL>". check_output($next->title) ."</SMALL>" : "&nbsp;") ."</TD></TR>\n";
- $output .= "</TABLE>\n";
+ $output .= " <TR><TD COLSPAN=\"3\"><HR></TD></TR>";
+ $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<A HREF=\"node.php?id=$prev->nid\">". t("previous") ."</A>" : t("previous")) ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\"><A HREF=\"module.php?mod=book\">index</A></TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<A HREF=\"node.php?id=$next->nid\">". t("next") ."</A>" : t("next")) ."</TD></TR>\n";
+ $output .= " <TR><TD ALIGN=\"left\" WIDTH=\"33%\">". ($prev ? "<SMALL>". check_output($prev->title) ."</SMALL>" : "&nbsp;") ."</TD><TD ALIGN=\"center\" WIDTH=\"34%\">". ($node->parent ? "<A HREF=\"node.php?id=$node->parent\">". t("up") ."</A>" : t("up")) ."</TD><TD ALIGN=\"right\" WIDTH=\"33%\">". ($next ? "<SMALL>". check_output($next->title) ."</SMALL>" : "&nbsp;") ."</TD></TR>\n";
+ $output .= "</TABLE>\n";
- $theme->box(t("Handbook"), $output);
+ $theme->box(t("Handbook"), $output);
+ }
}
function book_search($keys) {
diff --git a/modules/poll.module b/modules/poll.module
index 533a9b5e7..dfe37ba4b 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -113,7 +113,6 @@ function poll_view($node, $main = 0, $block = 0) {
$node->totalvotes = max(1, $node->totalvotes);
- if (!$block) $output .= "<small>Posted by " . format_username($node->userid) . " on " . format_date($node->timestamp, "large") . "</small><br>\r\n";
foreach ($node->choice as $key => $value) {
if ($value) {
if ($main) {
@@ -135,7 +134,6 @@ function poll_view($node, $main = 0, $block = 0) {
$node->totalvotes = max(1, $node->totalvotes);
- if (!$block) $output .= "<small>Posted by " . format_username($node->userid) . " on " . format_date($node->timestamp, "large") . "</small><br><br>\r\n";
$output .= "<table align=\"center\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td align=\"left\">";
foreach ($node->choice as $key => $value) {
if ($value) {
@@ -147,7 +145,11 @@ function poll_view($node, $main = 0, $block = 0) {
$output = form($REQUEST_URI, $output);
}
- if (!$block) $theme->box($title, $output);
+
+ if (!$block) {
+ $node->body = $output;
+ $theme->node($node, 1);
+ }
return array("title" => $title, "content" => $output);
}
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 533a9b5e7..dfe37ba4b 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -113,7 +113,6 @@ function poll_view($node, $main = 0, $block = 0) {
$node->totalvotes = max(1, $node->totalvotes);
- if (!$block) $output .= "<small>Posted by " . format_username($node->userid) . " on " . format_date($node->timestamp, "large") . "</small><br>\r\n";
foreach ($node->choice as $key => $value) {
if ($value) {
if ($main) {
@@ -135,7 +134,6 @@ function poll_view($node, $main = 0, $block = 0) {
$node->totalvotes = max(1, $node->totalvotes);
- if (!$block) $output .= "<small>Posted by " . format_username($node->userid) . " on " . format_date($node->timestamp, "large") . "</small><br><br>\r\n";
$output .= "<table align=\"center\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td align=\"left\">";
foreach ($node->choice as $key => $value) {
if ($value) {
@@ -147,7 +145,11 @@ function poll_view($node, $main = 0, $block = 0) {
$output = form($REQUEST_URI, $output);
}
- if (!$block) $theme->box($title, $output);
+
+ if (!$block) {
+ $node->body = $output;
+ $theme->node($node, 1);
+ }
return array("title" => $title, "content" => $output);
}
diff --git a/modules/story.module b/modules/story.module
index 637a4613a..d4faf74d9 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -31,7 +31,8 @@ function story_help() {
function story_view($node, $main = 0) {
global $theme;
- $theme->story($node, $main);
+ $node->body = ($main ? $node->abstract : "$node->abstract<HR>$node->body");
+ $theme->node($node, $main);
}
function story_form($edit = array()) {
diff --git a/modules/story/story.module b/modules/story/story.module
index 637a4613a..d4faf74d9 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -31,7 +31,8 @@ function story_help() {
function story_view($node, $main = 0) {
global $theme;
- $theme->story($node, $main);
+ $node->body = ($main ? $node->abstract : "$node->abstract<HR>$node->body");
+ $theme->node($node, $main);
}
function story_form($edit = array()) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 04:57:22 +0000