TWiki Enterprise Collaboration Platform

Author: SvenDowideit
Date: 2007-10-30 00:57:32 -0500 (Tue, 30 Oct 2007)
New Revision: 15435

Added:
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/data/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/data/TWiki/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/data/TWiki/JoomlaUsersContrib.txt
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib.pm
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/Config.spec
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/DEPENDENCIES
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/MANIFEST
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/build.pl
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/LoginManager/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/LoginManager/JoomlaLogin.pm
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Users/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Users/JoomlaUserMapping.pm
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/Joomla.png
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/wikiring.png
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/wikiringlogo.png
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribSuite.pm
   twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribTests.pm
Log:
Item4909: initial commit of JoomlaUsersContrib

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/data/TWiki/JoomlaUsersContrib.txt
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/data/TWiki/JoomlaUsersContrib.txt	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/data/TWiki/JoomlaUsersContrib.txt	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,63 @@
+
+<a href="http://www.joomla.org/" ><img src="%ATTACHURL%/Joomla.png" style="float: right; padding:30px;" /></a>
+
+---+!! JoomlaUsersContrib Contrib Package
+
+*REQUIRES TWiki 4.2 beta3 or later.*
+
+
+This Contrib enables you to replace the TWiki User and Groups system with a read only access to the User and Groups in a [[http://www.joomla.org/][Joomla]] Database. Registration of new users and their association with Groups is then _only_ handled by Joomla, making it possible to remove the distributed Main web.
+
+You are advised to use the same same host for TWiki and the Joomla Database, otherwise user query performance (happens every request) will severly degrade the response time.
+
+*NOTE:* for performance reasons, the Joomla Registered Users group is _not_ brought into the system, The other groups may cause performance degredation if they have too many members
+
+<a href="http://wikiring.com/" ><img src="%ATTACHURL%/wikiringlogo.png" style="float: right; padding:30px;" /></a>
+
+---++ Settings
+
+Settings are in =lib/LocalSite.cfg=. the TWiki configure script does not currently display the non-core options, but should also not remove them. See the Installation Instructions below for details.
+
+   * One line description:
+      * Set SHORTDESCRIPTION = replace the TWiki User and Groups System with Joomla's
+
+   * Name of the perl package
+      * Set STUB = TWiki::Contrib::JoomlaUsersContrib
+
+---++ Installation Instructions
+	* Download the ZIP file from the Plugin web (see below)
+	* Unzip ==%TOPIC%.zip== in your twiki installation directory. Content:
+	| *File:* | *Description:* |
+   | ==data/TWiki/JoomlaUsersContrib.txt== | Plugin doc page |
+   | ==lib/TWiki/Contrib/JoomlaUsersContrib.pm== | Plugin Perl module  |
+   | ==lib/TWiki/LoginManager/JoomlaLogin.pm== | use Joomla cookie for session initilaisation |
+   | ==lib/TWiki/Users/JoomlaUserMapping.pm== | get User and Group information from Joomla Database |
+
+	* Run ==%TOPIC%_installer.pl== to automatically check and install other modules that this module depends on. You can also do this step manually. Dependencies:
+	<table border="1"><tr><th>Name</th><th>Version</th><th>Description</th></tr><tr><td align="left">DBIx::SQLEngine</td><td align="left"> &gt;=0.93</td><td align="left">(and its pre-requisites) Extends DBI with High-Level Operations</td></tr><tr><td align="left">DBD::mysql</td><td align="left"> &gt;=3.0000</td><td align="left">(and its pre-requisites) MySQL driver for the Perl5 Database Interface (DBI)</td></tr></table>
+   * set TWiki::Users::JoomlaUserMapping as your UserMapping in configure's Security section
+   * set TWiki::LoginManager::JoomlaLogin as your LoginManager in configure's Security section
+   * set none as your PasswordManager in configure's Security section
+   * configure  JoomlaUsersContrib from the *User Managers* / *Joomla User Manager* section in configure
+      * this needs a dbi connection string to your Joomla database, and a valid username and password for it.
+   * Test if the installation was successful:
+      * __enter sample here__
+      * see also [[Sandbox.PluginTest%TOPIC%]]
+
+---++ Contrib Info
+
+|  Plugin Author: | TWiki:Main.SvenDowideit - of [[http://distributedINFORMATION.com][distributedINFORMATION.com]] - <img src="%ATTACHURL%/wikiring.png" /> [[http://www.wikiring.com][WikiRing.com]] |
+|  Copyright: | &copy; 2006-2007, SvenDowideit@... |
+|  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
+|  Dependencies: | <table border="1"><tr><th>Name</th><th>Version</th><th>Description</th></tr><tr><td align="left">DBIx::SQLEngine</td><td align="left"> &gt;=0.93</td><td align="left">(and its pre-requisites) Extends DBI with High-Level Operations</td></tr><tr><td align="left">DBD::mysql</td><td align="left"> &gt;=3.0000</td><td align="left">(and its pre-requisites) MySQL driver for the Perl5 Database Interface (DBI)</td></tr></table> |
+|  Version: | 138 |
+|  Change History: | <!-- versions below in reverse order -->&nbsp; |
+| Nov 2007 | updated to TWiki 4.2, and released |
+|  2006 | Initial version (not public) |
+|  Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% |
+|  Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev |
+|  Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal |
+
+__Related Topics:__ %TWIKIWEB%.TWikiPreferences
+
+-- SvenDowideit@... 

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/Config.spec
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/Config.spec	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/Config.spec	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,21 @@
+
+
+# ---+ User Managers
+# ---++ Joomla User Manager
+# to use JoomlaUserMapping, you need to set the following settings in the "Security Setup" above
+# <ol><li>
+# UserMappingManager = 'TWiki::Users::JoomlaUserMapping';
+# </li><li>
+# SuperAdminGroup = 'Super Administrator';
+# </li><li>
+# LoginManager = 'TWiki::LoginManager::JoomlaLogin'; - (This setting will allow TWiki to use the 'stay logged in' cookie that Joomla makes.)
+# </li></ol>
+# **STRING 25**
+# The DSN to connect to the Joomla Database.
+$TWiki::cfg{Plugins}{JoomlaUser}{DBI_dsn} = 'dbi:mysql:joomla_db:localhost';
+# **STRING 25**
+# The user to connect to the Joomla Database.
+$TWiki::cfg{Plugins}{JoomlaUser}{DBI_username} = 'mysqlpassword';
+# **PASSWORD**
+# The password to connect to the Joomla Database.
+$TWiki::cfg{Plugins}{JoomlaUser}{DBI_password} = 'pwd';

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/DEPENDENCIES
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/DEPENDENCIES	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/DEPENDENCIES	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,2 @@
+DBIx::SQLEngine, >=0.93, CPAN, (and its pre-requisites) Extends DBI with High-Level Operations
+DBD::mysql, >=3.0000, CPAN, (and its pre-requisites) MySQL driver for the Perl5 Database Interface (DBI)
\ No newline at end of file

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/MANIFEST
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/MANIFEST	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/MANIFEST	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,7 @@
+data/TWiki/JoomlaUsersContrib.txt  Plugin doc page
+lib/TWiki/Contrib/JoomlaUsersContrib.pm  Plugin Perl module 
+lib/TWiki/LoginManager/JoomlaLogin.pm use Joomla cookie for session initilaisation
+lib/TWiki/Users/JoomlaUserMapping.pm get User and Group information from Joomla Database
+lib/TWiki/Contrib/JoomlaUsersContrib/Config.spec
+pub/TWiki/JoomlaUsersContrib/Joomla.png
+pub/TWiki/JoomlaUsersContrib/wikiring.png

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/build.pl
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/build.pl	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib/build.pl	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+use strict;
+#
+# Example build class. Copy this file to the equivalent place in your
+# plugin or contrib and edit.
+#
+# Read the comments at the top of lib/TWiki/Contrib/Build.pm for
+# details of how the build process works, and what files you
+# have to provide and where.
+#
+# Requires the environment variable TWIKI_LIBS (a colon-separated path
+# list) to be set to point at the build system and any required dependencies.
+# Usage: ./build.pl [-n] [-v] [target]
+# where [target] is the optional build target (build, test,
+# install, release, uninstall), test is the default.`
+# Two command-line options are supported:
+# -n Don't actually do anything, just print commands
+# -v Be verbose
+#
+
+# Standard preamble
+BEGIN { unshift @INC, split( /:/, $ENV{TWIKI_LIBS} ) }
+
+use TWiki::Contrib::Build;
+
+# Declare our build package
+package BuildBuild;
+use base qw( TWiki::Contrib::Build );
+
+sub new {
+    my $class = shift;
+    return bless( $class->SUPER::new( "JoomlaUsersContrib" ), $class );
+}
+
+# Example: Override the build target
+sub target_build {
+    my $this = shift;
+
+    $this->SUPER::target_build();
+
+    # Do other build stuff here
+}
+
+# Create the build object
+my $build = new BuildBuild();
+
+# Build the target on the command line, or the default target
+$build->build($build->{target});
+

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib.pm	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Contrib/JoomlaUsersContrib.pm	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,4 @@
+package TWiki::Contrib::JoomlaUsersContrib;
+use vars qw( $VERSION );
+$VERSION = '$Rev$';
+1;

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/LoginManager/JoomlaLogin.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/LoginManager/JoomlaLogin.pm	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/LoginManager/JoomlaLogin.pm	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,89 @@
+# Module of TWiki Enterprise Collaboration Platform, http://TWiki.org/
+#
+# Copyright (C) 2006 Sven Dowideit, SvenDowideit@...
+# and TWiki Contributors. All Rights Reserved. TWiki Contributors
+# are listed in the AUTHORS file in the root of this distribution.
+# NOTE: Please extend that file, not this notice.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. For
+# more details read LICENSE in the root of this distribution.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# As per the GPL, removal of this notice is prohibited.
+
+=pod
+
+---+ package TWiki::LoginManager::JoomlaLogin
+
+This is a login manager that you can specify in the security setup section of [[%SCRIPTURL%/configure%SCRIPTSUFFIX%][configure]]. It provides users with a template-based form to enter usernames and passwords, and works with the PasswordManager that you specify to verify those passwords.
+
+Subclass of TWiki::LoginManager; see that class for documentation of the
+methods of this class.
+
+=cut
+
+package TWiki::LoginManager::JoomlaLogin;
+
+use strict;
+use Assert;
+use TWiki::LoginManager::TemplateLogin;
+
+@TWiki::LoginManager::JoomlaLogin::ISA = ( 'TWiki::LoginManager::TemplateLogin' );
+
+sub new {
+    my( $class, $session ) = @_;
+
+    my $this = bless( $class->SUPER::new($session), $class );
+    $session->enterContext( 'can_login' );
+    return $this;
+}
+
+=pod
+
+---++ ObjectMethod loadSession()
+
+add Joomla cookie to the session management
+
+=cut
+
+sub loadSession {
+    my $this = shift;
+    my $twiki = $this->{twiki};
+    my $query = $twiki->{cgiQuery};
+
+    ASSERT($this->isa( 'TWiki::LoginManager::JoomlaLogin')) if DEBUG;
+    
+    my $authUser = '';
+    
+    # see if there is a joomla username and password cookie
+    #TODO: think i should check the password is right too.. otherwise ignore it
+    my %cookies = fetch CGI::Cookie;
+    if (defined($cookies{'usercookie[username]'})) {
+	    my $id = $cookies{'usercookie[username]'}->value;
+	    my $password = $cookies{'usercookie[password]'}->value;
+	    my $user = $twiki->{users}->findUser($id, undef, 1);  
+	      
+        my $passwordHandler = $twiki->{users}->{passwords};
+        #return $passwordHandler->checkPassword($this->{login}, $password);	      
+	      
+	    if (defined($user) && 
+	       $passwordHandler->checkPassword($user->login(), $password, 1)) {
+            	$authUser = $id;
+        } else {
+            #mmm, if they have a cookie, but are not in the dba, either the db connection is busted, or we're in trouble
+        }
+
+        $this->userLoggedIn( $authUser );
+    } else {
+        $authUser = $this->SUPER::loadSession();
+    }
+    return $authUser;
+}
+
+1;


Property changes on: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/LoginManager/JoomlaLogin.pm
___________________________________________________________________
Name: svn:executable
   + *

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Users/JoomlaUserMapping.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Users/JoomlaUserMapping.pm	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Users/JoomlaUserMapping.pm	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,720 @@
+# Module of TWiki Enterprise Collaboration Platform, http://TWiki.org/
+#
+# Copyright (C) 2006, 2007 Sven Dowideit, SvenDowideit@...
+# and TWiki Contributors. All Rights Reserved. TWiki Contributors
+# are listed in the AUTHORS file in the root of this distribution.
+# NOTE: Please extend that file, not this notice.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. For
+# more details read LICENSE in the root of this distribution.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# As per the GPL, removal of this notice is prohibited.
+
+#THIS CODE has been hacked too many times to move it between versions of TWiki
+#I still have to clean the code up alot. Sven Nov 2007
+
+=begin twiki
+
+---+ package TWiki::Users::JoomlaUserMapping
+
+canonical user_id == id number of jos_user table
+login == username column
+
+
+=cut
+
+package TWiki::Users::JoomlaUserMapping;
+use base 'TWiki::UserMapping';
+
+use strict;
+use strict;
+use Assert;
+use TWiki::UserMapping;
+use TWiki::Users::BaseUserMapping;
+use TWiki::Time;
+use TWiki::ListIterator;
+use DBIx::SQLEngine;
+use DBD::mysql;
+
+use Error qw( :try );
+
+#@TWiki::Users::JoomlaUserMapping::ISA = qw( TWiki::Users::BaseUserMapping );
+
+=pod
+
+---++ ClassMethod new( $session ) -> $object
+
+Constructs a new password handler of this type, referring to $session
+for any required TWiki services.
+
+=cut
+
+sub new {
+    my( $class, $session ) = @_;
+	
+    my $this = bless( $class->SUPER::new($session, 'JoomlaUserMapping_'), $class );
+    $this->{session} = $session;
+
+    $this->{error} = undef;
+    require Digest::MD5;
+
+	$this->{groupCache} = {};
+	
+    return $this;
+}
+
+=begin twiki
+
+---++ ObjectMethod finish()
+Break circular references.
+
+=cut
+
+# Note to developers; please undef *all* fields in the object explicitly,
+# whether they are references or not. That way this method is "golden
+# documentation" of the live fields in the object.
+sub finish {
+    my $this = shift;
+
+    $this->{JoomlaDB} = undef;
+
+	$this->SUPER::finish();
+}
+
+=begin twiki
+
+---++ ObjectMethod handlesUser ( $cUID, $login, $wikiname) -> $boolean
+
+Called by the TWiki::Users object to determine which loaded mapping
+to use for a given user (must be fast).
+
+=cut
+
+sub handlesUser {
+	my ($this, $cUID, $login, $wikiname) = @_;
+	
+    return 1 if ( defined $cUID && $cUID =~ /$this->{mapping_id}/ );
+	return 1 if ($login && $this->getCanonicalUserID( $login ));
+#	return 1 if ($wikiname && $this->findUserByWikiName( $wikiname ));
+
+print STDERR "**** Joomla does not handle $cUID, $login";
+
+	return 0;
+}
+
+=begin twiki
+
+---++ ObjectMethod getCanonicalUserID ($login, $dontcheck) -> cUID
+
+Convert a login name to the corresponding canonical user name. The
+canonical name can be any string of 7-bit alphanumeric and underscore
+characters, and must correspond 1:1 to the login name.
+(undef on failure)
+
+(if dontcheck is true, return a cUID for a nonexistant user too - used for registration)
+
+Subclasses *must* implement this method.
+
+
+=cut
+
+sub getCanonicalUserID {
+    my ($this, $login, $dontcheck) = @_;
+	
+	#we ignore $dontcheck as this mapper does not do registration.
+	
+	return login2canonical($this, $login);
+}
+
+=begin twiki
+
+---++ ObjectMethod loginTemplateName () -> templateFile
+
+allows UserMappings to come with customised login screens - that should preffereably only over-ride the UI function
+
+=cut
+
+sub loginTemplateName {
+    return 'login';
+}
+
+
+#return 1 if the UserMapper supports registration (ie can create new users)
+sub supportsRegistration {
+    return; #NO, we don't
+}
+
+# Convert a login name to the corresponding canonical user name. The
+# canonical name can be any string of 7-bit alphanumeric and underscore
+# characters, and must correspond 1:1 to the login name.
+sub login2canonical {
+    my( $this, $login ) = @_;
+    
+	my $canonical_id = -1;
+    unless ($login eq $TWiki::cfg{DefaultUserLogin}) {
+        #QUESTION: is the login known valid? if so, need to ASSERT that
+        #QUESTION: why not use the cache to xform if available, and only aske if.. (or is this the case..... DOCCO )
+        use bytes;
+        # use bytes to ignore character encoding
+        #$login =~ s/([^a-zA-Z0-9])/'_'.sprintf('%02d', ord($1))/ge;
+    	 my $userDataset = $this->dbSelect('select * from jos_users where username = ?', $login );
+         if( exists $$userDataset[0] ) {
+         	$canonical_id = $$userDataset[0]{id};
+    		#TODO:ASSERT there is only one..
+        }	else {
+#                 throw Error::Simple(
+#                    'username does not exist: '.$login);
+			return;
+    	}
+        no bytes;
+    }
+    
+    $canonical_id = $this->{mapping_id}.$canonical_id;
+    
+    return $canonical_id;
+}
+
+# See login2 canonical
+sub canonical2login {
+    my( $this, $user ) = @_;
+    ASSERT($user) if DEBUG;
+
+    $user =~ s/^$this->{mapping_id}//;
+	return unless ( $user =~ /^\d+$/ );
+	return $TWiki::cfg{DefaultUserLogin} if ($user == -1);
+
+    my $login = $TWiki::cfg{DefaultUserLogin};
+	 my $userDataset = $this->dbSelect('select username from jos_users c2l where c2l.id = ?', $user );
+     if( exists $$userDataset[0] ) {
+     	$login = $$userDataset[0]{username};
+    }	else {
+		#TODO: examine having the mapper returnthe truth, and fakeing guest in the core...
+             #throw Error::Simple(
+             #   'user_id does not exist: '.$user);
+		#die "did you call c2l using a login?";
+		return $TWiki::cfg{DefaultUserLogin};
+	}	
+    return $login;
+}
+
+# PRIVATE
+#QUESTION: this seems to pre-suppose that login can at times validly be == wikiname
+sub _cacheUser {
+    my($this, $wikiname, $login) = @_;
+    ASSERT($wikiname) if DEBUG;
+
+    $login ||= $wikiname;
+
+    my $user = login2canonical( $this, $login );
+
+    #$this->{U2L}->{$user}     = $login;
+    $this->{U2W}->{$user}     = $wikiname;
+    $this->{L2U}->{$login}    = $user;
+    $this->{W2U}->{$wikiname} = $user;
+
+    return $user;
+}
+
+# PRIVATE get a list of groups defined in this TWiki
+sub _getListOfGroups {
+    my $this = shift;
+    ASSERT(ref($this) eq 'TWiki::Users::JoomlaUserMapping') if DEBUG;
+
+    unless( $this->{groupsList} ) {
+        $this->{groupsList} = [];
+            my $dataset = $this->dbSelect('select name from jos_core_acl_aro_groups' );
+            for my $row (@$dataset) {
+		        my $groupID = $$row{name};		
+				push @{$this->{groupsList}}, $groupID;
+			}
+    }
+    return $this->{groupsList};
+}
+
+sub addUser {
+    my ( $this, $login, $wikiname ) = @_;
+
+    throw Error::Simple(
+                'JoomlaUserMapping does not allow creation of users ');
+}
+
+# Remove a user from the mapping
+# Called by TWiki::Users
+sub removeUser {
+             throw Error::Simple(
+                'JoomlaUserMapping does not allow removeal of users ');
+}
+
+# Map a canonical user name to a wikiname
+sub getWikiName {
+    my ($this, $user) = @_;
+    $this->ASSERT_IS_CANONICAL_USER_ID($user);
+
+#print STDERR "getWikiName($user)?";
+#    $user =~ s/^$this->{mapping_id}//;
+#	return $TWiki::cfg{DefaultUserWikiName} if ($user == -1);	
+	return $TWiki::cfg{DefaultUserWikiName} if ($user =~ /^$this->{mapping_id}-1$/);	
+	
+	my $user_number = $user;
+    $user_number =~ s/^$this->{mapping_id}//;
+	my $name;
+	my $userDataset = $this->dbSelect('select name from jos_users gwn where gwn.id = ?', $user_number );
+     if( exists $$userDataset[0] ) {
+     	$name = $$userDataset[0]{name};
+    }	else {
+		#TODO: examine having the mapper returnthe truth, and fakeing guest in the core...
+             #throw Error::Simple(
+             #   'user_id does not exist: '.$user);
+		return $TWiki::cfg{DefaultUserWikiName};
+	}	
+#print STDERR "getWikiName($user) == $name";
+$name =~ s/ //g;
+	return $name;
+}
+
+# Map a canonical user name to a login name
+sub getLoginName {
+    my ($this, $user) = @_;
+    return canonical2login( $this, $user );
+}
+
+# Map a login name to the corresponding canonical user name. This is used for
+# lookups, and should be as fast as possible. Returns undef if no such user
+# exists. Called by TWiki::Users
+sub lookupLoginName {
+    my ($this, $login) = @_;
+
+    return login2canonical( $this, $login );
+}
+
+# Called from TWiki::Users. See the documentation of the corresponding
+# method in that module for details.
+sub eachUser {
+    my( $this ) = @_;
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+	my @list = ();
+#TODO: this needs to be implemented in terms of a DB iterator that only selects partial results
+	my $userDataset = $this->dbSelect('select id from jos_users' );
+    for my $row (@$userDataset) {
+        push @list, $this->{mapping_id}.$$row{id};		
+	}
+	
+    return new TWiki::ListIterator( \@list );
+}
+
+# Called from TWiki::Users. See the documentation of the corresponding
+# method in that module for details.
+sub eachGroupMember {
+    my $this = shift;
+    my $groupName = shift;	#group_name
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+    ASSERT(defined($groupName)) if DEBUG;
+#    my $store = $this->{session}->{store};
+#    my $users = $this->{session}->{users};
+
+	return new TWiki::ListIterator( $this->{groupCache}{$groupName} ) if (defined($this->{groupCache}{$groupName}));
+	
+    my $members = [];
+
+     #return [] if ($groupName =~ /Registered/);    #LIMIT it cos most users are resistered
+	my $groupIdDataSet = $this->dbSelect(
+			'select group_id from jos_core_acl_aro_groups where name = ?', $groupName );	
+     if( exists $$groupIdDataSet[0] ) {
+     		my $group = $$groupIdDataSet[0]{group_id};
+			my $groupDataset = $this->dbSelect(
+					'select aro_id from jos_core_acl_groups_aro_map where group_id = ?', $group );
+		#TODO: re-write with join & map
+			for my $row (@$groupDataset) {
+				#get rows of users in group
+				my $userDataset = $this->dbSelect('select value from jos_core_acl_aro where aro_id = ?', $$row{aro_id} );
+				my $user_id = $this->{mapping_id}.$$userDataset[0]{value};	# user_id
+				push @{$members}, $user_id;
+			}
+		
+    }		
+	$this->{groupCache}{$groupName} = $members;
+    return new TWiki::ListIterator( $members );
+}
+
+# Called from TWiki::Users. See the documentation of the corresponding
+# method in that module for details.
+sub isGroup {
+    my ($this, $user) = @_;
+	
+	#there are no groups that can login.
+	return 0;
+}
+
+# Called from TWiki::Users. See the documentation of the corresponding
+# method in that module for details.
+sub eachGroup {
+    my ( $this ) = @_;
+    _getListOfGroups( $this );
+    return new TWiki::ListIterator( \@{$this->{groupsList}} );
+}
+
+# Called from TWiki::Users. See the documentation of the corresponding
+# method in that module for details.
+sub eachMembership {
+    my ($this, $user) = @_;
+    my @groups = ();
+#TODO: reimpl using db
+    _getListOfGroups( $this );
+    my $it = new TWiki::ListIterator( \@{$this->{groupsList}} );
+    $it->{filter} = sub {
+        $this->isInGroup($user, $_[0]);
+    };
+    return $it;
+}
+
+=pod
+
+---++ ObjectMethod isAdmin( $user ) -> $boolean
+
+True if the user is an admin
+   * is $TWiki::cfg{SuperAdminGroup}
+   * is a member of the $TWiki::cfg{SuperAdminGroup}
+
+=cut
+
+sub NONOisAdmin {
+    my( $this, $user ) = @_;
+    my $isAdmin = 0;
+	$this->ASSERT_IS_CANONICAL_USER_ID($user) if DEBUG;
+
+    my $sag = $TWiki::cfg{SuperAdminGroup};
+    $isAdmin = $this->isInGroup( $user, $sag );
+
+    return $isAdmin;
+}
+
+# Called from TWiki::Users. See the documentation of the corresponding
+# method in that module for details.
+sub isInGroup {
+    my( $this, $user, $group, $scanning ) = @_;
+    ASSERT($user) if DEBUG;
+#TODO: reimpl using db
+
+    my @users;
+    my $it = $this->eachGroupMember($group);
+    while ($it->hasNext()) {
+        my $u = $it->next();
+        next if $scanning->{$u};
+        $scanning->{$u} = 1;
+        return 1 if $u eq $user;
+        if( $this->isGroup($u) ) {
+            return 1 if $this->isInGroup( $user, $u, $scanning);
+        }
+    }
+    return 0;
+}
+
+sub getEmails {
+    my( $this, $cUID ) = @_;
+	
+    $cUID =~ s/^$this->{mapping_id}//;
+	return unless ( $cUID =~ /^\d+$/ );
+
+    if( $cUID ) {
+            my $dataset = $this->dbSelect('select * from jos_users where id = ?', $cUID );
+            if( exists $$dataset[0] ) {
+                return ($$dataset[0]{email});
+            }
+            $this->{error} = 'Login invalid';
+            return ;
+    } else {
+        $this->{error} = 'No user';
+        return ;
+    }
+
+}
+
+sub setEmails {
+    my $this = shift;
+    my $user = shift;
+    #die unless ($user);
+
+	return 0;
+}
+
+=pod
+
+---++ ObjectMethod findUserByWikiName ($wikiname) -> list of cUIDs associated with that wikiname
+
+Called from TWiki::Users. See the documentation of the corresponding
+method in that module for details.
+
+Subclasses *must* implement this method.
+
+=cut
+
+sub findUserByWikiName {
+    my $this = shift;
+    my $wikiname = shift;
+
+    if( $wikiname ) {
+            my $dataset = $this->dbSelect('select * from jos_users where name = ?', $wikiname );
+            if( exists $$dataset[0] ) {
+                my @userList = ();
+                for my $row (@$dataset) {
+                    push(@userList, $this->{session}->{users}->findUser( $$row{username} ));
+                }
+                return @userList;
+            }
+            $this->{error} = 'Login invalid';
+            return 0;
+    } else {
+        $this->{error} = 'No user';
+	    return 0;
+    }
+     
+}
+
+#returns an array of user objects that relate to a email address
+sub findUserByEmail {
+    my $this = shift;
+    my $email = shift;
+
+    if( $email ) {
+            my $dataset = $this->dbSelect('select * from jos_users where email = ?', $email );
+            if( exists $$dataset[0] ) {
+                my @userList = ();
+                for my $row (@$dataset) {
+                    push(@userList, $this->{session}->{users}->findUser( $$row{username} ));
+                }
+                return @userList;
+            }
+            $this->{error} = 'Login invalid';
+            return 0;
+    } else {
+        $this->{error} = 'No user';
+        return 0;
+    }
+}
+
+sub encrypt {
+    my ( $this, $user, $passwd, $fresh ) = @_;
+
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+
+	my $toEncode= "$passwd";
+	return Digest::MD5::md5_hex( $toEncode );
+}
+
+sub fetchPass {
+    my ( $this, $user ) = @_;
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+print STDERR "fetchPass($user)";    
+    
+
+    if( $user ) {
+            my $dataset = $this->dbSelect('select * from jos_users where username = ?', $user );
+            #$this->{session}->writeWarning("$@$dataset");  
+print STDERR "fetchpass got - ".join(', ', keys(%{$$dataset[0]}))."aa";          
+            if( exists $$dataset[0] ) {
+print STDERR "fetchPass($user, ".$$dataset[0]{password}.")"; 
+                return $$dataset[0]{password};
+            }
+            $this->{error} = 'Login invalid';
+            return 0;
+    } else {
+        $this->{error} = 'No user';
+        return 0;
+    }
+}
+
+sub passwd {
+    my ( $this, $user, $newUserPassword, $oldUserPassword ) = @_;
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+
+    return 1;
+}
+
+sub deleteUser {
+    my ( $this, $user ) = @_;
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+
+    return 1;
+}
+
+# $user == login name, not the user object
+sub checkPassword {
+    my ( $this, $user, $password, $encrypted) = @_;
+print STDERR "checkPassword($user, $password, encrypted)";    
+    
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+    my $encryptedPassword;
+    if ((defined($encrypted)) && ($encrypted == 1)) {
+        $encryptedPassword = $password;
+    } else {
+        $encryptedPassword = $this->encrypt( $user, $password );
+    }
+
+    $this->{error} = undef;
+
+    my $pw = $this->fetchPass( $user );
+    # $pw will be 0 if there is no pw
+
+print STDERR "checkPassword( $pw && ($encryptedPassword eq $pw) )";
+
+    return 1 if( $pw && ($encryptedPassword eq $pw) );
+    # pw may validly be '', and must match an unencrypted ''. This is
+    # to allow for sysadmins removing the password field in .htpasswd in
+    # order to reset the password.
+    return 1 if ( $pw eq '' && $password eq '' );
+
+    $this->{error} = 'Invalid user/password';
+    return 0;
+}
+
+=pod
+
+---++ ObjectMethod setPassword( $user, $newPassU, $oldPassU ) -> $boolean
+
+If the $oldPassU matches matches the user's password, then it will
+replace it with $newPassU.
+
+If $oldPassU is not correct and not 1, will return 0.
+
+If $oldPassU is 1, will force the change irrespective of
+the existing password, adding the user if necessary.
+
+Otherwise returns 1 on success, undef on failure.
+
+=cut
+
+sub setPassword {
+    my( $this, $user, $newPassU, $oldPassU ) = @_;
+	$this->ASSERT_IS_CANONICAL_USER_ID($user) if DEBUG;
+    throw Error::Simple(
+          'cannot change user passwords using JoomlaUserMapper');
+
+    return $this->{passwords}->setPassword(
+        $this->getLoginName( $user ), $newPassU, $oldPassU);
+}
+
+sub passwordError {
+    my $this = shift;
+
+    return $this->{error};
+}
+
+###############################################################################
+#DB access methods
+
+
+#todo: cache DB connections
+sub getJoomlaDB {
+    my ( $this, $user ) = @_;
+    ASSERT($this->isa( 'TWiki::Users::JoomlaUserMapping')) if DEBUG;
+    my ( $dbi_dsn, $dbi_user, $dbi_passwd ) = 
+            ($TWiki::cfg{Plugins}{JoomlaUser}{DBI_dsn}, 
+            $TWiki::cfg{Plugins}{JoomlaUser}{DBI_username}, 
+            $TWiki::cfg{Plugins}{JoomlaUser}{DBI_password});
+
+#print STDERR "DBIx::SQLEngine->new( $dbi_dsn, $dbi_user, ...)";
+        	
+    unless (defined($this->{JoomlaDB})) {
+#        $this->{session}->writeWarning("DBIx::SQLEngine->new( $dbi_dsn, $dbi_user, ...)");
+        try {
+            $this->{JoomlaDB} = DBIx::SQLEngine->new( $dbi_dsn, $dbi_user, $dbi_passwd );
+        } catch Error::Simple with {
+            $this->{error} = $!;
+            $this->{session}->writeWarning("ERROR: DBIx::SQLEngine->new( $dbi_dsn, $dbi_user, ...) : $!");
+            die 'MYSQL login error ('.$dbi_dsn.', '.$dbi_user.') '.$!;
+        };
+    }
+    return $this->{JoomlaDB};
+}
+
+
+#returns an ref to an array dataset of rows
+#dbSelect(query, @list of params to query)
+sub dbSelect {
+    my $this = shift;
+    my @query = @_;
+    my $dataset;
+
+#print STDERR "fetch_select( @query )";
+
+#    $this->{session}->writeWarning("fetch_select( @query )");
+    if( @query ) {
+        try {
+            my $db = $this->getJoomlaDB();
+            $dataset = $db->fetch_select(
+                sql => [ @query ]);
+        } catch Error::Simple with {
+            $this->{error} = $!;
+print STDERR "            ERROR: fetch_select(@query) : $!";
+            $this->{session}->writeWarning("ERROR: fetch_select(@query) : $!");
+        };
+    }
+#    $this->{session}->writeWarning("fetch_select => ".@...);
+    return $dataset;
+}
+
+=pod
+
+---++ ObjectMethod ASSERT_IS_CANONICAL_USER_ID( $user_id ) -> $boolean
+
+used for debugging to ensure we are actually passing a canonical_id
+
+=cut
+
+sub ASSERT_IS_CANONICAL_USER_ID {
+    my( $this, $user_id ) = @_;
+#	print STDERR "ASSERT_IS_CANONICAL_USER_ID($user_id)";
+#    ASSERT( ($user_id =~/^$this->{mapping_id}-1$/) || ($user_id =~/^$this->{mapping_id}\d+$/) );	#un-signed INT
+
+}
+
+=pod
+
+---++ ObjectMethod ASSERT_IS_USER_LOGIN_ID( $user_login ) -> $boolean
+
+used for debugging to ensure we are actually passing a user login
+
+=cut
+
+sub ASSERT_IS_USER_LOGIN_ID {
+    my( $this, $user_login ) = @_;
+    
+}
+
+
+=pod
+
+---++ ObjectMethod ASSERT_IS_USER_DISPLAY_NAME( $user_display ) -> $boolean
+
+used for debugging to ensure we are actually passing a user display_name (commonly a WikiWord Name)
+
+=cut
+
+sub ASSERT_IS_USER_DISPLAY_NAME {
+    my( $this, $user_display ) = @_;
+    
+}
+
+=pod
+
+---++ ObjectMethod ASSERT_IS_GROUP_DISPLAY_NAME( $group_display ) -> $boolean
+
+used for debugging to ensure we are actually passing a group display_name (commonly a WikiWord Name)
+
+#TODO: i fear we'll need to make a canonical_group_id too 
+
+=cut
+
+sub ASSERT_IS_GROUP_DISPLAY_NAME {
+    my( $this, $group_display ) = @_;
+    
+}
+
+1;


Property changes on: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/lib/TWiki/Users/JoomlaUserMapping.pm
___________________________________________________________________
Name: svn:executable
   + *

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/Joomla.png
===================================================================
(Binary files differ)


Property changes on: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/Joomla.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/wikiring.png
===================================================================
(Binary files differ)


Property changes on: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/wikiring.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/wikiringlogo.png
===================================================================
(Binary files differ)


Property changes on: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/pub/TWiki/JoomlaUsersContrib/wikiringlogo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribSuite.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribSuite.pm	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribSuite.pm	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,9 @@
+package JoomlaUsersContribSuite;
+
+use base qw(Test::Unit::TestSuite);
+
+sub name { 'JoomlaUsersContribSuite' };
+
+sub include_tests { qw(JoomlaUsersContribTests) };
+
+1;

Added: twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribTests.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribTests.pm	                        (rev 0)
+++ twiki/branches/TWikiRelease04x02/twikiplugins/JoomlaUsersContrib/test/unit/JoomlaUsersContrib/JoomlaUsersContribTests.pm	2007-10-30 05:57:32 UTC (rev 15435)
@@ -0,0 +1,36 @@
+use strict;
+
+package JoomlaUsersContribTests;
+
+use base qw(TWikiTestCase);
+
+use strict;
+use TWiki;
+use CGI;
+
+my $twiki;
+
+sub new {
+    my $self = shift()->SUPER::new(@_);
+    return $self;
+}
+
+# Set up the test fixture
+sub set_up {
+    my $this = shift;
+
+    $this->SUPER::set_up();
+
+    $TWiki::Plugins::SESSION = $twiki;
+}
+
+sub tear_down {
+    my $this = shift;
+    $this->SUPER::tear_down();
+}
+
+sub test_self {
+    my $this = shift;
+}
+
+1;

Author: SvenDowideit
Date: 2007-10-30 00:42:34 -0500 (Tue, 30 Oct 2007)
New Revision: 15434

Modified:
   twiki/branches/MAIN/lib/TWiki/Func.pm
   twiki/branches/MAIN/lib/TWiki/UserMapping.pm
   twiki/branches/MAIN/lib/TWiki/Users.pm
Log:
Item4908: don't call the main usermapper if its already returned false to handlesUser

Modified: twiki/branches/MAIN/lib/TWiki/Func.pm
===================================================================
--- twiki/branches/MAIN/lib/TWiki/Func.pm	2007-10-30 05:01:18 UTC (rev 15433)
+++ twiki/branches/MAIN/lib/TWiki/Func.pm	2007-10-30 05:42:34 UTC (rev 15434)
@@ -1937,7 +1937,7 @@
 same TWiki installation. If =$passthru= is set to a true value, then TWiki
 will save the current URL parameters, and then try to restore them on the
 other side of the redirect. Parameters are stored on the server in a cache
-file (see ={PassthroughDir} in =configure=).
+file.
 
 Note that if =$passthru= is set, then any parameters in =$url= will be lost
 when the old parameters are restored. if you want to change any parameter

Modified: twiki/branches/MAIN/lib/TWiki/UserMapping.pm
===================================================================
--- twiki/branches/MAIN/lib/TWiki/UserMapping.pm	2007-10-30 05:01:18 UTC (rev 15433)
+++ twiki/branches/MAIN/lib/TWiki/UserMapping.pm	2007-10-30 05:42:34 UTC (rev 15434)
@@ -63,7 +63,7 @@
 sub new {
     my ($class, $session, $mid) = @_;
     my $this = bless( {
-        mapping_id => $mid,
+        mapping_id => $mid || '',
         session => $session,
     }, $class );
     return $this;
@@ -126,17 +126,20 @@
     return 0;
 }
 
-=pod
+=begin twiki
 
----++ ObjectMethod getCanonicalUserID ($login) -> cUID
+---++ ObjectMethod getCanonicalUserID ($login, $dontcheck) -> cUID
 
 Convert a login name to the corresponding canonical user name. The
 canonical name can be any string of 7-bit alphanumeric and underscore
 characters, and must correspond 1:1 to the login name.
 (undef on failure)
 
+(if dontcheck is true, return a cUID for a nonexistant user too - used for registration)
+
 Subclasses *must* implement this method.
 
+
 =cut
 
 sub getCanonicalUserID {

Modified: twiki/branches/MAIN/lib/TWiki/Users.pm
===================================================================
--- twiki/branches/MAIN/lib/TWiki/Users.pm	2007-10-30 05:01:18 UTC (rev 15433)
+++ twiki/branches/MAIN/lib/TWiki/Users.pm	2007-10-30 05:42:34 UTC (rev 15434)
@@ -207,9 +207,10 @@
       if ($this->{basemapping}->handlesUser($cUID, $login, $wikiname));
 	return $this->{mapping}
       if ($this->{mapping}->handlesUser($cUID, $login, $wikiname));
-    # TODO: I think it should fall back to basemapping, but to do that
-    # I need to get even more clever :/
-	return $this->{mapping} unless ($noFallBack);
+	#THIS MUS BE basemapping, otherwise the mapper implementations need to
+	#implement fallback / defaults for users they don't know about (which is
+	#BaseMappings job)
+	return $this->{basemapping} unless ($noFallBack);
 	return undef;
 }
 
@@ -342,7 +343,7 @@
 		unless ($cUID) {	#must be a wikiname
 			my( $web, $topic ) = $this->{session}->normalizeWebTopicName( '', $login );
 		    my $found = $this->findUserByWikiName($topic);
-    		$cUID = $found->[0] if scalar(@$found);
+    		$cUID = $found->[0] if ($found && scalar(@$found));
 #			print STDERR "\nfindUserByWikiName";	
 		}
     }
@@ -408,6 +409,8 @@
     my( $this, $cUID ) = @_;
 	$cUID = $this->getCanonicalUserID($cUID);
 	#$this->ASSERT_IS_CANONICAL_USER_ID($cUID) if DEBUG;
+	
+	return () unless ($cUID);
 
     return $this->_getMapping($cUID)->getEmails( $cUID );
 }
@@ -703,7 +706,7 @@
     my $otherMapping = ($mapping eq $this->{basemapping}) ? $this->{mapping} : $this->{basemapping};
     my $wikiname = $this->_getMapping($cUID)->getWikiName($cUID);
     my $cUIDList = $otherMapping->findUserByWikiName($wikiname);
-    my $othercUID = $cUIDList->[0]  if scalar(@$cUIDList);
+    my $othercUID = $cUIDList->[0]  if ($cUIDList && scalar(@$cUIDList));
 #print STDERR "---------------------------$cUID == $wikiname == $othercUID\n";
 
     if (($mapping eq $otherMapping) ||

Author: SvenDowideit
Date: 2007-10-30 00:01:18 -0500 (Tue, 30 Oct 2007)
New Revision: 15433

Modified:
   twiki/branches/TWikiRelease04x02/lib/TWiki/Func.pm
   twiki/branches/TWikiRelease04x02/lib/TWiki/UserMapping.pm
   twiki/branches/TWikiRelease04x02/lib/TWiki/Users.pm
Log:
Item4908: don't call the main usermapper if its already returned false to handlesUser

Modified: twiki/branches/TWikiRelease04x02/lib/TWiki/Func.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/lib/TWiki/Func.pm	2007-10-29 21:31:33 UTC (rev 15432)
+++ twiki/branches/TWikiRelease04x02/lib/TWiki/Func.pm	2007-10-30 05:01:18 UTC (rev 15433)
@@ -1937,7 +1937,7 @@
 same TWiki installation. If =$passthru= is set to a true value, then TWiki
 will save the current URL parameters, and then try to restore them on the
 other side of the redirect. Parameters are stored on the server in a cache
-file (see ={PassthroughDir} in =configure=).
+file.
 
 Note that if =$passthru= is set, then any parameters in =$url= will be lost
 when the old parameters are restored. if you want to change any parameter

Modified: twiki/branches/TWikiRelease04x02/lib/TWiki/UserMapping.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/lib/TWiki/UserMapping.pm	2007-10-29 21:31:33 UTC (rev 15432)
+++ twiki/branches/TWikiRelease04x02/lib/TWiki/UserMapping.pm	2007-10-30 05:01:18 UTC (rev 15433)
@@ -63,7 +63,7 @@
 sub new {
     my ($class, $session, $mid) = @_;
     my $this = bless( {
-        mapping_id => $mid,
+        mapping_id => $mid || '',
         session => $session,
     }, $class );
     return $this;
@@ -126,17 +126,20 @@
     return 0;
 }
 
-=pod
+=begin twiki
 
----++ ObjectMethod getCanonicalUserID ($login) -> cUID
+---++ ObjectMethod getCanonicalUserID ($login, $dontcheck) -> cUID
 
 Convert a login name to the corresponding canonical user name. The
 canonical name can be any string of 7-bit alphanumeric and underscore
 characters, and must correspond 1:1 to the login name.
 (undef on failure)
 
+(if dontcheck is true, return a cUID for a nonexistant user too - used for registration)
+
 Subclasses *must* implement this method.
 
+
 =cut
 
 sub getCanonicalUserID {

Modified: twiki/branches/TWikiRelease04x02/lib/TWiki/Users.pm
===================================================================
--- twiki/branches/TWikiRelease04x02/lib/TWiki/Users.pm	2007-10-29 21:31:33 UTC (rev 15432)
+++ twiki/branches/TWikiRelease04x02/lib/TWiki/Users.pm	2007-10-30 05:01:18 UTC (rev 15433)
@@ -208,9 +208,10 @@
       if ($this->{basemapping}->handlesUser($cUID, $login, $wikiname));
 	return $this->{mapping}
       if ($this->{mapping}->handlesUser($cUID, $login, $wikiname));
-    # TODO: I think it should fall back to basemapping, but to do that
-    # I need to get even more clever :/
-	return $this->{mapping} unless ($noFallBack);
+	#THIS MUS BE basemapping, otherwise the mapper implementations need to
+	#implement fallback / defaults for users they don't know about (which is
+	#BaseMappings job)
+	return $this->{basemapping} unless ($noFallBack);
 	return undef;
 }
 
@@ -367,7 +368,7 @@
 		unless ($cUID) {	#must be a wikiname
 			my( $web, $topic ) = $this->{session}->normalizeWebTopicName( '', $login );
 		    my $found = $this->findUserByWikiName($topic);
-    		$cUID = $found->[0] if scalar(@$found);
+    		$cUID = $found->[0] if ($found && scalar(@$found));
 #			print STDERR "\nfindUserByWikiName";	
 		}
     }
@@ -433,6 +434,8 @@
     my( $this, $cUID ) = @_;
 	$cUID = $this->getCanonicalUserID($cUID);
 	#$this->ASSERT_IS_CANONICAL_USER_ID($cUID) if DEBUG;
+	
+	return () unless ($cUID);
 
     return $this->_getMapping($cUID)->getEmails( $cUID );
 }
@@ -728,7 +731,7 @@
     my $otherMapping = ($mapping eq $this->{basemapping}) ? $this->{mapping} : $this->{basemapping};
     my $wikiname = $this->_getMapping($cUID)->getWikiName($cUID);
     my $cUIDList = $otherMapping->findUserByWikiName($wikiname);
-    my $othercUID = $cUIDList->[0]  if scalar(@$cUIDList);
+    my $othercUID = $cUIDList->[0]  if ($cUIDList && scalar(@$cUIDList));
 #print STDERR "---------------------------$cUID == $wikiname == $othercUID\n";
 
     if (($mapping eq $otherMapping) ||

Author: LynnwoodBrown
Date: 2007-10-29 16:31:33 -0500 (Mon, 29 Oct 2007)
New Revision: 15432

Modified:
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt
Log:
Item1715: Update history of plugin.

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt	2007-10-29 21:24:06 UTC (rev 15431)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt	2007-10-29 21:31:33 UTC (rev 15432)
@@ -52,6 +52,7 @@
 |  Copyright: | © |
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 | Change History: | |
+|  15431 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Fix TableSearchResults |
 |  15158 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Updated Weblog and added new Task Topic Type |
 |  15121 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Correcting some script names. |
 |  14840 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item4497'>Item4497</a>  finishing modernise references to SYSTEMWEB and USERSWEB for remaining plugins |

Author: LynnwoodBrown
Date: 2007-10-29 16:24:06 -0500 (Mon, 29 Oct 2007)
New Revision: 15431

Modified:
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTableSearchResults.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/lib/TWiki/Contrib/TopicClassificationAddOn/MANIFEST
Log:
Item1715: Fix TableSearchResults

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTableSearchResults.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTableSearchResults.txt	2007-10-29 05:22:02 UTC (rev 15430)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTableSearchResults.txt	2007-10-29 21:24:06 UTC (rev 15431)
@@ -32,7 +32,7 @@
 ~~~    INITLIMIT="%IFDEFINED{"%INITLIMIT%" 
 ~~~          then="$percntINITLIMIT$percnt" else="all" glue="off"}%" 
 ~~~   }%
