MANIFEST cleanup; prepare to delete messages automagically

MANIFEST

@@ -13,6 +13,9 @@ MANIFEST.SKIP
 Makefile
 README
 Slash/Apache/Apache.pm
+Slash/Apache/Banlist/Banlist.pm
+Slash/Apache/Banlist/MANIFEST
+Slash/Apache/Banlist/Makefile.PL
 Slash/Apache/Changes
 Slash/Apache/Log/Changes
 Slash/Apache/Log/Log.pm
@@ -147,6 +150,7 @@ docs/formkeys.txt
 docs/slasherd.fig
 docs/slasherd.pdf
 docs/slasherd.ps
+docs/slashguide.pod
 docs/slashstyle.pod
 docs/slashtables.pod
 httpd/slash.conf
@@ -246,7 +250,6 @@ plugins/Messages/MANIFEST
 plugins/Messages/Makefile.PL
 plugins/Messages/Messages.pm
 plugins/Messages/PLUGIN
-plugins/Messages/TODO
 plugins/Messages/dump
 plugins/Messages/message_delivery.pl
 plugins/Messages/messages.pl
@@ -289,6 +292,7 @@ plugins/Search/templates/searchform;search;default
 plugins/Search/templates/storysearch;search;default
 plugins/Search/templates/usersearch;search;default
 plugins/Search/test.pl
+sbin/dailyStuff
 sbin/moderatord
 sbin/portald
 sbin/slashd
@@ -345,6 +349,7 @@ themes/slashcode/htdocs/images/wr.gif
 themes/slashcode/htdocs/images/wr_cccccc.gif
 themes/slashcode/htdocs/index.pl
 themes/slashcode/htdocs/metamod.pl
+themes/slashcode/htdocs/moderation.shtml
 themes/slashcode/htdocs/pollBooth.pl
 themes/slashcode/htdocs/sections.pl
 themes/slashcode/htdocs/slashguide.shtml
@@ -358,15 +363,16 @@ themes/slashcode/sql/postgresql/datadump.sql
 themes/slashcode/sql/postgresql/prep.sql
 themes/slashcode/tasks/adminmail.pl
 themes/slashcode/tasks/counthits.pl
+themes/slashcode/tasks/daily.pl
 themes/slashcode/tasks/daily_archive.pl
-themes/slashcode/tasks/daily_mailing.pl
 themes/slashcode/tasks/expire.pl
 themes/slashcode/tasks/flush_formkeys.pl
 themes/slashcode/tasks/freshenup.pl
 themes/slashcode/tasks/new_headfoot.pl
 themes/slashcode/tasks/new_motd.pl
 themes/slashcode/tasks/open_backend.pl
 themes/slashcode/tasks/p2f_hof_topics.pl
+themes/slashcode/tasks/refresh_authors_cache.pl
 themes/slashcode/tasks/refresh_sectionindex.pl
 themes/slashcode/tasks/run_moderatord.pl
 themes/slashcode/tasks/run_portald.pl
@@ -435,6 +441,7 @@ themes/slashcode/templates/linkComment;misc;default
 themes/slashcode/templates/linkCommentPages;misc;default
 themes/slashcode/templates/linkStory;misc;default
 themes/slashcode/templates/listAbuses;admin;default
+themes/slashcode/templates/listBanned;users;default
 themes/slashcode/templates/listReadOnly;users;default
 themes/slashcode/templates/listSections;sections;default
 themes/slashcode/templates/listTopics;topics;default
@@ -484,6 +491,7 @@ themes/slashcode/templates/storylink;index;light
 themes/slashcode/templates/subEdAdmin;submit;default
 themes/slashcode/templates/subEdTable;submit;default
 themes/slashcode/templates/subEdUser;submit;default
+themes/slashcode/templates/three;misc;default
 themes/slashcode/templates/tildeEd;users;default
 themes/slashcode/templates/titlebar;misc;default
 themes/slashcode/templates/titlebar;misc;light
@@ -501,7 +509,7 @@ utils/convert-dump
 utils/excessiveHits
 utils/replaceblock
 utils/slash
-utils/slash1toslash2
 utils/slash1toslash2.2
+utils/slash2toslash2.2
 utils/slashcode-dearchive
 utils/sqlps

Slash/DB/Static/MySQL/MySQL.pm

