Changes from 2.2.0 release

tracks internal commit 12ba3bdc98b6cea7e2f369443e2933c75189af53
lottadot · Nov 7, 2001 · 22b59d4 · 22b59d4
1 parent 96987cf
commit 22b59d4
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 34 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,20 @@
+slash-2.2.0, 2001.11.07
+-----------------------
+
+*	Fix multi-language date handling (Alessio Bragadini)
+
+*	More minor changes to formatting, parameter checking and
+	filtering, seclevs, etc.
+
+*	More changes to stats report
+
+*	"section" field added to accesslog table (really changed
+	in slash 2.1.1, but not documented):
+		ALTER TABLE accesslog ADD
+		section varchar(30) DEFAULT 'index' NOT NULL;
+
+*	Added two keys to moderatorlog schema
+
 slash-2.1.1, 2001.10.31
 -----------------------
 

diff --git a/INSTALL b/INSTALL
@@ -2,10 +2,9 @@ NAME
     INSTALL - Slash Installation
 
 SYNOPSIS
-    This document describes how to install Slash 2.1/2.2 (where you see
-    "2.2" you may safely assume "2.1", except where specified). For
-    instructions on installation or upgrade of previous versions of Slash,
-    see the INSTALL document included with those distributions.
+    This document describes how to install Slash 2.2. For instructions on
+    installation or upgrade of previous versions of Slash, see the INSTALL
+    document included with those distributions.
 
     These instructions have only been tested on Linux. Installation under
     BSD and other Unix OSes should work similarly, but there are problems

diff --git a/MANIFEST b/MANIFEST
@@ -169,7 +169,6 @@ plugins/Admin/templates/ispellok;admin;default
 plugins/Admin/templates/keywordEdit;admin;default
 plugins/Admin/templates/listFilters;admin;default
 plugins/Admin/templates/listStories;admin;default
-plugins/Admin/templates/listTopics;admin;default
 plugins/Admin/templates/messages;admin;default
 plugins/Admin/templates/otherLinks;admin;default
 plugins/Admin/templates/relatedlinks;admin;default
@@ -402,7 +401,6 @@ themes/slashcode/templates/editUser;users;default
 themes/slashcode/templates/edit_comment;comments;default
 themes/slashcode/templates/editpoll;pollBooth;default
 themes/slashcode/templates/errors;comments;default
-themes/slashcode/templates/errors;metamod;default
 themes/slashcode/templates/errors;users;default
 themes/slashcode/templates/fancybox;misc;default
 themes/slashcode/templates/fancybox;misc;light

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@
 ##
 
 #   the used tools
-VERSION = 2.1.1
+VERSION = 2.2.0
 DISTNAME = slash
 DISTVNAME = $(DISTNAME)-$(VERSION)
 

diff --git a/README b/README
@@ -1,15 +1,6 @@
 NAME
     README - Slash Readme
 
-WARNING
-    This release is BETA software. It is not intended or recommended for
-    production use, and is constantly changing. Please use this only for
-    development and testing purposes.
-
-    The upgrade procedures are available (the INSTALL manpage). Standard
-    disclaimer applies. Please test them if you are so inclined, and let us
-    know how they work for you.
-
 DESCRIPTION
     Slash -- Slashdot Like Automated Storytelling Homepage -- is the code
     that runs Slashdot. More than that, however, Slash is an architecture

diff --git a/Slash/Apache/Apache.pm b/Slash/Apache/Apache.pm
@@ -18,7 +18,7 @@ require AutoLoader;
 use vars qw($REVISION $VERSION @ISA $USER_MATCH);
 
 @ISA		= qw(DynaLoader);