-%TABLE{tablewidth="100%" columnwidths=",,,50px"}%
+%TABLE{tablewidth="100%" }%
 %~~   DBQUERY{
 *~~       
 %~~       INCLUDE{"%TCAOWEB%.RenderSearchString"  

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt	2007-10-29 05:22:02 UTC (rev 15430)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt	2007-10-29 21:24:06 UTC (rev 15431)
@@ -86,7 +86,7 @@
 ~~~     as="choice"
 ~~~     glue="on"
 ~~~  }%%ELSEDEFINED%
-<input type="hidden" name="topicparent" value='%PARENT%' />
+<input type="hidden" name="topicparent" value='%IFDEFINED{"%PARENT%"}%' />
 %FIDEFINED%
 <div class="tcaoCreateNewTopic">
 %TABLE{ tablewidth="90%"  columnwidths="20%, 80%" dataalign="right, left"}%

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt	2007-10-29 05:22:02 UTC (rev 15430)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt	2007-10-29 21:24:06 UTC (rev 15431)
@@ -52,6 +52,10 @@
 |  Copyright: | &copy; |
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 | Change&nbsp;History: | |
+|  15158 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Updated Weblog and added new Task Topic Type |
+|  15121 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Correcting some script names. |
+|  14840 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item4497'>Item4497</a>  finishing modernise references to SYSTEMWEB and USERSWEB for remaining plugins |
+|  13643 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item4025'>Item4025</a>  some scripts don't have their executable bit set |
 |  13160 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Fixing change in name of removeSpacesAndPunctuation function, and changing form for creation new classes to table. |
 |  13112 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Add new format for display of search results in table |
 |  13111 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Further improvements to TopicTypes and navigation |

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/lib/TWiki/Contrib/TopicClassificationAddOn/MANIFEST
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/lib/TWiki/Contrib/TopicClassificationAddOn/MANIFEST	2007-10-29 05:22:02 UTC (rev 15430)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/lib/TWiki/Contrib/TopicClassificationAddOn/MANIFEST	2007-10-29 21:24:06 UTC (rev 15431)
@@ -40,6 +40,9 @@
 data/TCAO/Installs/Summary.txt 0644
 data/TCAO/Installs/SundryTangents.txt 0644
 data/TCAO/Installs/TWikiDevelopment.txt 0644
+data/TCAO/Installs/Task.txt 0644
+data/TCAO/Installs/TaskForm.txt 0644
+data/TCAO/Installs/TaskTemplate.txt 0644
 data/TCAO/Installs/TopicClassForm.txt 0644
 data/TCAO/Installs/TopicClassification.txt 0644
 data/TCAO/Installs/TopicForm.txt 0644
@@ -74,9 +77,9 @@
 data/TCAO/RenderAddComment.txt 0644
 data/TCAO/RenderAlphabeticalSearch.txt 0644
 data/TCAO/RenderBarFilterWithSort.txt 0644
+data/TCAO/RenderBlogList.txt 0644
 data/TCAO/RenderBlogListItem.txt 0644
 data/TCAO/RenderClassificationTopic.txt 0644
-data/TCAO/RenderClassificationTopicMessageLayout.txt 0644
 data/TCAO/RenderCommentCountBar.txt 0644
 data/TCAO/RenderCreateNewTopic.txt 0644
 data/TCAO/RenderCreateNewTopicDropDown.txt 0644
@@ -93,6 +96,8 @@
 data/TCAO/RenderTopicSummaryWithCommentsList.txt 0644
 data/TCAO/SubjectArea.txt 0644
 data/TCAO/TCAO.txt 0644
+data/TCAO/TCAOCommentsTemplate.txt 0644
+data/TCAO/TaskTopicMaster.txt 0644
 data/TCAO/TcaoAdmin.txt 0644
 data/TCAO/TcaoUse.txt 0644
 data/TCAO/TopicClassForm.txt 0644

Hi guys,

I have worked on TWikiStandAlone[1] feature proposal since last August and=
=20
it's firsts steps are ready. The main goal was to turn TWiki into a stand=20
alone server in order do speed it up and eat less memory. But this goal=20
changed a little, after I took a look at Rails and Catalyst. I made some=20
changes to core in order to let it be execution mode-agnostic, and this way=
 I=20
built support to run TWiki under FastCGI and as an HTTP stand alone server.=
 I=20
also adapted CGI, CLI and ModPerl support. No dependencies were added to ke=
ep=20
running TWiki as CGI, so with minor configuration changes to webserver the=
=20
new mechanism can be used.

I posted a short introduction about it on TWiki Blog[2].

I invite you all to read complete details at Codev topic and try it out. If=
=20
you like it (consensus reached), I'd like to merge what is done back to MAI=
N.=20
=46rom now on I'll spend more time writing my 'course conclusion paper' (I=
=20
don't know the exact name in english :p) and less with development, but I=20
want to cover all topics listed in "Next Steps" section ;)

1 - http://twiki.org/cgi-bin/view/Codev/TWikiStandAlone
2 - http://twiki.org/cgi-bin/view/Blog/2007-10-26-twiki-stand-alone-project

Cheers,
Gilmar

Crawford:

I created a symlink. You can access all packages at
http://twiki.org/r/release/

Basic auth is required, all registered users OK.

Regards,
Peter


Steffen Poulsen wrote:
> Peter Thoeny wrote:
>> Does this dynamic report help?
>>
>> http://twiki.org/cgi-bin/view/Codev/AllTWikiReleases
>>
>> What do you need the index for?
>>
>> The latest production release number is defined in
>> http://twiki.org/cgi-bin/view/Main/TWikiPreferences
>>
>> You can construct the download URL:
>>
>> %PUBURL%/Codev/Release/TWikiRelease-%LATEST_TWIKI_RELEASE_NUMBER%.zip
>>
>>   
> If we do not like the thought of having +Indexes in a twiki pub dir, 
> perhaps we could just symlink to somewhere else that has +Indexes? Could 
> be .htaccess-protected like /awstats or similar - anyway, I hate the 
> idea of turning this simple request into a why / why not argument - we 
> should simply try to support CC in the best way possible.
> 
> BTW: Best of luck on the WikiSym tutorials, greetings to all TWiki'ers 
> attending :-)
> 
> Best regards,
> Steffen
> 
> 
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems?  Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >> http://get.splunk.com/
> _______________________________________________
> TWiki-Dev mailing list
> TWiki-Dev@...
> https://lists.sourceforge.net/lists/listinfo/twiki-dev
> 

-- 
   * Peter Thoeny, CTO - peter.thoeny.public@...
   * http://twiki.net  - TWIKI.NET - the Enterprise Wiki
   * http://twiki.org  - is your team already TWiki enabled?
   * Knowledge cannot be managed, it can be discovered and shared
   * This e-mail is:   (_) private    (_) ask first    (x) public

Author: SvenDowideit
Date: 2007-10-29 00:22:02 -0500 (Mon, 29 Oct 2007)
New Revision: 15430

Modified:
   twiki/branches/MAIN/tools/pkg/debian/changelog
Log:
Item4899: from Item4898, fixing the security issues, and other debian bug reports