@@ -847,7 +847,10 @@ sub deleteStoryAll {
 
 ########################################################
 # For tasks/author_cache.pl
+# please don't unnecessarily stretch lines out to 250 columns -- pudge
 # This runs once a day, I am not worried -Brian
+# it makes it hard to read.  whether or not you are worried about
+# it doesn't matter.  that it was not readable matters.  -- pudge
 sub createAuthorCache {
 	my($self) = @_;
 	my $sql;

plugins/Messages/DB/MySQL/MySQL.pm

@@ -233,6 +233,25 @@ sub _thaw {
 	$data->{$store} = ${$data->{$store}} if ref($data->{$store}) eq 'SCALAR';
 }
 
+# For dailystuff
+sub deleteMessages {
+	my($self) = @_;
+	my $table = $self->{_web_table1};
+	my $prime = $self->{_web_prime1};
+
+	# set defaults
+	my $constants = getCurrentStatic();
+	my $sendx = $constants->{message_send_expire} || 7;
+	my $webx  = $constants->{message_web_expire}  || 31;
+
+	my $ids = $self->sqlSelectColArrayref($prime, $table,
+		"TO_DAYS(NOW()) - TO_DAYS(date) > $webx"
+	);
+	$self->_delete_web($_, 0, 1) for @$ids;
+
+	$self->_delete(0, "TO_DAYS(NOW()) - TO_DAYS(date) > $sendx");
+}
+
 sub _delete_web {
 	my($self, $id, $uid, $override) = @_;
 	my $table1 = $self->{_web_table1};
@@ -259,11 +278,13 @@ sub _delete_web {
 }
 
 sub _delete {
-	my($self, $id) = @_;
+	my($self, $id, $where) = @_;
 	my $table = $self->{_drop_table};
 	my $prime = $self->{_drop_prime};
-	my $id_db = $self->sqlQuote($id);
-	my $where = "$prime=$id_db";
+	if (!$where) {
+		my $id_db = $self->sqlQuote($id);
+		$where = "$prime=$id_db";
+	}
 
 	$self->sqlDo("DELETE FROM $table WHERE $where");
 }

plugins/Messages/dump

@@ -17,3 +17,5 @@ INSERT INTO menus (menu, label, value, seclev, menuorder) VALUES ('messages','Li
 INSERT INTO menus (menu, label, value, seclev, menuorder) VALUES ('messages','Message Preferences','[% constants.rootdir %]/messages.pl?op=display_prefs',1,2);
 
 INSERT INTO vars (name, value, description) VALUES ('message_process_count','100','Number of messages to process at each delivery interval');
+INSERT INTO vars (name, value, description) VALUES ('message_send_expire','7','Number of days to hold message in delivery queue');
+INSERT INTO vars (name, value, description) VALUES ('message_web_expire','31','Number of days to keep message on web site');

plugins/Messages/templates/display_prefs;messages;default

@@ -51,9 +51,12 @@ instead will be sent via email if selected.
 	</TD><TD VALIGN="TOP">
 		<B>Delivery Mode</B> <BR>
 Currently, your options for receiving messages is either via email, or via the web interface.
-If you don't have your email address registered with the system (???), you will receive
+If you don't have your email address registered with the system, you will receive
 messages via the web, regardless of how your preference is set here.  Daily headlines
-and newsletter will only be sent via email.
+and newsletter will only be sent via email.  Messages delivered via the web will be kept in
+the system for only <B>[% constants.message_web_expire || 31 %] days</B>, whether they
+have been read or not.  After [% constants.message_web_expire || 31 %] days, they
+<B>will be deleted</B>.
 	</TD></TR>
 	<TR><TD COLSPAN="2">
 		<INPUT TYPE="hidden" NAME="op" VALUE="save_prefs">

plugins/Messages/templates/list_messages;messages;default

@@ -18,10 +18,15 @@ __template__
 
 [% IF note %]<H2>[% note %]</H2>[% END %]
 
+[% IF message_list.size %]
+<P>These messages will be kept in the system for only
+<B>[% constants.message_web_expire || 31 %] days</B>, whether they
+have been read or not.  After [% constants.message_web_expire || 31 %] days, they
+<B>will be deleted</B>.</P>
+
 <P>Messages marked with "<FONT COLOR="[% user.bg.3 %]">*</FONT>" are unread.</P>
 
 <FORM ACTION="[% constants.rootdir %]/messages.pl" METHOD="POST">
-[% IF message_list.size %]
 <TABLE WIDTH="90%" BORDER="0" CELLPADDING="2" CELLSPACING="0">
 [% FOREACH message = message_list %]
   <TR>

themes/slashcode/templates/userInfo;users;default

@@ -62,7 +62,7 @@ before you do any moderation.<BR><P>
 [% END; IF useredit.fakeemail %]
 <A HREF="mailto:[% useredit.fakeemail | fixparam %]">[% useredit.fakeemail | strip_literal %]</A><BR>
 [% END; IF useredit.journal_last_entry_date.search('[1-9]') %]
-<A HREF="[% constants.rootdir %]/journal.pl?op=display&amp;uid=[% useredit.uid %]">
+<A HREF="[% constants.rootdir %]/~[% nick_plain | fixparam %]/journal/">
 Last Journal Entry was [% Slash.timeCalc(useredit.journal_last_entry_date) %]</A>
 [ <A HREF="[% constants.rootdir %]/journal.pl?op=list&amp;uid=[% useredit.uid %]">List</A> ]
 <BR>