From 1f79863053350f1a7d6cb654ac615123bc3b5133 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 25 Mar 2001 10:57:01 +0000 Subject: - large commit of everything else that has been queued in my backlog: it's not 100% stable yet --- modules/story.module | 60 ++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 28 deletions(-) (limited to 'modules/story.module') diff --git a/modules/story.module b/modules/story.module index 5623d4fba..bacd83155 100644 --- a/modules/story.module +++ b/modules/story.module @@ -21,16 +21,17 @@ class Story { } function story_cron() { - $result = db_query("SELECT * FROM nodes WHERE status = 3 AND timestamp <= ". time() .""); + global $status; + $result = db_query("SELECT * FROM nodes WHERE status = '$status[scheduled]' AND timestamp <= ". time() .""); while ($story = db_fetch_object($result)) { - db_query("UPDATE nodes SET status = '1', timestamp = '". time() ."' WHERE nid = '$story->nid' AND type = 'story'"); + db_query("UPDATE nodes SET status = '$status[queued]', timestamp = '". time() ."' WHERE nid = '$story->nid' AND type = 'story'"); } } function story_find($keys) { - global $user; + global $status, $user; $find = array(); - $result = db_query("SELECT n.*, s.* FROM story s LEFT JOIN nodes n ON s.node = n.nid WHERE n.status = 2 AND (n.title LIKE '%". check_input($keys) ."%' OR s.abstract LIKE '%". check_input($keys) ."%' OR s.body LIKE '%$keys%') LIMIT 20"); + $result = db_query("SELECT n.*, s.* FROM story s LEFT JOIN nodes n ON s.node = n.nid WHERE n.status = '$status[posted]' AND (n.title LIKE '%". check_input($keys) ."%' OR s.abstract LIKE '%". check_input($keys) ."%' OR s.body LIKE '%$keys%') LIMIT 20"); while ($story = db_fetch_object($result)) { array_push($find, array("title" => check_output($story->title), "link" => (user_access($user, "story") ? "admin.php?mod=story&op=edit&id=$story->nid" : "node.php?id=$story->nid"), "user" => $story->userid, "date" => $story->timestamp)); } @@ -52,10 +53,10 @@ function story_help() { header(); @@ -106,13 +107,12 @@ function story_view($node, $page = 0) { } function story_form($edit = array()) { - global $allowed_html, $PHP_SELF, $theme, $user; + global $allowed_html, $REQUEST_URI, $status, $theme, $user; - include "includes/story.inc"; - - $output .= "
\n"; + $output .= "\n"; $output .= "". t("Your name") .":
\n"; + $output .= "\n"; $output .= format_username(($edit[userid] ? $edit[userid] : $user->userid)) ."

"; $output .= "". t("Subject") .":
\n"; @@ -132,10 +132,10 @@ function story_form($edit = array()) { if (user_access($user, "story")) { $output .= "". t("Status") .":
\n"; - $output .= " scheduled for
\n"; - $output .= " posted
\n"; - $output .= " queued
\n"; - $output .= " dumped
\n"; + $output .= " scheduled for
\n"; + $output .= " posted
\n"; + $output .= " queued
\n"; + $output .= " dumped
\n"; $output .= "The textfield for scheduled stories expects a string containing an English date format of when you want to have your story automatically published. Example input: '". date("j F Y G:i") ."', '". date("m/d/y H:i") ."', '". date("F j, Y H:i") ."', ...

