Wikka 1.1.6.1
Wikka 1.1.6.2
Wikka from fbc Git 03538052 (fbc SVN r5572)

with unnecessary changes such as this dropped:

	-$Id: CHANGES,v 1.3 2004/12/03 22:36:32 oracleshinoda Exp $
	+$Id$

	- * CVS Revision Version: $Revision: 1.1 $
	+ * CVS Revision Version: $Revision$
	  * Date Started: 2004/07/26
	- * Last Modified: $Date: 2004/11/29 08:46:24 $
	+ * Last Modified: $Date$
Merge tag 'wikka-1.1.6.0-secfix'
Merge tag 'wikka-1.1.6.1'
Merge tag 'wikka-1.1.6.2'

Conflicts:
    	3rdparty/plugins/geshi/geshi.php
    		1. geshi changed "htmlentities" to "@htmlspecialchars",
    		   FB previously added 2nd parameter to change_case()
    		2. geshi fixed code formatting in change_case(),
    		   no functional changes,
    		   FB previously turned the if/elseif there into a switch,
    		   to handle some manually added GESHI_CAPS_* options
    		3. Adjustment to regex in parse_non_string_part()
    		   FB added "i" modifier to one regex, geshi now has that
    		   too, plus FB added 2nd arg to $func() call, since it
    		   points to change_case() where FB added 2nd param.
    	3rdparty/plugins/geshi/geshi/freebasic.php
    		geshi has a different version from 2005, while FB has
    		a custom one from 2007+ made by coderJeff, preserved the
    		FB one
    	3rdparty/plugins/wikiedit/protoedit.js
    		wikka added the 53+2048 key
    	actions/image.php
    		wikka replaced some \" by '
    	actions/usersettings.php
    		1. FB disallows registrations if accept_new_users var is
    		   set, had to be adjusted to Wikka changes to input
    		   validation (a switch block is used now instead of
    		   if/elseif, and the error message strings are now global
    	 	   defines, to allow i18n)
    		2. FB added wiki-error tags to various error reports:
    			<!-- <wiki-error>invalid username or pwd</wiki-error> -->
    		  (perhaps for debugging or parsing by the fbdoc tool?)
    	css/wikka.css
    		FB changed the .indent { margin-left = ... } value
    	handlers/page/acls.php
    		FB added "<!-- <wiki-error>forbidden</wiki-error> -->" tag
    		to error report
    	handlers/page/edit.php
    		more cases of added <wiki-error> tags
    	handlers/page/show.php
    		1. more added <wiki-error> tags,
    		2. FB added if block for show_attached_files
    	wikka.php
    		1. Wikka moved the Wakka class into a separate file:
    			libs/Wakka.class.php
    		2. FB added new $enctype parameter to Wakka.FormOpen()
    		   and modified the function body accordingly
    		3. more cases of <wiki-error> tag in Wakka.Action() and
    		   Wakka.Method()
    		4. FB adjusted UserIsOwner() to always RETURN a value
    		5. FB added functions to handle file attachments
    			Wakka.ListUploadedFiles()
    			Wakka.ShowAttachedFiles()
    			Wakka.CheckUploadedFiles()
    		   and two corresponding utility functions in wikka.php:
    			bytesToHumanReadableUsage()
    			mkdir_r()
    		6. FB commented out the PAGE_GENERATION_TIME display