From cb5bbdee20c649e5287fd9b90ce2f7215a6dcdec Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 26 Mar 2001 20:22:09 +0000 Subject: - small improvements as well as 2 bugfixes --- modules/story.module | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'modules/story.module') diff --git a/modules/story.module b/modules/story.module index bacd83155..06ace2f70 100644 --- a/modules/story.module +++ b/modules/story.module @@ -179,7 +179,7 @@ function story_save($edit) { } function story_delete($id) { - node_del_object("nid", $id); + return ($node = node_del("nid", $id) ? "story has been deleted" : "failed to delete story: change status to 'dumped' first"); } function story_block() { @@ -220,29 +220,29 @@ function story_overview() { // Queued stories: $result = db_query("SELECT n.*, u.userid FROM nodes n LEFT JOIN users u ON n.author = u.id WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY timestamp DESC"); $output .= " queued stories\n"; - while ($story = db_fetch_object($result)) { - $output .= " nid\">". check_output($story->title) ."". format_username($story->userid) ."votes: $story->votes, score: $story->scorenid\">viewnid\">editnid\">delete\n"; + while ($node = db_fetch_object($result)) { + $output .= " nid\">". check_output($node->title) ."". format_username($node->userid) ."votes: $node->votes, score: $node->scorenid\">viewnid\">editnid\">delete\n"; } // Scheduled stories: $result = db_query("SELECT n.*, u.userid FROM nodes n LEFT JOIN users u ON n.author = u.id WHERE n.type = 'story' AND n.status = '$status[scheduled]' ORDER BY timestamp DESC"); $output .= " scheduled stories\n"; - while ($story = db_fetch_object($result)) { - $output .= " nid\">". check_output($story->title) ."". format_username($story->userid) ."". date("D, m/d/Y H:i", $story->timestamp) ."
(". format_interval($story->timestamp - time()) ." left)nid\">viewnid\">editnid\">delete\n"; + while ($node = db_fetch_object($result)) { + $output .= " nid\">". check_output($node->title) ."". format_username($node->userid) ."". format_date($node->timestamp, "small") ."
(". format_interval($node->timestamp - time()) ." left)nid\">viewnid\">editnid\">delete\n"; } // Dumped stories: $result = db_query("SELECT n.*, u.userid FROM nodes n LEFT JOIN users u ON n.author = u.id WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY timestamp DESC LIMIT 5"); $output .= " dumped stories\n"; - while ($story = db_fetch_object($result)) { - $output .= " nid\">". check_output($story->title) ."". format_username($story->userid) ."". date("D, m/d/Y H:i", $story->timestamp) ."nid\">viewnid\">editnid\">delete\n"; + while ($node = db_fetch_object($result)) { + $output .= " nid\">". check_output($node->title) ."". format_username($node->userid) ."". format_date($node->timestamp, "small") ."nid\">viewnid\">editnid\">delete\n"; } // Posted stories: $result = db_query("SELECT n.*, u.userid FROM nodes n LEFT JOIN users u ON n.author = u.id WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY timestamp DESC LIMIT 15"); $output .= " posted stories\n"; - while ($story = db_fetch_object($result)) { - $output .= " nid\">". check_output($story->title) ."". format_username($story->userid) ."". date("D, m/d/Y H:i", $story->timestamp) ."nid\">viewnid\">editnid\">delete\n"; + while ($node = db_fetch_object($result)) { + $output .= " nid\">". check_output($node->title) ."". format_username($node->userid) ."". format_date($node->timestamp, "small") ."nid\">viewnid\">editnid\">delete\n"; } $output .= "\n"; -- cgit v1.2.3