From 1421c878d16f7d88bcc85c0dfc4b7c006b267526 Mon Sep 17 00:00:00 2001 From: Kjartan Mannes Date: Sun, 9 Mar 2003 17:19:50 +0000 Subject: - Moved moderation logic back into node module. * After having a chat with Dries we have agreed on the logics (or more specifically he told me how its supposed to work). The queue module is just a method to make moderation public, but its not necessarily the only way. This brings the power back. - Minor interface tweaks (names, case changes, etc). - Fixed error that would show when you tried to view the profile of a blocked user. --- modules/queue.module | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'modules/queue.module') diff --git a/modules/queue.module b/modules/queue.module index 3c57cbf64..ad9506bed 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -28,10 +28,6 @@ function queue_link($type) { $links[] = l(t("view submissions"), "queue", array("title" => t("Moderate the content in the submission queue."))) ." (". queue_count() .")"; } - if ($type == "admin" && user_access("administer nodes")) { - menu("admin/node/nodes/1", "approval queue", "node_admin", NULL, 1); - } - return $links ? $links : array(); } @@ -221,16 +217,8 @@ function queue_block($op = "list", $delta = 0) { function queue_nodeapi(&$node, $op, $arg = 0) { switch ($op) { - case "settings": - $output[t("Queue")] = form_checkbox("", "queue_$node->type", 1, variable_get("queue_$node->type", 0)); - return $output; case "fields": - return array("moderate", "score", "users", "votes"); - case "form admin": - if (user_access("administer moderation")) { - return form_select(t("Moderation status"), "moderate", isset($node->moderate) ? $node->moderate : variable_get("queue_$node->type", 0), array(t("Approved"), t("Awaiting approval"))); - } - break; + return array("score", "users", "votes"); case "validate": $node->promote = $node->moderate ? 0 : 1; if ($node->nid && $node->moderate) { -- cgit v1.2.3