\n"; } @@ -172,9 +172,10 @@ function story_form($edit = array()) { } function story_save($edit) { + global $status; $node = ($edit[nid] ? node_get_object("nid", $edit[nid]) : node_get_object("title", $edit[title])); - $edit[timestamp] = ($edit[status] == 3 && strtotime($edit[timestamp]) > time()) ? strtotime($edit[timestamp]) : ($node->timestamp ? $node->timestamp : time()); - node_save(array_merge($edit, array(nid => ($edit[nid] ? $edit[nid] : $node->nid), type => "story"))); + $edit[timestamp] = ($edit[status] == $status[scheduled] && strtotime($edit[timestamp]) > time()) ? strtotime($edit[timestamp]) : ($node->timestamp ? $node->timestamp : time()); + node_save(array_diff(array_merge($edit, array(nid => $node->nid, type => "story")), array(userid => $edit[userid]))); } function story_delete($id) { @@ -186,7 +187,8 @@ function story_block() { // // disabled for now // - $result = db_query("SELECT s.id, COUNT(c.cid) AS comments, s.title FROM story s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = 2 AND c.link = 'story' GROUP BY s.id ORDER BY comments DESC LIMIT 10"); + global $status; + $result = db_query("SELECT s.id, COUNT(c.cid) AS comments, s.title FROM story s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = '$status[posted]' AND c.link = 'story' GROUP BY s.id ORDER BY comments DESC LIMIT 10"); while ($story = db_fetch_object($result)) { $content .= "

  • id\">". check_output($story->title) ."
    (". format_plural($story->comments, "comment", "comments") .")
    • \n"; } @@ -197,7 +199,7 @@ function story_block() { unset($content); - $result = db_query("SELECT s.id, COUNT(c.cid) AS comments, s.title FROM story s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = 2 AND c.link = 'story' AND ". time() ." - s.timestamp < 2419200 GROUP BY s.id ORDER BY comments DESC LIMIT 10"); + $result = db_query("SELECT s.id, COUNT(c.cid) AS comments, s.title FROM story s LEFT JOIN comments c ON s.id = c.lid WHERE s.status = '$status[posted]' AND c.link = 'story' AND ". time() ." - s.timestamp < 2419200 GROUP BY s.id ORDER BY comments DESC LIMIT 10"); while ($story = db_fetch_object($result)) { $content .= "
  • id\">". check_output($story->title) ."
    (". format_plural($story->comments, "comment", "comments") .")
    • \n"; } @@ -211,31 +213,33 @@ function story_block() { } function story_overview() { + global $status; + $output .= "\n"; - // Pending 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 = 1 ORDER BY timestamp DESC"); + // 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 .= " \n"; while ($story = db_fetch_object($result)) { $output .= " \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 = 3 ORDER BY timestamp DESC"); + $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 .= " \n"; while ($story = db_fetch_object($result)) { $output .= " \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 = 0 ORDER BY timestamp DESC LIMIT 5"); + $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 .= " \n"; while ($story = db_fetch_object($result)) { $output .= " \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 = 2 ORDER BY timestamp DESC LIMIT 15"); + $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 .= " \n"; while ($story = db_fetch_object($result)) { $output .= " \n"; @@ -269,11 +273,11 @@ function story_admin() { story_search(); break; case t("Preview"): - $theme->story(new Story(($edit[author] ? $edit[author] : $user->userid), $edit[title], $edit[abstract], $edit[body], $edit[section], ($edit[timestamp] ? $edit[timestamp] : time())), "[ ". t("reply to this story") ." ]"); + story_view(new Story(($edit[userid] ? $edit[userid] : $user->userid), $edit[title], $edit[abstract], $edit[body], $edit[section], ($edit[timestamp] ? $edit[timestamp] : time())), 0); print story_form($edit); break; case t("Submit"): - story_save($edit, check_input($id)); + story_save($edit); story_overview(); break; default: @@ -283,15 +287,15 @@ function story_admin() { function story_user() { - global $edit, $id, $op, $theme, $user; + global $edit, $op, $theme, $user; switch($op) { case t("Preview"): - $theme->story(new Story(($edit[author] ? $edit[author] : $user->userid), $edit[title], $edit[abstract], $edit[body], $edit[section], ($edit[timestamp] ? $edit[timestamp] : time())), "[ ". t("reply to this story") ." ]"); + story_view(new Story($user->userid, $edit[title], $edit[abstract], $edit[body], $edit[section], ($edit[timestamp] ? $edit[timestamp] : time())), 0); $theme->box("Submit a story", story_form($edit)); break; case t("Submit"): - story_save($edit, check_input($id)); + story_save($edit); $theme->box(t("Submit a story"), t("Thank you for your submission.")); break; default: -- cgit v1.2.3
    queued stories
    nid\">". check_output($story->title) ."". format_username($story->userid) ."votes: $story->votes, score: $story->scorenid\">viewnid\">editnid\">delete
    scheduled stories
    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
    dumped stories
    nid\">". check_output($story->title) ."". format_username($story->userid) ."". date("D, m/d/Y H:i", $story->timestamp) ."nid\">viewnid\">editnid\">delete
    posted stories
    nid\">". check_output($story->title) ."". format_username($story->userid) ."". date("D, m/d/Y H:i", $story->timestamp) ."nid\">viewnid\">editnid\">delete