diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | account.php | 76 | ||||
| -rw-r--r-- | discussion.php | 2 | ||||
| -rw-r--r-- | includes/theme.inc | 6 | ||||
| -rw-r--r-- | includes/widget.inc | 154 | ||||
| -rw-r--r-- | modules/about.module | 9 | ||||
| -rw-r--r-- | modules/documentation.module | 28 | ||||
| -rw-r--r-- | modules/wishlist.module | 5 | ||||
| -rw-r--r-- | scripts/cron-lynx | 2 |
9 files changed, 60 insertions, 224 deletions
diff --git a/INSTALL b/INSTALL new file mode 100644 index 000000000..399b6e7a7 --- /dev/null +++ b/INSTALL @@ -0,0 +1,2 @@ +Point your browser to http://drop.org/module.php?mod=documentation +and read the installation guidelines. diff --git a/account.php b/account.php index 552cfb814..070eb3fa7 100644 --- a/account.php +++ b/account.php @@ -29,7 +29,7 @@ function account_email() { function account_create($user = "", $error = "") { global $theme; - if ($error) $output .= "<B><FONT COLOR=\"red\">Failed to register.</FONT>$error</B>\n"; + if ($error) $output .= "<B><FONT COLOR=\"red\">Failed to create account:</FONT>$error</B>\n"; else $output .= "<P>Registering allows you to comment on stories, to moderate comments and pending stories, to customize the look and feel of the site and generally helps you interact with the site more efficiently.</P><P>To create an account, simply fill out this form an click the `Create account' button below. An e-mail will then be sent to you with instructions on how to validate your account.</P>\n"; $output .= "<FORM ACTION=\"account.php\" METHOD=\"post\">\n"; @@ -108,7 +108,7 @@ function account_user_edit() { // Display output/content: $theme->header(); - $theme->box("Edit user settings", $output); + $theme->box("Edit user information", $output); $theme->footer(); } else { @@ -191,7 +191,7 @@ function account_site_edit() { $output .= "</FORM>\n"; $theme->header(); - $theme->box("Edit site settings", $output); + $theme->box("Edit your preferences", $output); $theme->footer(); } else { @@ -242,7 +242,7 @@ function account_content_edit() { $output .= "</FORM>\n"; $theme->header(); - $theme->box("Edit content settings", $output); + $theme->box("Edit site content", $output); $theme->footer(); } else { @@ -282,35 +282,35 @@ function account_user($uname) { $theme->footer(); } elseif ($uname && $account = account_get_user($uname)) { - $box1 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; - $box1 .= " <TR><TD ALIGN=\"right\"><B>Username:</B></TD><TD>$account->userid</TD></TR>\n"; - $box1 .= " <TR><TD ALIGN=\"right\"><B>E-mail:</B></TD><TD>". format_email($account->fake_email) ."</TD></TR>\n"; - $box1 .= " <TR><TD ALIGN=\"right\"><B>URL:</B></TD><TD>". format_url($account->url) ."</TD></TR>\n"; - $box1 .= " <TR><TD ALIGN=\"right\"><B>Bio:</B></TD><TD>". format_data($account->bio) ."</TD></TR>\n"; - $box1 .= "</TABLE>\n"; + $block1 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; + $block1 .= " <TR><TD ALIGN=\"right\"><B>Username:</B></TD><TD>$account->userid</TD></TR>\n"; + $block1 .= " <TR><TD ALIGN=\"right\"><B>E-mail:</B></TD><TD>". format_email($account->fake_email) ."</TD></TR>\n"; + $block1 .= " <TR><TD ALIGN=\"right\"><B>URL:</B></TD><TD>". format_url($account->url) ."</TD></TR>\n"; + $block1 .= " <TR><TD ALIGN=\"right\"><B>Bio:</B></TD><TD>". format_data($account->bio) ."</TD></TR>\n"; + $block1 .= "</TABLE>\n"; $result = db_query("SELECT c.cid, c.pid, c.sid, c.subject, c.timestamp, s.subject AS story FROM comments c LEFT JOIN users u ON u.id = c.author LEFT JOIN stories s ON s.id = c.sid WHERE u.userid = '$uname' AND s.status = 2 AND s.timestamp > ". (time() - 1209600) ." ORDER BY cid DESC LIMIT 10"); while ($comment = db_fetch_object($result)) { - $box2 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; - $box2 .= " <TR><TD ALIGN=\"right\"><B>Comment:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD></TR>\n"; - $box2 .= " <TR><TD ALIGN=\"right\"><B>Date:</B></TD><TD>". format_date($comment->timestamp) ."</TD></TR>\n"; - $box2 .= " <TR><TD ALIGN=\"right\"><B>Story:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid\">". check_output($comment->story) ."</A></TD></TR>\n"; - $box2 .= "</TABLE>\n"; - $box2 .= "<P>\n"; + $block2 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; + $block2 .= " <TR><TD ALIGN=\"right\"><B>Comment:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD></TR>\n"; + $block2 .= " <TR><TD ALIGN=\"right\"><B>Date:</B></TD><TD>". format_date($comment->timestamp) ."</TD></TR>\n"; + $block2 .= " <TR><TD ALIGN=\"right\"><B>Story:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid\">". check_output($comment->story) ."</A></TD></TR>\n"; + $block2 .= "</TABLE>\n"; + $block2 .= "<P>\n"; $comments++; } $result = db_query("SELECT d.* FROM diaries d LEFT JOIN users u ON u.id = d.author WHERE u.userid = '$uname' AND d.timestamp > ". (time() - 1209600) ." ORDER BY id DESC LIMIT 2"); while ($diary = db_fetch_object($result)) { - $box3 .= "<DL><DT><B>". date("l, F jS", $diary->timestamp) .":</B></DT><DD><P>". check_output($diary->text) ."</P><P>[ <A HREF=\"module.php?mod=diary&op=view&name=$uname\">more</A> ]</P></DD></DL>\n"; + $block3 .= "<DL><DT><B>". date("l, F jS", $diary->timestamp) .":</B></DT><DD><P>". check_output($diary->text) ."</P><P>[ <A HREF=\"module.php?mod=diary&op=view&name=$uname\">more</A> ]</P></DD></DL>\n"; $diaries++; } // Display account information: $theme->header(); - if ($box1) $theme->box("User information for $uname", $box1); - if ($box2) $theme->box("$uname has posted ". format_plural($comments, "comment", "comments") ." recently", $box2); - if ($box3) $theme->box("$uname has posted ". format_plural($diaries, "diary entry", "diary entries") ." recently", $box3); + if ($block1) $theme->box("User information for $uname", $block1); + if ($block2) $theme->box("$uname has posted ". format_plural($comments, "comment", "comments") ." recently", $block2); + if ($block3) $theme->box("$uname has posted ". format_plural($diaries, "diary entry", "diary entries") ." recently", $block3); $theme->footer(); } else { @@ -375,12 +375,12 @@ function account_email_submit($userid, $email) { function account_create_submit($userid, $email) { global $theme, $site_name, $site_url; - $new[userid] = $userid; - $new[real_email] = $email; + $new[userid] = trim($userid); + $new[real_email] = trim($email); - if ($rval = account_validate($new)) { + if ($error = account_validate($new)) { $theme->header(); - $theme->box("Create user account", account_create($new, $rval)); + $theme->box("Create user account", account_create($new, $error)); $theme->footer(); } else { @@ -496,12 +496,12 @@ function account_track_site() { $result1 = db_query("SELECT c.cid, c.pid, c.sid, c.subject, u.userid, s.subject AS story FROM comments c LEFT JOIN users u ON u.id = c.author LEFT JOIN stories s ON s.id = c.sid WHERE s.status = 2 ORDER BY cid DESC LIMIT 10"); while ($comment = db_fetch_object($result1)) { - $box1 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; - $box1 .= " <TR><TD ALIGN=\"right\"><B>Comment:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD></TR>\n"; - $box1 .= " <TR><TD ALIGN=\"right\"><B>Author:</B></TD><TD>". format_username($comment->userid) ."</TD></TR>\n"; - $box1 .= " <TR><TD ALIGN=\"right\"><B>Story:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid\">". check_output($comment->story) ."</A></TD></TR>\n"; - $box1 .= "</TABLE>\n"; - $box1 .= "<P>\n"; + $block1 .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; + $block1 .= " <TR><TD ALIGN=\"right\"><B>Comment:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</A></TD></TR>\n"; + $block1 .= " <TR><TD ALIGN=\"right\"><B>Author:</B></TD><TD>". format_username($comment->userid) ."</TD></TR>\n"; + $block1 .= " <TR><TD ALIGN=\"right\"><B>Story:</B></TD><TD><A HREF=\"discussion.php?id=$comment->sid\">". check_output($comment->story) ."</A></TD></TR>\n"; + $block1 .= "</TABLE>\n"; + $block1 .= "<P>\n"; } $users_total = db_result(db_query("SELECT COUNT(id) FROM users")); @@ -524,16 +524,16 @@ function account_track_site() { $result = db_query("SELECT u.userid, COUNT(d.author) AS count FROM diaries d LEFT JOIN users u ON d.author = u.id GROUP BY d.author ORDER BY count DESC LIMIT 10"); while ($poster = db_fetch_object($result)) $diaries_posters .= format_username($poster->userid) .", "; - $box2 .= "<TABLE BORDER=\"0\" CELLPADDING=\"2\" CELLSPACING=\"1\">\n"; - $box2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Users:</B></TD><TD>$users_total users</TD></TR>\n"; - $box2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Stories:</B></TD><TD>$stories_posted posted, $stories_queued queued, $stories_dumped dumped<BR><I>[most frequent posters: $stories_posters ...]</I></TD></TR>\n"; - $box2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Comments:</B></TD><TD>$comments_total comments with an average score of $comments_score<BR><I>[most frequent posters: $comments_posters ...]</I></TD></TR>\n"; - $box2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Diaries:</B></TD><TD>$diaries_total diary entries<BR><I>[most frequent posters: $diaries_posters ...]</I></TD></TR>\n"; - $box2 .= "</TABLE>\n"; + $block2 .= "<TABLE BORDER=\"0\" CELLPADDING=\"2\" CELLSPACING=\"1\">\n"; + $block2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Users:</B></TD><TD>$users_total users</TD></TR>\n"; + $block2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Stories:</B></TD><TD>$stories_posted posted, $stories_queued queued, $stories_dumped dumped<BR><I>[most frequent posters: $stories_posters ...]</I></TD></TR>\n"; + $block2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Comments:</B></TD><TD>$comments_total comments with an average score of $comments_score<BR><I>[most frequent posters: $comments_posters ...]</I></TD></TR>\n"; + $block2 .= " <TR><TD ALIGN=\"right\" VALIGN=\"top\"><B>Diaries:</B></TD><TD>$diaries_total diary entries<BR><I>[most frequent posters: $diaries_posters ...]</I></TD></TR>\n"; + $block2 .= "</TABLE>\n"; $theme->header(); - $theme->box("Recent comments", $box1); - $theme->box("Site statistics", $box2); + $theme->box("Recent comments", $block1); + $theme->box("Site statistics", $block2); $theme->footer(); } diff --git a/discussion.php b/discussion.php index d77130594..bd795a6f7 100644 --- a/discussion.php +++ b/discussion.php @@ -49,7 +49,7 @@ function discussion_kids($cid, $mode, $threshold, $level = 0, $dummy = 0) { if ($level && $comments) print "</UL>"; } -function discussion_childs($cid, $threshold, $level = 0, $thread) { +function discussion_childs($cid, $threshold, $level = 0, $thread = "") { global $theme, $user; // Perform SQL query: diff --git a/includes/theme.inc b/includes/theme.inc index 75413bdfa..8ce804be0 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -18,9 +18,9 @@ function theme_account($theme) { $content .= "<LI><A HREF=\"submission.php\">submission queue</A> (<FONT COLOR=\"red\">". submission_number() ."</FONT>)</LI>\n"; $content .= "<P>\n"; $content .= "<LI><A HREF=\"account.php?op=edit&topic=diary\">edit your diary</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=edit&topic=user\">edit user settings</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=edit&topic=site\">edit site settings</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=edit&topic=content\">edit content settings</A></LI>\n"; + $content .= "<LI><A HREF=\"account.php?op=edit&topic=user\">edit your information</A></LI>\n"; + $content .= "<LI><A HREF=\"account.php?op=edit&topic=site\">edit your preferences</A></LI>\n"; + $content .= "<LI><A HREF=\"account.php?op=edit&topic=content\">edit site content</A></LI>\n"; $content .= "<P>\n"; $content .= "<LI><A HREF=\"account.php?op=view&topic=diary\">view your diary</A></LI>\n"; $content .= "<LI><A HREF=\"account.php?op=view&topic=info\">view user settings</A></LI>\n"; diff --git a/includes/widget.inc b/includes/widget.inc deleted file mode 100644 index a42b11e54..000000000 --- a/includes/widget.inc +++ /dev/null @@ -1,154 +0,0 @@ -<? - -function display_account($theme) { - global $user, $site_name; - - if ($user->id) { - - function submission_number() { - $result = db_query("SELECT COUNT(id) FROM stories WHERE status = 1"); - return ($result) ? db_result($result, 0) : 0; - } - - // Display account settings: - $content .= "<LI><A HREF=\"account.php?op=track&topic=comments\">track your comments</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=track&topic=stories\">track your stories</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=track&topic=site\">track $site_name</A></LI>\n"; - $content .= "<P>\n"; - $content .= "<LI><A HREF=\"submission.php\">submission queue</A> (<FONT COLOR=\"red\">". submission_number() ."</FONT>)</LI>\n"; - $content .= "<P>\n"; - $content .= "<LI><A HREF=\"account.php?op=edit&topic=diary\">edit your diary</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=edit&topic=user\">edit your information</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=edit&topic=site\">edit your settings</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=edit&topic=block\">edit your blocks</A></LI>\n"; - $content .= "<P>\n"; - $content .= "<LI><A HREF=\"account.php?op=view&topic=diary\">view your diary</A></LI>\n"; - $content .= "<LI><A HREF=\"account.php?op=view&topic=info\">view your information</A></LI>\n"; - $content .= "<P>\n"; - $content .= "<LI><A HREF=\"account.php?op=logout\">logout</A></LI>\n"; - - $theme->box("$user->userid's configuration", "$content"); - } - else { - $output .= "<CENTER>\n"; - $output .= " <FORM ACTION=\"account.php?op=Login\" METHOD=\"post\">\n"; - $output .= " <P><B>Username:</B><BR><INPUT NAME=\"userid\" SIZE=\"15\"></P>\n"; - $output .= " <P><B>Password:</B><BR><INPUT NAME=\"passwd\" SIZE=\"15\" TYPE=\"password\"></P>\n"; - $output .= " <P><INPUT NAME=\"op\" TYPE=\"submit\" VALUE=\"Login\"></P>\n"; - $output .= " <P><A HREF=\"account.php\">REGISTER</A></P>\n"; - $output .= " </FORM>\n"; - $output .= "</CENTER>\n"; - - $theme->box("Login", $output); - } -} - - -function display_main_blocks($theme) { - global $PHP_SELF, $user, $id; - - switch (strtok($PHP_SELF, ".")) { - case "/discussion": - if ($user->id) $story = db_fetch_object(db_query("SELECT * FROM stories WHERE id = '$id'")); - if ($story->status == 1) display_moderation_results($theme, $story); - else display_new_headlines($theme); - break; - default: - display_account($theme); - } -} - -function display_user_blocks($theme) { - global $repository, $user; - if ($user->id) { - $result = db_query("SELECT * FROM layout l LEFT JOIN blocks b ON l.block = b.name WHERE l.user = '$user->id' AND l.weight > 0 AND b.status = '1' ORDER BY weight DESC"); - while ($block = db_fetch_object($result)) { - $blocks = module_execute($block->module, "block"); - $theme->box($blocks[$block->offset]["subject"], $blocks[$block->offset]["content"]); - } - } -} - -function display_morelink($theme, $story) { - return ($story->article) ? "[ <A HREF=\"discussion.php?id=$story->id\"><FONT COLOR=\"$theme->hlcolor2\"><B>read more</B></FONT></A> | ". strlen($story->article) ." bytes | <A HREF=\"discussion.php?id=$story->id\"><FONT COLOR=\"$theme->hlcolor2\">". format_plural($story->comments, "comment", "comments") ."</FONT></A> ]" : "[ <A HREF=\"discussion.php?id=$story->id\"><FONT COLOR=\"$theme->hlcolor2\">". format_plural($story->comments, "comment", "comments") ."</FONT></A> ]"; -} - -function display_moderation_results($theme, $story) { - global $user; - - if ($user->id && $story->id && $vote = user_getHistory($user->history, "s$story->id")) { - $output .= "<P><B>You voted `$vote'.</B></P>\n"; - $output .= "<P>\n"; - $output .= "<B>Other people voted:</B><BR>\n"; - - $result = db_query("SELECT * FROM users WHERE id != $user->id AND history LIKE '%s$story->id%'"); - while ($account = db_fetch_object($result)) { - $output .= "". format_username($account->userid) ." voted `". user_getHistory($account->history, "s$story->id") ."'.<BR>"; - } - - $theme->box("Moderation results", $output); - } -} - -function display_related_links($theme, $story) { - // Parse story for <A HREF="">-tags: - $text = stripslashes("$story->abstract $story->updates $story->article"); - while ($text = stristr($text, "<A HREF=")) { - $link = substr($text, 0, strpos(strtolower($text), "</a>") + 4); - $text = stristr($text, "</A>"); - if (!stristr($link, "mailto:")) $content .= "<LI>$link</LI>"; - } - - // Stories in the same category: - $content .= " <LI>More about <A HREF=\"search.php?category=". urlencode($story->category) ."\">$story->category</A>.</LI>"; - - // Stories from the same author: - if ($story->userid) $content .= " <LI>Also by <A HREF=\"search.php?author=". urlencode($story->userid) ."\">$story->userid</A>.</LI>"; - - $theme->box("Related links", $content); -} - -function display_old_headlines($theme, $num = 10) { - global $user; - - if ($user->stories) $result = db_query("SELECT id, subject, timestamp FROM stories WHERE status = 2 ORDER BY timestamp DESC LIMIT $user->stories, $num"); - else $result = db_query("SELECT id, subject, timestamp FROM stories WHERE status = 2 ORDER BY timestamp DESC LIMIT $num, $num"); - - while ($story = db_fetch_object($result)) { - if ($time != date("F jS", $story->timestamp)) { - $content .= "<P><B>". date("l, M jS", $story->timestamp) ."</B></P>\n"; - $time = date("F jS", $story->timestamp); - } - $content .= "<LI><A HREF=\"discussion.php?id=$story->id\">$story->subject</A></LI>\n"; - } - $content .= "<P ALIGN=\"right\">[ <A HREF=\"search.php\"><FONT COLOR=\"$theme->hlcolor2\">more</FONT></A> ]</P>"; - - $theme->box("Older headlines", $content); -} - -function display_comment_moderation($id, $author, $score, $votes) { - global $user, $comment_votes; - - if ($user->id && $user->userid != $author && !user_getHistory($user->history, "c$id")) { - $output .= "<SELECT NAME=\"moderate[$id]\">\n"; - foreach ($comment_votes as $key=>$value) $output .= " <OPTION VALUE=\"$value\">$key</OPTION>\n"; - $output .= "</SELECT>\n"; - } - else { - $output .= "<TABLE BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"0\"><TR><TD>score:</TD><TD>". format_data($score) ."</TD></TR><TR><TD>votes:</TD><TD>". format_data($votes) ."</TR></TABLE>"; - } - - return $output; -} - -function display_new_headlines($theme, $num = 10) { - global $user; - - $content = ""; - $result = db_query("SELECT id, subject FROM stories WHERE status = 2 ORDER BY id DESC LIMIT $num"); - while ($story = db_fetch_object($result)) $content .= "<LI><A HREF=\"discussion.php?id=$story->id\">$story->subject</A></LI>\n"; - $content .= "<P ALIGN=\"right\">[ <A HREF=\"search.php\"><FONT COLOR=\"$theme->hlcolor2\">more</FONT></A> ]</P>"; - $theme->box("Latest headlines", $content); -} - -?> diff --git a/modules/about.module b/modules/about.module deleted file mode 100644 index 3b3694866..000000000 --- a/modules/about.module +++ /dev/null @@ -1,9 +0,0 @@ -<? - -$module = array("admin" => "about_admin"); - -function about_admin() { - print "under construction"; -} - -?>
\ No newline at end of file diff --git a/modules/documentation.module b/modules/documentation.module index 27c3b4bc6..23ec99202 100644 --- a/modules/documentation.module +++ b/modules/documentation.module @@ -15,8 +15,8 @@ function documentation() { <H1>Chapter 1: introduction</H1> - <P>Drupal (is the English pronounciation for the dutch word 'druppel' which stands for 'drop') is a full-featured content management/discussion engine suitable to setup a news-driven community or portal site. Drupal aims towards easy installation, exessive configuration and fine-grained maintainance capabilities. Due to its modular design layer is flexibel and easy to adapt.</P> - <P>Drupal is 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>).</P> + <P>Drupal is the English pronounciation 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 maintainance capabilities. Due to its modular design drupal is flexibel and easy to adapt or extend.</P> + <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>).</P> <H1>Chapter 2: installation</H1> @@ -28,27 +28,27 @@ function documentation() { <H2>Installation process</H2> - <P><B>1.</B> We assume that you have some working experience with Apache, MySQL and PHP. If you still need to install Apache, MySQL or PHP, please install them now. The installation of these required packages is beyond the scope of this document but make sure your Apache is setup to allow <CODE>.htaccess</CODE> files so that drupal can override Apache options from within the drupal directories.</P> - <P><B>2.</B> Unzip the distribution tarball into the directory you want to serve web files from:</P> + <P>1. We assume that you have some working experience with Apache, MySQL and PHP. If you still need to install Apache, MySQL or PHP, please install them now. The installation of these required packages is beyond the scope of this document but make sure your Apache is setup to allow <CODE>.htaccess</CODE> files so that drupal can override Apache options from within the drupal directories.</P> + <P>2. Unzip the distribution tarball into the directory you want to serve web files from:</P> <BLOCKQUOTE>$ tar -zxvf drupal-x.x.x.tar.gz</BLOCKQUOTE> - <P><B>3.</B> Create a MySQL database for your drupal site (if not already done so):</P> + <P>3. Create a MySQL database for your drupal site (if not already done so):</P> <BLOCKQUOTE>$ mysqladmin create <database></BLOCKQUOTE> - <P>Make sure to check the MySQL documentation on how to setup the right access rights and permissions in your MySQL grant table.</P> - <P><B>4.</B> Once you have a proper database, dump the required tables into your database:</P> + <P>Make sure to check the MySQL documentation on how to setup the correct access rights and permissions in your MySQL grant tables.</P> + <P>4. Once you have a proper database, dump the required tables into your database:</P> <BLOCKQUOTE>$ mysql -h <hostname> -u <username> -p<password> <database> < database/database.mysql </BLOCKQUOTE> - <P><B>5.</B> Copy the file <CODE>includes/hostname.conf</CODE> to match your server's hostname:</P> + <P>5. Copy the file <CODE>includes/hostname.conf</CODE> to match your server's hostname:</P> <BLOCKQUOTE>$ cp includes/hostname.conf includes/www.yourdomain.com.conf</BLOCKQUOTE> - <P><B>6.</B> Edit your configuration file to set the required settings such as the database options and to customize your site to your likings.</P> - <P><B>7.</B> Launch your browser and point it to http://yourdomain.com/, create an account, log in and head on to http://yourdomain.com/admin.php. The first user will automatically have administrator permissions. Play with it for a bit and spend some time getting used to the administration interfaces.</P> - <P><B>8. (optional)</B> Optionally (yet recommended for smooth operation) setup a crontab to periodically visit http://yourdomain.com/cron.php.</P> + <P>6. Edit your configuration file to set the required settings such as the database options and to customize your site to your likings.</P> + <P>7. Launch your browser and point it to http://yourdomain.com/, create an account, log in and head on to http://yourdomain.com/admin.php. The first user will automatically have administrator permissions. Play with it for a bit and spend some time getting used to the administration interfaces.</P> + <P>8. (optional) Optionally (yet recommended for smooth operation) setup a crontab to periodically visit http://yourdomain.com/cron.php.</P> <P>Use a browser like lynx or wget but make sure the process terminates: either use /usr/bin/lynx -source http://yourdomain.com/cron.php or /usr/bin/wget -O /dev/null http://yourdomain.com/cron.php. Take a look at the example scripts in the <CODE>scripts</CODE>-directory and make sure to adjust them to your needs.</P> <P>A good crontab-line to run the cron-script once every hour would be:</P> <PRE> 00 * * * * /home/www/drupal/scripts/cron-lynx </PRE> - <P><B>9. (optional)</B> Create your site's theme or at least customize the existing themes. To get started, head on to the <CODE>themes</CODE>-directory and make a custom logo for each theme. - <P><B>10. (optional)</B> Add and remove modules to customize the functionality of your site. Adding and removing modules is plain easy. You can add a module by copying the files into the <CODE>modules</CODE>-directory and you can remove a module by removing a module's file from the <CODE>modules</CODE>-directory. The drupal engine will then automatically include or exclude this module. If for some reason, this seems to fail, "manually" rehash the modules list from http://yourdomain.com/admin.php?mod=module.</P> - <P><B>11.</B> If you get is to run, let us know at <A HREF="mailto:info@drop.org">info@drop.org</A> so we can add your site to our list of drupal sites. If you can't get it to run, you can find support at the drupal site or you can contact us by e-mail at <A HREF="mailto:info@drop.org">info@drop.org</A>.</P> + <P>9. (optional) Create your site's theme or at least customize the existing themes. To get started, head on to the <CODE>themes</CODE>-directory and make a custom logo for each theme. + <P>10. (optional) Add and remove modules to customize the functionality of your site. Adding and removing modules is plain easy. You can add a module by copying the files into the <CODE>modules</CODE>-directory and you can remove a module by removing a module's file from the <CODE>modules</CODE>-directory. The drupal engine will then automatically include or exclude this module. If for some reason, this seems to fail, "manually" rehash the modules list from http://yourdomain.com/admin.php?mod=module.</P> + <P>11. If you get is to run, let us know at <A HREF="mailto:info@drop.org">info@drop.org</A> so we can add your site to our list of drupal sites. If you can't get it to run, you can find support at the drupal site or you can contact us by e-mail at <A HREF="mailto:info@drop.org">info@drop.org</A>.</P> <H2>More than one (sub)domain on one machine</H2> diff --git a/modules/wishlist.module b/modules/wishlist.module index c17195caa..962a1d937 100644 --- a/modules/wishlist.module +++ b/modules/wishlist.module @@ -20,7 +20,6 @@ function wishlist_page() { <H3>Adminstration</H3> <UL> - <LI>enhance user administration</LI> <LI>auto. backup functionality</LI> <LI>auto. clean-up functionality (e.g. user's history field)</LI> </UL> @@ -58,10 +57,8 @@ function wishlist_page() { <H3>Public release</H3> <UL> - <LI>write minimum amount of documentation like installation guidelines, administrator guide, and so on</LI> - <LI>make (or find and install) a "task manager / todo list / progress meter / bug report"-tool so we can get ourselves and the project somewhat organized</LI> + <LI>make (or find and install) a "task manager / todo list / progress meter / bug report"-tool so we can get ourselves and the project somewhat organized. Ideally we would have a "project module".</LI> <LI>setup a developers mailing list</LI> - <LI>integration and testing with latest version of PHP (just to avoid bug reports that could have been easily avoided)</LI> <LI>code revision to close possible security holes</LI> </UL> diff --git a/scripts/cron-lynx b/scripts/cron-lynx index c17666d59..84e9e8fbb 100644 --- a/scripts/cron-lynx +++ b/scripts/cron-lynx @@ -1,2 +1,2 @@ #!/bin/sh -/usr/bin/lynx -source http://drop.org/cron.php > /dev/null 2>&1 +/usr/bin/lynx -source http://yoursite.com/cron.php > /dev/null 2>&1 |