summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/book.module8
-rw-r--r--modules/book/book.module8
-rw-r--r--modules/forum.module4
-rw-r--r--modules/forum/forum.module4
-rw-r--r--modules/moderate.module4
-rw-r--r--modules/node.module4
-rw-r--r--modules/node/node.module4
-rw-r--r--modules/page.module2
-rw-r--r--modules/page/page.module2
-rw-r--r--modules/poll.module15
-rw-r--r--modules/poll/poll.module15
-rw-r--r--modules/queue.module6
-rw-r--r--modules/story.module2
-rw-r--r--modules/story/story.module2
14 files changed, 37 insertions, 43 deletions
diff --git a/modules/book.module b/modules/book.module
index c46e7cd0d..757b63a03 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -109,7 +109,7 @@ function book_form($edit = array()) {
$form .= form_item(t("Category"), category_form_select("book", $edit));
if ($edit[pid]) {
- $node = node_get_object("nid", $edit[pid]);
+ $node = node_get_object(array("nid" => $edit[pid]));
$form .= form_item(t("Parent"), "<A HREF=\"node.php?id=$node->id\">". check_output($node->title) ."</A>", t("The parent subject or category the page belongs in."));
$form .= form_hidden("parent", $edit[parent]);
}
@@ -157,7 +157,7 @@ function book_save($edit) {
function book_parent($nid) {
global $status;
- if ($node = node_get_object("nid", $nid)) {
+ if ($node = node_get_object(array("nid" => $nid))) {
$list[$nid] = $nid;
}
if ($node->pid) {
@@ -205,7 +205,7 @@ function book_admin() {
print book_form();
break;
case "edit":
- print book_form(node_get_array(nid, $id));
+ print book_form(node_get_array(array(nid => $id)));
break;
case "listing":
print node_listing(book_query());
@@ -246,7 +246,7 @@ function book_page() {
function book_update($id) {
global $status;
- if ($node = node_get_object("nid", $id)) {
+ if ($node = node_get_object(array("nid" => $id))) {
if ($node->status != $status[posted]) {
return t("You can only update accepted pages: pages that are still queued or already expired can not be updated.");
}
diff --git a/modules/book/book.module b/modules/book/book.module
index c46e7cd0d..757b63a03 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -109,7 +109,7 @@ function book_form($edit = array()) {
$form .= form_item(t("Category"), category_form_select("book", $edit));
if ($edit[pid]) {
- $node = node_get_object("nid", $edit[pid]);
+ $node = node_get_object(array("nid" => $edit[pid]));
$form .= form_item(t("Parent"), "<A HREF=\"node.php?id=$node->id\">". check_output($node->title) ."</A>", t("The parent subject or category the page belongs in."));
$form .= form_hidden("parent", $edit[parent]);
}
@@ -157,7 +157,7 @@ function book_save($edit) {
function book_parent($nid) {
global $status;
- if ($node = node_get_object("nid", $nid)) {
+ if ($node = node_get_object(array("nid" => $nid))) {
$list[$nid] = $nid;
}
if ($node->pid) {
@@ -205,7 +205,7 @@ function book_admin() {
print book_form();
break;
case "edit":
- print book_form(node_get_array(nid, $id));
+ print book_form(node_get_array(array(nid => $id)));
break;
case "listing":
print node_listing(book_query());
@@ -246,7 +246,7 @@ function book_page() {
function book_update($id) {
global $status;
- if ($node = node_get_object("nid", $id)) {
+ if ($node = node_get_object(array("nid" => $id))) {
if ($node->status != $status[posted]) {
return t("You can only update accepted pages: pages that are still queued or already expired can not be updated.");
}
diff --git a/modules/forum.module b/modules/forum.module
index 8e3693f5f..031f8834b 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -48,7 +48,7 @@ function forum_page() {
$output .= "<TABLE BORDER=\"0\" CELLSPACING=\"4\" CELLPADDING=\"4\">\n";
$output .= " <TR><TH>". t("Forum") ."</TH><TH>". t("Comments") ."</TH><TH>". t("Last comment") ."</TH><TH>". t("Moderators") ."</TH></TR>";
while ($node = db_fetch_object($result)) {
- $node = node_get_object("nid", $node->nid);
+ $node = node_get_object(array("nid" => $node->nid));
$output .= " <TR><TD><A HREF=\"node.php?id=$node->nid\">". check_output($node->title) ."</A><BR><SMALL>". check_output($node->body, 1) ."</SMALL></TD><TD ALIGN=\"center\">". forum_num_comments($node->nid) ."</TD><TD ALIGN=\"center\">". forum_last_comment($node->nid) ."</TD><TD ALIGN=\"center\"><SMALL>". check_output($node->moderate) ."</SMALL></TD></TR>";
}
$output .= "</TABLE>\n";
@@ -72,7 +72,7 @@ function forum_admin() {
print forum_form();
break;
case "edit":
- print forum_form(node_get_array(nid, $id));
+ print forum_form(node_get_array(array(nid => $id)));
break;
case t("Submit"):
print status(forum_save($edit));
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 8e3693f5f..031f8834b 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -48,7 +48,7 @@ function forum_page() {
$output .= "<TABLE BORDER=\"0\" CELLSPACING=\"4\" CELLPADDING=\"4\">\n";
$output .= " <TR><TH>". t("Forum") ."</TH><TH>". t("Comments") ."</TH><TH>". t("Last comment") ."</TH><TH>". t("Moderators") ."</TH></TR>";
while ($node = db_fetch_object($result)) {
- $node = node_get_object("nid", $node->nid);
+ $node = node_get_object(array("nid" => $node->nid));
$output .= " <TR><TD><A HREF=\"node.php?id=$node->nid\">". check_output($node->title) ."</A><BR><SMALL>". check_output($node->body, 1) ."</SMALL></TD><TD ALIGN=\"center\">". forum_num_comments($node->nid) ."</TD><TD ALIGN=\"center\">". forum_last_comment($node->nid) ."</TD><TD ALIGN=\"center\"><SMALL>". check_output($node->moderate) ."</SMALL></TD></TR>";
}
$output .= "</TABLE>\n";
@@ -72,7 +72,7 @@ function forum_admin() {
print forum_form();
break;
case "edit":
- print forum_form(node_get_array(nid, $id));
+ print forum_form(node_get_array(array(nid => $id)));
break;
case t("Submit"):
print status(forum_save($edit));
diff --git a/modules/moderate.module b/modules/moderate.module
index 821a588ca..c284df522 100644
--- a/modules/moderate.module
+++ b/modules/moderate.module
@@ -31,7 +31,7 @@ function moderate_overview($query = array()) {
function moderate_node($edit, $name) {
global $user;
- $node = node_get_array("nid", $edit[nid]);
+ $node = node_get_array(array("nid" => $edit[nid]));
if ($node && strstr($node[moderate], $user->userid)) {
$edit[type] = $node[type];
return node_invoke($edit, $name);
@@ -86,7 +86,7 @@ function moderate_admin() {
default:
switch ($op) {
case "edit":
- print moderate_node_edit(node_get_array("nid", $id));
+ print moderate_node_edit(node_get_array(array("nid" => $id)));
break;
case t("Preview"):
print moderate_node_edit($edit);
diff --git a/modules/node.module b/modules/node.module
index 98b6482ef..33142a454 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -56,7 +56,7 @@ function node_overview($query = array()) {
}
function node_admin_view($id) {
- $node = node_get_object("nid", $id);
+ $node = node_get_object(array("nid" => $id));
$form .= form_item("Title", check_output($node->title));
$form .= form_item("Author", format_username($node->userid));
@@ -74,7 +74,7 @@ function node_admin_view($id) {
function node_admin_edit($id) {
global $user;
- $node = node_get_object("nid", $id);
+ $node = node_get_object(array("nid" => $id));
$form .= form_item("Title", check_output($node->title));
$form .= form_select("Author", "author", $node->author, array($node->author => $node->userid, $user->id => $user->userid));
diff --git a/modules/node/node.module b/modules/node/node.module
index 98b6482ef..33142a454 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -56,7 +56,7 @@ function node_overview($query = array()) {
}
function node_admin_view($id) {
- $node = node_get_object("nid", $id);
+ $node = node_get_object(array("nid" => $id));
$form .= form_item("Title", check_output($node->title));
$form .= form_item("Author", format_username($node->userid));
@@ -74,7 +74,7 @@ function node_admin_view($id) {
function node_admin_edit($id) {
global $user;
- $node = node_get_object("nid", $id);
+ $node = node_get_object(array("nid" => $id));
$form .= form_item("Title", check_output($node->title));
$form .= form_select("Author", "author", $node->author, array($node->author => $node->userid, $user->id => $user->userid));
diff --git a/modules/page.module b/modules/page.module
index 39ab6f63b..f9e59ed72 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -66,7 +66,7 @@ function page_admin() {
print page_form();
break;
case "edit":
- print page_form(node_get_array(nid, $id));
+ print page_form(node_get_array(array(nid => $id)));
break;
case "listing":
print node_listing(page_query());
diff --git a/modules/page/page.module b/modules/page/page.module
index 39ab6f63b..f9e59ed72 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -66,7 +66,7 @@ function page_admin() {
print page_form();
break;
case "edit":
- print page_form(node_get_array(nid, $id));
+ print page_form(node_get_array(array(nid => $id)));
break;
case "listing":
print node_listing(page_query());
diff --git a/modules/poll.module b/modules/poll.module
index 06661ba51..db40538be 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -13,12 +13,12 @@ class Poll {
}
function poll_cron() {
- $result = _node_get("type", "poll");
+ $result = _node_get(array("type" => "poll"));
while ($poll = db_fetch_array($result)) {
if ($poll[active]) {
if (($poll[timestamp] + $poll[runtime]) < time()) {
$poll[active] = 0;
- node_save($poll, array(filter));
+ node_save($poll, array(active));
}
}
}
@@ -98,10 +98,10 @@ function poll_view($node, $main = 0, $block = 0) {
if (($node->active) && (!field_get($node->voters, $user->userid))) {
$result = db_query("UPDATE poll_choices SET chvotes=chvotes+1 WHERE nid='" . $node->nid . "' && chid='" . check_input($chid) . "'");
if (($result) && ($user)) {
- $new = node_get_array("nid", $node->nid);
+ $new = node_get_array(array("nid" => $node->nid));
$new[voters] = field_set($node->voters, $user->userid,1);
node_save($new, array(voters));
- $node = node_get_object("nid", $node->nid);
+ $node = node_get_object(array("nid" => $node->nid));
}
}
@@ -228,10 +228,7 @@ function poll_save($edit) {
}
function poll_block() {
- $result = _node_get("type", "poll");
- while ($poll = db_fetch_object($result)) {
- if ($poll->active) break;
- }
+ $poll = node_get_object(array("type" => "poll", "active" => 1));
if ($poll) {
$poll = poll_view($poll, 0, 1);
$output = "<b>" . $poll[title] . "</b><br>" . $poll[content];
@@ -266,7 +263,7 @@ function poll_admin() {
print poll_overview(poll_query($type));
break;
case "edit":
- print poll_form(poll_get_choices_array(node_get_array("nid", check_input($id))));
+ print poll_form(poll_get_choices_array(node_get_array(array("nid" => check_input($id)))));
break;
case "help":
poll_help();
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 06661ba51..db40538be 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -13,12 +13,12 @@ class Poll {
}
function poll_cron() {
- $result = _node_get("type", "poll");
+ $result = _node_get(array("type" => "poll"));
while ($poll = db_fetch_array($result)) {
if ($poll[active]) {
if (($poll[timestamp] + $poll[runtime]) < time()) {
$poll[active] = 0;
- node_save($poll, array(filter));
+ node_save($poll, array(active));
}
}
}
@@ -98,10 +98,10 @@ function poll_view($node, $main = 0, $block = 0) {
if (($node->active) && (!field_get($node->voters, $user->userid))) {
$result = db_query("UPDATE poll_choices SET chvotes=chvotes+1 WHERE nid='" . $node->nid . "' && chid='" . check_input($chid) . "'");
if (($result) && ($user)) {
- $new = node_get_array("nid", $node->nid);
+ $new = node_get_array(array("nid" => $node->nid));
$new[voters] = field_set($node->voters, $user->userid,1);
node_save($new, array(voters));
- $node = node_get_object("nid", $node->nid);
+ $node = node_get_object(array("nid" => $node->nid));
}
}
@@ -228,10 +228,7 @@ function poll_save($edit) {
}
function poll_block() {
- $result = _node_get("type", "poll");
- while ($poll = db_fetch_object($result)) {
- if ($poll->active) break;
- }
+ $poll = node_get_object(array("type" => "poll", "active" => 1));
if ($poll) {
$poll = poll_view($poll, 0, 1);
$output = "<b>" . $poll[title] . "</b><br>" . $poll[content];
@@ -266,7 +263,7 @@ function poll_admin() {
print poll_overview(poll_query($type));
break;
case "edit":
- print poll_form(poll_get_choices_array(node_get_array("nid", check_input($id))));
+ print poll_form(poll_get_choices_array(node_get_array(array("nid" => check_input($id)))));
break;
case "help":
poll_help();
diff --git a/modules/queue.module b/modules/queue.module
index bf4cb7cc2..f609561c0 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -18,7 +18,7 @@ function queue_score($id) {
function queue_vote($id, $vote) {
global $status, $user;
- if ($node = node_get_object(nid, $id)) {
+ if ($node = node_get_object(array(nid => $id))) {
if (!field_get($node->users, $user->userid)) {
@@ -63,7 +63,7 @@ function queue_node($id) {
global $theme, $user;
- $node = node_get_object(nid, $id);
+ $node = node_get_object(array(nid => $id));
if ($user->id == $node->author || field_get($node->users, $user->userid)) {
header("Location: node.php?id=$node->nid");
@@ -72,7 +72,7 @@ function queue_node($id) {
$queue_votes = array("neutral (+0)" => "+ 0", "post it (+1)" => "+ 1", "dump it (-1)" => "- 1");
// The keys of this associative array are displayed in each submission's selection box whereas the corresponding values represent the mathematical calculation to be performed to update a comment's value.
- if ($n = node_get_object("nid", $node->pid)) {
+ if ($n = node_get_object(array("nid" => $node->pid))) {
$output .= " ". t("The above node is a proposed update of an existing node:") ." \"<A HREF=\"node.php?id=$n->nid\">". check_output($n->title) ."</A>\".";
}
diff --git a/modules/story.module b/modules/story.module
index 935f0ca93..637a4613a 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -135,7 +135,7 @@ function story_admin() {
print story_overview(story_query($type));
break;
case "edit":
- print story_form(node_get_array("nid", check_input($id)));
+ print story_form(node_get_array(array("nid" => check_input($id))));
break;
case "help":
story_help();
diff --git a/modules/story/story.module b/modules/story/story.module
index 935f0ca93..637a4613a 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -135,7 +135,7 @@ function story_admin() {
print story_overview(story_query($type));
break;
case "edit":
- print story_form(node_get_array("nid", check_input($id)));
+ print story_form(node_get_array(array("nid" => check_input($id))));
break;
case "help":
story_help();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 10:18:34 +0000