-$VERSION   	= '2.001001';  # v2.1.1
+$VERSION   	= '2.003000';  # v2.3.0
 ($REVISION)	= ' $Revision$ ' =~ /\$Revision:\s+([^\s]+)/;
 
 $USER_MATCH = qr{ \buser=(?!	# must have user, but NOT ...

diff --git a/Slash/Apache/User/User.pm b/Slash/Apache/User/User.pm
@@ -20,7 +20,7 @@ use URI ();
 use vars qw($REVISION $VERSION @ISA @QUOTES $USER_MATCH);
 
 @ISA		= qw(DynaLoader);
-$VERSION   	= '2.001001';  # v2.1.1
+$VERSION   	= '2.003000';  # v2.3.0
 ($REVISION)	= ' $Revision$ ' =~ /\$Revision:\s+([^\s]+)/;
 
 bootstrap Slash::Apache::User $VERSION;
@@ -333,34 +333,50 @@ sub userdir_handler {
 		# this won't work if the nick has a "/" in it ...
 		my($nick, $op) = split /\//, $1, 3;
 		$nick = fixparam($nick);	# make safe to pass back to script
+
+		# maybe we should refactor this code a bit ...
+		# have a hash that points op to args and script name -- pudge
+		# e.g.:
+		# my %ops = ( journal => ['/journal.pl', 'op=display'], ... );
+		# $r->args($ops{$op}[1] . "&nick=$nick");
+		# $r->uri($ops{$op}[0]);
+		# $r->filename($constants->{basedir} . $ops{$op}[0]);
+
 		if ($op eq 'journal') {
-			$r->args("nick=$nick&op=display");
+			$r->args("op=display&nick=$nick");
 			$r->uri('/journal.pl');
 			$r->filename($constants->{basedir} . '/journal.pl');
+
 		} elsif ($op eq 'discussions') {
-			$r->args("nick=$nick&op=creator_index");
+			$r->args("op=creator_index&nick=$nick");
 			$r->uri('/comments.pl');
 			$r->filename($constants->{basedir} . '/comments.pl');
+
 		} elsif ($op eq 'pubkey') {
 			$r->args("nick=$nick");
 			$r->uri('/pubkey.pl');
 			$r->filename($constants->{basedir} . '/pubkey.pl');
+
 		} elsif ($op eq 'friends') {
 			$r->args("op=friends&nick=$nick");
 			$r->uri('/zoo.pl');
 			$r->filename($constants->{basedir} . '/zoo.pl');
+
 		} elsif ($op eq 'fans') {
 			$r->args("op=fans&nick=$nick");
 			$r->uri('/zoo.pl');
 			$r->filename($constants->{basedir} . '/zoo.pl');
+
 		} elsif ($op eq 'foes') {
 			$r->args("op=foes&nick=$nick");
 			$r->uri('/zoo.pl');
 			$r->filename($constants->{basedir} . '/zoo.pl');
+
 		} else {
+			$r->args("nick=$nick");
 			$r->uri('/users.pl');
 			$r->filename($constants->{basedir} . '/users.pl');
-			$r->args("nick=$nick");
+
 		}
 		return OK;
 	}

diff --git a/Slash/Slash.pm b/Slash/Slash.pm
@@ -34,7 +34,7 @@ use Time::Local;
 use base 'Exporter';
 use vars qw($VERSION @EXPORT);
 
-$VERSION   	= '2.001001';  # v2.1.1
+$VERSION   	= '2.003000';  # v2.3.0
 # note: those last two lines of functions will be moved elsewhere
 @EXPORT		= qw(
 	getData

diff --git a/docs/INSTALL.html b/docs/INSTALL.html
@@ -66,8 +66,7 @@ <H1><A NAME="name">NAME</A></H1>
 <P>
 <HR>
 <H1><A NAME="synopsis">SYNOPSIS</A></H1>
-<P>This document describes how to install Slash 2.1/2.2 (where you see
-"2.2" you may safely assume "2.1", except where specified).  For instructions on
+<P>This document describes how to install Slash 2.2.  For instructions on
 installation or upgrade of previous versions of Slash, see the INSTALL
 document included with those distributions.</P>
 <P>These instructions have only been tested on Linux. Installation under

diff --git a/docs/README.html b/docs/README.html
@@ -12,7 +12,6 @@
 <UL>
 
 	<LI><A HREF="#name">NAME</A></LI>
-	<LI><A HREF="#warning">WARNING</A></LI>
 	<LI><A HREF="#description">DESCRIPTION</A></LI>
 	<LI><A HREF="#documentation">DOCUMENTATION</A></LI>
 	<LI><A HREF="#links">LINKS</A></LI>
@@ -27,15 +26,6 @@ <H1><A NAME="name">NAME</A></H1>
 <P>README - Slash Readme</P>
 <P>
 <HR>
-<H1><A NAME="warning">WARNING</A></H1>
-<P>This release is <STRONG>BETA</STRONG> software.  It is not intended or recommended
-for production use, and is constantly changing.  Please use this only
-for development and testing purposes.</P>
-<P>The upgrade procedures are available (<EM>INSTALL</EM>).  Standard
-disclaimer applies.  Please test them if you are so inclined, and
-let us know how they work for you.</P>
-<P>
-<HR>
 <H1><A NAME="description">DESCRIPTION</A></H1>
 <P>Slash -- Slashdot Like Automated Storytelling Homepage -- is the code
 that runs Slashdot.  More than that, however, Slash is an architecture