From c75057bb0fc99d56e1b7a48c5fecfe0cf0f6498d Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 4 Jun 2001 15:40:39 +0000 Subject: CHANGES: - Added improved node scheduler: + Automatically post node at date 'xx/xx/xx, xx:xx'. + Automatically queue node at date 'xx/xx/xx, xx:xx'. + Automatically dump node at date 'xx/xx/xx, xx:xx'. Requires a database update, see ./updates/2.00-to-x.xx.sql! - Refactored the admin interface of node.module. It is only a start but it should show the direction we are going. + The new interface is easier to extend with new functionality and operations. New "edit xxx" links can easily be added on our way. + The new interface tries to cover all content- or node-related functions. Thus making a special admin interface for each new node type redundant. To demonstrate this, I removed the admin hook from page.module and forum.module. This removes quite a bit of logic from the invidual modules which is a good sign if you ask me. A centralized GUI or interface covering all node-related administration should make Drupal easier to administer. TODO: - All node-related nodes need updating. This should be trivial and I'll hapilly tackle this later tonight. - There will be bugs, and I'm still working on this but I would like to get some feedback (from Natrak et all) on both user-friendliness and usability of this new interface. I'm still working on it as we speak ... --- modules/node.module | 198 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 155 insertions(+), 43 deletions(-) (limited to 'modules/node.module') diff --git a/modules/node.module b/modules/node.module index 8222393ed..8aeb5715c 100644 --- a/modules/node.module +++ b/modules/node.module @@ -39,64 +39,111 @@ function node_filter($text) { return $text; } +function node_cron() { + db_query("UPDATE node SET status = '". node_status("posted") ."', timestamp_posted = '' WHERE timestamp_posted > 0 AND timestamp_posted < ". time()); + db_query("UPDATE node SET status = '". node_status("queued") ."', timestamp_posted = '' WHERE timestamp_queued > 0 AND timestamp_queued < ". time()); + db_query("UPDATE node SET status = '". node_status("dumped") ."', timestamp_posted = '' WHERE timestamp_hidden > 0 AND timestamp_hidden < ". time()); +} + function node_overview($query = array()) { global $user; + $colors = array("#ffdc9b", "#dedec4"); + $result = db_query("SELECT n.*, u.userid, c.name AS category FROM node n LEFT JOIN users u ON n.author = u.id LEFT JOIN category c ON n.cid = c.cid $query[1] LIMIT 50"); $output .= status($query[0]); $output .= "\n"; - $output .= " \n"; + $output .= " \n"; + while ($node = db_fetch_object($result)) { - $output .= " \n"; + unset ($link); + + $link[] = user_access($user, $node->type) ? "type&op=edit&id=$node->nid\">edit content" : "edit content"; + $link[] = user_access($user, "node") ? "nid\">edit options" : "edit options"; + $link[] = user_access($user, "node") ? "nid\">edit status" : "edit status"; + $link[] = user_access($user, "node") ? "nid\">edit attributes" : "edit attributes"; + $link[] = user_access($user, "node") ? "nid\">delete node" : "delete node"; + + $color = $colors[$i++ % sizeof($colors)]; + + $output .= " \n"; + $output .= " \n"; } $output .= "
titlecategorystatusauthordateoperations
titletypestatusmeta attributesauthordate
nid\">". check_output($node->title) ."". check_output($node->category ? $node->category : $node->type) ."". node_status($node->status) ."". format_username($node->userid) ."". format_date($node->timestamp, "small") ."". (user_access($user, "node") ? "nid\">edit node" : "edit node") ."". (user_access($user, $node->type) ? "type&op=edit&id=$node->nid\">edit $node->type" : "edit $node->type") ."
nid\">". check_output($node->title) ."$node->type". node_status($node->status) ."". check_output($node->attribute) ."". format_username($node->userid) ."". format_date($node->timestamp, "small") ."
". implode(", ", $link) ."
\n"; return $output; } -function node_admin_view($id) { +function node_edit_option($id) { + global $user; + $node = node_get_object(array("nid" => $id)); - $form .= form_item("Title", check_output($node->title)); - $form .= form_item("Author", format_username($node->userid)); - $form .= form_item("Status", node_status($node->status)); - $form .= form_item("Comment", node_comment_status($node->comment)); - $form .= form_item("Promote", node_promote_status($node->promote)); - $form .= form_item("Moderate", check_output($node->moderate)); - $form .= form_item("Date", format_date($node->timestamp)); - $form .= form_submit("Edit node"); - $form .= form_submit("Delete node"); + $form .= form_item("Document title", check_output($node->title)); + $form .= form_select("Comment", "comment", $node->comment, node_comment_status(), "Allow users to post comments to this document."); + $form .= form_select("Promote", "promote", $node->promote, node_promote_status(), "Promote this document on the main page."); + $form .= form_textfield("Moderate", "moderate", $node->moderate, 35, 255, t("A comma-seperated list of the moderators their usernames.")); + $form .= form_hidden("nid", $node->nid); + $form .= form_submit("Save node"); return form("admin.php?mod=node&id=$node->nid", $form); } -function node_admin_edit($id) { +function node_edit_attribute($id) { global $user; $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)); - $form .= form_select("Status", "status", $node->status, node_status($node->type)); - $form .= form_select("Comment", "comment", $node->comment, node_comment_status()); - $form .= form_select("Promote", "promote", $node->promote, node_promote_status()); - $form .= form_textfield("Moderate", "moderate", $node->moderate, 35, 255, t("Provide a comma-seperated list of the moderators their usernames.")); - $form .= form_select("Date", "timestamp", $node->timestamp, array($node->timestamp => format_date($node->timestamp) ." (original)", time() => format_date(time()) ." (current)")); + $form .= form_item("Document title", check_output($node->title)); + $form .= form_textfield("Attributes", "attribute", $edit[attribute], 50, 128, htmlentities("A list meta attributes. Format: :;:;. Example: 'software:apache;type:webserver;os:linux;'.")); $form .= form_hidden("nid", $node->nid); $form .= form_submit("Save node"); - $form .= form_submit("View node"); return form("admin.php?mod=node&id=$node->nid", $form); } +function node_edit_status($id) { + global $REQUEST_URI; + + $node = node_get_object(array("nid" => $id)); + + $form .= form_item("Document title", check_output($node->title)); + $form .= form_select("Current status", "status", $node->status, node_status($node->type)); + $form .= form_textfield("Automatically post document", "timestamp_posted", ($node->timestamp_posted ? format_date($node->timestamp_posted) : ""), 30, 55, "The date at which your document will be automatically posted. Leave empty if you don't want to schedule this document, or fill out a string containing an English date format. Example input: '". date("j F Y G:i") ."', '". date("m/d/y H:i") ."', '". date("F j, Y H:i") ."', ..."); + $form .= form_textfield("Automatically queue document", "timestamp_queued", ($node->timestamp_queued ? format_date($node->timestamp_queued) : ""), 30, 55, "The date at which your document will be automatically queued. Leave empty if you don't want to schedule this document, or fill out a string containing an English date format. Example input: '". date("j F Y G:i") ."', '". date("m/d/y H:i") ."', '". date("F j, Y H:i") ."', ..."); + $form .= form_textfield("Automatically hide document", "timestamp_hidden", ($node->timestamp_hidden ? format_date($node->timestamp_hidden) : ""), 30, 55, "The date at which your document will be automatically hidden. Leave empty if you don't want to schedule this document, or fill out a string containing an English date format. Example input: '". date("j F Y G:i") ."', '". date("m/d/y H:i") ."', '". date("F j, Y H:i") ."', ..."); + $form .= form_hidden("nid", $node->nid); + $form .= form_submit("Save node"); + + return form($REQUEST_URI, $form); +} + function node_delete($id) { return (node_del(array("nid" => $id)) ? "node has been deleted." : "failed to delete node: node must be dumped first."); } function node_query($type = "") { - global $status; - $queries = array(array("recent nodes", "ORDER BY n.timestamp DESC"), array("posted nodes", "WHERE n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued nodes", "WHERE n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped nodes", "WHERE n.status = '$status[dumped]' ORDER BY n.timestamp DESC")); + $queries[] = array("all nodes: recent additions", "ORDER BY n.timestamp DESC"); + $queries[] = array("all nodes: status set to 'posted'", "WHERE n.status = '". node_status("posted") ."' ORDER BY n.timestamp DESC"); + $queries[] = array("all nodes: status set to 'queued'", "WHERE n.status = '". node_status("queued") ."' ORDER BY n.timestamp DESC"); + $queries[] = array("all nodes: status set to 'dumped'", "WHERE n.status = '". node_status("dumped") ."' ORDER BY n.timestamp DESC"); + $queries[] = array("all nodes: scheduled to be posted", "WHERE n.timestamp_posted > 0 ORDER BY n.timestamp DESC"); + $queries[] = array("all nodes: scheduled to be queued", "WHERE n.timestamp_queued > 0 ORDER BY n.timestamp DESC"); + $queries[] = array("all nodes: scheduled to be hidden", "WHERE n.timestamp_hidden > 0 ORDER BY n.timestamp DESC"); + + foreach (module_list() as $name) { + if (module_hook($name, "user")) { + $queries[] = array("$name: recent additions", "WHERE n.type = '$name' ORDER BY n.timestamp DESC"); + $queries[] = array("$name: status set to 'posted'", "WHERE n.type = '$name' AND n.status = '". node_status("posted") ."' ORDER BY n.timestamp DESC"); + $queries[] = array("$name: status set to 'queued'", "WHERE n.type = '$name' AND n.status = '". node_status("queued") ."' ORDER BY n.timestamp DESC"); + $queries[] = array("$name: status set to 'dumped'", "WHERE n.type = '$name' AND n.status = '". node_status("dumped") ."' ORDER BY n.timestamp DESC"); + $queries[] = array("$name: scheduled to be posted", "WHERE n.type = '$name' AND n.timestamp_posted > 0 ORDER BY n.timestamp DESC"); + $queries[] = array("$name: scheduled to be queued", "WHERE n.type = '$name' AND n.timestamp_queued > 0 ORDER BY n.timestamp DESC"); + $queries[] = array("$name: scheduled to be hidden", "WHERE n.type = '$name' AND n.timestamp_hidden > 0 ORDER BY n.timestamp DESC"); + } + } + return ($queries[$type] ? $queries[$type] : $queries); } @@ -118,13 +165,13 @@ function node_setting() { foreach (module_list() as $name) { if (module_hook($name, "user")) { $form .= "