Modified: twiki/branches/MAIN/tools/pkg/debian/changelog
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/changelog	2007-10-29 05:09:32 UTC (rev 15429)
+++ twiki/branches/MAIN/tools/pkg/debian/changelog	2007-10-29 05:22:02 UTC (rev 15430)
@@ -1,14 +1,21 @@
-twiki (1:4.1.2-2) unstable; urgency=high
+twiki (1:4.1.2-3) unstable; urgency=high
 
   * secure /var/www/twiki/pub/_work_areas (Closes: #444982)
     CVE-2007-5193
-  * added Dutch translation (Closes: #422245)
+  * session files in /tmp/twiki, and add O_EXCL to files that go there
   * updated Vietnamese translation (Closes: #426850)
-  * session files in /tmp/twiki, and add O_EXCL to files that go there
   * don't modify files that are not installed (Closes: #444498)
 
- -- Sven Dowideit <SvenDowideit@...>  Sun, 14 Oct 2007 09:53:40 +0100
+ -- Sven Dowideit <SvenDowideit@...>  Mon, 29 Oct 2007 09:53:40 +0100
 
+ twiki  (1:4.1.2-2) unstable; urgency=high
+
+   * secure /var/www/twiki/pub/_work_areas (Closes: #444982)
+     CVE-2007-5193
+   * added Dutch translation (Closes: #422245)
+
+ -- Sven Dowideit <SvenDowideit@...>  Sun, 14 Oct 2007 09:53:40 +0100 
+
 twiki (1:4.1.2-1) unstable; urgency=low
 
   * add commented out mod_perl on apache 2 support using IFModule

Author: SvenDowideit
Date: 2007-10-29 00:09:32 -0500 (Mon, 29 Oct 2007)
New Revision: 15429

Added:
   twiki/branches/MAIN/tools/pkg/debian/patches/001_WorkingDir.dpatch
   twiki/branches/MAIN/tools/pkg/debian/patches/00list
Modified:
   twiki/branches/MAIN/tools/pkg/debian/LocalSite.cfg
   twiki/branches/MAIN/tools/pkg/debian/changelog
   twiki/branches/MAIN/tools/pkg/debian/dirs
   twiki/branches/MAIN/tools/pkg/debian/po/vi.po
   twiki/branches/MAIN/tools/pkg/debian/postinst
   twiki/branches/MAIN/tools/pkg/debian/postrm
Log:
Item4899: from Item4898, fixing the security issues, and other debian bug reports

Modified: twiki/branches/MAIN/tools/pkg/debian/LocalSite.cfg
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/LocalSite.cfg	2007-10-29 04:07:51 UTC (rev 15428)
+++ twiki/branches/MAIN/tools/pkg/debian/LocalSite.cfg	2007-10-29 05:09:32 UTC (rev 15429)
@@ -11,7 +11,8 @@
 $TWiki::cfg{Site}{CharSet} = 'iso-8859-15';
 $TWiki::cfg{LoginManager} = 'TWiki::Client::ApacheLogin';
 $TWiki::cfg{Plugins}{WysiwygPlugin}{Enabled} = 1;
-$TWiki::cfg{RCS}{WorkAreaDir} = '/usr/lib/twiki/working/work_areas';
-$TWiki::cfg{Sessions}{Dir} = '/usr/lib/twiki/working/tmp';
-$TWiki::cfg{PassthroughDir} = '/usr/lib/twiki/working/tmp';
+$TWiki::cfg{RCS}{WorkAreaDir} = '/tmp/twiki';
+$TWiki::cfg{TempfileDir} = '/tmp/twiki';
+$TWiki::cfg{WorkingDir} = '/var/lib/twiki/working';
+
 1;

Modified: twiki/branches/MAIN/tools/pkg/debian/changelog
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/changelog	2007-10-29 04:07:51 UTC (rev 15428)
+++ twiki/branches/MAIN/tools/pkg/debian/changelog	2007-10-29 05:09:32 UTC (rev 15429)
@@ -3,6 +3,9 @@
   * secure /var/www/twiki/pub/_work_areas (Closes: #444982)
     CVE-2007-5193
   * added Dutch translation (Closes: #422245)
+  * updated Vietnamese translation (Closes: #426850)
+  * session files in /tmp/twiki, and add O_EXCL to files that go there
+  * don't modify files that are not installed (Closes: #444498)
 
  -- Sven Dowideit <SvenDowideit@...>  Sun, 14 Oct 2007 09:53:40 +0100
 

Modified: twiki/branches/MAIN/tools/pkg/debian/dirs
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/dirs	2007-10-29 04:07:51 UTC (rev 15428)
+++ twiki/branches/MAIN/tools/pkg/debian/dirs	2007-10-29 05:09:32 UTC (rev 15429)
@@ -7,6 +7,5 @@
 etc/twiki
 usr/share/doc/twiki
 usr/share/twiki
-usr/lib/twiki/working
-usr/lib/twiki/working/tmp
-usr/lib/twiki/working/work_areas
+var/lib/twiki/working
+var/lib/twiki/working/work_areas

Added: twiki/branches/MAIN/tools/pkg/debian/patches/001_WorkingDir.dpatch
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/patches/001_WorkingDir.dpatch	                        (rev 0)
+++ twiki/branches/MAIN/tools/pkg/debian/patches/001_WorkingDir.dpatch	2007-10-29 05:09:32 UTC (rev 15429)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 001_WorkingDir.dpatch by  <SvenDowideit@...>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: reduce the security footprint of working/tmp
+
+@DPATCH@
+
+diff -urNad /tmp/build_deb/twiki-4.1.2/lib/TWiki.pm TWiki412/lib/TWiki.pm 
+--- /tmp/build_deb/twiki-4.1.2/lib/TWiki.pm	2007-03-04 01:45:57.000000000 +1100
++++ TWiki412/lib/TWiki.pm	2007-10-29 13:47:09.000000000 +1100
+@@ -787,7 +787,9 @@
+         }
+     }
+ 
+-    open(F, ">$passthruFilename") || die "{TempfileDir} cache not writable $!";
++    use Fcntl;
++    #passthrough file is only written to once, so if it already exists, suspect a security hack (O_EXCL)
++    open(F, ">$passthruFilename", O_RDWR|O_EXCL|O_CREAT, 0644) || die "{TempfileDir} cache not writable $!";
+     $query->save(\*F);
+     close(F);
+     return 'twiki_redirect_cache='.$uid;
+
+diff -urNad /tmp/build_deb/twiki-4.1.2/lib/TWiki/Client.pm TWiki412/lib/TWiki/Client.pm 
+--- /tmp/build_deb/twiki-4.1.2/lib/TWiki/Client.pm	2007-03-04 01:45:57.000000000 +1100
++++ TWiki412/lib/TWiki/Client.pm	2007-10-29 13:25:03.000000000 +1100
+@@ -181,7 +181,7 @@
+     return undef unless $ip; # no IP address, can't map
+ 
+     my %ips;
+-    if( open( IPMAP, '<', $TWiki::cfg{TempfileDir}.'/ip2sid' )) {
++    if( open( IPMAP, '<', $TWiki::cfg{WorkingDir}.'/ip2sid' )) {
+         local $/ = undef;
+         %ips = map { split( /:/, $_ ) } split( /\r?\n/, <IPMAP> );
+         close(IPMAP);
+@@ -189,7 +189,7 @@
+     if( $sid ) {
+         # known SID, map the IP addr to it
+         $ips{$ip} = $sid;
+-        open( IPMAP, '>', $TWiki::cfg{TempfileDir}.'/ip2sid') ||
++        open( IPMAP, '>', $TWiki::cfg{WorkingDir}.'/ip2sid') ||
+           die "Failed to open ip2sid map for write. Ask your administrator to make sure that the {Sessions}{Dir} is writable by the webserver user.";
+         print IPMAP map { "$_:$ips{$_}\n" } keys %ips;
+         close(IPMAP);

Added: twiki/branches/MAIN/tools/pkg/debian/patches/00list
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/patches/00list	                        (rev 0)
+++ twiki/branches/MAIN/tools/pkg/debian/patches/00list	2007-10-29 05:09:32 UTC (rev 15429)
@@ -0,0 +1 @@
+001_WorkingDir

Modified: twiki/branches/MAIN/tools/pkg/debian/po/vi.po
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/po/vi.po	2007-10-29 04:07:51 UTC (rev 15428)
+++ twiki/branches/MAIN/tools/pkg/debian/po/vi.po	2007-10-29 05:09:32 UTC (rev 15429)
@@ -1,104 +1,84 @@
-# Vietnamese translation for twiki.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@...>, 2005.
-#
+# Vietnamese translation for TWiki.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@...>, 2005-2007.
+# 
 msgid ""
-msgstr ""
-"Project-Id-Version: twiki 20040902-3\n"
+""
+msgstr "Project-Id-Version: twiki 1:4.0.5-9\n"
 "Report-Msgid-Bugs-To: svenud@..."
-"POT-Creation-Date: 2007-02-17 09:09+0100\n"
-"PO-Revision-Date: 2005-08-10 22:45+0930\n"
+"POT-Creation-Date: 2007-02-16 20:22+0100\n"
+"PO-Revision-Date: 2007-05-31 19:08+0930\n"
 "Last-Translator: Clytie Siddall <clytie@..."
-"Language-Team: Vietnamese <gnomevi-list@..."
+"Language-Team: Vietnamese <vi-VN@..."
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.2.2\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
 
-#. Type: string
-#. Description
+#.Type: string
+#.Description
 #: ../templates:1001
-#, fuzzy
 msgid "Top-level URL of the server TWiki runs under:"
-msgstr "TWiki chạy trên máy phục vụ có địa chỉ Mạng cấp đầu nào?"
+msgstr "URL cấp đầu của máy phục vụ dưới đó chạy TWiki:"
 
-#. Type: string
-#. Description
+#.Type: string
+#.Description
 #: ../templates:1001
 msgid ""
 "For a normal install, this should be a URL for your web server's full name, "
-"which is used to construct URLs on some pages.  The install will serve up "
+"which is used to construct urls on some pages.  The install will serve up "
 "the data by adding \"twiki\" to the end of this setting; it is also needed "
 "for certain redirections."
-msgstr ""
-"Khi cài đặt một cách chuẩn, giá trị này nên là một địa chỉ Mạng cho tên đầy "
-"đủ của trình phục vụ Mạng bạn, mà được dùng để tạo địa chỉ Mạng trong một số "
-"trang. Việc cài đặt sẽ cung cấp dữ liệu bằng cách thêm « twiki » vào kết "
-"thức giá trị này; cũng cần thiết nó để chuyển hướng trong một số trường hợp."
+msgstr "Khi cài đặt chuẩn, giá trị này nên là địa chỉ Mạng cho tên đầy đủ của trình phục vụ Mạng, mà được dùng để tạo URL khác trong một số trang. Việc cài đặt sẽ cung cấp dữ liệu bằng cách thêm « twiki » vào kết thúc của giá trị này; cũng cần thiết nó để chuyển hướng trong một số trường hợp."
 
-#. Type: string
-#. Description
+#.Type: string
+#.Description
 #: ../templates:2001
-#, fuzzy
 msgid "Email address of the webmaster for this TWiki:"
-msgstr "Cho TWiki này, người chủ nơi Mạng có địa chỉ thư nào?"
+msgstr "Địa chỉ thư của chủ Mạng cho TWiki này:"
 
-#. Type: string
-#. Description
+#.Type: string
+#.Description
 #: ../templates:2001
 msgid ""
 "This email address gets mail for new user registration, and is listed on the "
 "\"oops\" page when things go wrong."
-msgstr ""
-"Địa chỉ thư này nhận thư khi người dùng mới đăng ký, và xuất hiện trong "
-"trang « ối » (oops) khi gặp lỗi."
+msgstr "Địa chỉ thư này nhận thư khi người dùng mới đăng ký, cũng được hiển thị trên trang « rõ tiếc! » khi gặp lỗi."
 
-#. Type: boolean
-#. Description
+#.Type: boolean
+#.Description
 #: ../templates:3001
-#, fuzzy
 msgid "Install default wiki Topic Set on initial install?"
-msgstr "Cài đặt môi trường wiki mẫu khi cài đặt đầu tiên không?"
+msgstr "Cài đặt Bộ Chủ đề wiki mặc định khi mới cơ sở dữ liệu không?"
 
-#. Type: boolean
-#. Description
+#.Type: boolean
+#.Description
 #: ../templates:3001
-#, fuzzy
 msgid ""
 "TWiki includes a complete \"starter kit\" which includes user registration "
 "pages, documentation, and tutorials.  Only decline if you're re-installing "
-"TWiki after deleting the package and want to keep the old data, or if you've "
-"got a TWiki data set from your own manual install.  If data/Main/WebHome.txt "
-"is present, the starter kit will not be unpacked.  The starter kit files can "
-"be found in /usr/share/twiki/twiki-data.tar.gz (and twiki-pub.tar.gz), if "
-"you want to install it manually or compare your topics with the new version."
-msgstr ""
-"TWiki bao gồm một bộ dụng cụ bắt đầu hoàn thành, gồm trang đăng ký người "
-"dùng, tài liệu và trợ lý học tập. Nếu bạn đang cài đặt lại twiki sau khi xóa "
-"bỏ gói và muốn giữ các dữ liệu cũ, hoặc nếu bạn có dữ liệu twiki từ việc cài "
-"đặt thủ công, thì bạn nên nói « Không » (no) tại đây. Khi cài đặt đầu tiên "
-"một cách chuẩn, hãy nói « Có » (yes), và một bộ dữ liệu mẫu sẽ được cài đặt "
-"vào « /var/lib/twiki/data » (và vào « /var/www/twiki/pub »). (Trong cả hai "
-"trường hợp, nếu có « data/Main/WebHome.txt » thì sẽ không giải nén bộ dụng "
-"cụ bắt đầu; bạn có thể xem trong « /usr/share/doc/twiki/twiki-data.tar.gz "
-"» (và trong « twiki-pub.tar.gz ») nếu bạn muốn tự cài đặt nó, hoặc muốn so "
-"sánh với một phiên bản mới."
+"twiki after deleting the package and want to keep the old data, or if you've "
+"got a twiki data set from your own manual install. If data/Main/WebHome.txt "
+"is present, the starter kit will not be unpacked. The starter kit files can "
+"be found in /usr/share/twiki/twiki-data.tar.gz  (and twiki-pub.tar.gz), if "
+"you want to install it manually or compare your  topics with the new version."
+msgstr "TWiki bao gồm một bộ công cụ bắt đầu hoàn thành, gồm trang đăng ký người "
+"dùng, tài liệu hướng dẫn và trợ lý học tập. Chỉ từ chối nếu bạn đang cài đặt lại twiki sau khi xoá gói và muốn giữ lại dữ liệu cũ, hoặc nếu bạn có dữ liệu twiki từ việc cài đặt thủ công. Có « data/Main/WebHome.txt » thì không mở bộ công cụ bắt đầu. Các tập tin công cụ bắt đầu nằm trong « /usr/share/twiki/twiki-data.tar.gz »  (và « twiki-pub.tar.gz »), nếu bạn muốn tự cài đặt hay so sánh chủ đề với phiên bản mới."
 
-#. Type: note
-#. Description
+#.Type: note
+#.Description
 #: ../templates:4001
-#, fuzzy
 msgid "Admin User Registration configuration required"
-msgstr "Cần thiết cấu hình đăng ký người dùng"
+msgstr "Cần thiết cấu hình kiểu đăng ký người dùng quản trị"
 
-#. Type: note
-#. Description
+#.Type: note
+#.Description
 #: ../templates:4001
 msgid ""
 "After you have created yourself a user, edit the Main.TWikiAdminGroup to "
 "restrict Admin privileges to that user."
-msgstr ""
+msgstr "Sau khi bạn tạo người dùng mình, sửa Main.TWikiAdminGroup để giới hạn quyền hạn quản trị chỉ cho người dùng đó."
 
 #~ msgid "http://localhost/"
 #~ msgstr "http://localhost/"
@@ -115,8 +95,7 @@
 #~ "TWikiRegistrationDefault to TWikiRegistration. IMPORTANT: After you have "
 #~ "created yourself a user, edit the Main.TWikiAdminGroup to restrict Admin "
 #~ "privileges"
-#~ msgstr ""
-#~ "Bản cài đặt TWiki Debian mặc định được cấu hình để tự động tạo người dùng "
+#~ msgstr "Bản cài đặt TWiki Debian mặc định được cấu hình để tự động tạo người dùng "
 #~ "mới khi người ấy đăng ký. Cách này không phải bảo mật như TWiki mặc định, "
 #~ "nhưng mà hữu ích hơn khi thử ra TWiki. Để thay đổi thiết lập này, để mà "
 #~ "quản trị tự tạo người dùng, hãy dùng « TWiki RenameTopic » (TWiki thay "

Modified: twiki/branches/MAIN/tools/pkg/debian/postinst
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/postinst	2007-10-29 04:07:51 UTC (rev 15428)
+++ twiki/branches/MAIN/tools/pkg/debian/postinst	2007-10-29 05:09:32 UTC (rev 15429)
@@ -68,10 +68,12 @@
 db_get twiki/wikiwebmaster
 # do rcs checkout first?
 #TODO: these settings should move to Main.TWikiPreferences
-perl -pi~ -e '$U=q{'"$RET"'}; s/^(.*\*\s*Set\s*WIKIWEBMASTER\s*=\s*).*(\r?\n)$/\1$U\2/;' /var/lib/twiki/data/TWiki/TWikiPreferences.txt
+if [ ! -e /var/lib/twiki/data/TWiki/TWikiPreferences.txt ]; then
+	perl -pi~ -e '$U=q{'"$RET"'}; s/^(.*\*\s*Set\s*WIKIWEBMASTER\s*=\s*).*(\r?\n)$/\1$U\2/;' /var/lib/twiki/data/TWiki/TWikiPreferences.txt
+	#force default to use sendmail by setting SMTPMAILHOST to blank
+	perl -pi~ -e 's/^(\s*\*\s*Set\s*SMTPMAILHOST\s*=\s*).*(\r\n)$/$1$2/;' /var/lib/twiki/data/TWiki/TWikiPreferences.txt
+fi
 
-#force default to use sendmail by setting SMTPMAILHOST to blank
-perl -pi~ -e 's/^(\s*\*\s*Set\s*SMTPMAILHOST\s*=\s*).*(\r\n)$/$1$2/;' /var/lib/twiki/data/TWiki/TWikiPreferences.txt
 
 
 # prevent further confusion: done with debconfig
@@ -125,7 +127,7 @@
 			    touch /var/lib/twiki/data/.htpasswd
 		       	    $HTPASSWDCMD -b /var/lib/twiki/data/.htpasswd TWikiGuest guest
 			    chown $TWIKI_OWNER.www-data /var/lib/twiki/data/.htpasswd
-			    chmod 664 /var/lib/twiki/data/.htpasswd
+			    chmod 660 /var/lib/twiki/data/.htpasswd
 			fi
 		fi
 	fi
@@ -142,16 +144,21 @@
 	if [ ! -e /var/lib/twiki/working ]; then
 		mkdir /var/lib/twiki/working 
 	fi
-	if [ ! -e /var/lib/twiki/working/tmp ]; then
-		mkdir /var/lib/twiki/working/tmp 
-	fi
+	chown $TWIKI_OWNER.www-data /var/lib/twiki/working
 	if [ ! -e /var/lib/twiki/working/work_areas ]; then
 		mkdir /var/lib/twiki/working/work_areas
 	fi
+	chown $TWIKI_OWNER.www-data /var/lib/twiki/working/work_areas
+
 	#mmmm, mailnotify etc may be running _not_ as www-data
 	#and for some reason create a session
-	chmod 777 /var/lib/twiki/working/tmp 
-	chown $TWIKI_OWNER.www-data /var/lib/twiki/working/tmp 
+	#use 1777 to prevent third parties replacing the file with a doctored one
+	#put into /tmp/twiki so that the open dir can't be used by others to fill up /var, thus crashing all logging
+	if [ ! -e /tmp/twiki ]; then
+		mkdir /tmp/twiki
+	fi
+	chmod 1777 /tmp/twiki
+	chown $TWIKI_OWNER.www-data /tmp/twiki
 
 	#add softlinks to make adding plugins easier ()
 	if [ ! -e /var/lib/twiki/lib ]; then
@@ -174,11 +181,8 @@
 	# reload apache configs
 	for server in $servers; do
 		if [ -e /etc/init.d/$server ]; then
-         	if which invoke-rc.d >/dev/null 2>&1; then
-         		invoke-rc.d $server reload
-         	else
-                /etc/init.d/$server reload
-			fi		
+			echo reloading $server config
+                	/etc/init.d/$server reload
 		fi
 	done
     ;;

Modified: twiki/branches/MAIN/tools/pkg/debian/postrm
===================================================================
--- twiki/branches/MAIN/tools/pkg/debian/postrm	2007-10-29 04:07:51 UTC (rev 15428)
+++ twiki/branches/MAIN/tools/pkg/debian/postrm	2007-10-29 05:09:32 UTC (rev 15429)
@@ -32,11 +32,7 @@
 	# reload apache configs
 	for server in $servers; do
 		if [ -e /etc/init.d/$server ]; then
-         	if which invoke-rc.d >/dev/null 2>&1; then
-         		invoke-rc.d $server reload
-         	else
-                /etc/init.d/$server reload
-			fi		
+                	/etc/init.d/$server reload
 		fi
 	done
 fi

Author: GilmarSantosJr
Date: 2007-10-28 23:07:51 -0500 (Sun, 28 Oct 2007)
New Revision: 15428

Modified:
   twiki/scratch/TWikiStandAlone/lib/TWiki.spec
   twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl
Log:
Item4662: TWikiStandAlone
   * Minor doc fix to TWiki.spec
   * Adapted tools/buildTWikiStandAloneRelease.pl to TSA context

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki.spec
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki.spec	2007-10-29 04:00:42 UTC (rev 15427)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki.spec	2007-10-29 04:07:51 UTC (rev 15428)
@@ -556,7 +556,7 @@
 # (and <b>{Sessions}{UseIPMatching}</b> will be useless)<br/>
 #
 # If you are not running behind a proxy and leave this checked then an 
-# attacker can perform an IP Spoofing by sending a fake 
+# attacker can perform an IP spoofing attack by sending a fake 
 # <code>X-Forwarded-For</code> HTTP header. <br/>
 #
 # This option matters only to HTTP engine.

Modified: twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl
===================================================================
--- twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl	2007-10-29 04:00:42 UTC (rev 15427)
+++ twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl	2007-10-29 04:07:51 UTC (rev 15428)
@@ -13,19 +13,11 @@
 #
 #
 
-my $SvensAutomatedBuilds = 0;
-if ( grep('-sven', @ARGV) ) {
-   $SvensAutomatedBuilds = 1;
-   print STDERR "doing an automated Sven build";
-}
+my $twikiBranch = 'TWikiStandAlone';
 
-
-
-my $twikiBranch = 'MAIN';
-
 unless ( -e $twikiBranch ) {
    print STDERR "doing a fresh checkout\n";
-   `svn co http://svn.twiki.org/svn/twiki/branches/$twikiBranch > TWiki-svn.log`;
+   `svn co http://svn.twiki.org/svn/twiki/scratch/$twikiBranch > TWiki-svn.log`;
    chdir($twikiBranch);
 } else {
 #TODO: should really do an svn revert..
@@ -38,7 +30,7 @@
 my $twikihome = `pwd`;
 chomp($twikihome);
 
-`mkdir working/tmp`;
+`mkdir -p working/tmp`;
 `chmod 777 working/tmp`;
 `chmod 777 lib`;
 #TODO: add a trivial and correct LocalSite.cfg
@@ -68,10 +60,6 @@
     close(UNIT);
     
     chdir($twikihome);
-    if ($SvensAutomatedBuilds) {
-    	`scp TWiki* distributedinformation\@distributedinformation.com:/home/distributedinformation/www/TWikiBuilds`;
-    	sendEmail('twiki-dev@...', "Subject: TWiki $twikiBranch branch has Unit test FAILURES\n\n see http://distributedinformation.com/TWikiBuilds/ for output files.\n".$unittestErrors);
-    }
     die "\n\n$errorcode: unit test failures - need to fix them first\n" 
 }
 
@@ -103,19 +91,10 @@
 #      * Note: if you specify a release name the script will attempt to commit to svn 
 `perl pseudo-install.pl BuildContrib`;
 chdir('lib');
-`perl ../tools/build.pl release -auto 2>&1 > $twikihome/TWiki-build.log`;
+`perl ../tools/buildTSA.pl release -auto 2>&1 > $twikihome/TWiki-build.log`;
 
 chdir($twikihome);
-if ($SvensAutomatedBuilds) {
-	#push the files to my server - http://distributedinformation.com/TWikiBuilds/
-	`scp TWiki* distributedinformation\@distributedinformation.com:/home/distributedinformation/www/TWikiBuilds` ;
-	my $buildOutput = `ls -alh *auto*`;
-	$buildOutput .= "\n";
-	$buildOutput .= `grep 'All tests passed' $twikihome/TWiki-UnitTests.log`;
-	sendEmail('Builds@...', "Subject: TWiki $twikiBranch built OK\n\n see http://distributedinformation.com/TWikiBuilds/ for output files.\n".$buildOutput);
-}
 
-
 sub getLocalSite {
    my $twikidir = shift;
 
@@ -131,23 +110,4 @@
    return $localsite;
 }
 
-#Yes, this email setup only works for Sven - will look at re-using the .settings file CC made for BuildContrib
-sub sendEmail {
-    return unless ($SvensAutomatedBuilds);
-    my $toAddress = shift;
-    my $text = shift;
-    use Net::SMTP;
-
-    my $smtp = Net::SMTP->new('mail.iinet.net.au', Hello=>'sven.home.org.au', Debug=>0);
-
-    $smtp->mail('SvenDowideit@...');
-    $smtp->to($toAddress);
-
-    $smtp->data();
-    $smtp->datasend("To: $toAddress\n");
-    $smtp->datasend($text);
-    $smtp->dataend();
-
-    $smtp->quit;
-}
 1;

Author: GilmarSantosJr
Date: 2007-10-28 23:00:42 -0500 (Sun, 28 Oct 2007)
New Revision: 15427

Added:
   twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl
Modified:
   twiki/scratch/TWikiStandAlone/tools/buildTSA.pl
Log:
Item4662: TWikiStandAlone
	* Updated buildTSA.pl to work with svn and cleaned
	* Coping buildTWikiRelease.pl to buildTWikiStandAloneRelease.pl


Modified: twiki/scratch/TWikiStandAlone/tools/buildTSA.pl
===================================================================
--- twiki/scratch/TWikiStandAlone/tools/buildTSA.pl	2007-10-29 02:29:10 UTC (rev 15426)
+++ twiki/scratch/TWikiStandAlone/tools/buildTSA.pl	2007-10-29 04:00:42 UTC (rev 15427)
@@ -1,8 +1,9 @@
 #!/usr/bin/perl -w
 #
-# Build for TWiki
-# Crawford Currie & Sven Dowideit
-# Copyright (C) TWikiContributors, 2005
+# Build for TWikiStandAlone
+# Original Authors: Crawford Currie & Sven Dowideit
+# Adapted to TWikiStandAlone by Gilmar Santos Jr
+# Copyright (C) TWikiContributors, 2007
 
 use strict;
 
@@ -23,6 +24,7 @@
     if(scalar(@path)) {
         unshift @INC, join( '/', @path ).'/twikiplugins/BuildContrib/lib';
     }
+	$ENV{LC_ALL} = $ENV{LANG} = $ENV{LANGUAGE} = 'C';
 }
 
 use TWiki::Contrib::Build;
@@ -42,24 +44,14 @@
         if ( $name eq '-auto' ) {
 
             #build a name from major.minor.patch.-auto.svnrev
-            my $rev = `svk info ..`;
-            $rev =~ /Mirrored.*Rev\. (\d*)/m;
+            my $rev = `svn info ..`;
+            $rev =~ /Revision: (\d*)/m;
             $name = 'TWikiStandAlone-'. getCurrentTWikiRELEASE() .'-auto'.$1;
             $autoBuild = 1;
         }
     }
-    my @olds = sort grep { /^TWikiRelease\d+x\d+x\d+$/ }
-        split('/\n', `svn ls http://svn.twiki.org/svn/twiki/tags`);
-    my $lastName = pop(@olds);
-    my $last = $lastName;
-    $last =~ s/TWikiRelease//;
-    $last =~ s/^0+//;
-    $last =~ s/x0+(\d)/x$1/g;
-    $last =~ s/x/./g;
 
     my $this = $class->SUPER::new( $name, 'TWiki' );
-    $this->{last} = $last;
-    $this->{lastName} = $lastName;
     return $this;
 }
 
@@ -73,91 +65,9 @@
 
     $this->SUPER::target_stage();
 
-    #use a Cairo install to create new ,v files for the data, and pub
-    #WARNING: I don't know how to get the 'last' release, so i'm hardcoding Cairo
     $this->stage_gendocs();
-#    $this->stage_rcsfiles();
 }
 
-# check in a single file to RCS
-sub _checkInFile {
-    my( $this, $old, $new, $file ) = @_;
-
-    return if ( shift =~ /\,v$/ ); #lets not check in ,v files
-
-    my $currentRevision = 0;
-    print "Checking in $new/$file\r";
-
-    # Remember the permissions
-    my @s = stat("$new/$file");
-    my $perms = $s[2];
-
-    if ( -e $old.'/'.$file.',v' ) {
-        $this->cp($old.'/'.$file.',v', $new.'/'.$file.',v');
-        #force unlock
-        `rcs -u -M $new/$file,v 2>&1`;
-        #lock to this user
-        `rcs -l $new/$file 2>&1`;
-
-        #try to get current revision number
-        my $rcsInfo = `rlog -r $new/$file 2>&1`;
-        if ( $rcsInfo =~ /revision \d+\.(\d+)/ ) {     #revision 1.2
-            $currentRevision = $1;
-        } else {
-            #it seems that you can have a ,v file with no commit, if you get here, you have an invalid ,v file. remove that file.
-            die 'failed to get revision (make sure the ,v file is valid): '.$file."\n";
-        }
-    } else {
-        #set revision number #TODO: what about topics with no META DATA?
-        my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision+1).'\"$2/\' '.$new.'/'.$file;
-        `$cmd`;
-        # create rcs file
-        `ci -u -mbuildrelease -wTWikiContributor -t-buildrelease $new/$file 2>&1`;
-    }
-
-    #only do a checkin, if the files are different (fake the rev number to be the same)
-    my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision).'\"$2/\' '.$new.'/'.$file;
-    `$cmd`;
-    my $different = `rcsdiff -q $new/$file`;
-    chomp($different);
- 
-    if (defined($different) && ($different ne '')) {
-	    #set revision number #TODO: what about topics with no META DATA?
-	    my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision+1).'\"$2/\' '.$new.'/'.$file;
-	    `$cmd`;
-	    #check in
-    	`ci -mbuildrelease -wTWikiContributor -t-new-topic $new/$file 2>&1`;
-    	#get a copy of the latest revsion, no lock
-    	`co -u -M $new/$file 2>&1`;
-    	print "\n";
-    } else {
-        #force unlock
-        `rcs -u -M $new/$file,v 2>&1`;
-    	print "nochange to $new/$file\n";
-    }
-
-    # restore the permissions
-    chmod($perms, "$new/$file");
-}
-
-# recursively check in files to RCS
-sub _checkInDir {
-    my( $this, $old, $new, $root, $filterIn ) = @_;
-    my $dir;
-
-    opendir( $dir, "$new/$root" ) || die "Failed to open $root: $!";
-    print "Scanning $new/$root...\r";
-    foreach my $content ( grep { !/^\./ } readdir($dir)) {
-        my $sub = "$root/$content";
-        if( -d "$new/$sub" ) {
-            $this->_checkInDir( $old, $new, $sub, $filterIn );
-        } elsif( -f "$new/$sub" && &$filterIn( $sub )) {
-            $this->_checkInFile( $old, $new, $sub );
-        }
-    }
-    close($dir);
-}
-
 sub stage_gendocs {
     my $this = shift;
 
@@ -186,36 +96,6 @@
     print "Automatic documentation built\n";
 }
 
-sub stage_rcsfiles() {
-    my $this = shift;
-
-    # svn co cairo to a new dir
-    #foreach file in data|pub in tmpDir, cp ,v file from svnCo 
-    #do a ci
-    #if there was no existing ,v file, make one and ci
-    #my $lastReleaseDir = $this->{tmpDir}.'/lastRel'.($$ +1);
-    #TODO: too unixy - but I'd like to stop checking out the entire release every nightly build
-    #TODO: verify that this is an unadulterated version of the checkout
-    my $lastReleaseDir = '/tmp/'.$this->{lastName};
-
-    $this->makepath($lastReleaseDir);
-    $this->pushd($lastReleaseDir);
-    print "Checking out release $this->{last} to $lastReleaseDir\n";
-    `svn co http://svn.twiki.org/svn/twiki/tags/$this->{lastName}/ .`;
-    $this->popd();
-    print "Creating ,v files.\n";
-    $this->_checkInDir( $lastReleaseDir, $this->{tmpDir}, 'data',
-                       sub { return shift =~ /\.txt$/ } );
-
-    $this->_checkInDir( $lastReleaseDir, $this->{tmpDir}, 'pub',
-                       sub { return -f shift; } );
-
-    # Fix perms mangled by RCS
-    $this->apply_perms($this->{files}, $this->{tmpDir} );
-
-    $this->rm( $lastReleaseDir );
-}
-
 # Create the build object
 my $build = new TWikiBuild();
 
@@ -232,23 +112,3 @@
     $content =~ /\$RELEASE\s*=\s*'TWikiStandAlone-(.*?)'/;
     return $1;
 }
-
-sub _get_svn_version {
-    my $this = shift;
-    unless( $this->{VERSION} ) {
-        # svk info all the files in the manifest
-        my $files = join(" ", map { "$this->{basedir}/$_->{name}" } @{$this->{files}});
-        my $log = `svk info $files`;
-        my $max = 0;
-        foreach my $line ( split(/\n/, $log )) {
-            if( $line =~ /^Last Changed Rev: (.*)$/ ) {
-                $max = $1 if $1 > $max;
-            }
-        }
-        $this->{VERSION} = $max;
-    }
-    my $rev = `svk info ..`;
-    $rev =~ /Revision: (\d+).*Mirrored.*?Rev\. (\d*)/s;
-    $this->{VERSION} = $2 - $1 + $this->{VERSION} - 1;
-    return $this->{VERSION};
-}

Copied: twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl (from rev 15426, twiki/scratch/TWikiStandAlone/tools/buildTWikiRelease.pl)
===================================================================
--- twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl	                        (rev 0)
+++ twiki/scratch/TWikiStandAlone/tools/buildTWikiStandAloneRelease.pl	2007-10-29 04:00:42 UTC (rev 15427)
@@ -0,0 +1,153 @@
+#!/usr/bin/perl -w
+#
+# Build a TWiki Release from branches in the TWiki  svn repository - see http://twiki.org/cgi-bin/view/Codev/BuildingARelease
+# checkout TWiki Branch
+# run the unit tests
+# run other tests
+# build a release tarball & upload...
+# Sven Dowideit
+# Copyright (C) TWikiContributors, 2005
+#
+# If you are Sven (used by Sven's automated nightly build system) - call with perl ./buildTWikiRelease.pl -sven
+# everyone else, can just run perl ./buildTWikiRelease.pl
+#
+#
+
+my $SvensAutomatedBuilds = 0;
+if ( grep('-sven', @ARGV) ) {
+   $SvensAutomatedBuilds = 1;
+   print STDERR "doing an automated Sven build";
+}
+
+
+
+my $twikiBranch = 'MAIN';
+
+unless ( -e $twikiBranch ) {
+   print STDERR "doing a fresh checkout\n";
+   `svn co http://svn.twiki.org/svn/twiki/branches/$twikiBranch > TWiki-svn.log`;
+   chdir($twikiBranch);
+} else {
+#TODO: should really do an svn revert..
+   print STDERR "using existing checkout, removing ? files";
+   chdir($twikiBranch);
+   `svn status | grep ? | sed 's/?/rm -r/' | sh > TWiki-svn.log`;
+   `svn up >> TWiki-svn.log`;
+}
+
+my $twikihome = `pwd`;
+chomp($twikihome);
+
+`mkdir working/tmp`;
+`chmod 777 working/tmp`;
+`chmod 777 lib`;
+#TODO: add a trivial and correct LocalSite.cfg
+`chmod -R 777 data pub`;
+
+#TODO: replace this code with 'configure' from comandline
+my $localsite = getLocalSite($twikihome);
+open(LS, ">$twikihome/lib/LocalSite.cfg");
+print LS $localsite;
+close(LS);
+
+
+`perl pseudo-install.pl default`;
+`perl pseudo-install.pl UnitTestContrib`; # required for all testcases
+`perl pseudo-install.pl TestFixturePlugin`; # required for semi-auto testcases to run
+
+#run unit tests
+#TODO: testrunner should exit == 0 if no errors?
+chdir('test/unit');
+my $unitTests = "export TWIKI_LIBS=; export TWIKI_HOME=$twikihome;perl ../bin/TestRunner.pl -clean TWikiSuite.pm 2>&1 > $twikihome/TWiki-UnitTests.log";
+my $return = `$unitTests`;
+my $errorcode = $? >> 8;
+unless ($errorcode == 0) {
+    open(UNIT, "$twikihome/TWiki-UnitTests.log");
+    local $/ = undef;
+    my $unittestErrors = <UNIT>;
+    close(UNIT);
+    
+    chdir($twikihome);
+    if ($SvensAutomatedBuilds) {
+    	`scp TWiki* distributedinformation\@distributedinformation.com:/home/distributedinformation/www/TWikiBuilds`;
+    	sendEmail('twiki-dev@...', "Subject: TWiki $twikiBranch branch has Unit test FAILURES\n\n see http://distributedinformation.com/TWikiBuilds/ for output files.\n".$unittestErrors);
+    }
+    die "\n\n$errorcode: unit test failures - need to fix them first\n" 
+}
+
+chdir($twikihome);
+#TODO: add a performance BM & compare to something golden.
+`perl tools/MemoryCycleTests.pl 2>&1 > $twikihome/TWiki-MemoryCycleTests.log`;
+`perlcritic lib/  2>&1 > $twikihome/TWiki-PerlCritic.log`;
+`perlcritic bin/ 2>&1 >> $twikihome/TWiki-PerlCritic.log`;
+#`cd tools; perl check_manifest.pl`;
+#`cd data; grep '%META:TOPICINFO{' */*.txt | grep -v TestCases | grep -v 'author="TWikiContributor".*version="\$Rev'`;
+
+#TODO: #  fix up release notes with new changelogs - see
+#
+#    * http://develop.twiki.org/~twiki4/cgi-bin/view/Bugs/ReleaseNotesTml?type=patch
+#        * Note that the release note is edited by editing the topic data/TWiki/TWikiReleaseNotes04x00. The build script creates a file in the root of the zip called TWikiReleaseNotes04x00? .html, and the build script needs your Twiki to be running to look up the release note topic and show it with the simple text skin.
+#            * Note - from 4.1 we need to call this data/TWiki/TWikiReleaseNotes04x01 
+#
+#
+
+print "\n\n ready to build release\n";
+
+#TODO: clean the setup again
+#   1.  Install default plugins (hard copy)
+#      * perl pseudo-install.pl default to install the plugins specified in MANIFEST 
+#   2. use the configure script to make your system basically functional
+#      * ensure that your apache has sufficient file and directory permissions for data and pub 
+#   3. cd tools
+#   4. perl build.pl release
+#      * Note: if you specify a release name the script will attempt to commit to svn 
+`perl pseudo-install.pl BuildContrib`;
+chdir('lib');
+`perl ../tools/build.pl release -auto 2>&1 > $twikihome/TWiki-build.log`;
+
+chdir($twikihome);
+if ($SvensAutomatedBuilds) {
+	#push the files to my server - http://distributedinformation.com/TWikiBuilds/
+	`scp TWiki* distributedinformation\@distributedinformation.com:/home/distributedinformation/www/TWikiBuilds` ;
+	my $buildOutput = `ls -alh *auto*`;
+	$buildOutput .= "\n";
+	$buildOutput .= `grep 'All tests passed' $twikihome/TWiki-UnitTests.log`;
+	sendEmail('Builds@...', "Subject: TWiki $twikiBranch built OK\n\n see http://distributedinformation.com/TWikiBuilds/ for output files.\n".$buildOutput);
+}
+
+
+sub getLocalSite {
+   my $twikidir = shift;
+
+#   open(TS, "$twikidir/lib/TWiki.spec");
+#   local $/ = undef;
+#   my $localsite = <TS>;
+#   close(TS);
+   my $localsite = `grep 'TWiki::cfg' $twikidir/lib/TWiki.spec`;
+
+   $localsite =~ s|/home/httpd/twiki|$twikidir|g;
+   $localsite =~ s|# \$TWiki|\$TWiki|g;
+
+   return $localsite;
+}
+
+#Yes, this email setup only works for Sven - will look at re-using the .settings file CC made for BuildContrib
+sub sendEmail {
+    return unless ($SvensAutomatedBuilds);
+    my $toAddress = shift;
+    my $text = shift;
+    use Net::SMTP;
+
+    my $smtp = Net::SMTP->new('mail.iinet.net.au', Hello=>'sven.home.org.au', Debug=>0);
+
+    $smtp->mail('SvenDowideit@...');
+    $smtp->to($toAddress);
+
+    $smtp->data();
+    $smtp->datasend("To: $toAddress\n");
+    $smtp->datasend($text);
+    $smtp->dataend();
+
+    $smtp->quit;
+}
+1;

Author: GilmarSantosJr
Date: 2007-10-28 21:29:10 -0500 (Sun, 28 Oct 2007)
New Revision: 15426

Removed:
   twiki/scratch/TWikiStandAlone/twikiplugins/AccessStatsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ActionTrackerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AddDBMGroupPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AdvertsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AgentPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AlbumOfSnapsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AliasPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AntiWikiSpamPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AnyWikiDrawPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ApprovalPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AttachContentPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AutoCompleteAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/AutoCompletePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/AutoViewTemplatePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BarcodePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BatchUploadPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BeautifierPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BenchmarkContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/BibliographyPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BibtexPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BlackListPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BlogAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/BlogPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BreadCrumbsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BugsContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/BugzillaLinkPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/BugzillaQueryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/CacheAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/CacheChooserAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/CalendarPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/CategoryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ChartPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ChecklistPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ChildTopicTemplatePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ChildTopicsTag/
   twiki/scratch/TWikiStandAlone/twikiplugins/CliRunnerContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/CompareRevisionsAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/ComponentEditPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ConditionalPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ContributorsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ControlsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/CopyCatSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/CounterPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/CpanContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/CreateTopicTag/
   twiki/scratch/TWikiStandAlone/twikiplugins/DBCacheContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/DBCachePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DakarContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/DallasSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DandruffSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DatabasePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DateFieldPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DateTimePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DefaultPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DirectedGraphPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DirectedGraphWebMapPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DiskUsagePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DistributionContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/DojoToolkitContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/DolphinToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/DoxygenPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DpSyntaxHighlighterPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/DragonSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EFetchPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EasyTimelinePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EditContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/EditRowPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EditSyntaxPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EditTablerowPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmbedBibPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmbedFlashPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmbedPDFPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmbedPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmbedQTPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmbedTopicPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmptyContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmptyHeaderArtContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/EmptyTag/
   twiki/scratch/TWikiStandAlone/twikiplugins/EncryptedPagesPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/EndNotePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExampleHeaderArtContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExcelImportExportPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExecuterContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExifMetaDataPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExplicitNumberingPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExtTopicListPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExtendedSelectPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ExternalLinkPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FakeBasicAuthRegPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FallbackPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FamilyTreePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FileListPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FilterPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FindElsewherePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FirefoxExtensionAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/FlexWebListPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FlowchartPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FormFieldListPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FormFieldsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FormPivotPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FormPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FormQueryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/FormsAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/FuncContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/FuncUsersContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/FundraisingPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GaugePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFLatexAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/GenerateSearchPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GenericWikiToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/GetAWebAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/GlobalReplacePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GluePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GnuPlotPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GoogleAjaxSearchPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GoogleAnalyticsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GoogleSearchPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GpgkeyPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/GuidPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/HTTPDUserAdminContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/HeadlinesPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/HiddenTextPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/HideInEditModePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/HistoryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/HolidaylistPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/HostnamePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/HtmlFormsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/IfDefinedPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ImageGalleryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ImagePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ImgPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ImgTag/
   twiki/scratch/TWikiStandAlone/twikiplugins/ImmediateNotifyPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/InclTag/
   twiki/scratch/TWikiStandAlone/twikiplugins/IncludeIndexPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/IncludeRevisionPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/InlineEditPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/IrcLogPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/IrcPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/JQueryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/JSPopupPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/JSPwikiToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/JSUnitContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/JavaPasteAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/KoalaSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/KupuContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/KwikiToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/LDAPPasswordChangerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LaTeXToMathMLPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LatexModePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LdapContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/LdapNgPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LdapPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LightboxPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LinkOptionsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LoadTagsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LocalCityTimePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LocalTimePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/LoginNameAliasesPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MacrosPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MailInContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/MailPageAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/MailReminderPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MailToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/MakeCtrlTopicsListAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/MaketextCompatibilityPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MathModePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MaxImageSizePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MediaWikiToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/MessageBoardPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MetaWorkflowPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MetasearchTag/
   twiki/scratch/TWikiStandAlone/twikiplugins/MoreFuncContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/MoreVarsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MovableTypePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MoveableTypeSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MrdIdPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MsOfficeAttachmentsAsHTMLPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MultiEditPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/MultiLangPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NamespaceManagerAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/NatEditContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/NatSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NatSkinPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NativeSearchContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/NavBarAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/NavPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NavbarPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NetgrepPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NewTopicEventPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NewUserPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NewsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NotificationPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/NotifyOnChildModificationTopic/
   twiki/scratch/TWikiStandAlone/twikiplugins/OoPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/OrphansPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PageStatsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PatentLinkPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PeerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PerlDocPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PerlSamplePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PersonalInfoAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/PhantomPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PhotoarchivePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PhpWikiToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/PingBackPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PloticusPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PluginBenchmarkAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/PluginsInstaller/
   twiki/scratch/TWikiStandAlone/twikiplugins/PollPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ProjectPlannerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ProtocolTlaPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PrototypeContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/PseudoXmlPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/PublishContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/PublishWebPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/QuickCalendarPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/QuickMenuSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/QuickSearchPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/QuizPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RackPlannerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RandomQuotePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RandomTopicPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RatingContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/RecursiveRenderPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RedDotPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RedirectBySubdomainAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/RedirectPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RenderTableDataPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RevRecoverPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RevisionLinkPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/RollupPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SablotronPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SafeWikiPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SchedulerContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/SearchEnginePluceneAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/SearchEngineSwishEAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/SearchSummaryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SectionalEditPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SecurityPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SeeSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SendEmailPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SetVariableAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/SignaturePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SimpleBlueSkin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SingletonWikiWordPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SkillsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SlashFilenamePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SlideNavPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SlidyPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SmartEditContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/SnazzyRoundedCornersContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/SnmpCommandPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SoapClientPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SourceHighlightPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SpacedWikiWordPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SpellCheckAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/SpellCheckerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/StopWikiWordLinkPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/StylePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SubscribePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SuggestLinksPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SvgPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/SyncContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/SyntaxHighlightingPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiAjaxContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiAjaxPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiCacheAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiDeploymentSpiderAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiDrawPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiDrawSvgPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiInstallerContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiInstallerWindowsContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiPluginInstallerContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiReleaseTrackerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiShellContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiUmlPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TableToolAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/TagCloudPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TagMePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TaskExeContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/TaskExePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TdbContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/TemplateToolkitPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TextSectionPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ThreadedDiscussionPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TigerSkinPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TimeSincePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TimelinePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TitleTag/
   twiki/scratch/TWikiStandAlone/twikiplugins/TocPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TodaysVisitorsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/ToolTipPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TopicClassificationAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/TopicCreatePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TopicReadersPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TopicReferencePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TopicTranslationsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TopicVarsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TouchGraphPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TranslateTagPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TreeBrowserPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TreePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/TypographyPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/URLCachePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/UpdateInfoPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/UploadToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/UseModWikiToTWikiAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/UserHomePageAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/UserInfoPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/VarCachePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/VersionLinkPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/VoodooPadXmlRpcAddOn/
   twiki/scratch/TWikiStandAlone/twikiplugins/VotePlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/WeatherPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/WebDAVPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/WebPermissionsPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/WikiwygContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/WorkflowPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/WorkflowReportsContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/XmlQueryPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/XmlRpcContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/XmlXslPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/XpTrackerPlugin/
   twiki/scratch/TWikiStandAlone/twikiplugins/YahooUserInterfaceContrib/
   twiki/scratch/TWikiStandAlone/twikiplugins/YetAnotherXpTrackerPlugin/
Modified:
   twiki/scratch/TWikiStandAlone/
   twiki/scratch/TWikiStandAlone/data/TWiki/TWikiEditingShorthand.txt
   twiki/scratch/TWikiStandAlone/data/TWiki/TWikiVariablesQuickStart.txt
   twiki/scratch/TWikiStandAlone/data/TWiki/TextFormattingRules.txt
   twiki/scratch/TWikiStandAlone/data/TWiki/UsingHTML.txt
Log:
Item4662: TWikiStandAlone
   * Removed non-default extensions from TSA tree (except UnitTestContrib, BuildContrib and TestFixturePlugin)
   * Merged from MAIN, rev 15425


Property changes on: twiki/scratch/TWikiStandAlone
___________________________________________________________________
Name: svk:merge
   - 1677e817-7831-46d5-99df-29670531d6f3:/local/MAIN:761
6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:13731
a00a5322-12db-0310-a70b-8735589c885e:/branches/TWikiRelease04x00:11417
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/DEVELOP:8671
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/MAIN:15420
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/TWikiRelease04x00:11683
a00a5322-12db-0310-a70b-8735589c885e:/twiki/trunk:1767
da601d30-f818-0410-9a57-a822fe5a4a93:/local/terceiro/TopicTranslationsPlugin:10084
db3699c8-1c30-0410-a7fc-e1c66c7c2fc9:/twiki/enhanced-diff:1757
   + 1677e817-7831-46d5-99df-29670531d6f3:/local/MAIN:761
6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:13731
a00a5322-12db-0310-a70b-8735589c885e:/branches/TWikiRelease04x00:11417
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/DEVELOP:8671
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/MAIN:15424
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/TWikiRelease04x00:11683
a00a5322-12db-0310-a70b-8735589c885e:/twiki/trunk:1767
da601d30-f818-0410-9a57-a822fe5a4a93:/local/terceiro/TopicTranslationsPlugin:10084
db3699c8-1c30-0410-a7fc-e1c66c7c2fc9:/twiki/enhanced-diff:1757

Modified: twiki/scratch/TWikiStandAlone/data/TWiki/TWikiEditingShorthand.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/data/TWiki/TWikiEditingShorthand.txt	2007-10-28 16:59:18 UTC (rev 15425)
+++ twiki/scratch/TWikiStandAlone/data/TWiki/TWikiEditingShorthand.txt	2007-10-29 02:29:10 UTC (rev 15426)
@@ -139,7 +139,7 @@
 </tr>
 <tr valign="top">
 <td>
- *Verbatim (Literal) Text:* %BR%
+ *Verbatim Text:* %BR%
  Surround code excerpts and other formatted text with =&lt;verbatim&gt;= and =&lt;/verbatim&gt;= tags.%BR%
 %T% =verbatim= tags disable HTML code. Use =&lt;pre&gt;= and =&lt;/pre&gt;= tags instead if you want the HTML code within the tags to be interpreted.%BR%
 __%X% NOTE:__ Preferences variables (* Set NAME = value) are set within verbatim tags.
@@ -454,6 +454,53 @@
 [[mailto:?subject=Hi][Hi]]
 </td>
 </tr>
+<tr>
+<td>
+ *Literal content:* %BR%
+ TWiki generates HTML code from TWiki shorthand.
+ *Experts* surround anything that must be output literally in the HTML code, without the application of
+ TWiki shorthand rules, with =&lt;literal&gt;..&lt;/literal&gt;= tags. %X% any HTML
+ within literal tags *must* be well formed i.e. all tags must be properly closed before
+ the end of the literal block. %I% TWiki Variables are expanded within literal blocks.
+</td><td>
+<pre>
+&lt;literal&gt;
+| Not | A | Table |
+&lt;literal&gt;
+</pre>
+</td>
+<td>
+<literal>
+| Not | A | Table |
+</literal>
+</td>
+</tr>
+<tr>
+<td>
+ *Protected content:* %BR%
+ *Experts* protect text from mangling by WYSIWYG editors using
+ =&lt;sticky&gt;..&lt;/sticky&gt;= tags. Sticky tags don't have any effect on normal
+ topic display; they are only relevant when content has to be
+ protected from a WYSIWYG editor (usually because it isn't well-formed HTML, or because it
+ is HTML that WYSIWYG would normally filter out or modify). Protected
+ content appears as plain text in the WYSIWYG editor.
+</td><td>
+=&lt;sticky&gt;=
+<verbatim>
+<div>
+This div is required
+</div>
+</verbatim>
+=&lt;sticky&gt;=
+</td>
+<td>
+<sticky>
+<div>
+This div is required
+</div>
+</sticky>
+</td>
+</tr>
 </table>
 
 %STOPINCLUDE%

Modified: twiki/scratch/TWikiStandAlone/data/TWiki/TWikiVariablesQuickStart.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/data/TWiki/TWikiVariablesQuickStart.txt	2007-10-28 16:59:18 UTC (rev 15425)
+++ twiki/scratch/TWikiStandAlone/data/TWiki/TWikiVariablesQuickStart.txt	2007-10-29 02:29:10 UTC (rev 15426)
@@ -3,24 +3,17 @@
 
 %STARTINCLUDE%
 
-TWiki Variables are names that are enclosed in percent signs =%= that are expanded on the fly. Some variables take arguments, such as =%<nop>INCLUDE%=. For those variables, the arguments are included in curly braces ({ and }).
+TWiki Variables are names enclosed in percent signs that are that are expanded to some other text when the topic
+is displayed. For example, =%<nop>TOPIC%= is expanded to %TOPIC%.
+Some variables can take arguments in curly braces - for example, =%<nop>INCLUDE{"OtherTopic" ARG="arg"}%=.
 
-| *Variable* | *In brief* | *Full documentation* |
-| =%<nop>TOC%= | Automatically generates a table of contents based on headings in a topic - see the top of this page for an example. |VarTOC |
-| =%<nop>WEB%= | The current web, is <b><nop>%WEB%</b>. | VarWEB |
-| =%<nop>TOPIC%= | The current topic name, is <b>%BASETOPIC%</b>. <!-- using BASETOPIC instead of TOPIC for the example because this document is normally included in TextFormattingRules --> | VarTOPIC |
-| =%<nop>ATTACHURL%= | The attachment URL of the current topic. Example usage: If you attach a file to a topic you can refer to it as =<b>%<nop>ATTACHURL%/image.gif</b>= to show the URL of the file or the image in your text. | VarATTACHURL |
-| =%<nop>INCLUDE{"SomeTopic"}%= | Server side include, includes another topic. The current web is the default web. Example: =<b>%<nop>INCLUDE{"%SYSTEMWEB%.SiteMap"}%</b>= | VarINCLUDE |
-| =%<nop>SEARCH{"sushi"}%= | Inline search showing the search result embedded in a topic. FormattedSearch gives you control over formatting, useful for creating web-based applications. | VarSEARCH |
+Many TWiki variables are built-in, and others are predefined for your convenience. You can also define your own
+TWiki Variables at the entire site, individual web, or individual topic level. For more information,
+go to *[[TWikiVariables]]*
 
-TWikiPreferences defines some site-wide variables. Among them are:
-   * *Line break:* Write =%<nop>BR%= to start a new line.
-   * *Colored text:* Write: =%<nop>RED% Red %<nop>ENDCOLOR% and %<nop>BLUE% blue %<nop>ENDCOLOR% colors= to get: %RED% Red %ENDCOLOR% and %BLUE% blue %ENDCOLOR% colors.
+TWiki Variables are fully expanded _before_ any of the TWiki text formatting rules are applied.
 
-There are many more variables. To see them all, go to *[[TWikiVariables]]*.
-
 *Documentation Graphics:* There are many graphics available to use in your topics. Use =%<nop>ICON{"help"}%=, =%<nop>ICON{"tip"}%=, and =%<nop>ICON{"warning"}%= to get: %H%, %T%, and %X%, respectively. TWikiDocGraphics lists them all.
 
-
 %ICON{"tip"}% To "escape" a variable, prefix it with an exclamation mark. Write: =!%<nop>SOMEVARIABLE%= to get: !%SOMEVARIABLE%.
 %STOPINCLUDE%

Modified: twiki/scratch/TWikiStandAlone/data/TWiki/TextFormattingRules.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/data/TWiki/TextFormattingRules.txt	2007-10-28 16:59:18 UTC (rev 15425)
+++ twiki/scratch/TWikiStandAlone/data/TWiki/TextFormattingRules.txt	2007-10-29 02:29:10 UTC (rev 15426)
@@ -15,10 +15,6 @@
 
 %INCLUDE{"UsingHTML"}%
 
----+++ Script tags
-
-You can use HTML =&lt;script>= tags for your TWiki applications. However note that your TWiki administrator can disable =&lt;script>= in topics, and may have chosen to do so for security considerations. TWiki markup and TWikiVariables are *not* expanded inside script tags.
-
 ---++ Hyperlinks
 
 Being able to create links without any special formatting is a core TWiki feature, made possible with WikiWords and inline URLs.

Modified: twiki/scratch/TWikiStandAlone/data/TWiki/UsingHTML.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/data/TWiki/UsingHTML.txt	2007-10-28 16:59:18 UTC (rev 15425)
+++ twiki/scratch/TWikiStandAlone/data/TWiki/UsingHTML.txt	2007-10-29 02:29:10 UTC (rev 15426)
@@ -2,20 +2,26 @@
 ---++ Using HTML
 
 %STARTINCLUDE%
-You can use just about any HTML tag without a problem. You can add HTML if there is no TWiki equivalent, for example, write =&lt;strike&gt;deleted text&lt;/strike&gt;= to get <strike>deleted text</strike>.
+You can use most HTML tags in TWiki topics without a problem. This is useful where you want to
+add some content that is formatted in a way that is not supported using [[#TWikiShorthand][TWiki shorthand]], for example,
+you can write =&lt;strike&gt;deleted text&lt;/strike&gt;= to get <strike>deleted text</strike>.
 
-%X% There are a few usability and technical considerations to keep in mind:
-   * On collaboration pages, it's better *not* to use HTML, but to use [[#TWikiShorthand][TWiki shorthand]] instead - this keeps the text uncluttered and easy to edit.
-   * If you use HTML use [[http://www.w3.org/TR/xhtml1/][XHTML 1.0 Transitional]] syntax.
+There are a few usability and technical considerations to keep in mind:
+   * On collaboration pages, it's better *not* to use HTML, but to use [[#TWikiShorthand][TWiki shorthand]] instead -
+     this keeps the text uncluttered and easy to edit using the plaintext editor.
+   * If you _must_ use HTML, use [[http://www.w3.org/TR/xhtml1/][XHTML 1.0 Transitional]] syntax.
+   * Use =&lt;literal&gt;..&lt;/literal&gt;= tags around blocks of HTML to avoid accidental interpretation of
+     [[#TWikiShorthand][TWiki shorthand]] within the HTML.
    * %X% Script tags may be filtered out, at the discretion of your TWiki administrator.
 
-Recommendations when pasting HTML from other sources:
+Recommendations when pasting HTML from other sources (using the plain-text editor):
    * Copy only text between =&lt;body&gt;= and =&lt;/body&gt;= tags.
    * Remove all empty lines. TWiki inserts =&lt;p /&gt;= paragraph tags on empty lines, which causes problems if done between HTML tags that do not allow paragraph tags, like for example between table tags.
    * Remove leading spaces. TWiki might interpret some text as lists.
-   * Do not span a tag over more than one line. TWiki requires that the opening and closing angle brackets - ==&lt;...&gt;== - of an HTML tag are on the same line, or the tag will be broken.
+   * Do not span a tag over more than one line. TWiki requires that the opening and closing angle brackets - ==&lt;...&gt;== - of a HTML tag are on the same line, or the tag will be broken.
    * In your HTML editing program, save without hard line breaks on text wrap.
 
-%T% TWiki converts shorthand notation to HTML for display. To copy a fully marked-up page, simply view the source in your browser and save the contents. If you need to save HTML frequently, you may want to check out TWiki:Plugins/PublishAddOn.
+When using a WYSIWYG editor, you can just copy-paste directly into the editor, and the content will
+be converted to [[#TWikiShorthand][TWiki shorthand]] automatically when you save.
 
 %STOPINCLUDE%

Below e-mail bounced, trying again (without spam
URL)

I also asked Google to revoke the twikiuser@...
account.

Cheers,
Peter


-------- Original Message --------
Subject: Re: [TWiki-Dev] Spam alert / AriBari
Date: Sat, 27 Oct 2007 13:49:42 -0700
From: Peter Thoeny <peter.thoeny.public@...>
Reply-To: TWiki-Dev list for developers <twiki-dev@...>
Organization: TWIKI.NET
To: TWiki-Dev list for developers <twiki-dev@...>


Thanks Steffen, I added ****-*****\.com to the
SPAMLIST of the BlackListPlugin to protect TWiki
sites.

Cheers,
Peter


Steffen Poulsen wrote:
> Hi,
> 
> FYI: There's a user calling himself AriBari that is currently spamming 
> TWiki sites - http://www.google.com/search?q=aribari+twiki.
> 
> He is registering with twikiuser@..., example of spam can be seen at
> 
> http://twiki.im.ufba.br/bin/view/Main/AriBari?raw=all (Comment field / 
> drugs-brands).
> 
> Best regards,
> Steffen Poulsen
> 
> 
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems?  Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >> http://get.splunk.com/
> _______________________________________________
> TWiki-Dev mailing list
> TWiki-Dev@...
> https://lists.sourceforge.net/lists/listinfo/twiki-dev
> 

-- 
   * Peter Thoeny, CTO - peter.thoeny.public@...
   * http://twiki.net  - TWIKI.NET - the Enterprise Wiki
   * http://twiki.org  - is your team already TWiki enabled?
   * Knowledge cannot be managed, it can be discovered and shared
   * This e-mail is:   (_) private    (_) ask first    (x) public

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
TWiki-Dev mailing list
TWiki-Dev@...
https://lists.sourceforge.net/lists/listinfo/twiki-dev


-- 
   * Peter Thoeny, CTO - peter.thoeny.public@...
   * http://twiki.net  - TWIKI.NET - the Enterprise Wiki
   * http://twiki.org  - is your team already TWiki enabled?
   * Knowledge cannot be managed, it can be discovered and shared
   * This e-mail is:   (_) private    (_) ask first    (x) public

All interested in TWiki Marketing:

Please join our scheduled TWiki Marketing meeting
on Monday, 2007-10-29 20:00 GMT on IRC channel
#twiki_marketing on the irc.freenode.net network.

The proposed agenda is posted at
http://twiki.org/cgi-bin/view/Codev/TWikiMarketingMeeting2007x10x29

See you tomorrow, cheers,
Peter


PS: Visit http://twiki.org/cgi-bin/xtra/tzdate to see
current GMT.


-- 
   * Peter Thoeny, CTO - peter.thoeny.public@...
   * http://twiki.net  - TWIKI.NET - the Enterprise Wiki
   * http://twiki.org  - is your team already TWiki enabled?
   * Knowledge cannot be managed, it can be discovered and shared
   * This e-mail is:   (_) private    (_) ask first    (x) public

Author: GilmarSantosJr
Date: 2007-10-28 11:59:18 -0500 (Sun, 28 Oct 2007)
New Revision: 15425

Added:
   twiki/scratch/TWikiStandAlone/tools/buildTSA.pl
Modified:
   twiki/scratch/TWikiStandAlone/lib/MANIFEST
   twiki/scratch/TWikiStandAlone/lib/TWiki.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm
Log:
Item4662: TWikiStandAlone
   * Added twiki_cgi.pl, twiki_cli.pl and twiki_fastcgi.pl to MANIFEST
   * Store::RcsWrap and Store::SearchAlgorithm::Forking didn't work with HTTP engine. Fixed.
   * Modified $TWiki::RELEASE
   * Added buildTSA.pl, adapted from build.pl to SVK and TWikiStandAlone

Modified: twiki/scratch/TWikiStandAlone/lib/MANIFEST
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/MANIFEST	2007-10-26 14:55:00 UTC (rev 15424)
+++ twiki/scratch/TWikiStandAlone/lib/MANIFEST	2007-10-28 16:59:18 UTC (rev 15425)
@@ -49,6 +49,9 @@
 bin/search 0555
 bin/setlib.cfg 0444
 bin/statistics 0555
+bin/twiki_cgi.pl 0555
+bin/twiki_cli.pl 0555
+bin/twiki_fastcgi.pl 0555
 bin/upload 0555
 bin/view 0555
 bin/viewfile 0555

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm	2007-10-26 14:55:00 UTC (rev 15424)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm	2007-10-28 16:59:18 UTC (rev 15425)
@@ -44,14 +44,14 @@
 sub run {
     my $this = shift;
 
-    my $child = fork;
-    die "Can't fork: $!\n" unless defined $child;
+    my $pid = fork;
+    die "Can't fork: $!\n" unless defined $pid;
     my %args = (
         port => 3000,
         host => 0,
         @_
     );
-    unless ( $child ) {
+    unless ( $pid ) {
         close STDIN;
         close STDOUT;
         my $monitor = _setupMonitor();

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm	2007-10-26 14:55:00 UTC (rev 15424)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm	2007-10-28 16:59:18 UTC (rev 15425)
@@ -86,24 +86,18 @@
         print ':' . $args{port} if $args{port} != 80;
         print "$args{binUrl}/view$TWiki::cfg{ScriptSuffix}\n";
     }
-    my $restart = 0;
 
-    local $SIG{HUP}  = sub { $restart = 1 };
-    local $SIG{CHLD} = 'IGNORE';
     local $SIG{PIPE} = 'IGNORE';
 
   CLIENT:
-    while ( !$restart && ( my $client = $httpd->accept ) ) {
+    while ( my $client = $httpd->accept ) {
         my $r = $client->get_request('headers_only_please');
         next CLIENT unless $r;
         if ( $r->method eq 'RESTART' ) {
             my $peerIp = $this->_canonicalIP($client->peerhost);
             my $ip     = $this->_canonicalIP($httpd->sockhost);
             $ip = '127.0.0.1' if $ip eq '0.0.0.0';
-            if ( $peerIp eq '127.0.0.1' || $peerIp eq $ip ) {
-                $restart = 1;
-                last CLIENT;
-            }
+            last CLIENT if $peerIp eq '127.0.0.1' || $peerIp eq $ip;
         }
         elsif ( $r->method eq 'GET' && $r->uri->path =~ m#^$pubUrl#o ) {
             my $pubDir = $TWiki::cfg{PubDir};
@@ -123,25 +117,23 @@
     }
     $httpd->close;
 
-    if ( $restart ) {
-        $SIG{CHLD} = 'DEFAULT';
-        wait unless $args{detach};
-        ### if the standalone server was invoked with perl -I .. we will loose
-        ### those include dirs upon re-exec. So add them to PERL5LIB, so they
-        ### are available again for the exec'ed process --kane
-        use Config;
-        $ENV{PERL5LIB} .= join $Config{path_sep}, @INC;
-        $ENV{PATH} = $TWiki::cfg{SafeEnvPath};
-        my $perl = $Config{perlpath};
-        if ( $^O ne 'VMS' ) {
-            $perl .= $Config{_exe}
-                unless $perl =~ m/$Config{_exe}$/i;
-        }
-        chdir TWiki::Sandbox::untaintUnchecked($this->{dir});
-        my $script = TWiki::Sandbox::untaintUnchecked($0);
-        my $args   = TWiki::Sandbox::untaintUnchecked(join( ' ', @ARGV ));
-        exec $perl . ' -wT "'. $script . '" ' . $args;
+    local $SIG{CHLD} = 'DEFAULT';
+    wait unless $args{detach};
+    ### if the standalone server was invoked with perl -I .. we will loose
+    ### those include dirs upon re-exec. So add them to PERL5LIB, so they
+    ### are available again for the exec'ed process --kane
+    use Config;
+    $ENV{PERL5LIB} .= join $Config{path_sep}, @INC;
+    $ENV{PATH} = $TWiki::cfg{SafeEnvPath};
+    my $perl = $Config{perlpath};
+    if ( $^O ne 'VMS' ) {
+        $perl .= $Config{_exe}
+            unless $perl =~ m/$Config{_exe}$/i;
     }
+    chdir TWiki::Sandbox::untaintUnchecked($this->{dir});
+    my $script = TWiki::Sandbox::untaintUnchecked($0);
+    my $args   = TWiki::Sandbox::untaintUnchecked(join( ' ', @ARGV ));
+    exec $perl . ' -wT "'. $script . '" ' . $args;
 }
 
 =begin twiki

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki.pm	2007-10-26 14:55:00 UTC (rev 15424)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki.pm	2007-10-28 16:59:18 UTC (rev 15425)
@@ -15,7 +15,8 @@
 with CGI accelerators such as mod_perl.
 
 ---++ Public Data members
-   * =cgiQuery=         Pointer to the CGI::
+   * =request=          Pointer to the TWiki::Request
+   * =response=         Pointer to the TWiki::Respose
    * =context=          Hash of context ids
    * moved: =loginManager=     TWiki::LoginManager singleton (moved to TWiki::Users)
    * =plugins=          TWiki::Plugins singleton
@@ -30,7 +31,7 @@
                         not consistently used. Avoid.
    * =security=         TWiki::Access singleton
    * =SESSION_TAGS=     Hash of TWiki variables whose value is specific to
-                        the current CGI request.
+                        the current request.
    * =store=            TWiki::Store singleton
    * =topicName=        Name of topic found in URL path or =topic= URL
                         parameter
@@ -170,7 +171,7 @@
     # DO NOT CHANGE THE FORMAT OF $VERSION
     # Automatically expanded on checkin of this module
     $VERSION = '$Date$ $Rev$ ';
-    $RELEASE = 'TWiki-4.3.0';
+    $RELEASE = 'TWikiStandAlone-4.3.0';
     $VERSION =~ s/^.*?\((.*)\).*: (\d+) .*?$/$RELEASE, $1, build $2/;
 
     # Default handlers for different %TAGS%
@@ -1246,7 +1247,7 @@
    * =$loginName= is the login username (*not* the wikiname) of the user you
      want to be logged-in if none is available from a session or browser.
      Used mainly for side scripts and debugging.
-   * =$query= the CGI query (may be undef, in which case an empty query
+   * =$query= the TWiki::Request query (may be undef, in which case an empty query
      is used)
    * =\%initialContext= - reference to a hash containing context
      name=value pairs to be pre-installed in the context hash
@@ -1279,12 +1280,12 @@
     require TWiki::Store;
     $this->{store} = new TWiki::Store( $this );
     $this->{request} = $query;
-    $this->{response} = TWiki::Response->new();
+    $this->{response} = new TWiki::Response();
 
     $this->{remoteUser} = $login;	#use login as a default (set when running from cmd line)
     require TWiki::Users;
     $this->{users} = new TWiki::Users( $this );
-	$this->{remoteUser} = $this->{users}->{remoteUser};
+    $this->{remoteUser} = $this->{users}->{remoteUser};
 
     # Make %ENV safer, preventing hijack of the search path
     # SMELL: can this be done in a BEGIN block? Or is the environment

Copied: twiki/scratch/TWikiStandAlone/tools/buildTSA.pl (from rev 14882, twiki/scratch/TWikiStandAlone/tools/build.pl)
===================================================================
--- twiki/scratch/TWikiStandAlone/tools/buildTSA.pl	                        (rev 0)
+++ twiki/scratch/TWikiStandAlone/tools/buildTSA.pl	2007-10-28 16:59:18 UTC (rev 15425)
@@ -0,0 +1,254 @@
+#!/usr/bin/perl -w
+#
+# Build for TWiki
+# Crawford Currie & Sven Dowideit
+# Copyright (C) TWikiContributors, 2005
+
+use strict;
+
+BEGIN {
+    use File::Spec;
+
+    unshift @INC, split(/:/, $ENV{TWIKI_LIBS} || '../lib' );
+
+    # designed to be run within a SVN checkout area
+    my @path = split( /\/+/, File::Spec->rel2abs($0) );
+    pop(@path); # the script name
+
+    while (scalar(@path) > 0) {
+        last if -d join( '/', @path).'/twikiplugins/BuildContrib';
+        pop( @path );
+    }
+
+    if(scalar(@path)) {
+        unshift @INC, join( '/', @path ).'/twikiplugins/BuildContrib/lib';
+    }
+}
+
+use TWiki::Contrib::Build;
+
+# Declare our build package
+package TWikiBuild;
+
+@TWikiBuild::ISA = ( "TWiki::Contrib::Build" );
+
+sub new {
+    my $class = shift;
+    my $autoBuild;	#set if this is an automatic build
+    my $name;
+
+    if ( scalar(@ARGV) > 1 ) {
+        $name = pop(@ARGV);
+        if ( $name eq '-auto' ) {
+
+            #build a name from major.minor.patch.-auto.svnrev
+            my $rev = `svk info ..`;
+            $rev =~ /Mirrored.*Rev\. (\d*)/m;
+            $name = 'TWikiStandAlone-'. getCurrentTWikiRELEASE() .'-auto'.$1;
+            $autoBuild = 1;
+        }
+    }
+    my @olds = sort grep { /^TWikiRelease\d+x\d+x\d+$/ }
+        split('/\n', `svn ls http://svn.twiki.org/svn/twiki/tags`);
+    my $lastName = pop(@olds);
+    my $last = $lastName;
+    $last =~ s/TWikiRelease//;
+    $last =~ s/^0+//;
+    $last =~ s/x0+(\d)/x$1/g;
+    $last =~ s/x/./g;
+
+    my $this = $class->SUPER::new( $name, 'TWiki' );
+    $this->{last} = $last;
+    $this->{lastName} = $lastName;
+    return $this;
+}
+
+# Override installer target; don't want an installer.
+sub target_installer {
+    my $this = shift;
+}
+
+sub target_stage {
+    my $this = shift;
+
+    $this->SUPER::target_stage();
+
+    #use a Cairo install to create new ,v files for the data, and pub
+    #WARNING: I don't know how to get the 'last' release, so i'm hardcoding Cairo
+    $this->stage_gendocs();
+#    $this->stage_rcsfiles();
+}
+
+# check in a single file to RCS
+sub _checkInFile {
+    my( $this, $old, $new, $file ) = @_;
+
+    return if ( shift =~ /\,v$/ ); #lets not check in ,v files
+
+    my $currentRevision = 0;
+    print "Checking in $new/$file\r";
+
+    # Remember the permissions
+    my @s = stat("$new/$file");
+    my $perms = $s[2];
+
+    if ( -e $old.'/'.$file.',v' ) {
+        $this->cp($old.'/'.$file.',v', $new.'/'.$file.',v');
+        #force unlock
+        `rcs -u -M $new/$file,v 2>&1`;
+        #lock to this user
+        `rcs -l $new/$file 2>&1`;
+
+        #try to get current revision number
+        my $rcsInfo = `rlog -r $new/$file 2>&1`;
+        if ( $rcsInfo =~ /revision \d+\.(\d+)/ ) {     #revision 1.2
+            $currentRevision = $1;
+        } else {
+            #it seems that you can have a ,v file with no commit, if you get here, you have an invalid ,v file. remove that file.
+            die 'failed to get revision (make sure the ,v file is valid): '.$file."\n";
+        }
+    } else {
+        #set revision number #TODO: what about topics with no META DATA?
+        my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision+1).'\"$2/\' '.$new.'/'.$file;
+        `$cmd`;
+        # create rcs file
+        `ci -u -mbuildrelease -wTWikiContributor -t-buildrelease $new/$file 2>&1`;
+    }
+
+    #only do a checkin, if the files are different (fake the rev number to be the same)
+    my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision).'\"$2/\' '.$new.'/'.$file;
+    `$cmd`;
+    my $different = `rcsdiff -q $new/$file`;
+    chomp($different);
+ 
+    if (defined($different) && ($different ne '')) {
+	    #set revision number #TODO: what about topics with no META DATA?
+	    my $cmd = 'perl -pi -e \'s/^(%META:TOPICINFO{.*version=)\"[^\"]*\"(.*)$/$1\"'.($currentRevision+1).'\"$2/\' '.$new.'/'.$file;
+	    `$cmd`;
+	    #check in
+    	`ci -mbuildrelease -wTWikiContributor -t-new-topic $new/$file 2>&1`;
+    	#get a copy of the latest revsion, no lock
+    	`co -u -M $new/$file 2>&1`;
+    	print "\n";
+    } else {
+        #force unlock
+        `rcs -u -M $new/$file,v 2>&1`;
+    	print "nochange to $new/$file\n";
+    }
+
+    # restore the permissions
+    chmod($perms, "$new/$file");
+}
+
+# recursively check in files to RCS
+sub _checkInDir {
+    my( $this, $old, $new, $root, $filterIn ) = @_;
+    my $dir;
+
+    opendir( $dir, "$new/$root" ) || die "Failed to open $root: $!";
+    print "Scanning $new/$root...\r";
+    foreach my $content ( grep { !/^\./ } readdir($dir)) {
+        my $sub = "$root/$content";
+        if( -d "$new/$sub" ) {
+            $this->_checkInDir( $old, $new, $sub, $filterIn );
+        } elsif( -f "$new/$sub" && &$filterIn( $sub )) {
+            $this->_checkInFile( $old, $new, $sub );
+        }
+    }
+    close($dir);
+}
+
+sub stage_gendocs {
+    my $this = shift;
+
+    # Note: generated documentation files do *NOT* appear in MANIFEST
+
+    # generate the POD documentation
+    print "Building automatic documentation to $this->{tmpDir}...";
+    print `perl $this->{basedir}/tools/gendocs.pl -debug -root $this->{tmpDir}`;
+    $this->cp( "$this->{tmpDir}/AUTHORS",
+               "$this->{tmpDir}/pub/TWiki/TWikiContributor/AUTHORS" );
+
+    for my $script qw( view rdiff ) {
+        $this->cp( "$this->{tmpDir}/bin/$script",
+                   "$this->{tmpDir}/bin/${script}auth" );
+        $this->prot( "0555", "$this->{tmpDir}/bin/${script}auth");
+    }
+
+    #SMELL: these should probably abort the build if they return errors / oopies
+#replaced by the simpler INSTALL.html
+#    print `cd $this->{basedir}/bin ; ./view TWiki.TWikiDocumentation skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/TWikiDocumentation.html`;
+    print `cd $this->{basedir}/bin ; ./view TWiki.TWikiHistory skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/TWikiHistory.html`;
+    print `cd $this->{basedir}/bin ; ./view TWiki.TWikiReleaseNotes04x02 skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/TWikiReleaseNotes04x02.html`;
+    print `cd $this->{basedir}/bin ; ./view TWiki.TWikiUpgradeGuide skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/TWikiUpgradeGuide.html`;
+    print `cd $this->{basedir}/bin ; ./view TWiki.TWikiInstallationGuide skin plain | $this->{basedir}/tools/fix_local_links.pl > $this->{tmpDir}/INSTALL.html`;
+    $this->filter_txt("$this->{tmpDir}/TWikiReleaseNotes04x02.html", "$this->{tmpDir}/TWikiReleaseNotes04x02.html");
+    print "Automatic documentation built\n";
+}
+
+sub stage_rcsfiles() {
+    my $this = shift;
+
+    # svn co cairo to a new dir
+    #foreach file in data|pub in tmpDir, cp ,v file from svnCo 
+    #do a ci
+    #if there was no existing ,v file, make one and ci
+    #my $lastReleaseDir = $this->{tmpDir}.'/lastRel'.($$ +1);
+    #TODO: too unixy - but I'd like to stop checking out the entire release every nightly build
+    #TODO: verify that this is an unadulterated version of the checkout
+    my $lastReleaseDir = '/tmp/'.$this->{lastName};
+
+    $this->makepath($lastReleaseDir);
+    $this->pushd($lastReleaseDir);
+    print "Checking out release $this->{last} to $lastReleaseDir\n";
+    `svn co http://svn.twiki.org/svn/twiki/tags/$this->{lastName}/ .`;
+    $this->popd();
+    print "Creating ,v files.\n";
+    $this->_checkInDir( $lastReleaseDir, $this->{tmpDir}, 'data',
+                       sub { return shift =~ /\.txt$/ } );
+
+    $this->_checkInDir( $lastReleaseDir, $this->{tmpDir}, 'pub',
+                       sub { return -f shift; } );
+
+    # Fix perms mangled by RCS
+    $this->apply_perms($this->{files}, $this->{tmpDir} );
+
+    $this->rm( $lastReleaseDir );
+}
+
+# Create the build object
+my $build = new TWikiBuild();
+
+# Build the target on the command line, or the default target
+$build->build($build->{target});
+
+
+#returns the version number portion in the $RELEASE line in TWiki.pm
+sub getCurrentTWikiRELEASE {
+    open( PM, "<../lib/TWiki.pm" ) || die $!;
+    local $/ = undef;
+    my $content = <PM>;
+    close(PM);
+    $content =~ /\$RELEASE\s*=\s*'TWikiStandAlone-(.*?)'/;
+    return $1;
+}
+
+sub _get_svn_version {
+    my $this = shift;
+    unless( $this->{VERSION} ) {
+        # svk info all the files in the manifest
+        my $files = join(" ", map { "$this->{basedir}/$_->{name}" } @{$this->{files}});
+        my $log = `svk info $files`;
+        my $max = 0;
+        foreach my $line ( split(/\n/, $log )) {
+            if( $line =~ /^Last Changed Rev: (.*)$/ ) {
+                $max = $1 if $1 > $max;
+            }
+        }
+        $this->{VERSION} = $max;
+    }
+    my $rev = `svk info ..`;
+    $rev =~ /Revision: (\d+).*Mirrored.*?Rev\. (\d*)/s;
+    $this->{VERSION} = $2 - $1 + $this->{VERSION} - 1;
+    return $this->{VERSION};
+}

Hi,

FYI: There's a user calling himself AriBari that is currently spamming 
TWiki sites - http://www.google.com/search?q=aribari+twiki.

He is registering with twikiuser@..., example of spam can be seen at

http://twiki.im.ufba.br/bin/view/Main/AriBari?raw=all (Comment field / 
drugs-brands).

Best regards,
Steffen Poulsen

Author: KennethLavrsen
Date: 2007-10-26 09:55:00 -0500 (Fri, 26 Oct 2007)
New Revision: 15424

Modified:
   twiki/branches/MAIN/data/TWiki/TWikiEditingShorthand.txt
   twiki/branches/MAIN/data/TWiki/TWikiVariablesQuickStart.txt
   twiki/branches/MAIN/data/TWiki/TextFormattingRules.txt
   twiki/branches/MAIN/data/TWiki/UsingHTML.txt
Log:
Item4888: Documented literal and sticky, and acknowledged the existence 
of WYSIWYG elsewhere in the doc (merged for Crawford)


Modified: twiki/branches/MAIN/data/TWiki/TWikiEditingShorthand.txt
===================================================================
--- twiki/branches/MAIN/data/TWiki/TWikiEditingShorthand.txt	2007-10-26 14:20:43 UTC (rev 15423)
+++ twiki/branches/MAIN/data/TWiki/TWikiEditingShorthand.txt	2007-10-26 14:55:00 UTC (rev 15424)
@@ -139,7 +139,7 @@
 </tr>
 <tr valign="top">
 <td>
- *Verbatim (Literal) Text:* %BR%
+ *Verbatim Text:* %BR%
  Surround code excerpts and other formatted text with =&lt;verbatim&gt;= and =&lt;/verbatim&gt;= tags.%BR%
 %T% =verbatim= tags disable HTML code. Use =&lt;pre&gt;= and =&lt;/pre&gt;= tags instead if you want the HTML code within the tags to be interpreted.%BR%
 __%X% NOTE:__ Preferences variables (* Set NAME = value) are set within verbatim tags.
@@ -454,6 +454,53 @@
 [[mailto:?subject=Hi][Hi]]
 </td>
 </tr>
+<tr>
+<td>
+ *Literal content:* %BR%
+ TWiki generates HTML code from TWiki shorthand.
+ *Experts* surround anything that must be output literally in the HTML code, without the application of
+ TWiki shorthand rules, with =&lt;literal&gt;..&lt;/literal&gt;= tags. %X% any HTML
+ within literal tags *must* be well formed i.e. all tags must be properly closed before
+ the end of the literal block. %I% TWiki Variables are expanded within literal blocks.
+</td><td>
+<pre>
+&lt;literal&gt;
+| Not | A | Table |
+&lt;literal&gt;
+</pre>
+</td>
+<td>
+<literal>
+| Not | A | Table |
+</literal>
+</td>
+</tr>
+<tr>
+<td>
+ *Protected content:* %BR%
+ *Experts* protect text from mangling by WYSIWYG editors using
+ =&lt;sticky&gt;..&lt;/sticky&gt;= tags. Sticky tags don't have any effect on normal
+ topic display; they are only relevant when content has to be
+ protected from a WYSIWYG editor (usually because it isn't well-formed HTML, or because it
+ is HTML that WYSIWYG would normally filter out or modify). Protected
+ content appears as plain text in the WYSIWYG editor.
+</td><td>
+=&lt;sticky&gt;=
+<verbatim>
+<div>
+This div is required
+</div>
+</verbatim>
+=&lt;sticky&gt;=
+</td>
+<td>
+<sticky>
+<div>
+This div is required
+</div>
+</sticky>
+</td>
+</tr>
 </table>
 
 %STOPINCLUDE%

Modified: twiki/branches/MAIN/data/TWiki/TWikiVariablesQuickStart.txt
===================================================================
--- twiki/branches/MAIN/data/TWiki/TWikiVariablesQuickStart.txt	2007-10-26 14:20:43 UTC (rev 15423)
+++ twiki/branches/MAIN/data/TWiki/TWikiVariablesQuickStart.txt	2007-10-26 14:55:00 UTC (rev 15424)
@@ -3,24 +3,17 @@
 
 %STARTINCLUDE%
 
-TWiki Variables are names that are enclosed in percent signs =%= that are expanded on the fly. Some variables take arguments, such as =%<nop>INCLUDE%=. For those variables, the arguments are included in curly braces ({ and }).
+TWiki Variables are names enclosed in percent signs that are that are expanded to some other text when the topic
+is displayed. For example, =%<nop>TOPIC%= is expanded to %TOPIC%.
+Some variables can take arguments in curly braces - for example, =%<nop>INCLUDE{"OtherTopic" ARG="arg"}%=.
 
-| *Variable* | *In brief* | *Full documentation* |
-| =%<nop>TOC%= | Automatically generates a table of contents based on headings in a topic - see the top of this page for an example. |VarTOC |
-| =%<nop>WEB%= | The current web, is <b><nop>%WEB%</b>. | VarWEB |
-| =%<nop>TOPIC%= | The current topic name, is <b>%BASETOPIC%</b>. <!-- using BASETOPIC instead of TOPIC for the example because this document is normally included in TextFormattingRules --> | VarTOPIC |
-| =%<nop>ATTACHURL%= | The attachment URL of the current topic. Example usage: If you attach a file to a topic you can refer to it as =<b>%<nop>ATTACHURL%/image.gif</b>= to show the URL of the file or the image in your text. | VarATTACHURL |
-| =%<nop>INCLUDE{"SomeTopic"}%= | Server side include, includes another topic. The current web is the default web. Example: =<b>%<nop>INCLUDE{"%SYSTEMWEB%.SiteMap"}%</b>= | VarINCLUDE |
-| =%<nop>SEARCH{"sushi"}%= | Inline search showing the search result embedded in a topic. FormattedSearch gives you control over formatting, useful for creating web-based applications. | VarSEARCH |
+Many TWiki variables are built-in, and others are predefined for your convenience. You can also define your own
+TWiki Variables at the entire site, individual web, or individual topic level. For more information,
+go to *[[TWikiVariables]]*
 
-TWikiPreferences defines some site-wide variables. Among them are:
-   * *Line break:* Write =%<nop>BR%= to start a new line.
-   * *Colored text:* Write: =%<nop>RED% Red %<nop>ENDCOLOR% and %<nop>BLUE% blue %<nop>ENDCOLOR% colors= to get: %RED% Red %ENDCOLOR% and %BLUE% blue %ENDCOLOR% colors.
+TWiki Variables are fully expanded _before_ any of the TWiki text formatting rules are applied.
 
-There are many more variables. To see them all, go to *[[TWikiVariables]]*.
-
 *Documentation Graphics:* There are many graphics available to use in your topics. Use =%<nop>ICON{"help"}%=, =%<nop>ICON{"tip"}%=, and =%<nop>ICON{"warning"}%= to get: %H%, %T%, and %X%, respectively. TWikiDocGraphics lists them all.
 
-
 %ICON{"tip"}% To "escape" a variable, prefix it with an exclamation mark. Write: =!%<nop>SOMEVARIABLE%= to get: !%SOMEVARIABLE%.
 %STOPINCLUDE%

Modified: twiki/branches/MAIN/data/TWiki/TextFormattingRules.txt
===================================================================
--- twiki/branches/MAIN/data/TWiki/TextFormattingRules.txt	2007-10-26 14:20:43 UTC (rev 15423)
+++ twiki/branches/MAIN/data/TWiki/TextFormattingRules.txt	2007-10-26 14:55:00 UTC (rev 15424)
@@ -15,10 +15,6 @@
 
 %INCLUDE{"UsingHTML"}%
 
----+++ Script tags
-
-You can use HTML =&lt;script>= tags for your TWiki applications. However note that your TWiki administrator can disable =&lt;script>= in topics, and may have chosen to do so for security considerations. TWiki markup and TWikiVariables are *not* expanded inside script tags.
-
 ---++ Hyperlinks
 
 Being able to create links without any special formatting is a core TWiki feature, made possible with WikiWords and inline URLs.

Modified: twiki/branches/MAIN/data/TWiki/UsingHTML.txt
===================================================================
--- twiki/branches/MAIN/data/TWiki/UsingHTML.txt	2007-10-26 14:20:43 UTC (rev 15423)
+++ twiki/branches/MAIN/data/TWiki/UsingHTML.txt	2007-10-26 14:55:00 UTC (rev 15424)
@@ -2,20 +2,26 @@
 ---++ Using HTML
 
 %STARTINCLUDE%
-You can use just about any HTML tag without a problem. You can add HTML if there is no TWiki equivalent, for example, write =&lt;strike&gt;deleted text&lt;/strike&gt;= to get <strike>deleted text</strike>.
+You can use most HTML tags in TWiki topics without a problem. This is useful where you want to
+add some content that is formatted in a way that is not supported using [[#TWikiShorthand][TWiki shorthand]], for example,
+you can write =&lt;strike&gt;deleted text&lt;/strike&gt;= to get <strike>deleted text</strike>.
 
-%X% There are a few usability and technical considerations to keep in mind:
-   * On collaboration pages, it's better *not* to use HTML, but to use [[#TWikiShorthand][TWiki shorthand]] instead - this keeps the text uncluttered and easy to edit.
-   * If you use HTML use [[http://www.w3.org/TR/xhtml1/][XHTML 1.0 Transitional]] syntax.
+There are a few usability and technical considerations to keep in mind:
+   * On collaboration pages, it's better *not* to use HTML, but to use [[#TWikiShorthand][TWiki shorthand]] instead -
+     this keeps the text uncluttered and easy to edit using the plaintext editor.
+   * If you _must_ use HTML, use [[http://www.w3.org/TR/xhtml1/][XHTML 1.0 Transitional]] syntax.
+   * Use =&lt;literal&gt;..&lt;/literal&gt;= tags around blocks of HTML to avoid accidental interpretation of
+     [[#TWikiShorthand][TWiki shorthand]] within the HTML.
    * %X% Script tags may be filtered out, at the discretion of your TWiki administrator.
 
-Recommendations when pasting HTML from other sources:
+Recommendations when pasting HTML from other sources (using the plain-text editor):
    * Copy only text between =&lt;body&gt;= and =&lt;/body&gt;= tags.
    * Remove all empty lines. TWiki inserts =&lt;p /&gt;= paragraph tags on empty lines, which causes problems if done between HTML tags that do not allow paragraph tags, like for example between table tags.
    * Remove leading spaces. TWiki might interpret some text as lists.
-   * Do not span a tag over more than one line. TWiki requires that the opening and closing angle brackets - ==&lt;...&gt;== - of an HTML tag are on the same line, or the tag will be broken.
+   * Do not span a tag over more than one line. TWiki requires that the opening and closing angle brackets - ==&lt;...&gt;== - of a HTML tag are on the same line, or the tag will be broken.
    * In your HTML editing program, save without hard line breaks on text wrap.
 
-%T% TWiki converts shorthand notation to HTML for display. To copy a fully marked-up page, simply view the source in your browser and save the contents. If you need to save HTML frequently, you may want to check out TWiki:Plugins/PublishAddOn.
+When using a WYSIWYG editor, you can just copy-paste directly into the editor, and the content will
+be converted to [[#TWikiShorthand][TWiki shorthand]] automatically when you save.
 
 %STOPINCLUDE%

Author: GilmarSantosJr
Date: 2007-10-26 09:20:43 -0500 (Fri, 26 Oct 2007)
New Revision: 15423

Modified:
   twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm
   twiki/scratch/TWikiStandAlone/tools/twiki_http.pl
Log:
Item4662: TSA
    * --restart option of tools/twiki_http.pl didn't work if --daemon was in use. Fixed.
    * Remove residual debug code from TWiki::UI
    * Improved restart feature (watch only for files ending in .pm, .spec and .cfg)

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm	2007-10-26 11:43:39 UTC (rev 15422)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP/Restarter.pm	2007-10-26 14:20:43 UTC (rev 15423)
@@ -33,6 +33,10 @@
 
 use strict;
 use base 'TWiki::Engine::HTTP';
+use HTTP::Request;
+use HTTP::Headers;
+use Time::HiRes 'sleep';
+use IO::Socket::INET;
 use File::Monitor;
 use File::Spec;
 use File::Find;
@@ -42,36 +46,57 @@
 
     my $child = fork;
     die "Can't fork: $!\n" unless defined $child;
+    my %args = (
+        port => 3000,
+        host => 0,
+        @_
+    );
     unless ( $child ) {
         close STDIN;
         close STDOUT;
-        my $monitor = setupMonitor();
+        my $monitor = _setupMonitor();
+        my $serverIp = $this->_canonicalIP($args{host});
+        $serverIp = '127.0.0.1' if $serverIp eq '0.0.0.0';
         while (1) {
-            my @changed =
-                grep { $_->is_size || $_->is_time || $_->is_directory }
-                $monitor->scan;
-            my $ppid = getppid;
-            last if $ppid == 1;
+            my @changed = grep { $_->is_mtime } $monitor->scan;
             if ( @changed ) {
-                kill 1, $ppid;
+                my $client = new IO::Socket::INET(
+                        PeerAddr => $serverIp,
+                        PeerPort => $args{port},
+                )
+                or die "Can't create client socket (is server running?): ",
+                $!;
+
+                my $kill = new HTTP::Request('RESTART', '/', 
+                    new HTTP::Headers(Connection => 'close') );
+                $kill->protocol('HTTP/1.0');
+                $client->send( $kill->as_string )
+                    or die "Can't send restart instruction: ", $!;
+                $client->close();
                 last;
             }
-            sleep 1;
+            sleep $args{rdelay};
         }
         exit(0);
     }
     $this->SUPER::run(@_);
 }
 
-sub setupMonitor {
+sub _setupMonitor {
     my $monitor = new File::Monitor();
     finddepth(
         {
             wanted => sub {
                 $monitor->watch(
                     { name => $File::Find::name, recurse => 0, files => 0 } )
-                  if !-l $File::Find::name
-                      && ( -f $File::Find::name || -d $File::Find::name );
+                    if !-l $File::Find::name &&
+                        (
+                          (
+                            -f $File::Find::name &&
+                            $File::Find::name =~ /\.(?:pm|cfg|spec)$/
+                          ) || 
+                          -d $File::Find::name
+                        );
             },
             follow   => 0,
             no_chdir => 1,

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm	2007-10-26 11:43:39 UTC (rev 15422)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm	2007-10-26 14:20:43 UTC (rev 15423)
@@ -45,29 +45,46 @@
 use TWiki::Request;
 use TWiki::Request::Upload;
 use TWiki::Response;
+use Cwd;
 
 use constant CHUNKSIZE => 4096;
 use constant READ_TIMEOUT => 60;
 
+sub new {
+    my $this = shift;
+    $this = $this->SUPER::new(@_);
+    $this->{dir} = getcwd;
+    return $this;
+}
+
 sub run {
-    my ( $this, %args ) = @_;
+    my $this = shift;
+    my %args = (
+        port   => 3000,
+        host   => 0,
+        detach => 0,
+        binUrl => $TWiki::cfg{ScriptUrlPath},
+        pubUrl => $TWiki::cfg{PubUrlPath},
+        @_
+    );
     my $httpd = HTTP::Daemon->new(
-        LocalPort => $args{port} || 3000,
-        LocalHost => $args{host} || 0,
+        LocalPort => $args{port},
+        LocalHost => $args{host},
         Listen    => 50,
         Reuse     => 1
     ) or die "Could not setup server: $!";
-    my $binUrl = $args{binUrl} || $TWiki::cfg{ScriptUrlPath};
-    my $pubUrl = $args{pubUrl} || $TWiki::cfg{PubUrlPath};
+    my $binUrl = $args{binUrl};
+    my $pubUrl = $args{pubUrl};
     if ( $args{detach} ) {
         detach();
     }
     else {
+        my $ip = $this->_canonicalIP($args{host});
+        $ip = '127.0.0.1' if $ip eq '0.0.0.0';
         print "TWiki HTTP Engine started. Visit me at ";
-        print defined $args{host} && $args{host}                    ? 
-              'http://' . $args{host} . ':' . ($args{port} || 3000) :
-              $TWiki::cfg{DefaultUrlHost};
-        print "$binUrl/view$TWiki::cfg{ScriptSuffix}\n";
+        print 'http://' . $ip;
+        print ':' . $args{port} if $args{port} != 80;
+        print "$args{binUrl}/view$TWiki::cfg{ScriptSuffix}\n";
     }
     my $restart = 0;
 
@@ -79,7 +96,16 @@
     while ( !$restart && ( my $client = $httpd->accept ) ) {
         my $r = $client->get_request('headers_only_please');
         next CLIENT unless $r;
-        if ( $r->method eq 'GET' && $r->uri->path =~ m#^$pubUrl#o ) {
+        if ( $r->method eq 'RESTART' ) {
+            my $peerIp = $this->_canonicalIP($client->peerhost);
+            my $ip     = $this->_canonicalIP($httpd->sockhost);
+            $ip = '127.0.0.1' if $ip eq '0.0.0.0';
+            if ( $peerIp eq '127.0.0.1' || $peerIp eq $ip ) {
+                $restart = 1;
+                last CLIENT;
+            }
+        }
+        elsif ( $r->method eq 'GET' && $r->uri->path =~ m#^$pubUrl#o ) {
             my $pubDir = $TWiki::cfg{PubDir};
             my $file = $r->uri->path;
             $file =~ s/\.\.//g;
@@ -99,19 +125,19 @@
 
     if ( $restart ) {
         $SIG{CHLD} = 'DEFAULT';
-        wait;
+        wait unless $args{detach};
         ### if the standalone server was invoked with perl -I .. we will loose
         ### those include dirs upon re-exec. So add them to PERL5LIB, so they
         ### are available again for the exec'ed process --kane
         use Config;
         $ENV{PERL5LIB} .= join $Config{path_sep}, @INC;
         $ENV{PATH} = $TWiki::cfg{SafeEnvPath};
-        use Config;
         my $perl = $Config{perlpath};
         if ( $^O ne 'VMS' ) {
             $perl .= $Config{_exe}
                 unless $perl =~ m/$Config{_exe}$/i;
         }
+        chdir TWiki::Sandbox::untaintUnchecked($this->{dir});
         my $script = TWiki::Sandbox::untaintUnchecked($0);
         my $args   = TWiki::Sandbox::untaintUnchecked(join( ' ', @ARGV ));
         exec $perl . ' -wT "'. $script . '" ' . $args;
@@ -137,6 +163,10 @@
     POSIX::setsid();
 }
 
+sub _canonicalIP {
+    return inet_ntoa(inet_aton($_[1]));
+}
+
 sub prepareRequest {
     my ( $this, $req, $r, $client, $binUrl ) = @_;
     $this->{r}      = $r;
@@ -147,7 +177,7 @@
 sub prepareConnection { 
     my ( $this, $req ) = @_;
     $req->method( $this->{r}->method );
-    $req->remoteAddress( inet_ntoa( inet_aton( $this->{client}->peerhost ) ) );
+    $req->remoteAddress( $this->_canonicalIP($this->{client}->peerhost) );
     $req->remotePort( $this->{client}->peerport );
     $req->secure(0); # Doesn't support https yet
     # remoteUser is set in prepareHeaders, cause of authentication

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm	2007-10-26 11:43:39 UTC (rev 15422)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm	2007-10-26 14:20:43 UTC (rev 15423)
@@ -122,8 +122,6 @@
 sub handleRequest {
     my $req = prepare(@_);
     if ( ref $req ) {
-        use Data::Dumper;
-        print STDERR Dumper($req);
         my $res = dispatch($req);
         finalize( $res, $req );
         return $res->status;

Modified: twiki/scratch/TWikiStandAlone/tools/twiki_http.pl
===================================================================
--- twiki/scratch/TWikiStandAlone/tools/twiki_http.pl	2007-10-26 11:43:39 UTC (rev 15422)
+++ twiki/scratch/TWikiStandAlone/tools/twiki_http.pl	2007-10-26 14:20:43 UTC (rev 15423)
@@ -29,7 +29,7 @@
 use Getopt::Long;
 use Pod::Usage;
 
-my ( $pubUrl, $scriptUrl, $detach, $host, $port, $restart, $help );
+my ( $pubUrl, $scriptUrl, $detach, $host, $port, $restart, $rdelay, $help);
 
 BEGIN {
     my @argBackup = @ARGV;
@@ -40,8 +40,10 @@
         'host|h=s'    => \$host,
         'port|p=i'    => \$port,
         'restart|r'   => \$restart,
+        'rdelay=f'    => \$rdelay,
         'help|?'      => \$help,
     );
+    $rdelay ||= 1;
     $TWiki::cfg{Engine} .= '::Restarter' if $restart;
     @ARGV = @argBackup;
 }
@@ -54,14 +56,16 @@
 use Carp;
 local $SIG{__DIE__} = \&Carp::confess unless $detach;
 
-$TWiki::engine->run(
-    pubUrl    => $pubUrl,
-    scriptUrl => $scriptUrl,
-    detach    => $detach,
-    host      => TWiki::Sandbox::untaintUnchecked($host),
-    port      => $port,
-);
+my %args = ();
 
+$args{pubUrl}    = $pubUrl    if defined $pubUrl;
+$args{scriptUrl} = $scriptUrl if defined $scriptUrl;
+$args{detach}    = $detach    if defined $detach;
+$args{host} = TWiki::Sandbox::untaintUnchecked($host) if defined $host;
+$args{port} = $port if defined $port;
+
+$TWiki::engine->run(%args, rdelay => $rdelay);
+
 __END__
 
 =head1 SYNOPSIS
@@ -75,6 +79,7 @@
     -p --port       Port (defaults to 3000)
     -h --host       Host (defaults to all)
     -r --restart    Restart server when files gets modified. Defaults to false.
+       --rdelay     Delay between check for changes
     -? --help       Display this help and exits
 
 =cut

Author: CrawfordCurrie
Date: 2007-10-26 06:43:39 -0500 (Fri, 26 Oct 2007)
New Revision: 15422

Modified:
   twiki/branches/TWikiRelease04x02/data/TWiki/TWikiEditingShorthand.txt
   twiki/branches/TWikiRelease04x02/data/TWiki/TWikiVariablesQuickStart.txt
   twiki/branches/TWikiRelease04x02/data/TWiki/TextFormattingRules.txt
   twiki/branches/TWikiRelease04x02/data/TWiki/UsingHTML.txt
Log:
Item4888: Documented literal and sticky, and acknowledged the existence of WYSIWYG elsewhere in the doc.

Modified: twiki/branches/TWikiRelease04x02/data/TWiki/TWikiEditingShorthand.txt
===================================================================
--- twiki/branches/TWikiRelease04x02/data/TWiki/TWikiEditingShorthand.txt	2007-10-26 04:15:19 UTC (rev 15421)
+++ twiki/branches/TWikiRelease04x02/data/TWiki/TWikiEditingShorthand.txt	2007-10-26 11:43:39 UTC (rev 15422)
@@ -139,7 +139,7 @@
 </tr>
 <tr valign="top">
 <td>
- *Verbatim (Literal) Text:* %BR%
+ *Verbatim Text:* %BR%
  Surround code excerpts and other formatted text with =&lt;verbatim&gt;= and =&lt;/verbatim&gt;= tags.%BR%
 %T% =verbatim= tags disable HTML code. Use =&lt;pre&gt;= and =&lt;/pre&gt;= tags instead if you want the HTML code within the tags to be interpreted.%BR%
 __%X% NOTE:__ Preferences variables (* Set NAME = value) are set within verbatim tags.
@@ -454,6 +454,53 @@
 [[mailto:?subject=Hi][Hi]]
 </td>
 </tr>
+<tr>
+<td>
+ *Literal content:* %BR%
+ TWiki generates HTML code from TWiki shorthand.
+ *Experts* surround anything that must be output literally in the HTML code, without the application of
+ TWiki shorthand rules, with =&lt;literal&gt;..&lt;/literal&gt;= tags. %X% any HTML
+ within literal tags *must* be well formed i.e. all tags must be properly closed before
+ the end of the literal block. %I% TWiki Variables are expanded within literal blocks.
+</td><td>
+<pre>
+&lt;literal&gt;
+| Not | A | Table |
+&lt;literal&gt;
+</pre>
+</td>
+<td>
+<literal>
+| Not | A | Table |
+</literal>
+</td>
+</tr>
+<tr>
+<td>
+ *Protected content:* %BR%
+ *Experts* protect text from mangling by WYSIWYG editors using
+ =&lt;sticky&gt;..&lt;/sticky&gt;= tags. Sticky tags don't have any effect on normal
+ topic display; they are only relevant when content has to be
+ protected from a WYSIWYG editor (usually because it isn't well-formed HTML, or because it
+ is HTML that WYSIWYG would normally filter out or modify). Protected
+ content appears as plain text in the WYSIWYG editor.
+</td><td>
+=&lt;sticky&gt;=
+<verbatim>
+<div>
+This div is required
+</div>
+</verbatim>
+=&lt;sticky&gt;=
+</td>
+<td>
+<sticky>
+<div>
+This div is required
+</div>
+</sticky>
+</td>
+</tr>
 </table>
 
 %STOPINCLUDE%

Modified: twiki/branches/TWikiRelease04x02/data/TWiki/TWikiVariablesQuickStart.txt
===================================================================
--- twiki/branches/TWikiRelease04x02/data/TWiki/TWikiVariablesQuickStart.txt	2007-10-26 04:15:19 UTC (rev 15421)
+++ twiki/branches/TWikiRelease04x02/data/TWiki/TWikiVariablesQuickStart.txt	2007-10-26 11:43:39 UTC (rev 15422)
@@ -3,24 +3,17 @@
 
 %STARTINCLUDE%
 
-TWiki Variables are names that are enclosed in percent signs =%= that are expanded on the fly. Some variables take arguments, such as =%<nop>INCLUDE%=. For those variables, the arguments are included in curly braces ({ and }).
+TWiki Variables are names enclosed in percent signs that are that are expanded to some other text when the topic
+is displayed. For example, =%<nop>TOPIC%= is expanded to %TOPIC%.
+Some variables can take arguments in curly braces - for example, =%<nop>INCLUDE{"OtherTopic" ARG="arg"}%=.
 
-| *Variable* | *In brief* | *Full documentation* |
-| =%<nop>TOC%= | Automatically generates a table of contents based on headings in a topic - see the top of this page for an example. |VarTOC |
-| =%<nop>WEB%= | The current web, is <b><nop>%WEB%</b>. | VarWEB |
-| =%<nop>TOPIC%= | The current topic name, is <b>%BASETOPIC%</b>. <!-- using BASETOPIC instead of TOPIC for the example because this document is normally included in TextFormattingRules --> | VarTOPIC |
-| =%<nop>ATTACHURL%= | The attachment URL of the current topic. Example usage: If you attach a file to a topic you can refer to it as =<b>%<nop>ATTACHURL%/image.gif</b>= to show the URL of the file or the image in your text. | VarATTACHURL |
-| =%<nop>INCLUDE{"SomeTopic"}%= | Server side include, includes another topic. The current web is the default web. Example: =<b>%<nop>INCLUDE{"%SYSTEMWEB%.SiteMap"}%</b>= | VarINCLUDE |
-| =%<nop>SEARCH{"sushi"}%= | Inline search showing the search result embedded in a topic. FormattedSearch gives you control over formatting, useful for creating web-based applications. | VarSEARCH |
+Many TWiki variables are built-in, and others are predefined for your convenience. You can also define your own
+TWiki Variables at the entire site, individual web, or individual topic level. For more information,
+go to *[[TWikiVariables]]*
 
-TWikiPreferences defines some site-wide variables. Among them are:
-   * *Line break:* Write =%<nop>BR%= to start a new line.
-   * *Colored text:* Write: =%<nop>RED% Red %<nop>ENDCOLOR% and %<nop>BLUE% blue %<nop>ENDCOLOR% colors= to get: %RED% Red %ENDCOLOR% and %BLUE% blue %ENDCOLOR% colors.
+TWiki Variables are fully expanded _before_ any of the TWiki text formatting rules are applied.
 
-There are many more variables. To see them all, go to *[[TWikiVariables]]*.
-
 *Documentation Graphics:* There are many graphics available to use in your topics. Use =%<nop>ICON{"help"}%=, =%<nop>ICON{"tip"}%=, and =%<nop>ICON{"warning"}%= to get: %H%, %T%, and %X%, respectively. TWikiDocGraphics lists them all.
 
-
 %ICON{"tip"}% To "escape" a variable, prefix it with an exclamation mark. Write: =!%<nop>SOMEVARIABLE%= to get: !%SOMEVARIABLE%.
 %STOPINCLUDE%

Modified: twiki/branches/TWikiRelease04x02/data/TWiki/TextFormattingRules.txt
===================================================================
--- twiki/branches/TWikiRelease04x02/data/TWiki/TextFormattingRules.txt	2007-10-26 04:15:19 UTC (rev 15421)
+++ twiki/branches/TWikiRelease04x02/data/TWiki/TextFormattingRules.txt	2007-10-26 11:43:39 UTC (rev 15422)
@@ -15,10 +15,6 @@
 
 %INCLUDE{"UsingHTML"}%
 
----+++ Script tags
-
-You can use HTML =&lt;script>= tags for your TWiki applications. However note that your TWiki administrator can disable =&lt;script>= in topics, and may have chosen to do so for security considerations. TWiki markup and TWikiVariables are *not* expanded inside script tags.
-
 ---++ Hyperlinks
 
 Being able to create links without any special formatting is a core TWiki feature, made possible with WikiWords and inline URLs.

Modified: twiki/branches/TWikiRelease04x02/data/TWiki/UsingHTML.txt
===================================================================
--- twiki/branches/TWikiRelease04x02/data/TWiki/UsingHTML.txt	2007-10-26 04:15:19 UTC (rev 15421)
+++ twiki/branches/TWikiRelease04x02/data/TWiki/UsingHTML.txt	2007-10-26 11:43:39 UTC (rev 15422)
@@ -2,20 +2,26 @@
 ---++ Using HTML
 
 %STARTINCLUDE%
-You can use just about any HTML tag without a problem. You can add HTML if there is no TWiki equivalent, for example, write =&lt;strike&gt;deleted text&lt;/strike&gt;= to get <strike>deleted text</strike>.
+You can use most HTML tags in TWiki topics without a problem. This is useful where you want to
+add some content that is formatted in a way that is not supported using [[#TWikiShorthand][TWiki shorthand]], for example,
+you can write =&lt;strike&gt;deleted text&lt;/strike&gt;= to get <strike>deleted text</strike>.
 
-%X% There are a few usability and technical considerations to keep in mind:
-   * On collaboration pages, it's better *not* to use HTML, but to use [[#TWikiShorthand][TWiki shorthand]] instead - this keeps the text uncluttered and easy to edit.
-   * If you use HTML use [[http://www.w3.org/TR/xhtml1/][XHTML 1.0 Transitional]] syntax.
+There are a few usability and technical considerations to keep in mind:
+   * On collaboration pages, it's better *not* to use HTML, but to use [[#TWikiShorthand][TWiki shorthand]] instead -
+     this keeps the text uncluttered and easy to edit using the plaintext editor.
+   * If you _must_ use HTML, use [[http://www.w3.org/TR/xhtml1/][XHTML 1.0 Transitional]] syntax.
+   * Use =&lt;literal&gt;..&lt;/literal&gt;= tags around blocks of HTML to avoid accidental interpretation of
+     [[#TWikiShorthand][TWiki shorthand]] within the HTML.
    * %X% Script tags may be filtered out, at the discretion of your TWiki administrator.
 
-Recommendations when pasting HTML from other sources:
+Recommendations when pasting HTML from other sources (using the plain-text editor):
    * Copy only text between =&lt;body&gt;= and =&lt;/body&gt;= tags.
    * Remove all empty lines. TWiki inserts =&lt;p /&gt;= paragraph tags on empty lines, which causes problems if done between HTML tags that do not allow paragraph tags, like for example between table tags.
    * Remove leading spaces. TWiki might interpret some text as lists.
-   * Do not span a tag over more than one line. TWiki requires that the opening and closing angle brackets - ==&lt;...&gt;== - of an HTML tag are on the same line, or the tag will be broken.
+   * Do not span a tag over more than one line. TWiki requires that the opening and closing angle brackets - ==&lt;...&gt;== - of a HTML tag are on the same line, or the tag will be broken.
    * In your HTML editing program, save without hard line breaks on text wrap.
 
-%T% TWiki converts shorthand notation to HTML for display. To copy a fully marked-up page, simply view the source in your browser and save the contents. If you need to save HTML frequently, you may want to check out TWiki:Plugins/PublishAddOn.
+When using a WYSIWYG editor, you can just copy-paste directly into the editor, and the content will
+be converted to [[#TWikiShorthand][TWiki shorthand]] automatically when you save.
 
 %STOPINCLUDE%

Author: GilmarSantosJr
Date: 2007-10-25 23:15:19 -0500 (Thu, 25 Oct 2007)
New Revision: 15421

Added:
   twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/parts.gif
   twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/sitemap.gif
   twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/sitetree.gif
Modified:
   twiki/scratch/TWikiStandAlone/
   twiki/scratch/TWikiStandAlone/bin/setlib.cfg
   twiki/scratch/TWikiStandAlone/data/TWiki/IfStatements.txt
   twiki/scratch/TWikiStandAlone/data/TWiki/TWikiDocGraphics.txt
   twiki/scratch/TWikiStandAlone/lib/MANIFEST
   twiki/scratch/TWikiStandAlone/lib/Monitor.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki.spec
   twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UI.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UIs/Value.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/If/Node.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/Query/HoistREs.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm
   twiki/scratch/TWikiStandAlone/lib/TWiki/Users.pm
   twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/quiet.gif
   twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt
   twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm
   twiki/scratch/TWikiStandAlone/twikiplugins/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm
   twiki/scratch/TWikiStandAlone/twikiplugins/TWikiUserMappingContrib/data/Main/TWikiAdminGroup.txt
   twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/Fn_IF.pm
   twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm
   twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/RegisterTests.pm
   twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/TWikiFnTestCase.pm
Log:
Item4662: TSA
    * Updated Monitor.pm, so it can be used with persistend engines
    * Added $TWiki::cfg{BehindProxy} option
    * Updated HTTP engine to consider $TWiki::cfg{BehindProxy} and X-Forwarded-For HTTP header
    * Merged from MAIN, rev 15420


Property changes on: twiki/scratch/TWikiStandAlone
___________________________________________________________________
Name: svk:merge
   - 1677e817-7831-46d5-99df-29670531d6f3:/local/MAIN:761
6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:13731
a00a5322-12db-0310-a70b-8735589c885e:/branches/TWikiRelease04x00:11417
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/DEVELOP:8671
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/MAIN:15401
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/TWikiRelease04x00:11683
a00a5322-12db-0310-a70b-8735589c885e:/twiki/trunk:1767
da601d30-f818-0410-9a57-a822fe5a4a93:/local/terceiro/TopicTranslationsPlugin:10084
db3699c8-1c30-0410-a7fc-e1c66c7c2fc9:/twiki/enhanced-diff:1757
   + 1677e817-7831-46d5-99df-29670531d6f3:/local/MAIN:761
6fe119f3-adff-0310-8d65-eaf721ad8dcd:/local/twiki:13731
a00a5322-12db-0310-a70b-8735589c885e:/branches/TWikiRelease04x00:11417
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/DEVELOP:8671
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/MAIN:15420
a00a5322-12db-0310-a70b-8735589c885e:/twiki/branches/TWikiRelease04x00:11683
a00a5322-12db-0310-a70b-8735589c885e:/twiki/trunk:1767
da601d30-f818-0410-9a57-a822fe5a4a93:/local/terceiro/TopicTranslationsPlugin:10084
db3699c8-1c30-0410-a7fc-e1c66c7c2fc9:/twiki/enhanced-diff:1757

Modified: twiki/scratch/TWikiStandAlone/bin/setlib.cfg
===================================================================
--- twiki/scratch/TWikiStandAlone/bin/setlib.cfg	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/bin/setlib.cfg	2007-10-26 04:15:19 UTC (rev 15421)
@@ -22,6 +22,7 @@
 
 # for development, you can enable ASSERTS by adding
 # $ENV{TWIKI_ASSERTS} = 1;
+# $ENV{TWIKI_MONITOR} = 1;
 # to your bin/LocalLib.cfg
 
 use vars qw( $twikiLibPath @localPerlLibPath );

Modified: twiki/scratch/TWikiStandAlone/data/TWiki/IfStatements.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/data/TWiki/IfStatements.txt	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/data/TWiki/IfStatements.txt	2007-10-26 04:15:19 UTC (rev 15421)
@@ -24,18 +24,18 @@
 
 1. TWiki variable defined or not
 <verbatim>
-%IF{"defined WIKINAME" then="WIKINAME is defined" else="WIKINAME is not defined"}%
+%IF{"defined 'WIKINAME'" then="WIKINAME is defined" else="WIKINAME is not defined"}%
 </verbatim>
 
 2. Compare TWiki variable
 <verbatim>
-You are %IF{ "$ WIKINAME='TWikiGuest' and not defined OPEN_DAY" then="not" }% allowed to
+You are %IF{ "$ WIKINAME='TWikiGuest' and not defined 'OPEN_DAY'" then="not" }% allowed to
 %IF{ "context view" then="view" else="edit"}% this TWiki today.
 </verbatim>
 
 3. URL parameter
 <verbatim>
-%IF{ "defined search" then="Search: $percntURLPARAM{search}$percnt" else="No search passed in"}%
+%IF{ "defined 'search'" then="Search: $percntURLPARAM{search}$percnt" else="No search passed in"}%
 </verbatim>
 
 4. Range test on URL parameter

Modified: twiki/scratch/TWikiStandAlone/data/TWiki/TWikiDocGraphics.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/data/TWiki/TWikiDocGraphics.txt	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/data/TWiki/TWikiDocGraphics.txt	2007-10-26 04:15:19 UTC (rev 15421)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1190703677" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="TWikiContributor" date="1193349525" format="1.1" version="$Rev$"}%
 ---+!! TWiki Documentation Graphics and Filetype icons
 
 This is the TWiki icon library. The graphics can be used in topics and by web applications. 
@@ -43,6 +43,7 @@
 | <img src="%ATTACHURLPATH%/move.gif" alt="Move" title="Move" />  | =move.gif= | Move | =%<nop>ICON{move}%= |
 | <img src="%ATTACHURLPATH%/note.gif" alt="Note" title="Note" />  | =note.gif= | Note | =%<nop>ICON{note}%= |
 | <img src="%ATTACHURLPATH%/parked.gif" alt="Parked" title="Parked" />  | =parked.gif= | Parked | =%<nop>ICON{parked}%= |
+| <img src="%ATTACHURLPATH%/parts.gif" alt="Parts" title="Parts" />  | =parts.gif= | Parts | =%<nop>ICON{parts}%= |
 | <img src="%ATTACHURLPATH%/pencil.gif" alt="Pencil / Refactor / Edit" title="Pencil / Refactor / Edit" />  | =pencil.gif= | Pencil / Refactor / Edit | =%<nop>P%=, =%<nop>ICON{pencil}%= |
 | <img src="%ATTACHURLPATH%/phone.gif" alt="Phone" title="Phone" />  | =phone.gif= | Phone | =%<nop>ICON{phone}%= |
 | <img src="%ATTACHURLPATH%/photo.gif" alt="Photo" title="Photo" />  | =photo.gif= | Photo, 13x10 | =&lt;img src="%<nop>ICONURL{photo}%" width="13" height="10" alt="Photo" border="0" /&gt;= |
@@ -50,6 +51,8 @@
 | <img src="%ATTACHURLPATH%/question.gif" alt="Question" title="Question" />  | =question.gif= | Question | =%<nop>ICON{question}%= |
 | <img src="%ATTACHURLPATH%/quiet.gif" alt="Quiet" title="Quiet" />  | =quiet.gif= | Quiet | =%<nop>ICON{quiet}%= |
 | <img src="%ATTACHURLPATH%/rfc.gif" alt="Request for comments" title="Request for comments" />  | =rfc.gif= | Request for comments | =%<nop>ICON{rfc}%= |
+| <img src="%ATTACHURLPATH%/sitemap.gif" alt="Site map" title="Site map" />  | =sitemap.gif= | Site map | =%<nop>ICON{sitemap}%= |
+| <img src="%ATTACHURLPATH%/sitetree.gif" alt="Site tree" title="Site tree" />  | =sitetree.gif= | Site tree | =%<nop>ICON{sitetree}%= |
 | <img src="%ATTACHURLPATH%/skype.gif" alt="Skype" title="Skype" />  | =skype.gif= | Skype | =%<nop>ICON{skype}%= |
 | <img src="%ATTACHURLPATH%/sort.gif" alt="Sort" title="Sort" />  | =sort.gif= | Sort | =%<nop>ICON{sort}%= |
 | <img src="%ATTACHURLPATH%/stargold.gif" alt="Gold star, favorites" title="Gold star, favorites" />  | =stargold.gif= | Gold star, favorites | =%<nop>ICON{stargold}%= |
@@ -183,8 +186,11 @@
 %TABLE{headeralign="left" databg="#ffffff,#ffffff" databgsorted="#f5f5f5"}%
 | *&nbsp;* | *File Name* | *Description* | *Write...* |
 | <img src="%ATTACHURLPATH%/home.gif" alt="Home" title="Home" />  | =home.gif= | Home | =%<nop>ICON{home}%= |
+| <img src="%ATTACHURLPATH%/sitemap.gif" alt="Site map" title="Site map" />  | =sitemap.gif= | Site map | =%<nop>ICON{sitemap}%= |
+| <img src="%ATTACHURLPATH%/sitetree.gif" alt="Site tree" title="Site tree" />  | =sitetree.gif= | Site tree | =%<nop>ICON{sitetree}%= |
+| <img src="%ATTACHURLPATH%/topicbacklinks.gif" alt="Topic back-links" title="Topic back-links" />  | =topicbacklinks.gif= | Topic back-links | =%<nop>ICON{topicbacklinks}%= |
+| <img src="%ATTACHURLPATH%/arrowdot.gif" alt="Meet here (arrows to red dot)" title="Meet here (arrows to red dot)" /> | =arrowdot.gif= | Meet here (arrows to red dot) | =%<nop>ICON{arrowdot}%= |
 | <img src="%ATTACHURLPATH%/external.gif" alt="External site" title="External site" />  | =external.gif= | External site | =%<nop>ICON{external}%= |
-| <img src="%ATTACHURLPATH%/arrowdot.gif" alt="Meet here (arrows to red dot)" title="Meet here (arrows to red dot)" /> | =arrowdot.gif= | Meet here (arrows to red dot) | =%<nop>ICON{arrowdot}%= |
 | <img src="%ATTACHURLPATH%/left.gif" alt="Left" title="Left" />  | =left.gif= | Left | =%<nop>ICON{left}%= |
 | <img src="%ATTACHURLPATH%/right.gif" alt="Right" title="Right" />  | =right.gif= | Right | =%<nop>ICON{right}%= |
 | <img src="%ATTACHURLPATH%/up.gif" alt="Up" title="Up" />  | =up.gif= | Up | =%<nop>ICON{up}%= |
@@ -355,230 +361,252 @@
 
 __Related Topics:__ TWikiSkins, DeveloperDocumentationCategory, AdminDocumentationCategory
 
-__Contributors:__ Most icons on this page were originally designed by TWiki:Main.PeterThoeny. All icons were recreated by TWiki:Main.ArthurClemens, except for led-color icons, dot graph and line graph images.
+__Contributors:__ Most icons on this page were originally designed by TWiki:Main.PeterThoeny. Many icons were recreated by TWiki:Main.ArthurClemens.
 
-%META:FILEATTACHMENT{name="addon.gif" attr="" autoattached="1" comment="" date="1169565034" path="addon.gif" size="370" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="application.gif" attr="" autoattached="1" comment="" date="1169565034" path="application.gif" size="356" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowbdown.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowbdown.gif" size="101" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowbleft.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowbleft.gif" size="98" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowbright.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowbright.gif" size="97" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowbup.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowbup.gif" size="101" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowdot.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowdot.gif" size="159" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowdown.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowdown.gif" size="97" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowleft.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowleft.gif" size="97" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowright-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowright-small.gif" size="100" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowright.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowright.gif" size="97" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="arrowup.gif" attr="" autoattached="1" comment="" date="1169565034" path="arrowup.gif" size="97" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="as.gif" attr="" autoattached="1" comment="" date="1169565034" path="as.gif" size="379" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="attachfile.gif" attr="" autoattached="1" comment="" date="1169565034" path="attachfile.gif" size="121" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="bat.gif" attr="" autoattached="1" comment="" date="1169565034" path="bat.gif" size="377" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="bmp.gif" attr="" autoattached="1" comment="" date="1169565034" path="bmp.gif" size="378" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="book.gif" attr="" autoattached="1" comment="" date="1169565034" path="book.gif" size="361" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="bubble.gif" attr="" autoattached="1" comment="" date="1169565034" path="bubble.gif" size="342" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="building.gif" attr="" autoattached="1" comment="" date="1169565034" path="building.gif" size="133" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="buildings.gif" attr="" autoattached="1" comment="" date="1169565034" path="buildings.gif" size="167" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="c.gif" attr="" autoattached="1" comment="" date="1169565034" path="c.gif" size="372" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="cachetopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="cachetopic.gif" size="163" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="changes-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="changes-small.gif" size="86" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="changes.gif" attr="" autoattached="1" comment="" date="1169565034" path="changes.gif" size="118" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="checked.gif" attr="" autoattached="1" comment="" date="1169565034" path="checked.gif" size="118" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="choice-cancel.gif" attr="" autoattached="1" comment="" date="1169565034" path="choice-cancel.gif" size="347" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="choice-no.gif" attr="" autoattached="1" comment="" date="1169565034" path="choice-no.gif" size="166" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="choice-yes.gif" attr="" autoattached="1" comment="" date="1169565034" path="choice-yes.gif" size="159" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="closed.gif" attr="" autoattached="1" comment="" date="1169565034" path="closed.gif" size="379" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="code.gif" attr="" autoattached="1" comment="" date="1169565035" path="code.gif" size="374" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="days.gif" attr="" autoattached="1" comment="" date="1169565034" path="days.gif" size="161" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="detail.gif" attr="" autoattached="1" comment="" date="1169565034" path="detail.gif" size="118" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dll.gif" attr="" autoattached="1" comment="" date="1169565034" path="dll.gif" size="376" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="doc.gif" attr="" autoattached="1" comment="" date="1169565034" path="doc.gif" size="381" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="done.gif" attr="" autoattached="1" comment="" date="1169565034" path="done.gif" size="313" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_ld.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_ld.gif" size="106" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_lr.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_lr.gif" size="105" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_lrd.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_lrd.gif" size="108" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_rd.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_rd.gif" size="107" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_ud.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_ud.gif" size="108" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_udl.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_udl.gif" size="109" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_udlr.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_udlr.gif" size="111" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_udr.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_udr.gif" size="109" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_ul.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_ul.gif" size="106" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_ulr.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_ulr.gif" size="108" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="dot_ur.gif" attr="" autoattached="1" comment="" date="1169565034" path="dot_ur.gif" size="106" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="down.gif" attr="" autoattached="1" comment="" date="1169565034" path="down.gif" size="199" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="download.gif" attr="" autoattached="1" comment="" date="1169565034" path="download.gif" size="120" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="edittopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="edittopic.gif" size="219" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="else.gif" attr="" autoattached="1" comment="" date="1169565034" path="else.gif" size="366" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="eml.gif" attr="" autoattached="1" comment="" date="1169565034" path="eml.gif" size="359" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="empty.gif" attr="" autoattached="1" comment="" date="1169565034" path="empty.gif" size="100" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="exe.gif" attr="" autoattached="1" comment="" date="1169565034" path="exe.gif" size="372" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="external.gif" attr="" autoattached="1" comment="" date="1169565034" path="external.gif" size="79" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="filter.gif" attr="" autoattached="1" comment="" date="1169565034" path="filter.gif" size="341" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="fla.gif" attr="" autoattached="1" comment="" date="1169565034" path="fla.gif" size="378" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="flag-gray-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="flag-gray-small.gif" size="145" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="flag-gray.gif" attr="" autoattached="1" comment="" date="1169565034" path="flag-gray.gif" size="125" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="flag.gif" attr="" autoattached="1" comment="" date="1169565034" path="flag.gif" size="124" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="folder.gif" attr="" autoattached="1" comment="" date="1169565034" path="folder.gif" size="553" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="fon.gif" attr="" autoattached="1" comment="" date="1169565034" path="fon.gif" size="378" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="gear.gif" attr="" autoattached="1" comment="" date="1169565034" path="gear.gif" size="596" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="gif.gif" attr="" autoattached="1" comment="" date="1169565034" path="gif.gif" size="374" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="globe.gif" attr="" autoattached="1" comment="" date="1169565034" path="globe.gif" size="601" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="go_back.gif" attr="" autoattached="1" comment="" date="1169565034" path="go_back.gif" size="235" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="go_end.gif" attr="" autoattached="1" comment="" date="1169565034" path="go_end.gif" size="240" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="go_fb.gif" attr="" autoattached="1" comment="" date="1169565034" path="go_fb.gif" size="242" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="go_ff.gif" attr="" autoattached="1" comment="" date="1169565034" path="go_ff.gif" size="242" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="go_forward.gif" attr="" autoattached="1" comment="" date="1169565034" path="go_forward.gif" size="234" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="go_start.gif" attr="" autoattached="1" comment="" date="1169565034" path="go_start.gif" size="236" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="group.gif" attr="" autoattached="1" comment="" date="1169565034" path="group.gif" size="182" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="h.gif" attr="" autoattached="1" comment="" date="1169565034" path="h.gif" size="375" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="hand.gif" attr="" autoattached="1" comment="" date="1169565034" path="hand.gif" size="344" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="help.gif" attr="" autoattached="1" comment="" date="1169565034" path="help.gif" size="212" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="hlp.gif" attr="" autoattached="1" comment="" date="1169565034" path="hlp.gif" size="370" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="home.gif" attr="" autoattached="1" comment="" date="1169565034" path="home.gif" size="342" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="hourglass.gif" attr="" autoattached="1" comment="" date="1169565034" path="hourglass.gif" size="371" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="html.gif" attr="" autoattached="1" comment="" date="1169565034" path="html.gif" size="376" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="index.gif" attr="" autoattached="1" comment="" date="1169565034" path="index.gif" size="100" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="indexlist.gif" attr="" autoattached="1" comment="" date="1169565034" path="indexlist.gif" size="102" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="info.gif" attr="" autoattached="1" comment="" date="1169565034" path="info.gif" size="212" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="java.gif" attr="" autoattached="1" comment="" date="1169565034" path="java.gif" size="375" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="jpg.gif" attr="" autoattached="1" comment="" date="1169565034" path="jpg.gif" size="375" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="js.gif" attr="" autoattached="1" comment="" date="1169565034" path="js.gif" size="378" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="key.gif" attr="" autoattached="1" comment="" date="1169565034" path="key.gif" size="91" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-aqua.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-aqua.gif" size="951" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-blue.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-blue.gif" size="944" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-aqua.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-aqua.gif" size="393" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-blue.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-blue.gif" size="393" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-gray.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-gray.gif" size="389" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-green.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-green.gif" size="393" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-orange.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-orange.gif" size="393" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-purple.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-purple.gif" size="393" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-red.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-red.gif" size="393" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-box-yellow.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-box-yellow.gif" size="393" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-gray.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-gray.gif" size="935" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-green.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-green.gif" size="944" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-orange.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-orange.gif" size="951" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-purple.gif" attr="" autoattached="1" comment="" date="1169565035" path="led-purple.gif" size="951" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-red.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-red.gif" size="943" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="led-yellow.gif" attr="" autoattached="1" comment="" date="1169565034" path="led-yellow.gif" size="944" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="left.gif" attr="" autoattached="1" comment="" date="1169565034" path="left.gif" size="195" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_ld.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_ld.gif" size="106" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_lr.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_lr.gif" size="105" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_lrd.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_lrd.gif" size="111" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_rd.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_rd.gif" size="106" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_ud.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_ud.gif" size="114" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_udl.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_udl.gif" size="116" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_udlr.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_udlr.gif" size="116" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_udr.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_udr.gif" size="115" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_ul.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_ul.gif" size="111" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_ulr.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_ulr.gif" size="112" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="line_ur.gif" attr="" autoattached="1" comment="" date="1169565034" path="line_ur.gif" size="111" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="lock.gif" attr="" autoattached="1" comment="" date="1169565034" path="lock.gif" size="221" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="lockfolder.gif" attr="" autoattached="1" comment="" date="1169565034" path="lockfolder.gif" size="213" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="lockfoldergray.gif" attr="" autoattached="1" comment="" date="1169565034" path="lockfoldergray.gif" size="156" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="locktopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="locktopic.gif" size="217" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="locktopicgray.gif" attr="" autoattached="1" comment="" date="1169565034" path="locktopicgray.gif" size="159" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="logout.gif" attr="" autoattached="1" comment="" date="1169565034" path="logout.gif" size="221" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="mail.gif" attr="" autoattached="1" comment="" date="1169565034" path="mail.gif" size="224" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="map.gif" attr="" autoattached="1" comment="" date="1181928995" path="map.gif" size="932" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="mdb.gif" attr="" autoattached="1" comment="" date="1169565034" path="mdb.gif" size="385" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="minus.gif" attr="" autoattached="1" comment="" date="1169565034" path="minus.gif" size="83" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="monospace.gif" attr="" autoattached="1" comment="" date="1169565034" path="monospace.gif" size="145" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="more-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="more-small.gif" size="84" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="more.gif" attr="" autoattached="1" comment="" date="1169565034" path="more.gif" size="118" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="mov.gif" attr="" autoattached="1" comment="" date="1169565034" path="mov.gif" size="379" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="move.gif" attr="" autoattached="1" comment="" date="1169565034" path="move.gif" size="204" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="mp3.gif" attr="" autoattached="1" comment="" date="1169565034" path="mp3.gif" size="377" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="new.gif" attr="" autoattached="1" comment="" date="1169565034" path="new.gif" size="298" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="newtopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="newtopic.gif" size="340" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="note.gif" attr="" autoattached="1" comment="" date="1169565034" path="note.gif" size="222" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="notify.gif" attr="" autoattached="1" comment="" date="1169565034" path="notify.gif" size="347" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="package.gif" attr="" autoattached="1" comment="" date="1169565034" path="package.gif" size="173" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="parked.gif" attr="" autoattached="1" comment="" date="1169565034" path="parked.gif" size="225" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="pdf.gif" attr="" autoattached="1" comment="" date="1169565034" path="pdf.gif" size="375" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="pencil.gif" attr="" autoattached="1" comment="" date="1169565034" path="pencil.gif" size="539" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="person.gif" attr="" autoattached="1" comment="" date="1169565034" path="person.gif" size="166" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="persons.gif" attr="" autoattached="1" comment="" date="1169565034" path="persons.gif" size="172" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="photo.gif" attr="" autoattached="1" comment="" date="1169565034" path="photo.gif" size="328" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="pl.gif" attr="" autoattached="1" comment="" date="1169565034" path="pl.gif" size="380" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="plugin.gif" attr="" autoattached="1" comment="" date="1169565034" path="plugin.gif" size="357" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="plus.gif" attr="" autoattached="1" comment="" date="1169565034" path="plus.gif" size="90" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="png.gif" attr="" autoattached="1" comment="" date="1169565034" path="png.gif" size="378" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="ppt.gif" attr="" autoattached="1" comment="" date="1169565034" path="ppt.gif" size="373" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="printtopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="printtopic.gif" size="221" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="proportional.gif" attr="" autoattached="1" comment="" date="1169565034" path="proportional.gif" size="137" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="ps.gif" attr="" autoattached="1" comment="" date="1169565034" path="ps.gif" size="362" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="psd.gif" attr="" autoattached="1" comment="" date="1169565034" path="psd.gif" size="369" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="puzzle.gif" attr="" autoattached="1" comment="" date="1169565034" path="puzzle.gif" size="332" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="py.gif" attr="" autoattached="1" comment="" date="1169565034" path="py.gif" size="382" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="question.gif" attr="" autoattached="1" comment="" date="1169565034" path="question.gif" size="214" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="ram.gif" attr="" autoattached="1" comment="" date="1169565034" path="ram.gif" size="373" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="recentchanges.gif" attr="" autoattached="1" comment="" date="1169565035" path="recentchanges.gif" size="220" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="refreshtopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="refreshtopic.gif" size="229" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="reg.gif" attr="" autoattached="1" comment="" date="1169565034" path="reg.gif" size="377" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="rfc.gif" attr="" autoattached="1" comment="" date="1169565034" path="rfc.gif" size="369" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="right.gif" attr="" autoattached="1" comment="" date="1169565034" path="right.gif" size="194" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="rss-feed.gif" attr="" autoattached="1" comment="" date="1169565034" path="rss-feed.gif" size="227" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="rss-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="rss-small.gif" size="122" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="save.gif" attr="" autoattached="1" comment="" date="1169565034" path="save.gif" size="222" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="search-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="search-small.gif" size="554" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="searchpackage.gif" attr="" autoattached="1" comment="" date="1169565034" path="searchpackage.gif" size="383" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="searchtag.gif" attr="" autoattached="1" comment="" date="1169565034" path="searchtag.gif" size="380" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="searchtopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="searchtopic.gif" size="580" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="sh.gif" attr="" autoattached="1" comment="" date="1169565034" path="sh.gif" size="380" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="skin.gif" attr="" autoattached="1" comment="" date="1169565034" path="skin.gif" size="356" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="sniff.gif" attr="" autoattached="1" comment="" date="1169565034" path="sniff.gif" size="368" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="sort.gif" attr="" autoattached="1" comment="" date="1169565034" path="sort.gif" size="129" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="stargold.gif" attr="" autoattached="1" comment="" date="1169565034" path="stargold.gif" size="338" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="starred.gif" attr="" autoattached="1" comment="" date="1169565034" path="starred.gif" size="226" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="statistics.gif" attr="" autoattached="1" comment="" date="1169565034" path="statistics.gif" size="118" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="stop.gif" attr="" autoattached="1" comment="" date="1169565034" path="stop.gif" size="159" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="swf.gif" attr="" autoattached="1" comment="" date="1169565034" path="swf.gif" size="380" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tablesortdiamond.gif" attr="" autoattached="1" comment="" date="1169565034" path="tablesortdiamond.gif" size="369" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tablesortdown.gif" attr="" autoattached="1" comment="" date="1169565034" path="tablesortdown.gif" size="351" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tablesortup.gif" attr="" autoattached="1" comment="" date="1169565034" path="tablesortup.gif" size="351" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-black.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-black.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-blue.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-blue.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-brown.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-brown.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-green.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-green.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-magenta.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-magenta.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-orange.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-orange.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-purple.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-purple.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-red.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-red.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag-yellow.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag-yellow.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tag.gif" attr="" autoattached="1" comment="" date="1169565034" path="tag.gif" size="348" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="target.gif" attr="" autoattached="1" comment="" date="1169565034" path="target.gif" size="261" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="tip.gif" attr="" autoattached="1" comment="" date="1169565034" path="tip.gif" size="233" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="todo.gif" attr="" autoattached="1" comment="" date="1169565034" path="todo.gif" size="318" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleclose-mini.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleclose-mini.gif" size="51" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleclose-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleclose-small.gif" size="135" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleclose.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleclose.gif" size="142" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="togglecloseleft-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="togglecloseleft-small.gif" size="135" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleopen-mini.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleopen-mini.gif" size="51" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleopen-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleopen-small.gif" size="136" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleopen.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleopen.gif" size="143" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleopenleft-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleopenleft-small.gif" size="135" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="toggleopenleft.gif" attr="" autoattached="1" comment="" date="1169565034" path="toggleopenleft.gif" size="141" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="topicbacklinks.gif" attr="" autoattached="1" comment="" date="1169565034" path="topicbacklinks.gif" size="130" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="topicdiffs.gif" attr="" autoattached="1" comment="" date="1169565034" path="topicdiffs.gif" size="157" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="trash.gif" attr="" autoattached="1" comment="" date="1169565034" path="trash.gif" size="224" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="ttf.gif" attr="" autoattached="1" comment="" date="1169565034" path="ttf.gif" size="378" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="twiki.gif" attr="" autoattached="1" comment="" date="1169565034" path="twiki.gif" size="585" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="txt.gif" attr="" autoattached="1" comment="" date="1169565034" path="txt.gif" size="375" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="unchecked.gif" attr="" autoattached="1" comment="" date="1169565034" path="unchecked.gif" size="96" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="up.gif" attr="" autoattached="1" comment="" date="1169565034" path="up.gif" size="199" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="updated.gif" attr="" autoattached="1" comment="" date="1169565034" path="updated.gif" size="401" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="vsd.gif" attr="" autoattached="1" comment="" date="1169565034" path="vsd.gif" size="373" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="video.gif" attr="" autoattached="1" comment="" date="1169565034" path="video.gif" size="329" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="viewtopic.gif" attr="" autoattached="1" comment="" date="1169565034" path="viewtopic.gif" size="118" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="warning.gif" attr="" autoattached="1" comment="" date="1169565034" path="warning.gif" size="215" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="watch.gif" attr="" autoattached="1" comment="" date="1169565034" path="watch.gif" size="237" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="wav.gif" attr="" autoattached="1" comment="" date="1169565034" path="wav.gif" size="377" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="web-bg-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="web-bg-small.gif" size="77" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="web-bg.gif" attr="" autoattached="1" comment="" date="1169565034" path="web-bg.gif" size="85" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="wip.gif" attr="" autoattached="1" comment="" date="1169565034" path="wip.gif" size="594" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="wrench.gif" attr="" autoattached="1" comment="" date="1169565034" path="wrench.gif" size="377" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="wri.gif" attr="" autoattached="1" comment="" date="1169565034" path="wri.gif" size="382" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="xls.gif" attr="" autoattached="1" comment="" date="1169565034" path="xls.gif" size="374" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="xml-feed.gif" attr="" autoattached="1" comment="" date="1169565034" path="xml-feed.gif" size="223" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="xml-small.gif" attr="" autoattached="1" comment="" date="1169565034" path="xml-small.gif" size="100" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="xml.gif" attr="" autoattached="1" comment="" date="1169565034" path="xml.gif" size="376" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="xsl.gif" attr="" autoattached="1" comment="" date="1169565034" path="xsl.gif" size="375" user="UnknownUser" version=""}%
-%META:FILEATTACHMENT{name="zip.gif" attr="" autoattached="1" comment="" date="1169565034" path="zip.gif" size="383" user="UnknownUser" version=""}%
+%META:FILEATTACHMENT{name="addon.gif" attr="" comment="" date="1169565034" path="addon.gif" size="370" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="application.gif" attr="" comment="" date="1169565034" path="application.gif" size="356" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowbdown.gif" attr="" comment="" date="1169565034" path="arrowbdown.gif" size="101" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowbleft.gif" attr="" comment="" date="1169565034" path="arrowbleft.gif" size="98" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowbright.gif" attr="" comment="" date="1169565034" path="arrowbright.gif" size="97" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowbup.gif" attr="" comment="" date="1169565034" path="arrowbup.gif" size="101" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowdot.gif" attr="" comment="" date="1169565034" path="arrowdot.gif" size="159" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowdown.gif" attr="" comment="" date="1169565034" path="arrowdown.gif" size="97" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowleft.gif" attr="" comment="" date="1169565034" path="arrowleft.gif" size="97" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowright-small.gif" attr="" comment="" date="1169565034" path="arrowright-small.gif" size="100" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowright.gif" attr="" comment="" date="1169565034" path="arrowright.gif" size="97" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="arrowup.gif" attr="" comment="" date="1169565034" path="arrowup.gif" size="97" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="as.gif" attr="" comment="" date="1169565034" path="as.gif" size="379" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="attachfile.gif" attr="" comment="" date="1169565034" path="attachfile.gif" size="121" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="bat.gif" attr="" comment="" date="1169565034" path="bat.gif" size="377" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="blank.gif" attr="" comment="" date="1193349525" path="blank.gif" size="110" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="blank-bg.gif" attr="" comment="" date="1193349525" path="blank-bg.gif" size="118" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="bmp.gif" attr="" comment="" date="1169565034" path="bmp.gif" size="378" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="book.gif" attr="" comment="" date="1169565034" path="book.gif" size="361" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="bubble.gif" attr="" comment="" date="1169565034" path="bubble.gif" size="342" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="building.gif" attr="" comment="" date="1169565034" path="building.gif" size="133" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="buildings.gif" attr="" comment="" date="1169565034" path="buildings.gif" size="167" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="c.gif" attr="" comment="" date="1169565034" path="c.gif" size="372" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="cachetopic.gif" attr="" comment="" date="1169565034" path="cachetopic.gif" size="163" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="changes-small.gif" attr="" comment="" date="1169565034" path="changes-small.gif" size="86" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="changes.gif" attr="" comment="" date="1169565034" path="changes.gif" size="118" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="checked.gif" attr="" comment="" date="1169565034" path="checked.gif" size="118" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="choice-cancel.gif" attr="" comment="" date="1169565034" path="choice-cancel.gif" size="347" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="choice-no.gif" attr="" comment="" date="1169565034" path="choice-no.gif" size="166" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="choice-yes.gif" attr="" comment="" date="1169565034" path="choice-yes.gif" size="159" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="closed.gif" attr="" comment="" date="1169565034" path="closed.gif" size="379" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="code.gif" attr="" comment="" date="1169565035" path="code.gif" size="374" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="days.gif" attr="" comment="" date="1169565034" path="days.gif" size="161" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="detail.gif" attr="" comment="" date="1169565034" path="detail.gif" size="118" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dll.gif" attr="" comment="" date="1169565034" path="dll.gif" size="376" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="doc.gif" attr="" comment="" date="1169565034" path="doc.gif" size="381" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="done.gif" attr="" comment="" date="1169565034" path="done.gif" size="313" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_ld.gif" attr="" comment="" date="1169565034" path="dot_ld.gif" size="106" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_lr.gif" attr="" comment="" date="1169565034" path="dot_lr.gif" size="105" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_lrd.gif" attr="" comment="" date="1169565034" path="dot_lrd.gif" size="108" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_rd.gif" attr="" comment="" date="1169565034" path="dot_rd.gif" size="107" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_ud.gif" attr="" comment="" date="1169565034" path="dot_ud.gif" size="108" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_udl.gif" attr="" comment="" date="1169565034" path="dot_udl.gif" size="109" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_udlr.gif" attr="" comment="" date="1169565034" path="dot_udlr.gif" size="111" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_udr.gif" attr="" comment="" date="1169565034" path="dot_udr.gif" size="109" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_ul.gif" attr="" comment="" date="1169565034" path="dot_ul.gif" size="106" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_ulr.gif" attr="" comment="" date="1169565034" path="dot_ulr.gif" size="108" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="dot_ur.gif" attr="" comment="" date="1169565034" path="dot_ur.gif" size="106" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="down.gif" attr="" comment="" date="1169565034" path="down.gif" size="199" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="download.gif" attr="" comment="" date="1169565034" path="download.gif" size="120" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="edittable.gif" attr="" comment="" date="1193349525" path="edittable.gif" size="906" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="edittopic.gif" attr="" comment="" date="1169565034" path="edittopic.gif" size="219" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="else.gif" attr="" comment="" date="1169565034" path="else.gif" size="366" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="eml.gif" attr="" comment="" date="1169565034" path="eml.gif" size="359" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="empty.gif" attr="" comment="" date="1169565034" path="empty.gif" size="100" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="exe.gif" attr="" comment="" date="1169565034" path="exe.gif" size="372" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="external.gif" attr="" comment="" date="1169565034" path="external.gif" size="79" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="fax.gif" attr="" comment="" date="1193349525" path="fax.gif" size="122" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="feed.gif" attr="" comment="" date="1193349525" path="feed.gif" size="1023" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="filter.gif" attr="" comment="" date="1169565034" path="filter.gif" size="341" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="fla.gif" attr="" comment="" date="1169565034" path="fla.gif" size="378" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="flag-gray-small.gif" attr="" comment="" date="1169565034" path="flag-gray-small.gif" size="145" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="flag-gray.gif" attr="" comment="" date="1169565034" path="flag-gray.gif" size="125" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="flag.gif" attr="" comment="" date="1169565034" path="flag.gif" size="124" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="folder.gif" attr="" comment="" date="1169565034" path="folder.gif" size="553" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="fon.gif" attr="" comment="" date="1169565034" path="fon.gif" size="378" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="gear.gif" attr="" comment="" date="1169565034" path="gear.gif" size="596" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="gif.gif" attr="" comment="" date="1169565034" path="gif.gif" size="374" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="globe.gif" attr="" comment="" date="1169565034" path="globe.gif" size="601" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="go_back.gif" attr="" comment="" date="1169565034" path="go_back.gif" size="235" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="go_end.gif" attr="" comment="" date="1169565034" path="go_end.gif" size="240" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="go_fb.gif" attr="" comment="" date="1169565034" path="go_fb.gif" size="242" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="go_ff.gif" attr="" comment="" date="1169565034" path="go_ff.gif" size="242" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="go_forward.gif" attr="" comment="" date="1169565034" path="go_forward.gif" size="234" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="go_start.gif" attr="" comment="" date="1169565034" path="go_start.gif" size="236" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="group.gif" attr="" comment="" date="1169565034" path="group.gif" size="182" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="h.gif" attr="" comment="" date="1169565034" path="h.gif" size="375" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="hand.gif" attr="" comment="" date="1169565034" path="hand.gif" size="344" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="help.gif" attr="" comment="" date="1169565034" path="help.gif" size="212" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="hlp.gif" attr="" comment="" date="1169565034" path="hlp.gif" size="370" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="home.gif" attr="" comment="" date="1169565034" path="home.gif" size="342" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="hourglass.gif" attr="" comment="" date="1169565034" path="hourglass.gif" size="371" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="html.gif" attr="" comment="" date="1169565034" path="html.gif" size="376" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="index.gif" attr="" comment="" date="1169565034" path="index.gif" size="100" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="indexlist.gif" attr="" comment="" date="1169565034" path="indexlist.gif" size="102" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="info.gif" attr="" comment="" date="1169565034" path="info.gif" size="212" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="java.gif" attr="" comment="" date="1169565034" path="java.gif" size="375" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="jpg.gif" attr="" comment="" date="1169565034" path="jpg.gif" size="375" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="js.gif" attr="" comment="" date="1169565034" path="js.gif" size="378" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="key.gif" attr="" comment="" date="1169565034" path="key.gif" size="91" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-aqua.gif" attr="" comment="" date="1169565034" path="led-aqua.gif" size="951" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-blue.gif" attr="" comment="" date="1169565034" path="led-blue.gif" size="944" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-aqua.gif" attr="" comment="" date="1169565034" path="led-box-aqua.gif" size="393" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-blue.gif" attr="" comment="" date="1169565034" path="led-box-blue.gif" size="393" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-gray.gif" attr="" comment="" date="1169565034" path="led-box-gray.gif" size="389" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-green.gif" attr="" comment="" date="1169565034" path="led-box-green.gif" size="393" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-orange.gif" attr="" comment="" date="1169565034" path="led-box-orange.gif" size="393" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-purple.gif" attr="" comment="" date="1169565034" path="led-box-purple.gif" size="393" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-red.gif" attr="" comment="" date="1169565034" path="led-box-red.gif" size="393" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-box-yellow.gif" attr="" comment="" date="1169565034" path="led-box-yellow.gif" size="393" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-gray.gif" attr="" comment="" date="1169565034" path="led-gray.gif" size="935" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-green.gif" attr="" comment="" date="1169565034" path="led-green.gif" size="944" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-orange.gif" attr="" comment="" date="1169565034" path="led-orange.gif" size="951" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-purple.gif" attr="" comment="" date="1169565035" path="led-purple.gif" size="951" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-red.gif" attr="" comment="" date="1169565034" path="led-red.gif" size="943" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="led-yellow.gif" attr="" comment="" date="1169565034" path="led-yellow.gif" size="944" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="left.gif" attr="" comment="" date="1169565034" path="left.gif" size="195" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_ld.gif" attr="" comment="" date="1169565034" path="line_ld.gif" size="106" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_lr.gif" attr="" comment="" date="1169565034" path="line_lr.gif" size="105" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_lrd.gif" attr="" comment="" date="1169565034" path="line_lrd.gif" size="111" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_rd.gif" attr="" comment="" date="1169565034" path="line_rd.gif" size="106" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_ud.gif" attr="" comment="" date="1169565034" path="line_ud.gif" size="114" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_udl.gif" attr="" comment="" date="1169565034" path="line_udl.gif" size="116" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_udlr.gif" attr="" comment="" date="1169565034" path="line_udlr.gif" size="116" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_udr.gif" attr="" comment="" date="1169565034" path="line_udr.gif" size="115" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_ul.gif" attr="" comment="" date="1169565034" path="line_ul.gif" size="111" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_ulr.gif" attr="" comment="" date="1169565034" path="line_ulr.gif" size="112" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="line_ur.gif" attr="" comment="" date="1169565034" path="line_ur.gif" size="111" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="lock.gif" attr="" comment="" date="1169565034" path="lock.gif" size="221" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="lockfolder.gif" attr="" comment="" date="1169565034" path="lockfolder.gif" size="213" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="lockfoldergray.gif" attr="" comment="" date="1169565034" path="lockfoldergray.gif" size="156" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="locktopic.gif" attr="" comment="" date="1169565034" path="locktopic.gif" size="217" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="locktopicgray.gif" attr="" comment="" date="1169565034" path="locktopicgray.gif" size="159" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="logout.gif" attr="" comment="" date="1169565034" path="logout.gif" size="221" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="mail.gif" attr="" comment="" date="1169565034" path="mail.gif" size="224" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="map.gif" attr="" comment="" date="1181928995" path="map.gif" size="932" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="mdb.gif" attr="" comment="" date="1169565034" path="mdb.gif" size="385" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="minus.gif" attr="" comment="" date="1169565034" path="minus.gif" size="83" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="mobile.gif" attr="" comment="" date="1193349525" path="mobile.gif" size="333" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="monospace.gif" attr="" comment="" date="1169565034" path="monospace.gif" size="145" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="more-small.gif" attr="" comment="" date="1169565034" path="more-small.gif" size="84" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="more.gif" attr="" comment="" date="1169565034" path="more.gif" size="118" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="mov.gif" attr="" comment="" date="1169565034" path="mov.gif" size="379" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="move.gif" attr="" comment="" date="1169565034" path="move.gif" size="204" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="mp3.gif" attr="" comment="" date="1169565034" path="mp3.gif" size="377" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="new.gif" attr="" comment="" date="1169565034" path="new.gif" size="298" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="newtopic.gif" attr="" comment="" date="1169565034" path="newtopic.gif" size="340" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="note.gif" attr="" comment="" date="1169565034" path="note.gif" size="222" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="notify.gif" attr="" comment="" date="1169565034" path="notify.gif" size="347" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="package.gif" attr="" comment="" date="1169565034" path="package.gif" size="173" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="parked.gif" attr="" comment="" date="1169565034" path="parked.gif" size="225" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="parts.gif" attr="" comment="" date="1193349525" path="parts.gif" size="908" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="pdf.gif" attr="" comment="" date="1169565034" path="pdf.gif" size="375" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="pencil.gif" attr="" comment="" date="1169565034" path="pencil.gif" size="539" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="person.gif" attr="" comment="" date="1169565034" path="person.gif" size="166" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="persons.gif" attr="" comment="" date="1169565034" path="persons.gif" size="172" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="phone.gif" attr="" comment="" date="1193349525" path="phone.gif" size="116" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="photo.gif" attr="" comment="" date="1169565034" path="photo.gif" size="328" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="pl.gif" attr="" comment="" date="1169565034" path="pl.gif" size="380" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="plugin.gif" attr="" comment="" date="1169565034" path="plugin.gif" size="357" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="plus.gif" attr="" comment="" date="1169565034" path="plus.gif" size="90" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="png.gif" attr="" comment="" date="1169565034" path="png.gif" size="378" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="ppt.gif" attr="" comment="" date="1169565034" path="ppt.gif" size="373" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="printtopic.gif" attr="" comment="" date="1169565034" path="printtopic.gif" size="221" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="proportional.gif" attr="" comment="" date="1169565034" path="proportional.gif" size="137" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="ps.gif" attr="" comment="" date="1169565034" path="ps.gif" size="362" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="psd.gif" attr="" comment="" date="1169565034" path="psd.gif" size="369" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="puzzle.gif" attr="" comment="" date="1169565034" path="puzzle.gif" size="332" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="py.gif" attr="" comment="" date="1169565034" path="py.gif" size="382" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="question.gif" attr="" comment="" date="1169565034" path="question.gif" size="214" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="quiet.gif" attr="" comment="" date="1193349525" path="quiet.gif" size="977" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="ram.gif" attr="" comment="" date="1169565034" path="ram.gif" size="373" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="recentchanges.gif" attr="" comment="" date="1169565035" path="recentchanges.gif" size="220" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="refreshtopic.gif" attr="" comment="" date="1169565034" path="refreshtopic.gif" size="229" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="reg.gif" attr="" comment="" date="1169565034" path="reg.gif" size="377" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="rfc.gif" attr="" comment="" date="1169565034" path="rfc.gif" size="369" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="right.gif" attr="" comment="" date="1169565034" path="right.gif" size="194" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="rss-feed.gif" attr="" comment="" date="1169565034" path="rss-feed.gif" size="227" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="rss-small.gif" attr="" comment="" date="1169565034" path="rss-small.gif" size="122" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="save.gif" attr="" comment="" date="1169565034" path="save.gif" size="222" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="search-small.gif" attr="" comment="" date="1169565034" path="search-small.gif" size="554" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="searchpackage.gif" attr="" comment="" date="1169565034" path="searchpackage.gif" size="383" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="searchtag.gif" attr="" comment="" date="1169565034" path="searchtag.gif" size="380" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="searchtopic.gif" attr="" comment="" date="1169565034" path="searchtopic.gif" size="580" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="sh.gif" attr="" comment="" date="1169565034" path="sh.gif" size="380" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="sitemap.gif" attr="" comment="" date="1193349525" path="sitemap.gif" size="090" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="sitetree.gif" attr="" comment="" date="1193349525" path="sitetree.gif" size="892" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="skin.gif" attr="" comment="" date="1169565034" path="skin.gif" size="356" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="skype.gif" attr="" comment="" date="1193349525" path="skype.gif" size="588" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="sniff.gif" attr="" comment="" date="1169565034" path="sniff.gif" size="368" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="sort.gif" attr="" comment="" date="1169565034" path="sort.gif" size="129" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="stargold.gif" attr="" comment="" date="1169565034" path="stargold.gif" size="338" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="starred.gif" attr="" comment="" date="1169565034" path="starred.gif" size="226" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="statistics.gif" attr="" comment="" date="1169565034" path="statistics.gif" size="118" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="stop.gif" attr="" comment="" date="1169565034" path="stop.gif" size="159" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="swf.gif" attr="" comment="" date="1169565034" path="swf.gif" size="380" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="table.gif" attr="" comment="" date="1193349525" path="table.gif" size="136" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tablesortdiamond.gif" attr="" comment="" date="1169565034" path="tablesortdiamond.gif" size="369" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tablesortdown.gif" attr="" comment="" date="1169565034" path="tablesortdown.gif" size="351" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tablesortup.gif" attr="" comment="" date="1169565034" path="tablesortup.gif" size="351" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-black.gif" attr="" comment="" date="1169565034" path="tag-black.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-blue.gif" attr="" comment="" date="1169565034" path="tag-blue.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-brown.gif" attr="" comment="" date="1169565034" path="tag-brown.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-green.gif" attr="" comment="" date="1169565034" path="tag-green.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-magenta.gif" attr="" comment="" date="1169565034" path="tag-magenta.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-orange.gif" attr="" comment="" date="1169565034" path="tag-orange.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-purple.gif" attr="" comment="" date="1169565034" path="tag-purple.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-red.gif" attr="" comment="" date="1169565034" path="tag-red.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag-yellow.gif" attr="" comment="" date="1169565034" path="tag-yellow.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tag.gif" attr="" comment="" date="1169565034" path="tag.gif" size="348" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="target.gif" attr="" comment="" date="1169565034" path="target.gif" size="261" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="tip.gif" attr="" comment="" date="1169565034" path="tip.gif" size="233" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="todo.gif" attr="" comment="" date="1169565034" path="todo.gif" size="318" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleclose-mini.gif" attr="" comment="" date="1169565034" path="toggleclose-mini.gif" size="51" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleclose-small.gif" attr="" comment="" date="1169565034" path="toggleclose-small.gif" size="135" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleclose.gif" attr="" comment="" date="1169565034" path="toggleclose.gif" size="142" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="togglecloseleft-small.gif" attr="" comment="" date="1169565034" path="togglecloseleft-small.gif" size="135" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleopen-mini.gif" attr="" comment="" date="1169565034" path="toggleopen-mini.gif" size="51" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleopen-small.gif" attr="" comment="" date="1169565034" path="toggleopen-small.gif" size="136" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleopen.gif" attr="" comment="" date="1169565034" path="toggleopen.gif" size="143" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleopenleft-small.gif" attr="" comment="" date="1169565034" path="toggleopenleft-small.gif" size="135" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="toggleopenleft.gif" attr="" comment="" date="1169565034" path="toggleopenleft.gif" size="141" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="topicbacklinks.gif" attr="" comment="" date="1169565034" path="topicbacklinks.gif" size="130" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="topicdiffs.gif" attr="" comment="" date="1169565034" path="topicdiffs.gif" size="157" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="trash.gif" attr="" comment="" date="1169565034" path="trash.gif" size="224" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="ttf.gif" attr="" comment="" date="1169565034" path="ttf.gif" size="378" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="twiki.gif" attr="" comment="" date="1169565034" path="twiki.gif" size="585" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="txt.gif" attr="" comment="" date="1169565034" path="txt.gif" size="375" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="unchecked.gif" attr="" comment="" date="1169565034" path="unchecked.gif" size="96" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="up.gif" attr="" comment="" date="1169565034" path="up.gif" size="199" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="updated.gif" attr="" comment="" date="1169565034" path="updated.gif" size="401" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-bo.gif" attr="" comment="" date="1193349525" path="uweb-bo.gif" size="158" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-bo12.gif" attr="" comment="" date="1193349525" path="uweb-bo12.gif" size="890" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-g.gif" attr="" comment="" date="1193349525" path="uweb-g.gif" size="999" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-gs.gif" attr="" comment="" date="1193349525" path="uweb-gs.gif" size="978" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-m12.gif" attr="" comment="" date="1193349525" path="uweb-m12.gif" size="925" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-o.gif" attr="" comment="" date="1193349525" path="uweb-o.gif" size="1004" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-o12.gif" attr="" comment="" date="1193349525" path="uweb-o12.gif" size="935" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-oo.gif" attr="" comment="" date="1193349525" path="uweb-oo.gif" size="915" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="uweb-os.gif" attr="" comment="" date="1193349525" path="uweb-o2.gif" size="985" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="vsd.gif" attr="" comment="" date="1169565034" path="vsd.gif" size="373" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="video.gif" attr="" comment="" date="1169565034" path="video.gif" size="329" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="viewtopic.gif" attr="" comment="" date="1169565034" path="viewtopic.gif" size="118" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="warning.gif" attr="" comment="" date="1169565034" path="warning.gif" size="215" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="watch.gif" attr="" comment="" date="1169565034" path="watch.gif" size="237" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="wav.gif" attr="" comment="" date="1169565034" path="wav.gif" size="377" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="web-bg-small.gif" attr="" comment="" date="1169565034" path="web-bg-small.gif" size="77" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="web-bg.gif" attr="" comment="" date="1169565034" path="web-bg.gif" size="85" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="wip.gif" attr="" comment="" date="1169565034" path="wip.gif" size="594" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="wrench.gif" attr="" comment="" date="1169565034" path="wrench.gif" size="377" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="wri.gif" attr="" comment="" date="1169565034" path="wri.gif" size="382" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="xls.gif" attr="" comment="" date="1169565034" path="xls.gif" size="374" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="xml-feed.gif" attr="" comment="" date="1169565034" path="xml-feed.gif" size="223" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="xml-small.gif" attr="" comment="" date="1169565034" path="xml-small.gif" size="100" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="xml.gif" attr="" comment="" date="1169565034" path="xml.gif" size="376" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="xsl.gif" attr="" comment="" date="1169565034" path="xsl.gif" size="375" user="TWikiContributor" version=""}%
+%META:FILEATTACHMENT{name="zip.gif" attr="" comment="" date="1169565034" path="zip.gif" size="383" user="TWikiContributor" version=""}%

Modified: twiki/scratch/TWikiStandAlone/lib/MANIFEST
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/MANIFEST	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/MANIFEST	2007-10-26 04:15:19 UTC (rev 15421)
@@ -99,7 +99,7 @@
 data/TWiki/DontNotify.txt 0644
 data/TWiki/EditDoesNotIncreaseTheRevision.txt 0644
 data/TWiki/ExampleTopicTemplate.txt 0644
-data/TWiki/FormatTokens.txt
+data/TWiki/FormatTokens.txt 0644
 data/TWiki/FileAttachment.txt 0644
 data/TWiki/FileAttribute.txt 0644
 data/TWiki/ForceNewRevision.txt 0644
@@ -782,6 +782,7 @@
 pub/TWiki/TWikiDocGraphics/locktopicgray.gif 0644
 pub/TWiki/TWikiDocGraphics/logout.gif 0644
 pub/TWiki/TWikiDocGraphics/mail.gif 0644
+pub/TWiki/TWikiDocGraphics/map.gif 0644
 pub/TWiki/TWikiDocGraphics/mdb.gif 0644
 pub/TWiki/TWikiDocGraphics/minus.gif 0644
 pub/TWiki/TWikiDocGraphics/mobile.gif 0644
@@ -797,6 +798,7 @@
 pub/TWiki/TWikiDocGraphics/notify.gif 0644
 pub/TWiki/TWikiDocGraphics/package.gif 0644
 pub/TWiki/TWikiDocGraphics/parked.gif 0644
+pub/TWiki/TWikiDocGraphics/parts.gif 0644
 pub/TWiki/TWikiDocGraphics/pdf.gif 0644
 pub/TWiki/TWikiDocGraphics/pencil.gif 0644
 pub/TWiki/TWikiDocGraphics/person.gif 0644
@@ -830,6 +832,8 @@
 pub/TWiki/TWikiDocGraphics/searchtag.gif 0644
 pub/TWiki/TWikiDocGraphics/searchtopic.gif 0644
 pub/TWiki/TWikiDocGraphics/sh.gif 0644
+pub/TWiki/TWikiDocGraphics/sitemap.gif 0644
+pub/TWiki/TWikiDocGraphics/sitetree.gif 0644
 pub/TWiki/TWikiDocGraphics/skin.gif 0644
 pub/TWiki/TWikiDocGraphics/skype.gif 0644
 pub/TWiki/TWikiDocGraphics/sniff.gif 0644

Modified: twiki/scratch/TWikiStandAlone/lib/Monitor.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/Monitor.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/Monitor.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -89,11 +89,15 @@
 }
 
 sub END {
+    writeReport();
+}
+
+sub writeReport {
     return unless ($ENV{TWIKI_MONITOR});
     MARK('END');
-    my $lastbm;
-    my $firstbm;
-    my %mash;
+#    my $lastbm;
+#    my $firstbm;
+#    my %mash;
 #    foreach my $bm (@times) {
 #        $firstbm = $bm unless $firstbm;
 #        if ($lastbm) {
@@ -104,6 +108,7 @@
 #        }
 #        $lastbm = $bm;
 #    }
+#    @times = ();
 	my %methods;
 	foreach my $call (@methodStats) {
 		$methods{$call->{method}} = {count=>0,min=>99999999,max=>0} unless defined($methods{$call->{method}} );
@@ -126,6 +131,7 @@
             .sprintf('%6.3f', $methods{$method}{max}).' | '
 			.timestr($methods{$method}{total})." | $method |";
 	}
+    @methodStats = ();
     print STDERR "\n";
 }
 

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UI.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UI.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UI.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -215,12 +215,14 @@
         return 0;
     }
 
-    if (crypt($pass, $TWiki::cfg{Password}) ne $TWiki::cfg{Password}) {
+    # If a password has been defined, check that it has been used
+    if ($TWiki::cfg{Password} &&
+        crypt($pass, $TWiki::cfg{Password}) ne $TWiki::cfg{Password}) {
         print CGI::div({class=>'error'}, "Password incorrect");
         return 0;
     }
 
-    # Password is correct
+    # Password is correct, or no password defined
     # Change the password if so requested
     my $newPass = $TWiki::query->param('newCfgP');
 

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UIs/Value.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UIs/Value.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Configure/UIs/Value.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -49,7 +49,7 @@
             $info .= $check;
             $isBroken = 1;
         }
-        if ($check eq 'NOT USED IN THIS CONFIGURATION') {
+        if ($check && $check eq 'NOT USED IN THIS CONFIGURATION') {
             $isUnused = 1;
         }
     }

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Engine/HTTP.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -165,6 +165,13 @@
     my ( $this, $req ) = @_;
     $req->header( $_ => $this->{r}->header($_) )
       foreach $this->{r}->header_field_names;
+    if ( $TWiki::cfg{BehindProxy} ) {
+        if ( my $source = $req->header('X-Forwarded-For') ) {
+            my $ip = (split /[, ]+/, $source)[-1];
+            $req->remoteAddress($1) 
+                if defined $ip and $ip =~ /^((?:\d{1,3}\.){3}\d{1,3})$/;
+        }
+    }
     my $user;
     if ( $TWiki::cfg{LoginManager} eq 'TWiki::LoginManager::ApacheLogin' ) {
         my ( $pass, $htPasswd );

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/If/Node.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/If/Node.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/If/Node.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -23,10 +23,24 @@
     }
 }
 
+# Used wherever a plain string is expected, this method suppresses automatic
+# lookup of names in meta-data
+sub _evaluate {
+    my $this = shift;
+    my $result;
+
+    if (!ref( $this->{op})) {
+        return $this->{params}[0];
+    } else {
+        return $this->evaluate(@_);
+    }
+}
+
 sub OP_context {
-    my( $this, %domain ) = @_;
+    my $this = shift;
     my $a = $this->{params}->[0];
-    my $text = $a->evaluate() || '';
+    my $text = $a->_evaluate(@_) || '';
+    my %domain = @_;
     my $session = $domain{tom}->session;
     throw Error::Simple('No context in which to evaluate "'.
                           $a->stringify().'"') unless $session;
@@ -34,14 +48,15 @@
 }
 
 sub OP_allows {
-    my( $this, %domain ) = @_;
+    my $this = shift;
     my $a = $this->{params}->[0]; # topic name (string)
     my $b = $this->{params}->[1]; # access mode (string)
-    my $mode = $b->evaluate() || 'view';
+    my $mode = $b->_evaluate(@_) || 'view';
+    my %domain = @_;
     my $session = $domain{tom}->session;
     throw Error::Simple('No context in which to evaluate "'.
                           $a->stringify().'"') unless $session;
-    my $str = $a->evaluate();
+    my $str = $a->evaluate(@_);
     return 0 unless $str;
     my ($web, $topic) = $session->normalizeWebTopicName(
         $session->{webName}, $str);
@@ -59,33 +74,36 @@
 }
 
 sub OP_istopic {
-    my( $this, %domain ) = @_;
+    my $this = shift;
     my $a = $this->{params}->[0];
-    my $session = $domain{tom}->{_session};
+    my %domain = @_;
+    my $session = $domain{tom}->session;
     throw Error::Simple('No context in which to evaluate "'.
                           $a->stringify().'"') unless $session;
     my ($web, $topic) = $session->normalizeWebTopicName(
-        $session->{webName}, $a->evaluate() || '');
+        $session->{webName}, $a->_evaluate(@_) || '');
     return $session->{store}->topicExists($web, $topic) ? 1 : 0;
 }
 
 sub OP_isweb {
-    my( $this, %domain ) = @_;
+    my $this = shift;
     my $a = $this->{params}->[0];
-    my $session = $domain{tom}->{_session};
+    my %domain = @_;
+    my $session = $domain{tom}->session;
     throw Error::Simple('No context in which to evaluate "'.
                           $a->stringify().'"') unless $session;
-    my $web = $a->evaluate() || '';
+    my $web = $a->_evaluate(@_) || '';
     return $session->{store}->webExists($web) ? 1 : 0;
 }
 
 sub OP_dollar {
-    my( $this, %domain ) = @_;
+    my $this = shift;
     my $a = $this->{params}->[0];
+    my %domain = @_;
     my $session = $domain{tom}->session;
     throw Error::Simple('No context in which to evaluate "'.
                           $a->stringify().'"') unless $session;
-    my $text = $a->evaluate() || '';
+    my $text = $a->_evaluate(@_) || '';
     if( $text && defined( $session->{request}->param( $text ))) {
         return $session->{request}->param( $text );
     }
@@ -97,30 +115,33 @@
 }
 
 sub OP_defined {
-    my( $this, %domain ) = @_;
+    my $this = shift;
     my $a = $this->{params}->[0];
-    my $session = $domain{tom}->{_session};
+    my %domain = @_;
+    my $session = $domain{tom}->session;
     throw Error::Simple('No context in which to evaluate "'.
                           $a->stringify().'"') unless $session;
-    my $eval =  $a->evaluate();
+    my $eval =  $a->_evaluate(@_);
     return 0 unless $eval;
     return 1 if( defined( $session->{request}->param( $eval )));
     return 1 if( defined(
         $session->{prefs}->getPreferencesValue( $eval )));
     return 1 if( defined( $session->{SESSION_TAGS}{$eval} ));
+    return 1 if( defined( $TWiki::functionTags{$eval} ));
     return 0;
 }
 
 sub OP_ingroup {
-    my( $this, %domain ) = @_;
+    my $this = shift;
     my $a = $this->{params}->[0]; # user cUID/ loginname / WikiName / WebDotWikiName :( (string)
     my $b = $this->{params}->[1]; # group name (string
-    my $session = $domain{tom}->{_session};
+    my %domain = @_;
+    my $session = $domain{tom}->session;
     throw Error::Simple('No context in which to evaluate "'.
                           $a->stringify().'"') unless $session;
-    my $user =  $session->{users}->getCanonicalUserID($a->evaluate());
+    my $user =  $session->{users}->getCanonicalUserID($a->evaluate(@_));
     return 0 unless $user;
-    my $group =  $b->evaluate();
+    my $group =  $b->_evaluate(@_);
     return 0 unless $group;
     return 1 if( $session->{users}->isInGroup($user, $group) );
     return 0;

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Query/HoistREs.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Query/HoistREs.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Query/HoistREs.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -29,7 +29,7 @@
 # second level LHS is a field access
 # second level RHS is a static string or number
 
-sub MONITOR_HOIST { 0 }
+sub MONITOR_HOIST { 1 }
 
 =pod
 
@@ -179,7 +179,13 @@
 
         }
     } elsif (!ref($node->{op}) && $node->{op} eq $TWiki::Infix::Node::NAME) {
-        if ($node->{params}[0] eq 'text') {
+        if ($node->{params}[0] eq 'name') {
+            # Special case for the topic name
+	    return undef;
+        } elsif ($node->{params}[0] eq 'web') {
+            # Special case for the web name
+	    return undef;
+        } elsif ($node->{params}[0] eq 'text') {
             # Special case for the text body
             return "\000RHS\001";
         } else {

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/UI.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -122,6 +122,8 @@
 sub handleRequest {
     my $req = prepare(@_);
     if ( ref $req ) {
+        use Data::Dumper;
+        print STDERR Dumper($req);
         my $res = dispatch($req);
         finalize( $res, $req );
         return $res->status;

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki/Users.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki/Users.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki/Users.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -243,7 +243,9 @@
     $login = $plogin if $plogin;
 
     # if we get here without a login id, we are a guest
-    my $cUID = $this->getCanonicalUserID( $login ) || $this->getCanonicalUserID( $TWiki::cfg{DefaultUserLogin} );
+    my $cUID;
+    $cUID = $this->getCanonicalUserID( $login ) if (defined($login) && ($login ne ''));
+    $cUID = $cUID || $this->getCanonicalUserID( $TWiki::cfg{DefaultUserLogin} );
 	return $cUID;
 }
 
@@ -520,17 +522,26 @@
 
 sub getWikiName {
     my ($this, $cUID ) = @_;
-    return 'UnknownUser' unless $cUID;
+    return 'UnknownUser' unless defined($cUID);
 	return $this->{getWikiName}->{$cUID} if (defined($this->{getWikiName}->{$cUID}));
 
 	my $legacycUID = $this->getCanonicalUserID($cUID);
 
-    my $wikiname = $this->_getMapping($legacycUID)->getWikiName($legacycUID) if ($legacycUID && $this->_getMapping($legacycUID));
-	if (defined($TWiki::cfg{RenderLoggedInButUnknownUsers} ) || ($TWiki::cfg{RenderLoggedInButUnknownUsers}) ) {
-		$this->{getWikiName}->{$cUID} = $wikiname || "UnknownUser (<nop>$cUID)";
-	} else {
-		$this->{getWikiName}->{$cUID} = $wikiname || "$cUID";
-	}
+    my $wikiname;
+    $wikiname = $this->_getMapping($legacycUID)->getWikiName($legacycUID) if (defined($legacycUID) && ($legacycUID ne '') && $this->_getMapping($legacycUID));
+    
+	if (!defined($wikiname)) {
+        if (defined($TWiki::cfg{RenderLoggedInButUnknownUsers} ) &&
+            ($TWiki::cfg{RenderLoggedInButUnknownUsers}) ) {
+            $wikiname = "UnknownUser (<nop>$cUID)";
+        } else {
+            $wikiname = "$cUID";
+        }
+    }
+    
+    my ( $web, $topic ) = $this->{session}->normalizeWebTopicName( $TWiki::cfg{UsersWebName}, $wikiname );
+    $this->{getWikiName}->{$cUID} = $topic;
+    
     return $this->{getWikiName}->{$cUID};
 }
 
@@ -782,12 +793,15 @@
 
 used for debugging to ensure we are actually passing a canonical_id
 
+These ASSERTS have been disabled, as they have been made dangerous and misleading
+due to the legacy cUID code
+
 =cut
 
 sub ASSERT_IS_CANONICAL_USER_ID {
     my( $this, $user_id ) = @_;
 
-    $this->_getMapping($user_id)->ASSERT_IS_CANONICAL_USER_ID($user_id) if ($this->_getMapping($user_id));
+    #$this->_getMapping($user_id)->ASSERT_IS_CANONICAL_USER_ID($user_id) if ($this->_getMapping($user_id));
 }
 
 =pod
@@ -796,11 +810,14 @@
 
 used for debugging to ensure we are actually passing a user login
 
+These ASSERTS have been disabled, as they have been made dangerous and misleading
+due to the legacy cUID code
+
 =cut
 
 sub ASSERT_IS_USER_LOGIN_ID {
     my( $this, $user_login ) = @_;
-    $this->_getMapping(undef, $user_login)->ASSERT_IS_USER_LOGIN_ID($user_login) if ($this->_getMapping(undef, $user_login));
+    #$this->_getMapping(undef, $user_login)->ASSERT_IS_USER_LOGIN_ID($user_login) if ($this->_getMapping(undef, $user_login));
 }
 
 
@@ -810,11 +827,14 @@
 
 used for debugging to ensure we are actually passing a user display_name (commonly a WikiWord Name)
 
+These ASSERTS have been disabled, as they have been made dangerous and misleading
+due to the legacy cUID code
+
 =cut
 
 sub ASSERT_IS_USER_DISPLAY_NAME {
     my( $this, $user_display ) = @_;
-    $this->_getMapping(undef, undef, $user_display)->ASSERT_IS_USER_DISPLAY_NAME($user_display) if ($this->_getMapping(undef, undef, $user_display));
+    #$this->_getMapping(undef, undef, $user_display)->ASSERT_IS_USER_DISPLAY_NAME($user_display) if ($this->_getMapping(undef, undef, $user_display));
 }
 
 1;

Modified: twiki/scratch/TWikiStandAlone/lib/TWiki.spec
===================================================================
--- twiki/scratch/TWikiStandAlone/lib/TWiki.spec	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/lib/TWiki.spec	2007-10-26 04:15:19 UTC (rev 15421)
@@ -544,6 +544,24 @@
 # '^.*$' to allow all environment variables to be seen (not recommended).
 $TWiki::cfg{AccessibleENV} = '^(HTTP_\w+|REMOTE_\w+|SERVER_\w+|REQUEST_\w+|MOD_PERL)$';
 
+# **BOOLEAN EXPERT**
+# If you are using HTTP engine it's <b>really</b> recommended to run it 
+# behind a proxy. <br />
+#
+# Check this option only if you are using HTTP engine <b>and</b> running 
+# behind a proxy. <br/>
+#
+# If you are running behind a proxy with this unchecked then 
+# <code>%ENV{"REMOTE_ADDR"}%</code> will always return proxy's IP
+# (and <b>{Sessions}{UseIPMatching}</b> will be useless)<br/>
+#
+# If you are not running behind a proxy and leave this checked then an 
+# attacker can perform an IP Spoofing by sending a fake 
+# <code>X-Forwarded-For</code> HTTP header. <br/>
+#
+# This option matters only to HTTP engine.
+$TWiki::cfg{BehindProxy} = 0;
+
 #---+ Anti-spam measures
 
 # Standard TWiki incorporates some simple anti-spam measures to protect

Added: twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/parts.gif
===================================================================
(Binary files differ)


Property changes on: twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/parts.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/quiet.gif
===================================================================
(Binary files differ)

Added: twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/sitemap.gif
===================================================================
(Binary files differ)


Property changes on: twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/sitemap.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/sitetree.gif
===================================================================
(Binary files differ)


Property changes on: twiki/scratch/TWikiStandAlone/pub/TWiki/TWikiDocGraphics/sitetree.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/data/TWiki/GenPDFAddOn.txt	2007-10-26 04:15:19 UTC (rev 15421)
@@ -151,8 +151,9 @@
 ---++ Add-On Info
 
 |  Add-on Author: | TWiki:Main/BrianSpinar, TWiki:Main/WadeTurland |
-|  Add-on Version: | 31 Aug 2007 |
+|  Add-on Version: | 23 Oct 2007 |
 |  Change History: | |
+|  23 Oct 2007 | Fixed Bugs:Item4452 & Bugs:Item4885, compatibility with Perl 5.6 and  missing images with SSL certificates |
 |  31 Aug 2007 | Fixed Bugs:Item4530, improper rendering of lists | 
 |  13196 | Removed =nop= tags before sending to htmldoc, fixed Bugs:Item3549 |
 |  11673 | TWiki:Main/RickMach updated MIME type to pdf from x-pdf, fixed bug preventing disabling the TOC |

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/GenPDFAddOn/lib/TWiki/Contrib/GenPDF.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -50,7 +50,7 @@
 use CGI;
 use TWiki::Func;
 use TWiki::UI::View;
-use File::Temp;
+use File::Temp qw( tempfile );
 use Error qw( :try );
 
 use vars qw( $VERSION $RELEASE );
@@ -245,19 +245,27 @@
    # FIXME - should this be a preference?
    $text =~ s/<span class="twikiNewLink".*?>([\w\s]+)<.*?\/span>/$1/gs;
 
-   # Fix the image tags for links relative to web server root and
-   # fully qualify any unqualified URLs (to make it portable to another host)
+   # Fix the image tags to use hard-desk path range than url paths.
+   # This is needed in case wiki requires read authentication like SSL client
+   # certificates.
+   # Fully qualify any unqualified URLs (to make it portable to another host)
    my $url = TWiki::Func::getUrlHost();
-   $text =~ s/<img(.*?) src="\//<img$1 src="$url\//sgi;
+   my $pdir = TWiki::Func::getPubDir();
+   my $purlp = TWiki::Func::getPubUrlPath();
+
+   $text =~ s!<img(.*?) src="($url)?$purlp!<img$1 src="$pdir\/!sgi;
    $text =~ s/<a(.*?) href="(?!#)\//<a$1 href="$url\//sgi;
 
    # Save it to a file
-   my $fh = new File::Temp(TEMPLATE => 'GenPDFAddOnXXXXXXXXXX',
-                           DIR => File::Spec->tmpdir(),
-                           SUFFIX => '.html');
+   my ($fh, $name) = tempfile('GenPDFAddOnXXXXXXXXXX',
+                               DIR => File::Spec->tmpdir(),
+	                       SUFFIX => '.html');
+   open $fh, ">$name";
+
    print $fh $text;
 
-   return $fh;
+   close $fh; 
+   return $name;
 }
 
 
@@ -356,10 +364,14 @@
    # FIXME - should this be a preference?
    $html =~ s/<span class="twikiNewLink".*?>([\w\s]+)<.*?\/span>/$1/gs;
 
-   # Fix the image tags for links relative to web server root and
-   # fully qualify any unqualified URLs (to make it portable to another host)
+   # Fix the image tags to use hard-disk path rather than relative url paths for
+   # images.  Needed if wiki requires authentication like SSL client certifcates.
+   # Fully qualify any unqualified URLs (to make it portable to another host)
    my $url = TWiki::Func::getUrlHost();
-   $html =~ s/<img(.*?) src="\//<img$1 src="$url\//sgi;
+   my $pdir = TWiki::Func::getPubDir();
+   my $purlp = TWiki::Func::getPubUrlPath();
+
+   $html =~ s!<img(.*?) src="($url)?$purlp!<img$1 src="$pdir\/!sgi;
    $html =~ s/<a(.*?) href="\//<a$1 href="$url\//sgi;
    # link internally if we include the topic
    for my $wikiword (@$refTopics) {
@@ -391,34 +403,33 @@
    # HTMLDOC location
    # $TWiki::htmldocCmd must be set in TWiki.cfg
 
-    use constant {
-       BANNER => "",
-       TITLE => "",
-       SUBTITLE => "",
-       HEADERTOPIC => "",
-       TITLETOPIC => "",
-       SKIN => "print.pattern",
-       RECURSIVE => undef,
-       FORMAT => "pdf14",
-       TOCLEVELS => 5,
-       PAGESIZE => "a4",
-       ORIENTATION => "portrait",
-       WIDTH => 860,
-       HEADERSHIFT => 0,
-       KEYWORDS => '%FORMFIELD{"KeyWords"}%',
-       SUBJECT => '%FORMFIELD{"TopicHeadline"}%',
-       TOCHEADER => "...",
-       TOCFOOTER => "..i",
-       HEADFOOTFONT => "",
-       BODYIMAGE => "",
-       LOGOIMAGE => "",
-       NUMBEREDTOC => undef,
-       DUPLEX => undef,
-       PERMISSIONS => undef,
-       MARGINS => undef,
-       BODYCOLOR => undef,
-   };
+  use constant BANNER => "";
+  use constant TITLE => "";
+  use constant SUBTITLE => "";
+  use constant HEADERTOPIC => "";
+  use constant TITLETOPIC => "";
+  use constant SKIN => "print.pattern";
+  use constant RECURSIVE => undef;
+  use constant FORMAT => "pdf14";
+  use constant TOCLEVELS => 5;
+  use constant PAGESIZE => "a4";
+  use constant ORIENTATION => "portrait";
+  use constant WIDTH => 860;
+  use constant HEADERSHIFT => 0;
+  use constant KEYWORDS => '%FORMFIELD{"KeyWords"}%';
+  use constant SUBJECT => '%FORMFIELD{"TopicHeadline"}%';
+  use constant TOCHEADER => "...";
+  use constant TOCFOOTER => "..i";
+  use constant HEADFOOTFONT => "";
+  use constant BODYIMAGE => "";
+  use constant LOGOIMAGE => "";
+  use constant NUMBEREDTOC => undef;
+  use constant DUPLEX => undef;
+  use constant PERMISSIONS => undef;
+  use constant MARGINS => undef;
+  use constant BODYCOLOR => undef;
 
+
    # header/footer topic
    $prefs{'hftopic'} = $query->param('pdfheadertopic') || TWiki::Func::getPreferencesValue("GENPDFADDON_HEADERTOPIC") || HEADERTOPIC;
 
@@ -632,11 +643,13 @@
       $htmlData =~ s|.*(<!DOCTYPE)|$1|s;
 
       # Save this to a temp file for htmldoc processing
-      my $contentFile = new File::Temp(TEMPLATE => 'GenPDFAddOnXXXXXXXXXX',
-                                       DIR => File::Spec->tmpdir(),
-                                       #UNLINK => 0, # DEBUG
-                                       SUFFIX => '.html');
-      print $contentFile $hfData . $htmlData;
+      my ($cfh, $contentFile) = tempfile('GenPDFAddOnXXXXXXXXXX',
+                                          DIR => File::Spec->tmpdir(),
+                                          #UNLINK => 0, # DEBUG
+                                          SUFFIX => '.html');
+      open $cfh, ">$contentFile";
+      print $cfh $hfData . $htmlData;
+      close $cfh;
       push @contentFiles, $contentFile;
    }
 
@@ -644,10 +657,10 @@
    my $titleFile = _createTitleFile($webName);
 
    # Create a temp file for output
-   my $outputFile = new File::Temp(TEMPLATE => 'GenPDFAddOnXXXXXXXXXX',
-                                   DIR => File::Spec->tmpdir(),
-                                   #UNLINK => 0, # DEBUG
-                                   SUFFIX => '.pdf');
+   my ($ofh, $outputFile) = tempfile('GenPDFAddOnXXXXXXXXXX',
+                                      DIR => File::Spec->tmpdir(),
+                                      #UNLINK => 0, # DEBUG
+	                              SUFFIX => '.pdf');
 
    # Convert contentFile to PDF using HTMLDOC
    my @htmldocArgs;
@@ -686,7 +699,7 @@
 
    push @htmldocArgs, @contentFiles;
 
-   print STDERR "Calling htmldoc with args: @htmldocArgs\n";
+#   print STDERR "Calling htmldoc with args: @htmldocArgs\n";
 
    # Disable CGI feature of newer versions of htmldoc
    # (thanks to Brent Roberts for this fix)
@@ -722,10 +735,15 @@
    } catch Error::Simple with {
    };
 
-   while(<$outputFile>){
-      print;
+   open $ofh, $outputFile;
+   while(<$ofh>){
+	  print;
    }
-   close $outputFile;
+   close $ofh;
+
+   # Cleaning up temporary files
+   unlink $outputFile, $titleFile;
+   unlink @contentFiles; 
 }
 
 1;

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -67,6 +67,7 @@
         "TestGroup", "   * Set GROUP = TestUser3\n");
 
     # Must create a new twiki to force re-registration of users
+    $TWiki::cfg{EnableEmail} = 1;
     $this->{twiki} = new TWiki();
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
     @TWikiFnTestCase::mails = ();

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/TWikiUserMappingContrib/data/Main/TWikiAdminGroup.txt
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/TWikiUserMappingContrib/data/Main/TWikiAdminGroup.txt	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/TWikiUserMappingContrib/data/Main/TWikiAdminGroup.txt	2007-10-26 04:15:19 UTC (rev 15421)
@@ -1,7 +1,13 @@
 %META:TOPICINFO{author="TWikiContributor" date="1111931141" format="1.0" version="$Rev$"}%
 ---+ TWiki Administrator Group
 
-<div style="background-color:yellow">
+
+   * Member list (comma-separated list):
+      * Set GROUP = 
+   * Persons/group who can change the list:
+      * Set ALLOWTOPICCHANGE = TWikiAdminGroup
+
+<sticky><div style="background-color:yellow"></sticky>
 __How to add the first administrator__ %BR%
 If you haven't previously set up an administrator, follow these steps:
    1 Authenticate as the internal TWiki administrator using the [[%SCRIPTURL{login}%/%WEB%/%TOPIC%?sudo=sudo;origurl=%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%][internal admin login]] (use the username suggested, and the password you set in =configure=).
@@ -9,14 +15,10 @@
    1 Insert the wikinames of admin users in the TWiki Administrator Group by listing them in the GROUP setting %BR% (example =* Set GROUP = <nop>JohnSmith, <nop>JamesBond=)
    1 Save this topic
    1 [[%LOGOUTURL%][Logout]] from the Internal TWikiAdminUser
-   1 Verify that new members show up properly in the group listing at %USERSWEB%.TWikiGroups </li> <li type="a">Make sure always to keep this topic write protected by keeping the already defined ALLOWTOPICCHANGE setting
+   1 Verify that new members show up properly in the group listing at %USERSWEB%.TWikiGroups
+   1 Make sure always to keep this topic write protected by keeping the already defined ALLOWTOPICCHANGE setting
    1 The ALLOWTOPICHANGE and ALLOWTOPICRENAME settings in [[%SYSTEMWEB%.TWikiPreferences]] and [[%USERSWEB%.TWikiPreferences]] have already been set to this group (<nop>TWikiAdminGroup), restricting edit of site-wide preferences to the TWiki Administrator Group
-</div>
-   
-   * Member list (comma-separated list):
-      * Set GROUP = 
-   * Persons/group who can change the list:
-      * Set ALLOWTOPICCHANGE = TWikiAdminGroup
+<sticky></div></sticky>
 
 __Related topics:__ %WIKIUSERSTOPIC%, TWikiAdminUser, TWikiGroups, %SYSTEMWEB%.TWikiAccessControl
 ---
@@ -25,5 +27,3 @@
 ---
 __%X% NOTE:__ If you lock yourself out of <nop>TWikiAdminGroup during setup activities, or have forgotten the configure password, you can edit this group topic at file system level using any text file editor (as a last resort.)
 ---
-
-

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/Fn_IF.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/Fn_IF.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/Fn_IF.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -14,6 +14,532 @@
     return $self;
 }
 
+sub test_1 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='B'", then=>0, else=>1);
+}
+
+sub test_2 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'!='B'", then=>1, else=>0);
+}
+
+sub test_3 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='A'", then=>1, else=>0);
+}
+
+sub test_4 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='B'", then=>0, else=>1);
+}
+
+sub test_5 {
+    my $this = shift;
+    $this->simpleTest(test => 'context test', then=>1, else=>0);
+}
+
+sub test_5a {
+    my $this = shift;
+    $this->simpleTest(test => 'context \'test\'', then=>1, else=>0);
+}
+
+sub test_6 {
+    my $this = shift;
+    $this->simpleTest(test => "{Fnargle}='Fleeble'", then=>1, else=>0);
+}
+
+sub test_7 {
+    my $this = shift;
+    $this->simpleTest(test => "{A}{B}='C'", then=>1, else=>0);
+}
+
+sub test_8 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => '$ WIKINAME = \''.$u->getWikiName($this->{twiki}->{user})."'", then=>1, else=>0);
+}
+
+sub test_8a {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => '$ \'WIKINAME\' = \''.$u->getWikiName($this->{twiki}->{user})."'", then=>1, else=>0);
+}
+
+sub test_9 {
+    my $this = shift;
+    $this->simpleTest(test => 'defined EDITBOXHEIGHT', then=>1, else=>0);
+}
+
+sub test_9a {
+    my $this = shift;
+    $this->simpleTest(test => 'defined \'EDITBOXHEIGHT\'', then=>1, else=>0);
+}
+
+sub test_10 {
+    my $this = shift;
+    $this->simpleTest(test => '0>1', then=>0, else=>1);
+}
+
+sub test_11 {
+    my $this = shift;
+    $this->simpleTest(test => '1>0', then=>1, else=>0);
+}
+
+sub test_12 {
+    my $this = shift;
+    $this->simpleTest(test => '1<0', then=>0, else=>1);
+}
+
+sub test_13 {
+    my $this = shift;
+    $this->simpleTest(test => '0<1', then=>1, else=>0);
+}
+
+sub test_14 {
+    my $this = shift;
+    $this->simpleTest(test => "0>=\t1", then=>0, else=>1);
+}
+
+sub test_15 {
+    my $this = shift;
+    $this->simpleTest(test => '1>=0', then=>1, else=>0);
+}
+
+sub test_16 {
+    my $this = shift;
+    $this->simpleTest(test => '1>=1', then=>1, else=>0);
+}
+
+sub test_17 {
+    my $this = shift;
+    $this->simpleTest(test => '1<=0', then=>0, else=>1);
+}
+
+sub test_18 {
+    my $this = shift;
+    $this->simpleTest(test => '0<=1', then=>1, else=>0);
+}
+
+sub test_19 {
+    my $this = shift;
+    $this->simpleTest(test => '1<=1', then=>1, else=>0);
+}
+
+sub test_20 {
+    my $this = shift;
+    $this->simpleTest(test => "not 'A'='B'", then=>1, else=>0);
+}
+
+sub test_21 {
+    my $this = shift;
+    $this->simpleTest(test => "not NOT 'A'='B'", then=>0, else=>1);
+}
+
+sub test_22 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='A' AND 'B'='B'", then=>1, else=>0);
+}
+
+sub test_23 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='A' and 'B'='B'", then=>1, else=>0);
+}
+
+sub test_24 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='A' and 'B'='B'", then=>1, else=>0);
+}
+
+sub test_25 {
+    my $this = shift;
+    $this->simpleTest(test => "('A'='B' or 'A'='A') and ('B'='B')", then=>1, else=>0);
+}
+
+sub test_26 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='B' or 'B'='B'", then=>1, else=>0);
+}
+
+sub test_27 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='A' or 'B'='A'", then=>1, else=>0);
+}
+
+sub test_28 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'='B' or 'B'='A'", then=>0, else=>1);
+}
+
+sub test_29 {
+    my $this = shift;
+    $this->simpleTest(test => "\$PUBURLPATH='".$TWiki::cfg{PubUrlPath}."'", then=>1, else =>0);
+}
+
+sub test_29a {
+    my $this = shift;
+    $this->simpleTest(test => "\$'PUBURLPATH'='".$TWiki::cfg{PubUrlPath}."'", then=>1, else =>0);
+}
+
+sub test_30 {
+    my $this = shift;
+    $this->simpleTest(test => "'A'~'B'", then=>0, else=>1);
+}
+
+sub test_31 {
+    my $this = shift;
+    $this->simpleTest(test => "'ABLABA'~'*B?AB*'", then=>1, else=>0);
+}
+
+sub test_32 {
+    my $this = shift;
+    $this->simpleTest(test => '\"BABBA\"~\"*BB?\"', then=>1, else=>0);
+}
+
+sub test_33 {
+    my $this = shift;
+    $this->simpleTest(test => "lc('FRED')='fred'", then=>1, else=>0);
+}
+
+sub test_34 {
+    my $this = shift;
+    $this->simpleTest(test => "('FRED')=uc 'fred'", then=>1, else=>0);
+}
+
+sub test_35 {
+    my $this = shift;
+    $this->simpleTest(test => "d2n('2007-03-26')=".TWiki::Time::parseTime('2007-03-26', 1), then=>1, else=>0);
+}
+
+sub test_36 {
+    my $this = shift;
+    $this->simpleTest(test => "d2n('wibble')=1174863600", then=>0, else=>1);
+}
+
+sub test_37 {
+    my $this = shift;
+    $this->simpleTest(test => "1 = 1 > 0", then=>1, else=>0);
+}
+
+sub test_38 {
+    my $this = shift;
+    $this->simpleTest(test => "1 > 1 = 0", then=>1, else=>0);
+}
+
+sub test_39 {
+    my $this = shift;
+    $this->simpleTest(test => "not 1 = 2", then=>1, else=>0);
+}
+
+sub test_40 {
+    my $this = shift;
+    $this->simpleTest(test => "not not 1 and 1", then=>1, else=>0);
+}
+
+sub test_41 {
+    my $this = shift;
+    $this->simpleTest(test => "0 or not not 1 and 1", then=>1, else=>0);
+}
+
+sub test_42 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$this->{twiki}->{user}."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_43 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$this->{twiki}->{user}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_44 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$this->{twiki}->{user}."' ingroup '$TWiki::cfg{SuperAdminGroup}'",
+         then=>0, else=>1);
+}
+
+sub test_45 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$this->{twiki}->{user}."' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_46 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERNAME%' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_47 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERNAME%' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_48 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERNAME%' ingroup '$TWiki::cfg{SuperAdminGroup}'", then=>0, else=>1);
+}
+
+sub test_49 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERNAME%' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_50 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$username\"}%' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_51 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$username\"}%' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test52_ {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$username\"}%' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1);
+}
+
+sub test_53 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$username\"}%' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_54 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiname\"}%' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_55 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiname\"}%' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_56 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiname\"}%' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1);
+}
+
+sub test_57 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiname\"}%' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_58 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiusername\"}%' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_59 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiusername\"}%' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_60 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiusername\"}%' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1);
+}
+
+sub test_61 {
+    my $this = shift;
+    $this->simpleTest(test => "'%USERINFO{format=\"\$wikiusername\"}%' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_62 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getWikiName($this->{twiki}->{user})."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_63 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getWikiName($this->{twiki}->{user})."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_64 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getWikiName($this->{twiki}->{user})."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1);
+}
+
+sub test_65 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getWikiName($this->{twiki}->{user})."' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_66 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_67 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_68 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>1, else=>0);
+}
+
+sub test_69 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup 'GropeGroup'", then=>0, else=>1);
+}
+
+sub test_70 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{DefaultUserWikiName}."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_71 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{DefaultUserWikiName}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_72 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{DefaultUserWikiName}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1);
+}
+
+sub test_73 {
+    my $this = shift;
+    $this->simpleTest(test => "'$TWiki::cfg{DefaultUserWikiName}' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_74 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_75 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_76 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>1, else=>0);
+}
+
+sub test_77 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup 'GropeGroup'", then=>0, else=>1);
+}
+
+sub test_78 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_79 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_80 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1);
+}
+
+sub test_81 {
+    my $this = shift;
+    $this->simpleTest(test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_82 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_83 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_84 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>1, else=>0);
+}
+
+sub test_85 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup 'GropeGroup'", then=>0, else=>1);
+}
+
+sub test_86 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup 'TWikiGuest'", then=>0, else=>1);
+}
+
+sub test_87 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1);
+}
+
+sub test_88 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1);
+}
+
+sub test_89 {
+    my $this = shift;
+    my $u = $this->{twiki}->{users};
+    $this->simpleTest(test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup 'GropeGroup'", then=>1, else=>0);
+}
+
+sub test_90 {
+    my $this = shift;
+    $this->simpleTest(test => "isweb 'TWiki'", then=>1, else=>0);
+}
+
+sub test_91 {
+    my $this = shift;
+    $this->simpleTest(test => "isweb 'Not a web'", then=>0, else=>1);
+}
+
+sub test_92 {
+    my $this = shift;
+    $this->simpleTest(test => "istopic \$'TWiki'", then=>0, else=>1);
+}
+
+sub test_93 {
+    my $this = shift;
+    $this->simpleTest(test => "istopic \$'Not a web'", then=>0, else=>1);
+}
+
+sub test_94 {
+    my $this = shift;
+    $this->simpleTest(test => "isweb \$ 'SYSTEMWEB'", then=>1, else=>0);
+}
+
+sub test_95 {
+    my $this = shift;
+    $this->simpleTest(test => 'defined \'SYSTEMWEB\'', then=>1, else=>0);
+}
+
+sub test_96 {
+    my $this = shift;
+    $this->simpleTest(test => 'defined SYSTEMWEB', then=>1, else=>0);
+}
+
+sub test_97 {
+    my $this = shift;
+    $this->simpleTest(test => 'defined \'IF\'', then=>1, else=>0);
+}
+
+sub test_98 {
+    my $this = shift;
+    $this->simpleTest(test => 'defined IF', then=>1, else=>0);
+}
+
+
 sub set_up {
     my $this = shift;
     $this->SUPER::set_up(@_);
@@ -25,115 +551,19 @@
         "   * Set GROUP = ".$u->getWikiName($this->{twiki}->{user})."\n");
 }
 
-sub test_correctIF {
-    my $this = shift;
+sub simpleTest {
+    my ($this, %test) = @_;
     $this->{twiki}->enterContext('test');
     $TWiki::cfg{Fnargle} = 'Fleeble';
     $TWiki::cfg{A}{B} = 'C';
-    my $u = $this->{twiki}->{users};
-    my @tests = (
-        { test => "'A'='B'", then=>0, else=>1 },
-        { test => "'A'!='B'", then=>1, else=>0 },
-        { test => "'A'='A'", then=>1, else=>0 },
-        { test => "'A'='B'", then=>0, else=>1 },
-        { test => 'context test', then=>1, else=>0 },
-        { test => "{Fnargle}='Fleeble'", then=>1, else=>0 },
-        { test => "{A}{B}='C'", then=>1, else=>0 },
-        { test => '$ WIKINAME = \''.$u->getWikiName($this->{twiki}->{user})."'",
-          then=>1, else=>0 },
-        { test => 'defined EDITBOXHEIGHT', then=>1, else=>0 },
-        { test => '0>1', then=>0, else=>1 },
-        { test => '1>0', then=>1, else=>0 },
-        { test => '1<0', then=>0, else=>1 },
-        { test => '0<1', then=>1, else=>0 },
-        { test => "0>=\t1", then=>0, else=>1 },
-        { test => '1>=0', then=>1, else=>0 },
-        { test => '1>=1', then=>1, else=>0 },
-        { test => '1<=0', then=>0, else=>1 },
-        { test => '0<=1', then=>1, else=>0 },
-        { test => '1<=1', then=>1, else=>0 },
-        { test => "not 'A'='B'", then=>1, else=>0 },
-        { test => "not NOT 'A'='B'", then=>0, else=>1 },
-        { test => "'A'='A' AND 'B'='B'", then=>1, else=>0 },
-        { test => "'A'='A' and 'B'='B'", then=>1, else=>0 },
-        { test => "'A'='A' and 'B'='B'", then=>1, else=>0 },
-        { test => "('A'='B' or 'A'='A') and ('B'='B')", then=>1, else=>0 },
-        { test => "'A'='B' or 'B'='B'", then=>1, else=>0 },
-        { test => "'A'='A' or 'B'='A'", then=>1, else=>0 },
-        { test => "'A'='B' or 'B'='A'", then=>0, else=>1 },
-        { test => "\$PUBURLPATH='".$TWiki::cfg{PubUrlPath}."'", then=>1, else =>0 },
-        { test => "'A'~'B'", then=>0, else=>1 },
-        { test => "'ABLABA'~'*B?AB*'", then=>1, else=>0 },
-        { test => '\"BABBA\"~\"*BB?\"', then=>1, else=>0 },
-        { test => "lc('FRED')='fred'", then=>1, else=>0 },
-        { test => "('FRED')=uc 'fred'", then=>1, else=>0 },
-        { test => "d2n('2007-03-26')=".TWiki::Time::parseTime('2007-03-26', 1), then=>1, else=>0 },
-        { test => "d2n('wibble')=1174863600", then=>0, else=>1 },
-        { test => "1 = 1 > 0", then=>1, else=>0 },
-        { test => "1 > 1 = 0", then=>1, else=>0 },
-        { test => "not 1 = 2", then=>1, else=>0 },
-        { test => "not not 1 and 1", then=>1, else=>0 },
-        { test => "0 or not not 1 and 1", then=>1, else=>0 },
-        { test => $this->{twiki}->{user}." ingroup TWikiGuest", then=>0, else=>1 },
-        { test => $this->{twiki}->{user}." ingroup ThereHadBetterBeNoSuchGroup", then=>0, else=>1 },
-        { test => $this->{twiki}->{user}." ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => $this->{twiki}->{user}." ingroup GropeGroup", then=>1, else=>0 },
-        { test => "%USERNAME% ingroup TWikiGuest", then=>0, else=>1 },
-        { test => "%USERNAME% ingroup ThereHadBetterBeNoSuchGroup", then=>0, else=>1 },
-        { test => "%USERNAME% ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => "%USERNAME% ingroup GropeGroup", then=>1, else=>0 },
-        { test => "%USERINFO{format=\"\$username\"}% ingroup TWikiGuest", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$username\"}% ingroup ThereHadBetterBeNoSuchGroup", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$username\"}% ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$username\"}% ingroup GropeGroup", then=>1, else=>0 },
-        { test => "%USERINFO{format=\"\$wikiname\"}% ingroup TWikiGuest", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$wikiname\"}% ingroup ThereHadBetterBeNoSuchGroup", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$wikiname\"}% ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$wikiname\"}% ingroup GropeGroup", then=>1, else=>0 },
-        { test => "%USERINFO{format=\"\$wikiusername\"}% ingroup TWikiGuest", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$wikiusername\"}% ingroup ThereHadBetterBeNoSuchGroup", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$wikiusername\"}% ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => "%USERINFO{format=\"\$wikiusername\"}% ingroup GropeGroup", then=>1, else=>0 },
 
-        { test => $u->getWikiName($this->{twiki}->{user})." ingroup TWikiGuest", then=>0, else=>1 },
-        { test => $u->getWikiName($this->{twiki}->{user})." ingroup ThereHadBetterBeNoSuchGroup", then=>0, else=>1 },
-        { test => $u->getWikiName($this->{twiki}->{user})." ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => $u->getWikiName($this->{twiki}->{user})." ingroup GropeGroup", then=>1, else=>0 },
-        { test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup 'TWikiGuest'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>1, else=>0 },
-        { test => "'".$TWiki::cfg{AdminUserWikiName}."' ingroup 'GropeGroup'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserWikiName}."' ingroup 'TWikiGuest'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserWikiName}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserWikiName}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserWikiName}."' ingroup 'GropeGroup'", then=>1, else=>0 },        
-        { test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup 'TWikiGuest'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>1, else=>0 },
-        { test => "'".$TWiki::cfg{AdminUserLogin}."' ingroup 'GropeGroup'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup 'TWikiGuest'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => "'".$TWiki::cfg{DefaultUserLogin}."' ingroup 'GropeGroup'", then=>1, else=>0 },        
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup 'TWikiGuest'", then=>0, else=>1 },
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1 },
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>1, else=>0 },
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{AdminUserLogin})."' ingroup 'GropeGroup'", then=>0, else=>1 },
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup 'TWikiGuest'", then=>0, else=>1 },
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup 'ThereHadBetterBeNoSuchGroup'", then=>0, else=>1 },
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup '".$TWiki::cfg{SuperAdminGroup}."'", then=>0, else=>1 },
-        { test => "'".$u->getCanonicalUserID($TWiki::cfg{DefaultUserLogin})."' ingroup 'GropeGroup'", then=>1, else=>0 },        
-       );
-
     my $meta = new TWiki::Meta($this->{twiki}, $this->{test_web},
                                $this->{test_topic});
-    foreach my $test (@tests) {
-        my $text = '%IF{"'.$test->{test}.'" then="'.
-          $test->{then}.'" else="'.$test->{else}.'"}%';
-        my $result = $this->{twiki}->handleCommonTags(
-            $text, $this->{test_web}, $this->{test_topic}, $meta);
-        $this->assert_equals('1', $result, $text." => ".$result);
-    }
+    my $text = '%IF{"'.$test{test}.'" then="'.
+      $test{then}.'" else="'.$test{else}.'"}%';
+    my $result = $this->{twiki}->handleCommonTags(
+        $text, $this->{test_web}, $this->{test_topic}, $meta);
+    $this->assert_equals('1', $result, $text." => ".$result);
 }
 
 sub test_INCLUDEparams {

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -81,6 +81,12 @@
     if ($this->{twiki}->inContext('registration_supported') && $this->{twiki}->inContext('registration_enabled'))  {
         try {
             $this->registerUser('usera', 'User', 'A', 'user@...');
+            $this->registerUser('usera86', 'User', 'A86', 'user86@...');
+            $this->registerUser('user86a', 'User86', 'A', 'user86a@...');
+            #this should fail... as its the same as the one above
+            #$this->registerUser('user862a', 'User', '86A', 'user862a@...');
+            #this one does fail..
+            #$this->registerUser('86usera', '86User', 'A', 'user86a@...');
             $this->registerUser('userb', 'User', 'B', 'user@...');
             $this->registerUser('userc', 'User', 'C', 'userc@...');
             $this->{twiki}->{store}->saveTopic(
@@ -158,7 +164,7 @@
     if ($TWiki::cfg{UserMappingManager} eq 'TWiki::Users::BaseUserMapping') {
          @correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser/;
     } else {
-         @correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser ScumBag UserA UserB UserC/;
+         @correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser ScumBag User86A UserA UserA86 UserB UserC/;
     }
     push @correctList, $TWiki::cfg{AdminUserWikiName};
     my $correct = join(',', sort @correctList);
@@ -187,7 +193,7 @@
          @correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser/;
     } else {
 #TODO: should reture WikiName's - trouble is that this means wikiname==loginname - and they were registered with them different
-         @correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser scum usera userb userc/;
+         @correctList = qw/TWikiContributor TWikiGuest TWikiRegistrationAgent UnknownUser scum user86a usera usera86 userb userc/;
     }
     push @correctList, $TWiki::cfg{AdminUserWikiName};
     my $correct = join(',', sort @correctList);
@@ -375,11 +381,28 @@
     $this->assert_str_equals($usera_cUID, TWiki::Func::getCanonicalUserID('UserA'));
     $this->assert_str_equals($usera_cUID, TWiki::Func::getCanonicalUserID($TWiki::cfg{UsersWebName}.'.'.'UserA'));
 
+
+#            $this->registerUser('usera86', 'User', 'A86', 'user86@...');
+    my $usera86_cUID = $this->{twiki}->{users}->getCanonicalUserID('usera86');
+    $this->assert_str_equals($usera86_cUID, TWiki::Func::getCanonicalUserID($usera86_cUID));
+    $this->assert_str_equals($usera86_cUID, TWiki::Func::getCanonicalUserID('usera86'));
+    $this->assert_str_equals($usera86_cUID, TWiki::Func::getCanonicalUserID('UserA86'));
+    $this->assert_str_equals($usera86_cUID, TWiki::Func::getCanonicalUserID($TWiki::cfg{UsersWebName}.'.'.'UserA86'));
+#            $this->registerUser('user86a', 'User86', 'A', 'user86a@...');
+    my $user86a_cUID = $this->{twiki}->{users}->getCanonicalUserID('user86a');
+    $this->assert_str_equals($user86a_cUID, TWiki::Func::getCanonicalUserID($user86a_cUID));
+    $this->assert_str_equals($user86a_cUID, TWiki::Func::getCanonicalUserID('user86a'));
+    $this->assert_str_equals($user86a_cUID, TWiki::Func::getCanonicalUserID('User86A'));
+    $this->assert_str_equals($user86a_cUID, TWiki::Func::getCanonicalUserID($TWiki::cfg{UsersWebName}.'.'.'User86A'));
+#            $this->registerUser('user862a', 'User', '86A', 'user862a@...');
+#            $this->registerUser('86usera', '86User', 'A', 'user86a@...');
+
     #TODO: consider how to render unkown user's
     $this->assert_null($this->{twiki}->{users}->getCanonicalUserID('nonexistantuser'));
     $this->assert_null(TWiki::Func::getCanonicalUserID('nonexistantuser'));
     $this->assert_null(TWiki::Func::getCanonicalUserID('NonExistantUser'));
     $this->assert_null(TWiki::Func::getCanonicalUserID($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser'));
+    $this->assert_null(TWiki::Func::getCanonicalUserID($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser86'));
 
     #TODO: consider what to return for GROUPs
 #    $this->assert_null($this->{twiki}->{users}->getCanonicalUserID('AandBGroup'));
@@ -415,6 +438,21 @@
     $this->assert_str_equals('UserA', TWiki::Func::getWikiName('usera'));
     $this->assert_str_equals('UserA', TWiki::Func::getWikiName('UserA'));
     $this->assert_str_equals('UserA', TWiki::Func::getWikiName($TWiki::cfg{UsersWebName}.'.'.'UserA'));
+    
+#            $this->registerUser('usera86', 'User', 'A86', 'user86@...');
+    my $usera86_cUID = $this->{twiki}->{users}->getCanonicalUserID('usera86');
+    $this->assert_str_equals('UserA86', TWiki::Func::getWikiName($usera86_cUID));
+    $this->assert_str_equals('UserA86', TWiki::Func::getWikiName('usera86'));
+    $this->assert_str_equals('UserA86', TWiki::Func::getWikiName('UserA86'));
+    $this->assert_str_equals('UserA86', TWiki::Func::getWikiName($TWiki::cfg{UsersWebName}.'.'.'UserA86'));
+#            $this->registerUser('user86a', 'User86', 'A', 'user86a@...');
+    my $user86a_cUID = $this->{twiki}->{users}->getCanonicalUserID('user86a');
+    $this->assert_str_equals('User86A', TWiki::Func::getWikiName($user86a_cUID));
+    $this->assert_str_equals('User86A', TWiki::Func::getWikiName('user86a'));
+    $this->assert_str_equals('User86A', TWiki::Func::getWikiName('User86A'));
+    $this->assert_str_equals('User86A', TWiki::Func::getWikiName($TWiki::cfg{UsersWebName}.'.'.'User86A'));
+#            $this->registerUser('user862a', 'User', '86A', 'user862a@...');
+#            $this->registerUser('86usera', '86User', 'A', 'user86a@...');
 
     #TODO: consider how to render unkown user's
     #$TWiki::cfg{RenderLoggedInButUnknownUsers} is false, or undefined
@@ -424,7 +462,8 @@
     $this->assert_str_equals($TWiki::cfg{DefaultUserWikiName}, TWiki::Func::getWikiName($nonexistantuser_cUID));
     $this->assert_str_equals('nonexistantuser', TWiki::Func::getWikiName('nonexistantuser'));
     $this->assert_str_equals('NonExistantUser', TWiki::Func::getWikiName('NonExistantUser'));
-    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.NonExistantUser', TWiki::Func::getWikiName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser'));
+    $this->assert_str_equals('NonExistantUser', TWiki::Func::getWikiName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser'));
+    $this->assert_str_equals('NonExistantUser86', TWiki::Func::getWikiName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser86'));
 
     #TODO: consider how to render unkown user's
     #my $AandBGroup_cUID = $this->{twiki}->{users}->getCanonicalUserID('AandBGroup');
@@ -458,14 +497,32 @@
     $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'UserA', TWiki::Func::getWikiUserName('UserA'));
     $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'UserA', TWiki::Func::getWikiUserName($TWiki::cfg{UsersWebName}.'.'.'UserA'));
 
+#            $this->registerUser('usera86', 'User', 'A86', 'user86@...');
+    my $usera86_cUID = $this->{twiki}->{users}->getCanonicalUserID('usera86');
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'UserA86', TWiki::Func::getWikiUserName($usera86_cUID));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'UserA86', TWiki::Func::getWikiUserName('usera86'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'UserA86', TWiki::Func::getWikiUserName('UserA86'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'UserA86', TWiki::Func::getWikiUserName($TWiki::cfg{UsersWebName}.'.'.'UserA86'));
+#            $this->registerUser('user86a', 'User86', 'A', 'user86a@...');
+    my $user86a_cUID = $this->{twiki}->{users}->getCanonicalUserID('user86a');
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'User86A', TWiki::Func::getWikiUserName($user86a_cUID));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'User86A', TWiki::Func::getWikiUserName('user86a'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'User86A', TWiki::Func::getWikiUserName('User86A'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'User86A', TWiki::Func::getWikiUserName($TWiki::cfg{UsersWebName}.'.'.'User86A'));
+#            $this->registerUser('user862a', 'User', '86A', 'user862a@...');
+#            $this->registerUser('86usera', '86User', 'A', 'user86a@...');
+
+
     #TODO: consider how to render unkown user's
-    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'TWikiUserMapping_NonExistantUser', TWiki::Func::getWikiUserName('TWikiUserMapping_NonExistantUser'));
-    my $nonexistantuser_cUID = $this->{twiki}->{users}->getCanonicalUserID('nonexistantuser');
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'NonExistantUserAsdf', TWiki::Func::getWikiUserName('NonExistantUserAsdf'));
+    my $nonexistantuser_cUID = $this->{twiki}->{users}->getCanonicalUserID('nonexistantuserasdf');
     $this->annotate($nonexistantuser_cUID);			#returns guest
     $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.$TWiki::cfg{DefaultUserWikiName}, TWiki::Func::getWikiUserName($nonexistantuser_cUID));
-    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'nonexistantuser', TWiki::Func::getWikiUserName('nonexistantuser'));
-    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser', TWiki::Func::getWikiUserName('NonExistantUser'));
-    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.$TWiki::cfg{UsersWebName}.'.'.'NonExistantUser', TWiki::Func::getWikiUserName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'nonexistantuserasdf', TWiki::Func::getWikiUserName('nonexistantuserasdf'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'nonexistantuserasdfqwer', TWiki::Func::getWikiUserName('nonexistantuserasdfqwer'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'NonExistantUserAsdf', TWiki::Func::getWikiUserName('NonExistantUserAsdf'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'NonExistantUserAsdf', TWiki::Func::getWikiUserName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUserAsdf'));
+    $this->assert_str_equals($TWiki::cfg{UsersWebName}.'.'.'NonExistantUserAsdf86', TWiki::Func::getWikiUserName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUserAsdf86'));
 
     #TODO: consider how to render unkown user's
     #my $AandBGroup_cUID = $this->{twiki}->{users}->getCanonicalUserID('AandBGroup');
@@ -498,11 +555,27 @@
     $this->assert_str_equals('usera', TWiki::Func::wikiToUserName('UserA'));
     $this->assert_str_equals('usera', TWiki::Func::wikiToUserName($TWiki::cfg{UsersWebName}.'.'.'UserA'));
 
+#            $this->registerUser('usera86', 'User', 'A86', 'user86@...');
+    my $usera86_cUID = $this->{twiki}->{users}->getCanonicalUserID('usera86');
+    $this->assert_str_equals('usera86', TWiki::Func::wikiToUserName($usera86_cUID));
+    $this->assert_str_equals('usera86', TWiki::Func::wikiToUserName('usera86'));
+    $this->assert_str_equals('usera86', TWiki::Func::wikiToUserName('UserA86'));
+    $this->assert_str_equals('usera86', TWiki::Func::wikiToUserName($TWiki::cfg{UsersWebName}.'.'.'UserA86'));
+#            $this->registerUser('user86a', 'User86', 'A', 'user86a@...');
+    my $user86a_cUID = $this->{twiki}->{users}->getCanonicalUserID('user86a');
+    $this->assert_str_equals('user86a', TWiki::Func::wikiToUserName($user86a_cUID));
+    $this->assert_str_equals('user86a', TWiki::Func::wikiToUserName('user86a'));
+    $this->assert_str_equals('user86a', TWiki::Func::wikiToUserName('User86A'));
+    $this->assert_str_equals('user86a', TWiki::Func::wikiToUserName($TWiki::cfg{UsersWebName}.'.'.'User86A'));
+#            $this->registerUser('user862a', 'User', '86A', 'user862a@...');
+#            $this->registerUser('86usera', '86User', 'A', 'user86a@...');
+
     #TODO: consider how to render unkown user's
     $this->assert_null(TWiki::Func::wikiToUserName('TWikiUserMapping_NonExistantUser'));
     $this->assert_null(TWiki::Func::wikiToUserName('nonexistantuser'));
     $this->assert_null(TWiki::Func::wikiToUserName('NonExistantUser'));
     $this->assert_null(TWiki::Func::wikiToUserName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser'));
+    $this->assert_null(TWiki::Func::wikiToUserName($TWiki::cfg{UsersWebName}.'.'.'NonExistantUser86'));
 
     #TODO: consider how to render unkown user's
     #my $AandBGroup_cUID = $this->{twiki}->{users}->getCanonicalUserID('AandBGroup');

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/RegisterTests.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/RegisterTests.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/RegisterTests.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -92,6 +92,7 @@
                                      $systemWeb,
                                      $TWiki::cfg{SystemWebName});
         $TWiki::cfg{SystemWebName} = $systemWeb;
+        $TWiki::cfg{EnableEmail} = 1;
 
     } catch TWiki::AccessControlException with {
         $this->assert(0,shift->stringify());

Modified: twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/TWikiFnTestCase.pm
===================================================================
--- twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/TWikiFnTestCase.pm	2007-10-25 23:33:23 UTC (rev 15420)
+++ twiki/scratch/TWikiStandAlone/twikiplugins/UnitTestContrib/test/unit/TWikiFnTestCase.pm	2007-10-26 04:15:19 UTC (rev 15421)
@@ -44,6 +44,7 @@
     $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TWikiUserMapping';
     $TWiki::cfg{LoginManager} = 'TWiki::LoginManager::TemplateLogin';
     $TWiki::cfg{Register}{EnableNewUserRegistration} = 1;
+    $TWiki::cfg{RenderLoggedInButUnknownUsers} = 0;
 
     $TWiki::cfg{Register}{NeedVerification} = 0;
     $TWiki::cfg{MinPasswordLength} = 0;

All:

Due to maintenance, the twiki.org server will by unavailable
for about one hour between 07:00 and 08:00 GMT on Sat,
2007-10-27.

Cheers,
Peter


-------- Original Message --------
Subject: [#31970-3834#] Safty Power Maintenance 10/26 - 11:59pm to
10:27 1am duration 1 hr
Date: Thu, 25 Oct 2007 14:54:16 -0700
From: support@...
To: peter.thoeny@...

Fastmetrics facility manger will shut down power to the access switch
two (2) which the Ethernet wire to your server is connected to.

 This work will be done during the night of
 Friday 10-26, 11:59 PDT to 10-27 1am.
 Duration is maximum of 1 hour.

All other power circuits and network connectivity will continue
working normally. This is due to a circuit breaker replacement

Andreas Glocker
Fastmetrics
415-778-5105 find me
415-778-5100 Main



-- 
   * Peter Thoeny, CTO - peter.thoeny.public@...
   * http://twiki.net  - TWIKI.NET - the Enterprise Wiki
   * http://twiki.org  - is your team already TWiki enabled?
   * Knowledge cannot be managed, it can be discovered and shared
   * This e-mail is:   (_) private    (_) ask first    (x) public