- improved module descriptions.

- removed admin options for queue and comment module if the modules are not
  loaded.
- nodes are now auto promoted when queue module isn't enabled.
- moderation result block is now visible by the node author.

38 files changed, 59 insertions, 47 deletions

diff --git a/modules/aggregator.module b/modules/aggregator.module
index 59ddccd78..e50b77c5b 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -12,7 +12,7 @@ function import_help() {
 }
 
 function import_system($field){
-  $system["description"] = t("Used to import syndicated content (ie. news feeds)");
+  $system["description"] = t("Used to aggregate syndicated content (RSS and RDF).");
   return $system[$field];
 }
 
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 59ddccd78..e50b77c5b 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -12,7 +12,7 @@ function import_help() {
 }
 
 function import_system($field){
-  $system["description"] = t("Used to import syndicated content (ie. news feeds)");
+  $system["description"] = t("Used to aggregate syndicated content (RSS and RDF).");
   return $system[$field];
 }
 
diff --git a/modules/archive.module b/modules/archive.module
index 459fe34f0..4c0cf4bc1 100644
--- a/modules/archive.module
+++ b/modules/archive.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function archive_system($field){
-  $system["description"] = t("Displays calendar navigation to old content.");
+  $system["description"] = t("Displays a calendar to navigation old content.");
   return $system[$field];
 }
 
diff --git a/modules/archive/archive.module b/modules/archive/archive.module
index 459fe34f0..4c0cf4bc1 100644
--- a/modules/archive/archive.module
+++ b/modules/archive/archive.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function archive_system($field){
-  $system["description"] = t("Displays calendar navigation to old content.");
+  $system["description"] = t("Displays a calendar to navigation old content.");
   return $system[$field];
 }
 
diff --git a/modules/block.module b/modules/block.module
index 638f0dc08..5c7ab47f7 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -39,7 +39,7 @@ function block_help() {
 }
 
 function block_system($field){
-  $system["description"] = t("Displays content in small boxes, generally along the side of the page.");
+  $system["description"] = t("Controls the boxes that are displayed around the main content.");
   return $system[$field];
 }
 
diff --git a/modules/block/block.module b/modules/block/block.module
index 638f0dc08..5c7ab47f7 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -39,7 +39,7 @@ function block_help() {
 }
 
 function block_system($field){
-  $system["description"] = t("Displays content in small boxes, generally along the side of the page.");
+  $system["description"] = t("Controls the boxes that are displayed around the main content.");
   return $system[$field];
 }
 
diff --git a/modules/blog.module b/modules/blog.module
index 28f669225..15020a1d2 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function blog_system($field){
-  $system["description"] = t("Enables keeping an online journal.");
+  $system["description"] = t("Enables users to keep a blog or online journal.");
   return $system[$field];
 }
 
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 28f669225..15020a1d2 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function blog_system($field){
-  $system["description"] = t("Enables keeping an online journal.");
+  $system["description"] = t("Enables users to keep a blog or online journal.");
   return $system[$field];
 }
 
diff --git a/modules/bloggerapi.module b/modules/bloggerapi.module
index c663762a4..68a6120c1 100644
--- a/modules/bloggerapi.module
+++ b/modules/bloggerapi.module
@@ -365,7 +365,7 @@ function bloggerapi_perm() {
 }
 
 function bloggerapi_system($field){
-  $system["description"] = t("Allows users post to Drupal via alternate methods or different tools.");
+  $system["description"] = t("Enables users to post using tools or applications that support the Blogger API.");
   return $system[$field];
 }
 
diff --git a/modules/comment.module b/modules/comment.module
index 22c7c8aaa..0adf660ec 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -14,7 +14,7 @@ function comment_help() {
 }
 
 function comment_system($field){
-  $system["description"] = t("Enables user commenting.");
+  $system["description"] = t("Enables user to comment on content (nodes).");
   return $system[$field];
 }
 
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 22c7c8aaa..0adf660ec 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -14,7 +14,7 @@ function comment_help() {
 }
 
 function comment_system($field){
-  $system["description"] = t("Enables user commenting.");
+  $system["description"] = t("Enables user to comment on content (nodes).");
   return $system[$field];
 }
 