Default settings for $name nodes

"; - $form .= form_select(t("Comment"), $name ."_comment", variable_get($name ."_comment", 0), node_comment_status(), t("By default, allow or dissallow users to post comments in this category.")); - $form .= form_select(t("Promote"), $name ."_promote", variable_get($name ."_promote", 0), node_promote_status(), t("By default, promote new submissions in this category to the front page.")); - $form .= form_select(t("Status"), $name ."_status", variable_get($name ."_status", node_status("queued")), node_status($name), t("What to do with new submissions in this category?")); - $form .= form_select(t("Post threshold"), $name ."_post", variable_get($name ."_post", 4), $threshold_post, t("If new submissions are subject to moderation, select a post threshold.")); - $form .= form_select(t("Dump threshold"), $name ."_dump", variable_get($name ."_dump", -2), $threshold_dump, t("If new submissions are subject to moderation, select a dump threshold.")); - $form .= form_select(t("Expiration threshold"), $name ."_expire", variable_get($name ."_expire", 8), $threshold_expire, t("If new submissions are subject to moderation, select a expiration threshold.")); - $form .= form_textfield("Moderate", $name ."_moderate", variable_get($name ."_moderate", ""), 35, 255, t("Provide a comma-seperated list of the moderators' usernames.")); + $form .= form_select(t("Comment"), $name ."_comment", variable_get($name ."_comment", 0), node_comment_status(), "By default, allow or dissallow users to post comments in this category."); + $form .= form_select(t("Promote"), $name ."_promote", variable_get($name ."_promote", 0), node_promote_status(), "By default, promote new submissions in this category to the front page."); + $form .= form_select(t("Status"), $name ."_status", variable_get($name ."_status", node_status("queued")), node_status($name), "What to do with new submissions in this category?"); + $form .= form_select(t("Post threshold"), $name ."_post", variable_get($name ."_post", 4), $threshold_post, "If new submissions are subject to moderation, select a post threshold."); + $form .= form_select(t("Dump threshold"), $name ."_dump", variable_get($name ."_dump", -2), $threshold_dump, "If new submissions are subject to moderation, select a dump threshold."); + $form .= form_select(t("Expiration threshold"), $name ."_expire", variable_get($name ."_expire", 8), $threshold_expire, "If new submissions are subject to moderation, select a expiration threshold."); + $form .= form_textfield("Moderate", $name ."_moderate", variable_get($name ."_moderate", ""), 35, 255, "A comma-seperated list of the moderators' usernames."); } } @@ -134,23 +181,83 @@ function node_setting() { return form($REQUEST_URI, $form); } +function node_admin_save($edit) { + if (isset($edit[status])) { + $edit[timestamp_posted] = (strtotime($edit[timestamp_posted]) > time()) ? strtotime($edit[timestamp_posted]) : 0; + $edit[timestamp_queued] = (strtotime($edit[timestamp_queued]) > time()) ? strtotime($edit[timestamp_queued]) : 0; + $edit[timestamp_hidden] = (strtotime($edit[timestamp_hidden]) > time()) ? strtotime($edit[timestamp_hidden]) : 0; + node_save($edit, array(status, timestamp_posted, timestamp_queued, timestamp_hidden)); + } + else if (isset($edit[attribute])) { + node_save($edit, array(attribute)); + } + else { + node_save($edit, array(comment, moderate, promote)); + } +} + +function node_search() { + global $REQUEST_URI; + + foreach (module_list() as $name) { + if (module_hook($name, "user")) { + $options .= "\n"; + } + } + + $output .= "
\n"; + $output .= " \n"; + $output .= " \n"; + $output .= " \n"; + $output .= "
\n"; + + return $output; +} + +function node_module_edit($edit, $type) { + $edit[type] = $type; + return node_invoke($edit, "form"); +} + +function node_module_save($edit, $type) { + $edit[type] = $type; + return node_invoke($edit, "save"); +} + function node_admin() { - global $op, $id, $edit, $type; + global $op, $id, $edit, $query, $type, $keys; - print "node settings | node listings | overview
\n"; + foreach (module_list() as $name) { + if (module_hook($name, "status") && $name != "node") { + $link[] = "add $name"; + } + } + + print "". implode(" | ", $link) ." | node settings | node listings | search node | overview
\n"; $id = check_input($edit[nid] ? $edit[nid] : $id); - $type = ($type ? $type : 0); switch ($op) { - case "Edit node": - case "edit": - print node_admin_edit($id); + case "add": + print module_invoke($type, "form"); + break; + case "search": + print node_search($id); + print search_data($keys, $type); + break; + case "status": + print node_edit_status($id); + break; + case "option": + print node_edit_option($id); + break; + case "attribute": + print node_edit_attribute($id); break; case "default": print node_setting(); break; - case "Delete node": + case "delete": print status(node_delete($id)); print node_overview(); break; @@ -166,15 +273,20 @@ function node_admin() { print node_setting(); break; case "Save node": - node_save($edit, array(author, comment, moderate, promote, status, timestamp)); - print node_admin_view($id); + print node_admin_save($edit); + print node_overview(); + break; + case "edit": + print node_module_edit(node_get_array(array("nid" => $id)), $type); break; - case "View node": - case "view": - print node_admin_view($id); + case "Preview": + print node_module_edit($edit, $type); break; + case "Submit": + print status(node_module_save($edit, $type)); + // fall through: default: - print node_overview(node_query($type)); + print node_overview(node_query($query ? $query : 0)); } } -- cgit v1.2.3