- the diary module is truly modular now

- the faq has been spell checked

2 files changed, 18 insertions, 10 deletions

diff --git a/modules/diary.module b/modules/diary.module
index 6a9f902e5..27a74dea4 100644
--- a/modules/diary.module
+++ b/modules/diary.module
@@ -4,6 +4,7 @@ $module = array("page"  => "diary_page",
                 "block" => "diary_block",
                 "help" => "diary_help",
                 "user" => "diary_user",
+                "menu" => "diary_menu",
                 "admin" => "diary_admin",
                 "export" => "diary_export");
 
@@ -54,6 +55,8 @@ function diary_page_entry($timestamp, $text, $id = 0) {
 function diary_page_display($username) {
   global $theme, $user;
 
+  $username = empty($username) ? $user->userid : $username;
+ 
   $result = db_query("SELECT d.*, u.userid FROM diaries d LEFT JOIN users u ON d.author = u.id WHERE u.userid = '$username' ORDER BY timestamp DESC");
 
   if ($username == $user->userid) {
@@ -215,8 +218,13 @@ function diary_user($username, $section, $operation) {
   }
 }
 
+function diary_menu() {
+  global $user;
+  return array("edit your diary" => "module.php?mod=diary&op=edit", "view your diary" => "module.php?mod=diary&op=view");
+}
+
 function diary_block() {
-  $result = db_query("SELECT u.userid, d.timestamp FROM diaries d LEFT JOIN users u ON d.author = u.id ORDER BY timestamp DESC LIMIT 20");
+  $result = db_query("SELECT u.userid, d.timestamp FROM diaries d LEFT JOIN users u ON d.author = u.id ORDER BY timestamp DESC LIMIT 10");
 
   while ($diary = db_fetch_object($result)) {
     if ($time != date("F jS", $diary->timestamp)) {
@@ -327,4 +335,4 @@ function diary_export($uri) {
   }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/modules/faq.module b/modules/faq.module
index 7c2fbaa9e..9ca4cfa13 100644
--- a/modules/faq.module
+++ b/modules/faq.module
@@ -27,8 +27,8 @@ function faq_page() {
    <DT><B>Isn't $site_name similar to slashdot.org and kuro5hin.org?</B></DT>
    <DD>To some extend, yes.  Credit where credit is due: we borrowed many ideas (like the interface and moderation) from <A HREF=\"http://slashdot.org/\">slashdot.org</A> and <A HREF=\"http://kuro5hin.org/\">kuro5hin.org</A> because they have many good ideas about discussion forums.  We do not use their code or any permutation thereof as $site_name has been written entirely from scratch.  Our goal was to create a similar base initially, and to go from there and to transform $site_name into something different by adding new and unique features.<P></DD>
 
-   <DT><B><A NAME=\"moderation\">Why moderatiom, trust metrics and collaborative filtering?</A></B></DT>
-   <DD>To help individuals and communities address the challenges of information overload.<P>As each new piece of information competes for attention, people quickly tend to become overwhelmed and seek assistance in identifying the most interesting, worthwhile, valuable or enteraining items.  Not to mention the fact, reader-contributed content and other levels of interactivity tend to become chaotic, bloated and disreputable.<P>Therefor, we decided to develop a public system powered by a community that aims to bring quality content to everyone's attention and to filter out all junk: to <I>sort the wheat from the chaff</I>.  The output should be something clean and homogenized featuring quality content, and should slide down the gullet far more easily.  Another objective is to provide a customized service according to public and individual preferences, whether expressed or inferred.<P>Yes, you are right: it all sounds a bit idealistic, not to mention hypothetical.  However, don't get this wrong: this isn't a new concept, various such systems exist nowadays (like <A HREF=\"http://slashdot.org/\">slashdot.org</A> or <A HREF=\"http://www.kuro5hin.org/\">kuro5hin.org</A>).  We just happen to want our own system.<P>Last but not least we, the $site_name team, don't want the responsibility to manually review each post and to select the ones worthy.  Systematic editing by individual editors is nice and dandy if they get paid for it or if you they some time to kill.  After all, we are not writers, critics nor reviewers for that matter; we are programmers, designers and technicians.<P></DD>
+   <DT><B><A NAME=\"moderation\">Why moderation, trust metrics and collaborative filtering?</A></B></DT>
+   <DD>To help individuals and communities address the challenges of information overload.<P>As each new piece of information competes for attention, people quickly tend to become overwhelmed and seek assistance in identifying the most interesting, worthwhile, valuable or entertaining items.  Not to mention the fact, reader-contributed content and other levels of interactivity tend to become chaotic, bloated and disreputable.<P>Therefor, we decided to develop a public system powered by a community that aims to bring quality content to everyone's attention and to filter out all junk: to <I>sort the wheat from the chaff</I>.  The output should be something clean and homogenized featuring quality content, and should slide down the gullet far more easily.  Another objective is to provide a customized service according to public and individual preferences, whether expressed or inferred.<P>Yes, you are right: it all sounds a bit idealistic, not to mention hypothetical.  However, don't get this wrong: this isn't a new concept, various such systems exist nowadays (like <A HREF=\"http://slashdot.org/\">slashdot.org</A> or <A HREF=\"http://www.kuro5hin.org/\">kuro5hin.org</A>).  We just happen to want our own system.<P>Last but not least we, the $site_name team, don't want the responsibility to manually review each post and to select the ones worthy.  Systematic editing by individual editors is nice and dandy if they get paid for it or if you they some time to kill.  After all, we are not writers, critics nor reviewers for that matter; we are programmers, designers and technicians.<P></DD>
     
    <DT><B>How does submission moderation work?</B></DT>
    <DD>Anyone who drops in and has some news or some thoughts they'd like to share, can submit new content for consideration.  After someone has submitted something, their story is added to a queue.  All registered users can access this list of pending stories, that is, stories that have been submitted, but do not yet appear on the public front page. Those registered users can vote whether they think the story should be posted or not. When enough people vote to post a story, the story is pushed over the threshold and up it goes on the public page. On the other hand, when too many people voted to drop a story, the story will get trashed.<P></DD>
@@ -37,7 +37,7 @@ function faq_page() {
    <DD>If you create an account and log in, you will be able to moderate comments.  This lets you assign a score to a comment on how good you think the comment was or how visible you think it should be.  When more than one person rates a comment, the overall rating is just a simple average of all ratings.  Comments with a high ratings are more visible than comments with a lower rating.  That way, comments that gain the approval of participants will gradually move up through statistical effects, while pointless comments will sink into oblivion.<P>Hence, the purpose of comment moderation is two-fold: <UL><LI>To bring the really good comments to everyone's attention.</LI><LI>To hide or get get rid of spam, flamebait and trolls.</LI></UL>In the latter, comment moderation provides a technical solution to a social problem.<P></DD>
 
    <DT><B>Why would I want to create a user account?</B></DT>
-   <DD>No $site_name participant can use his own name or handle to post comments until they sign up and submit their e-mail address.  Those who don't may participate as `$anonymous', but they will suffer numerous disadvantages, for example their posts beginning at a lower score.<P>In contrast, those with a user account can use their own name or handle and are granted various priveleges: the most important is probably the ability to moderate new submissions and to rate comments.  Also, registered users can tune the site to their personal needs.  For instance: they can select one of the available themes to alter the look-and-feel of the site or they can fine-tune the values of various settings to their likings.<P></DD>
+   <DD>No $site_name participant can use his own name or handle to post comments until they sign up and submit their e-mail address.  Those who don't may participate as `$anonymous', but they will suffer numerous disadvantages, for example their posts beginning at a lower score.<P>In contrast, those with a user account can use their own name or handle and are granted various privileges: the most important is probably the ability to moderate new submissions and to rate comments.  Also, registered users can tune the site to their personal needs.  For instance: they can select one of the available themes to alter the look-and-feel of the site or they can fine-tune the values of various settings to their likings.<P></DD>
 
    <DT><B>I forgot my password, what do I do?</B></DT>
    <DD>You should be able to get it from the <A HREF=\"account.php\">account page</A>.  Just type in your username, hit the 'E-mail password' button and your password will be whisked off to your e-mail address.  If, however, this doesn't seem to be working, contact us at <A HREF=\"mailto:$site_email\">$site_email</A>.<P></DD>
@@ -46,7 +46,7 @@ function faq_page() {
    <DD>Check out the <A HREF=\"submit.php\">submission form</A>.  If you fill out that form, your contribution gets shipped off to the submission queue for evaluation, <A HREF=\"#moderation\">moderation</A>, and possibly even posting.<P></DD>
 
    <DT><B>How reliable are the stories and comments?</B></DT>
-   <DD>There is one big problem with user-contributed news and comments: `reliability and quality'.<P>The stories are not likely to suffer from this problem as they tend to provide links to other sites that are reputable and have dependable information that can be trusted.  The problem with reliability is probably in the comments people post.  Sometimes they are helpful, accurate, and even amusing, but other times they are not.  Comments stand out as a good idea and can really make a story considerably better, but we have to face the facts.  Not all comments add value to a discussion: some are redundant, off-topic or even completly fake.<P>We try to address this problem by experimenting with trust metrics, moderation and collaborative filtering.  Thus, we aim towards a high quality of content and content posters by using and experimenting with several such techniques and systems.<P></DD>
+   <DD>There is one big problem with user-contributed news and comments: `reliability and quality'.<P>The stories are not likely to suffer from this problem as they tend to provide links to other sites that are reputable and have dependable information that can be trusted.  The problem with reliability is probably in the comments people post.  Sometimes they are helpful, accurate, and even amusing, but other times they are not.  Comments stand out as a good idea and can really make a story considerably better, but we have to face the facts.  Not all comments add value to a discussion: some are redundant, off-topic or even completely fake.<P>We try to address this problem by experimenting with trust metrics, moderation and collaborative filtering.  Thus, we aim towards a high quality of content and content posters by using and experimenting with several such techniques and systems.<P></DD>
 
    <DT><B>Why was my comment deleted?</B></DT>
    <DD>It probably wasn't.  It probably just got moderated down by our army of moderators. Try browsing at a lower threshold and see if your comment becomes visible.<P></DD>
@@ -59,9 +59,9 @@ function faq_page() {
 
    <DT><B>What features does the engine have?</B></DT>
    <DD>
-    <LI>A theme system: the entire website is fully themable in terms of colors, layout, look-and-feel and markup.</LI>
+    <LI>A theme system: the entire website is fully themable in terms of colors, layout, look-and-feel and mark-up.</LI>
     <LI>A user account system with session management, secure authentication, human-readable password generator, user and page preferences, comment tracker and so on.</LI>
-    <LI>A discussion system: supports different display modes (<I>threaded</I>, <I>flat</I>, <I>netsted</I>), order modes (<I>newest first</I>, <I>oldest first</I>, <I>highest scorings first</I>), comment moderation, customable HTML-support, etc.</LI>
+    <LI>A discussion system: supports different display modes (<I>threaded</I>, <I>flat</I>, <I>nested</I>), order modes (<I>newest first</I>, <I>oldest first</I>, <I>highest scorings first</I>), comment moderation, customable HTML-support, etc.</LI>
     <LI>An open submission queue and submission moderation.</LI>
     <LI>An embedded diary system.</LI>
     <LI>Anonymous reader/poster support across the entire site in case visitors prefers to remain anonymous or in case cookies are disabled.</LI>
@@ -72,12 +72,12 @@ function faq_page() {
    </DD>
 
    <DT><B>What is your disclaimer?</B></DT>
-   <DD>All messages made available (including any discussion goups and bulletin boards) and any opinions, advice, statements or other information contained in any messages posted or transmitted by any third party are the responsibility of the author of that message and not of $site_name. The fact that a particular message is posted on or transmitted using this website does not mean that $site_name has endorsed that message in any way or verified the accuracy, completeness or usefulness of any message.<P>Furthermore, all persons who use $site_name are advised not to use them for solicitations or any other commercial purposes.  We make no representation regarding the merchantability or fitness for any particular purpose of any message posted by any third party. Users are encouraged to seek the advice of their appropriate professional advisors, when evaluating the information contained in any message. $site_name is not responsible for any defamatory, offensive or illegal conduct of any user.<P></DD>
+   <DD>All messages made available (including any discussion groups and bulletin boards) and any opinions, advice, statements or other information contained in any messages posted or transmitted by any third party are the responsibility of the author of that message and not of $site_name. The fact that a particular message is posted on or transmitted using this website does not mean that $site_name has endorsed that message in any way or verified the accuracy, completeness or usefulness of any message.<P>Furthermore, all persons who use $site_name are advised not to use them for solicitation or any other commercial purposes.  We make no representation regarding the merchantability or fitness for any particular purpose of any message posted by any third party. Users are encouraged to seek the advice of their appropriate professional advisors, when evaluating the information contained in any message. $site_name is not responsible for any defamatory, offensive or illegal conduct of any user.<P></DD>
    
    <DT><B>What are your terms and conditions?</B></DT>
    <DD>
     This website includes threaded discussion groups and discussion forums which allow feedback to $site_name and real-time interaction between the persons who use this service.  The responsibility for any opinions, advice, statements or other information contained in any messages posted or transmitted by any third party on this website resides solely with the author.<P>
-    <U>1. When using the discussion forums, you may NOT:</U><BR><I>a.</I> Keep any other person from using and enjoying the discussion forums.<BR><I>b.</I> Post or transmit any messages (or content in general) that would constitute or encourage conduct that would constitute a criminal offense, give rise to civil liability or otherwise violate any local, state, national or international law, including any threatening, abusive libelous, defamatory, obscene, vulgar, pornographic, profane or indecent messages of any kind.<BR><I>c.</I> Post or transmit any information, software or other materials which violate or infringe upon the rights of others, including their privacy or publicity rights, or which is protected by copyright, trademark or other proprietary rights, without first obtaining permission from the person who owns or holds that right.<BR><I>d.</I> Use the discussion forum in any way for solicitations or other commercial purposes.<P>
+    <U>1. When using the discussion forums, you may NOT:</U><BR><I>a.</I> Keep any other person from using and enjoying the discussion forums.<BR><I>b.</I> Post or transmit any messages (or content in general) that would constitute or encourage conduct that would constitute a criminal offense, give rise to civil liability or otherwise violate any local, state, national or international law, including any threatening, abusive libelous, defamatory, obscene, vulgar, pornographic, profane or indecent messages of any kind.<BR><I>c.</I> Post or transmit any information, software or other materials which violate or infringe upon the rights of others, including their privacy or publicity rights, or which is protected by copyright, trademark or other proprietary rights, without first obtaining permission from the person who owns or holds that right.<BR><I>d.</I> Use the discussion forum in any way for solicitation or other commercial purposes.<P>
     <U>2. $site_name's right to monitor the discussion forums:</U><BR>You understand that $site_name has no obligation to monitor the discussion forum.  However $site_name reserves the right at all times to edit, refuse to post or to remove any information or materials, in whole or in part, that in $site_name's sole discretion are objectionable or in violation of these terms and conditions and to disclose any information necessary to satisfy or governmental request.<P>
    </DD>
   </DL>";