diff --git a/modules/drupal.module b/modules/drupal.module
index 1c852e80c..7c433a8a0 100644
--- a/modules/drupal.module
+++ b/modules/drupal.module
@@ -1,7 +1,7 @@
 <?php
 
 function drupal_system($field){
-  $system["description"] = t("You'll need this :-)");
+  $system["description"] = t("Lets users log in using a Drupal ID and can notify drupal.org about your site.");
   return $system[$field];
 }
 
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index 1c852e80c..7c433a8a0 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -1,7 +1,7 @@
 <?php
 
 function drupal_system($field){
-  $system["description"] = t("You'll need this :-)");
+  $system["description"] = t("Lets users log in using a Drupal ID and can notify drupal.org about your site.");
   return $system[$field];
 }
 
diff --git a/modules/import.module b/modules/import.module
index 59ddccd78..e50b77c5b 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -12,7 +12,7 @@ function import_help() {
 }
 
 function import_system($field){
-  $system["description"] = t("Used to import syndicated content (ie. news feeds)");
+  $system["description"] = t("Used to aggregate syndicated content (RSS and RDF).");
   return $system[$field];
 }
 
diff --git a/modules/jabber.module b/modules/jabber.module
index abe1a4448..47be2babf 100644
--- a/modules/jabber.module
+++ b/modules/jabber.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function jabber_system($field){
-  $system["description"] = t("Enables login with Jabber ID and Password");
+  $system["description"] = t("Enables login with Jabber ID and password.");
   return $system[$field];
 }
 
diff --git a/modules/locale.module b/modules/locale.module
index 93ba4e8a2..055828998 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -36,7 +36,7 @@ function locale_help() {
 }
 
 function locale_system($field){
-  $system["description"] = t("Enables the translation of drupal messages to languages other than English.");
+  $system["description"] = t("Enables the translation of the user interface to languages other than English.");
   return $system[$field];
 }
 
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 93ba4e8a2..055828998 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -36,7 +36,7 @@ function locale_help() {
 }
 
 function locale_system($field){
-  $system["description"] = t("Enables the translation of drupal messages to languages other than English.");
+  $system["description"] = t("Enables the translation of the user interface to languages other than English.");
   return $system[$field];
 }
 
diff --git a/modules/node.module b/modules/node.module
index a12e61ad9..149e675bf 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -15,7 +15,7 @@ function node_help() {
 }
 
 function node_system($field){
-  $system["description"] = t("You'll need this too.");
+  $system["description"] = t("The core that allows content to be submitted to the site.");
   return $system[$field];
 }
 
@@ -494,7 +494,7 @@ function node_admin_nodes() {
   $output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
   $output .= " <tr><th>title</th><th>type</th><th>author</th><th>status</th><th colspan=\"2\">operations</th></tr>\n";
   while ($node = db_fetch_object($result)) {
-    $output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>$node->type</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
+    $output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>". module_invoke($node->type, "node", "name") ."</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
   }
   $output .= "</table>";
 
@@ -878,10 +878,16 @@ function node_form($edit, $error = NULL) {
     $output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]);
     $output .= "<br />";
     $output .= form_select(t("Set public/published"), "status", $edit->status, array("Disabled", "Enabled"));
-    $output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
+    // TODO: move this to the queue.module
+    if (module_exist("queue")) {
+      $output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
+    }
     $output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled"));
     $output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled"));
-    $output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
+    // TODO: move this to the comment.module
+    if (module_exist("comment")) {
+      $output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
+    }
     $output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled"));
   }
 
@@ -906,7 +912,7 @@ function node_add($type) {
 
   if ($type && node_access("create", $type)) {
     // Initialize settings
-    $output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "moderate" => 1, "comment" => 2));
+    $output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "promote" => !module_exist("queue"), "moderate" => module_exist("queue"), "comment" => module_exist("queue") ? 2 : 0));
   }
   else {
 
diff --git a/modules/node/node.module b/modules/node/node.module
index a12e61ad9..149e675bf 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -15,7 +15,7 @@ function node_help() {
 }
 
 function node_system($field){
-  $system["description"] = t("You'll need this too.");
+  $system["description"] = t("The core that allows content to be submitted to the site.");
   return $system[$field];
 }
 
@@ -494,7 +494,7 @@ function node_admin_nodes() {
   $output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
   $output .= " <tr><th>title</th><th>type</th><th>author</th><th>status</th><th colspan=\"2\">operations</th></tr>\n";
   while ($node = db_fetch_object($result)) {
-    $output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>$node->type</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
+    $output .= "<tr><td>". l(check_output($node->title), array("id" => $node->nid)) ."</td><td>". module_invoke($node->type, "node", "name") ."</td><td nowrap=\"nowrap\">". format_name($node) ."</td><td>". ($node->status ? t("published") : t("not published")) ."</td><td nowrap=\"nowrap\">". la(t("edit node"), array("mod" => "node", "op" => "edit", "id" => $node->nid)) ."</td><td nowrap=\"nowrap\">". la(t("delete node"), array("mod" => "node", "op" => "delete", "id" => $node->nid)) ."</td></tr>";
   }
   $output .= "</table>";
 
@@ -878,10 +878,16 @@ function node_form($edit, $error = NULL) {
     $output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]);
     $output .= "<br />";
     $output .= form_select(t("Set public/published"), "status", $edit->status, array("Disabled", "Enabled"));
-    $output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
+    // TODO: move this to the queue.module
+    if (module_exist("queue")) {
+      $output .= form_select(t("Queue for moderation"), "moderate", $edit->moderate, array("Disabled", "Enabled"));
+    }
     $output .= form_select(t("Promote to front page"), "promote", $edit->promote, array("Disabled", "Enabled"));
     $output .= form_select(t("Static on front page"), "static", $edit->static, array("Disabled", "Enabled"));
-    $output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
+    // TODO: move this to the comment.module
+    if (module_exist("comment")) {
+      $output .= form_select(t("Allow users comments"), "comment", $edit->comment, array("Disabled", "Read only", "Read/Write"));
+    }
     $output .= form_select(t("Create new revision"), "revision", $edit->revision, array("Disabled", "Enabled"));
   }
 
