- updated drupal page

2 files changed, 14 insertions, 100 deletions

diff --git a/modules/drupal.module b/modules/drupal.module
index b4687a899..040b432c2 100644
--- a/modules/drupal.module
+++ b/modules/drupal.module
@@ -2,12 +2,11 @@
 
 $module = array("page" => "drupal_page");
 
-include_once "includes/common.inc";
-include_once "includes/comment.inc";
-
-function drupal_render($id, $cid) {
+function drupal_page() {
   global $theme, $user;
 
+  $theme->header();
+
   $output  = " <P>Drupal is the English pronunciation for the Dutch word 'druppel' which stands for 'drop'.  Drupal is a full-featured content management/discussion engine suitable to setup a news-driven community or portal site.  Drupal aims towards easy installation, excessive configuration and fine-grained maintenance capabilities.  Due to its modular design drupal is flexible and easy to adapt or extend.</P>\n";
   $output .= " <P>Drupal is primarily written by Dries Buytaert (dries_at_drop.org) and build after Slash (<A HREF=\"http://slashcode.com/\">http://slashcode.com/</A>) and Scoop (<A HREF=\"http://scoop.kuro5hin.org/\">http://scoop.kuro5hin.org/</A>).  The source code is available under terms of GNU General Public License (GPL).</P>\n";
   $output .= " <P>We don't have a real demo site yet but drupal is used by (and created for) <A HREF=\"http://drop.org/\">http://drop.org/</A>.  Create an account, play with it for a bit, read the <A HREF=\"module.php?mod=documentation\">documentation</A> and spend some time getting used to it.</P>\n";
@@ -25,58 +24,16 @@ function drupal_render($id, $cid) {
   closedir($handle);
   $theme->box("Screenshots", $output);
 
-  $output  = "<H2>Documentation</H2>\n";
+  $output  = "<H3>Documentation</H3>\n";
   $output .= " <LI><A HREF=\"module.php?mod=documentation\">documentation</A></LI>\n";
   $output .= " <LI><A HREF=\"module.php?mod=wishlist\">wishlist</A></LI>\n";
-  $output .= "<H2>Mailing list</H2>\n";
+  $output .= "<H3>Mailing list</H3>\n";
   $output .= " <P>The <CODE>drupal-support@drop.org</CODE> list discusses drupal development. All submissions relevant to that, such as bug reports, enhancement ideas, patches or reports that a patch fixed a bug are appropriate.</P>\n";
   $output .= " <LI>To subscribe to the <CODE>drupal-support@drop.org</CODE> mailing list, send an e-mail to <A HREF=\"mailto:drupal-support-request@drop.org\">drupal-support-request@drop.org</A> with no subject and put <B>subscribe</B> in the body of your message.</LI>\n";
   $output .= " <LI>To unsubscribe from the <CODE>drupal-support@drop.org</CODE> mailing list, send an e-mail to <A HREF=\"mailto:drupal-support-request@drop.org\">drupal-support-request@drop.org</A> and put <B>unsubscribe</B> in the body of your mail.\n";
   $theme->box("Support and development", $output);
-
-  print "<H3>Comments</H3>\n";
-
-  // Display comments:
-  comment_render($id, $cid);
-}
-
-function drupal_page() {
-  global $cid, $comment, $id, $op, $pid, $lid, $link, $mode, $order, $subject, $theme, $threshold;
-
-  switch($op) {
-    case t("Preview comment"):
-      $theme->header();
-      comment_preview($pid, $id, $subject, $comment);
-      $theme->footer();
-      break;
-    case t("Post comment"):
-      comment_post($pid, $id, $subject, $comment);
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-      break;
-    case "reply":
-      $theme->header();
-      comment_reply($pid, $id);
-      $theme->footer();
-      break;
-    case t("Update settings"):
-      comment_settings($mode, $order, $threshold);
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-      break;
-    case t("Moderate comments"):
-      comment_moderate($moderate);
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-      break;
-    default:
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-  }
+ 
+  $theme->footer();
 }
 
 ?>
\ No newline at end of file
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index b4687a899..040b432c2 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -2,12 +2,11 @@
 
 $module = array("page" => "drupal_page");
 
-include_once "includes/common.inc";
-include_once "includes/comment.inc";
-
-function drupal_render($id, $cid) {
+function drupal_page() {
   global $theme, $user;
 
+  $theme->header();
+
   $output  = " <P>Drupal is the English pronunciation for the Dutch word 'druppel' which stands for 'drop'.  Drupal is a full-featured content management/discussion engine suitable to setup a news-driven community or portal site.  Drupal aims towards easy installation, excessive configuration and fine-grained maintenance capabilities.  Due to its modular design drupal is flexible and easy to adapt or extend.</P>\n";
   $output .= " <P>Drupal is primarily written by Dries Buytaert (dries_at_drop.org) and build after Slash (<A HREF=\"http://slashcode.com/\">http://slashcode.com/</A>) and Scoop (<A HREF=\"http://scoop.kuro5hin.org/\">http://scoop.kuro5hin.org/</A>).  The source code is available under terms of GNU General Public License (GPL).</P>\n";
   $output .= " <P>We don't have a real demo site yet but drupal is used by (and created for) <A HREF=\"http://drop.org/\">http://drop.org/</A>.  Create an account, play with it for a bit, read the <A HREF=\"module.php?mod=documentation\">documentation</A> and spend some time getting used to it.</P>\n";
@@ -25,58 +24,16 @@ function drupal_render($id, $cid) {
   closedir($handle);
   $theme->box("Screenshots", $output);
 
-  $output  = "<H2>Documentation</H2>\n";
+  $output  = "<H3>Documentation</H3>\n";
   $output .= " <LI><A HREF=\"module.php?mod=documentation\">documentation</A></LI>\n";
   $output .= " <LI><A HREF=\"module.php?mod=wishlist\">wishlist</A></LI>\n";
-  $output .= "<H2>Mailing list</H2>\n";
+  $output .= "<H3>Mailing list</H3>\n";
   $output .= " <P>The <CODE>drupal-support@drop.org</CODE> list discusses drupal development. All submissions relevant to that, such as bug reports, enhancement ideas, patches or reports that a patch fixed a bug are appropriate.</P>\n";
   $output .= " <LI>To subscribe to the <CODE>drupal-support@drop.org</CODE> mailing list, send an e-mail to <A HREF=\"mailto:drupal-support-request@drop.org\">drupal-support-request@drop.org</A> with no subject and put <B>subscribe</B> in the body of your message.</LI>\n";
   $output .= " <LI>To unsubscribe from the <CODE>drupal-support@drop.org</CODE> mailing list, send an e-mail to <A HREF=\"mailto:drupal-support-request@drop.org\">drupal-support-request@drop.org</A> and put <B>unsubscribe</B> in the body of your mail.\n";
   $theme->box("Support and development", $output);
-
-  print "<H3>Comments</H3>\n";
-
-  // Display comments:
-  comment_render($id, $cid);
-}
-
-function drupal_page() {
-  global $cid, $comment, $id, $op, $pid, $lid, $link, $mode, $order, $subject, $theme, $threshold;
-
-  switch($op) {
-    case t("Preview comment"):
-      $theme->header();
-      comment_preview($pid, $id, $subject, $comment);
-      $theme->footer();
-      break;
-    case t("Post comment"):
-      comment_post($pid, $id, $subject, $comment);
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-      break;
-    case "reply":
-      $theme->header();
-      comment_reply($pid, $id);
-      $theme->footer();
-      break;
-    case t("Update settings"):
-      comment_settings($mode, $order, $threshold);
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-      break;
-    case t("Moderate comments"):
-      comment_moderate($moderate);
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-      break;
-    default:
-      $theme->header();
-      drupal_render($id, $cid);
-      $theme->footer();
-  }
+ 
+  $theme->footer();
 }
 
 ?>
\ No newline at end of file