Penguin
Hide Sidebar Hide Ads Recent Changes
Note: You are viewing an old revision of this page. View the current version.

We are currently undertaking an effort to merge all our patches to our phpwiki source (CVS from early 2002) onto the current phpwiki HEAD so that we can more closely keep track of upstream development and help contribute new features.

This page tracks the patches that we've extracted out of our changes and the status of merging them into our SubVersion repository which contains regularly synched snapshots of phpwiki CVS HEAD. This page is needed because many/most of our patches aren't actually able to be applied straight to phpwiki head as lots of things have changed and many of our features have been implemented in other ways.

The canonical location for the WLUG Wiki Patches against the 2002 CVS snapshot that we use are found at http://www.wlug.org.nz/matt/wlugwiki/

This location is currently missing patches for the following

The following sections detail each diff in that directory and it's process in being merged onto head. If you want to help with this process and need access to our SubVersion repository at http://svn.wlug.org.nz/viewcvs/?root=wiki then talk to MattBrown.

I've defined several categories that each diff can be in

  • Unstarted - no one has really looked at merging this diff yet
  • In Progess - someone has taken the diff and is in the process of porting it forward and testing it, please add your name to assigned to
  • Checked In - the forward port has been checked in and is being tested on http://test.wlug.org.nz/
  • Forwarded - The forward port has been tested and sent upstream
  • Accepted - The port is now in phpwiki upstream CVS
  • Complete - WLUG SVN repository has been synched with upstream CVS revision containing the accepted patch

I've also defined several levels of difficulty based on how complex each diff looks to resovle (in my opinion)

  • Trivial - Obvious 1 or 2 line patch
  • Medium - Obvious change but reasonable amount of code
  • Hard - Big structural changes, not obvious how to proceed

Patches in the queue

AntiAbuse.php.diff

  • Description: John's spam fighting code
  • Assigned To:
  • Difficulty: Hard
  • Status: Unstarted

lib_HtmlElement.php

  • Description: UTF8 nbsp, add <object> and <embed> tags
  • Assigned To:
  • Difficulty: Trivial
  • Status: Unstarted

lib_RssWriter.php.diff

  • Description: XML Escaping
  • Assigned To:
  • Difficulty: Trivial
  • Status: Unstarted

lib_Theme.php.diff

  • Description: Wiki Author Links, time / date formatting, Printable CSS updates
  • Assigned To:
  • Difficulty: Medium / Hard
  • Status: Unstarted

lib_WikiDB.php.diff

  • Description: Disable DB optimisation / vacuuming, Add empty page haiku's
  • Assigned To: MattBrown
  • Difficulty: Medium
  • Status: Forwarded - commited in r24 and r25 and filed upstream as issue 1377011. Page Haiku's are already implemented upstream as fortune stuff.

lib_WikiDB_backend_PearDB.diff

  • Description: Improve pageID allocation to use database abstraction nextId function
  • Assigned To: MattBrown
  • Difficulty: Trivial
  • Status: Forwarded - committed in r23 and filed upstream as issue 1376988

lib_WikiUser.php.diff

  • Description: noindex,nofollow addition
  • Assigned To:
  • Difficulty: Trivial
  • Status: Unstarted

lib_config.php.diff

  • Description: UTF8 and regexp fixes
  • Assigned To:
  • Difficulty: Medium
  • Status: Unstarted

lib_diff.php.diff

  • Description: last modification string add author name, add template for diff output
  • Assigned To:
  • Difficulty: Medium
  • Status: Unstarted

lib_display.php.diff

  • Description: Caching, sidebar, robots noindex,nofollow
  • Assigned To:
  • Difficulty: Hard / Medium
  • Status: Unstarted

lib_editpage.php.diff

  • Description: UTF8, spam prevention, new markup
  • Assigned To:
  • Difficulty: Medium
  • Status: Unstarted

lib_main.php.diff

  • Description: UTF8 fixes
  • Assigned To:
  • Difficulty: Trivial
  • Status: Unstarted

lib_plugin_Calendar.php.diff

  • Description: robots nofollow
  • Assigned To:
  • Difficulty: Trivial
  • Status: Unstarted

lib_plugin_FullTextSearch.php.diff

  • Description: WLUG specific disable...
  • Assigned To:
  • Difficulty: Trivial
  • Status: Unstarted. Unlikely to be merged upstream. Perhaps a more general disable method is needed?

lib_plugin_IncludePage.php.diff

  • Description: backported support for float and other things
  • Assigned To:
  • Difficulty: Medium
  • Status: Unstarted

lib_plugin_Jabber.php.diff

  • Description: WLUG specific jabber plugin (hardcodes jabber.mnnz) could be made more generic
  • Assigned To:
  • Difficulty: Medium
  • Status: Unstarted

lib_plugin_RecentChanges.php.diff

  • Description: Wiki author link addition, robots nofollow addition
  • Assigned To:
  • Difficulty: Trivial
  • Status: Unstarted

lib_plugin_WlugMember.php.diff

  • Description: WLUG specific LDAP membership
  • Assigned To:
  • Difficulty: Medium
  • Status: Unstarted

lib_plugin_WlugWantedPages.php.diff

  • Description: WLUG specific required pages, should be made more generic?
  • Assigned To:
  • Difficulty: Medium
  • Status: Unstarted

lib_stdlib.php.diff

  • Description: Jabber implementation, <object> and <embed> implementation, new markup backport
  • Assigned To:
  • Difficulty: Medium / Hard
  • Status: Unstarted

Patches that have already been dealt with and need no further action

lib_BlockParser.php

  • Description: Backported new markup implementation?
  • Status: Complete - _match change was backported. No action required. _hdr ID addition superseded by CreateTocPlugin? in 1.3.11p1.

lib_interwiki.map.diff

  • Description: As with previous
  • Status: Complete - PHPwiki, Twiki and Wikipedia entries already updated upstream. Jargon file entry pointed to WLUG Greenstone - committed in r21.

lib_plugin_GreenStone.php.diff

  • Description: WLUG greenstone implementation
  • Status: Complete - Added in r20, not a candidate for upstream push.

lib_plugin_Info.php.diff

  • Description: Page info. I think this is backported?
  • Status: Complete - was backported. No action required. Is called Page Info in 1.3.11p1.

lib_plugin_OldStyleTable.php.diff

  • Description: Backported old style table plugin
  • Status: Complete - was backported. No action required.

lib_plugin_OrphanedPages.php.diff

  • Description: Backported orphaned pages plugin?
  • Status: Complete - was backported. No action required.

lib_plugin_RedirectTo.php.diff

  • Description: Backported redirect to plugin?
  • Status: Complete - was backported. No action required.

lib_plugin_WikiForm.php.diff

  • Description: Backported WikiForm plugin?
  • Status: Complete - was backported. No action required.

soap.wsdl.diff

  • Description: Backported soap implementation?
  • Status: Complete - Much more featureful implementation is present in 1.3.11p1

lib_transform.php.diff

  • Description: footnotes / old markup changes
  • Status: Complete - Code appears to be obsolete. Cannot find in 1.3.11p1. Assuming no action is required.