@@ -906,7 +912,7 @@ function node_add($type) {
 
   if ($type && node_access("create", $type)) {
     // Initialize settings
-    $output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "moderate" => 1, "comment" => 2));
+    $output = node_form(array("uid" => $user->uid, "name" => $user->name, "type" => $type, "status" => 1, "promote" => !module_exist("queue"), "moderate" => module_exist("queue"), "comment" => module_exist("queue") ? 2 : 0));
   }
   else {
 
diff --git a/modules/page.module b/modules/page.module
index fa53d8bb0..f326f4254 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -8,7 +8,7 @@ function page_help() {
 }
 
 function page_system($field){
-  $system["description"] = t("Enables the creation of persistent site pages that can be added to the navigation system.");
+  $system["description"] = t("Enables the creation of a static pages that can be added to the navigation system.");
   return $system[$field];
 }
 
diff --git a/modules/page/page.module b/modules/page/page.module
index fa53d8bb0..f326f4254 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -8,7 +8,7 @@ function page_help() {
 }
 
 function page_system($field){
-  $system["description"] = t("Enables the creation of persistent site pages that can be added to the navigation system.");
+  $system["description"] = t("Enables the creation of a static pages that can be added to the navigation system.");
   return $system[$field];
 }
 
diff --git a/modules/poll.module b/modules/poll.module
index c00cdff83..b355df013 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -253,7 +253,7 @@ function poll_save($op, $node) {
 }
 
 function poll_system($field){
-  $system["description"] = t("Enables submission of multiple choice questions for voting.");
+  $system["description"] = t("Allows users to submit multiple choice questions for voting.");
   return $system[$field];
 }
 
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index c00cdff83..b355df013 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -253,7 +253,7 @@ function poll_save($op, $node) {
 }
 
 function poll_system($field){
-  $system["description"] = t("Enables submission of multiple choice questions for voting.");
+  $system["description"] = t("Allows users to submit multiple choice questions for voting.");
   return $system[$field];
 }
 
diff --git a/modules/queue.module b/modules/queue.module
index 744b83ddc..ab55f953a 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function queue_system($field){
-  $system["description"] = t("Enables new content submissions to be rated before being displayed");
+  $system["description"] = t("Enables content to be moderated by the community.");
   return $system[$field];
 }
 
@@ -184,7 +184,7 @@ function queue_block() {
     if ($user->uid) {
       $node = node_load(array("nid" => $id));
     }
-    if (substr_count($node->users, "$user->uid=") && $node->moderate == 1) {
+    if (($user->uid == $node->uid && substr_count($node->users, "$user->uid=")) && $node->moderate == 1) {
       foreach (explode(",", $node->users) as $vote) {
         if ($vote) {
           $data = explode("=", $vote);
diff --git a/modules/search.module b/modules/search.module
index b5ce9403a..92f7807b5 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -15,7 +15,7 @@ function search_help() {
 }
 
 function search_system($field){
-  $system["description"] = t("Enables site wide keyword searching");
+  $system["description"] = t("Enables site wide keyword searching.");
   return $system[$field];
 }
 
diff --git a/modules/search/search.module b/modules/search/search.module
index b5ce9403a..92f7807b5 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -15,7 +15,7 @@ function search_help() {
 }
 
 function search_system($field){
-  $system["description"] = t("Enables site wide keyword searching");
+  $system["description"] = t("Enables site wide keyword searching.");
   return $system[$field];
 }
 
diff --git a/modules/statistics.module b/modules/statistics.module
index c4e1d48d0..da8be898d 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -15,7 +15,7 @@ function statistics_help() {
 }
 
 function statistics_system($field){
-  $system["description"] = t("Gathers and displays site metrics.");
+  $system["description"] = t("Gathers and displays referers.");
   return $system[$field];
 }
 
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index c4e1d48d0..da8be898d 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -15,7 +15,7 @@ function statistics_help() {
 }
 
 function statistics_system($field){
-  $system["description"] = t("Gathers and displays site metrics.");
+  $system["description"] = t("Gathers and displays referers.");
   return $system[$field];
 }
 
diff --git a/modules/story.module b/modules/story.module
index 8742be964..475c7d78f 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -8,7 +8,7 @@ function story_help() {
 }
 
 function story_system($field){
-  $system["description"] = t("Enables users to submit stories.  These stories are not part of their blogs.");
+  $system["description"] = t("Enables users to submit stories, articles or similar content.");
   return $system[$field];
 }
 
diff --git a/modules/story/story.module b/modules/story/story.module
index 8742be964..475c7d78f 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -8,7 +8,7 @@ function story_help() {
 }
 
 function story_system($field){
-  $system["description"] = t("Enables users to submit stories.  These stories are not part of their blogs.");
+  $system["description"] = t("Enables users to submit stories, articles or similar content.");
   return $system[$field];
 }
 
diff --git a/modules/system.module b/modules/system.module
index 55bdfedba..2d284e814 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -9,7 +9,7 @@ function system_help() {
 }
 
 function system_system($field){
-  $system["description"] = t("You'll need this.");
+  $system["description"] = t("Configuration system that lets site admins modify the workings of the site.");
   return $system[$field];
 }
 
diff --git a/modules/system/system.module b/modules/system/system.module
index 55bdfedba..2d284e814 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@ function system_help() {
 }
 
 function system_system($field){
-  $system["description"] = t("You'll need this.");
+  $system["description"] = t("Configuration system that lets site admins modify the workings of the site.");
   return $system[$field];
 }
 
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 695db46d2..2bc895b1a 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function taxonomy_system($field){
-  $system["description"] = t("Enables the organization of content into categories and subcategories.");
+  $system["description"] = t("Enables the organization of content into categories.");
   return $system[$field];
 }
 
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 695db46d2..2bc895b1a 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -2,7 +2,7 @@
 // $Id$
 
 function taxonomy_system($field){
-  $system["description"] = t("Enables the organization of content into categories and subcategories.");
+  $system["description"] = t("Enables the organization of content into categories.");
   return $system[$field];
 }
 
diff --git a/modules/tracker.module b/modules/tracker.module
index 5335b2e6d..e643c8db5 100644
--- a/modules/tracker.module
+++ b/modules/tracker.module
@@ -7,7 +7,7 @@ function tracker_help() {
 }
 
 function tracker_system($field){
-  $system["description"] = t("Enables tracking of recent and new comments for site readers.");
+  $system["description"] = t("Enables tracking of recent and new comments for users.");
   return $system[$field];
 }
 
diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module
index 5335b2e6d..e643c8db5 100644
--- a/modules/tracker/tracker.module
+++ b/modules/tracker/tracker.module
@@ -7,7 +7,7 @@ function tracker_help() {
 }
 
 function tracker_system($field){
-  $system["description"] = t("Enables tracking of recent and new comments for site readers.");
+  $system["description"] = t("Enables tracking of recent and new comments for users.");
   return $system[$field];
 }
 
diff --git a/modules/user.module b/modules/user.module
index fcf225514..2818952b8 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -5,7 +5,7 @@ session_set_save_handler("sess_open", "sess_close", "sess_read", "sess_write", "
 session_start();
 
 function user_system($field){
-  $system["description"] = t("Enables a user registration system.");
+  $system["description"] = t("Enables the user registration and login system.");
   return $system[$field];
 }
 
diff --git a/modules/user/user.module b/modules/user/user.module
index fcf225514..2818952b8 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -5,7 +5,7 @@ session_set_save_handler("sess_open", "sess_close", "sess_read", "sess_write", "
 session_start();
 
 function user_system($field){
-  $system["description"] = t("Enables a user registration system.");
+  $system["description"] = t("Enables the user registration and login system.");
   return $system[$field];
 }