trunk coordination ticket

[DarTar]

This is a coordination ticket for code committed to trunk (which at the moment represents the 1.3 codebase)

Changesets included in trunk and not referring to specific issues or components should refer to this ticket.

See also

#654 action review for 1.3

[DarTar]

Minor layout change in [506]

[DotMG]

[521] : Corrected a Notice in footer.

The title for Edit link used $this->page, which is an array, instead fo $this->GetPageTag(), as the pagename.

Sorry for the wrong commits on commit message and comments at ticket #487, :(

[BrianKoontz]

(In [558]) Assignment of new by reference is deprecated. Changed to assignment by value, refs #496.

[JavaWoman]

Replying to BrianKoontz:

(In [558]) Assignment of new by reference is deprecated. Changed to assignment by value, refs #496.

I wondered where this change came from... it's deprecated only in PHP5 (where pass by reference of an object happens automatically) but definitely not in PHP4 where you'd get a copy instead of (a reference to) the actual object.

As long as we support PHP4 (probably for quite a while! we're not writing PHP5 code anyway), we should keep the 'Object = & new Class' notation to avoid unwanted side effects - or detect PHP version and handle accordingly. I'll be doing one of those two...

[JavaWoman]

(In [606]) partially reverting [558]: in PHP4 pass by reference of an object is not automatic like in PHP5, and desired rather than deprecated. refs #496 comments 3 & 4

[JavaWoman]

(In [614]) Replacing config...? with GetConfigValue() (or SetConfigValue()). refs #496

[JavaWoman]

(In [615]) Replacing config...? with GetConfigValue() (or SetConfigValue()). refs #496

[JavaWoman]

In [622] Mostly cleanup (a lot of it), some minor functional changes and bug fixes, in Wakka.class.php - more exciting stuff to follow, but the cleanup and "todo" markers were needed first.

[JavaWoman]

(In [623]) - cleanup (whitespace, coding standards) - expanded docblock - make use of the new object variable $included_pages instead of the misused $config array

refs #496

[JavaWoman]

Replying to JavaWoman:

(In [606]) partially reverting [558]: in PHP4 pass by reference of an object is not automatic like in PHP5, and desired rather than deprecated. refs #496 comments 3 & 4

I'm now implementing a little function that encapsulates this behavior so it can be used for all instantiations, so that '=' is used if running on PHP5, and '=&' if running on a lower version... a bit over the top maybe, but PHP4 is still very common and we explicitly support PHP as of 4.1.0.

[JavaWoman]

I'm now implementing a little function that encapsulates this behavior so it can be used for all instantiations, so that '=' is used if running on PHP5, and '=&' if running on a lower version... a bit over the top maybe, but PHP4 is still very common and we explicitly support PHP as of 4.1.0.

• Function in place and implemented for wikka.php in [624].
• still needs to be implemented elsewhere

[JavaWoman]

Revision [628] effectively applies the security fixes in [431] as implemented in 1.1.6.3 to trunk for IncludeBuffered(), Action(), Handler() and Format()

Re-evaluation showed that security could still be a little tightened - see commit note and comments in the source code!

[JavaWoman]

(In [629]) Implementing compatibility function getmicrotime() (now in Compatibility library). Old core GetMicroTime() left in place for now, but returning zero. (Is this necessary? I'd prefer to remove it completely - please advise.)

refs #496

[JavaWoman]

(In [630]) * fixed several NOTICEs due to uninitialized variables or accessing those

• in Wakka.class.php also:
  • fixed minor bugs unnoticed until NOTICEs were seen in CheckMySQLVersion(), Action() and HasAccess()
  • added ID_LENGTH (to be removed from wikka.php)
  • various docblokcs added / updated
  • todos/markers added"

refs #496

[JavaWoman]

(In [631]) major cleanup: deriving all variables before generating any output - (almost) template-ready now

refs #496

[DarTar]

Testing connection via Mylyn

[JavaWoman]

(In [632]) implementing StaticHref() for the 'XML' icon refs #496

[JavaWoman]

(In [633]) re-ordering two statements prevents NOTICE refs #496

[JavaWoman]

(In [634]) - fixing NOTICE on 'showpagetitle' - a little cleanup (whitespace, coding standards) refs #496

[JavaWoman]

(In [635]) implementing StaticHref() for 'XML' icon refs #496

[JavaWoman]

(In [636]) - a little cleanup - updating docblock: Config::base_url is not actually used - adding @todo refs #496

[JavaWoman]

(In [637]) * implemented StaticHref() for the comment display buttons

• removed redundant span
• prevented NOTICE by initializing a variable
• removed comment about templating class
• a little coding style cleanup

refs #496

[JavaWoman]

(In [639]) - implemented StaticHref() for Flash url (requires new implementation of StaticHref(), to follow) refs #496

[JavaWoman]

(In [640]) minor: docblock layout refs #496

[JavaWoman]

(In [641]) needs restructuring - some todo markers added refs #496

[JavaWoman]

(In [642]) - docblock update - StaticHref() implemented - a little cleanup refs #496

[JavaWoman]

(In [643]) needs major restructuring or rewrite; a few todo markers added as reminder

refs #496

[JavaWoman]

(In [644]) docblock cleanup; also fixes typo in @todo tag so it becomes "visible". refs #496 (see also comments added to #415)

[JavaWoman]

(In [645]) @todo marker added (standardize pages output) #refs #496

[JavaWoman]

(In [646]) added todo markers for configurability of date and time formats

refs #496

[JavaWoman]

(In [648]) small correction: $default_comment_display, $revisioncount and $changescount are integers (not strings) and now treated as such. refs #496

[JavaWoman]

(In [649]) just added a few @todo/@@@ markers for further investigation/action refs #496

[JavaWoman]

(In [650]) docblock updated refs #496

[JavaWoman]

(In [651]) several @todo/@@@ markers added for further action; minor code layout changes refs #496

[JavaWoman]

(In [653]) - cleanup of docblock and other minor cleanup - removed references to "templating class" refs #496

[JavaWoman]

(In [654]) - removed references to #312 @todo (done) - minor query layout (more todo)

refs #496

[JavaWoman]

(In [655]) - changed subpackage to Files (to indicate commonality with files handler!) - added @todo refs #496

[JavaWoman]

(In [657]) - cleanup (coding standards) - one @todo added refs #496

[JavaWoman]

(In [658]) - cleanup (coding guidelines) - group doc for constants refs #496

[JavaWoman]

(In [659]) - cleanup (whitespace, coding standards) - removed references to "templating class" refs #496

[JavaWoman]

(In [660]) minor correction: $_SESSIONgo_back_tag? wasn't always unset after login refs #496

[JavaWoman]

(In [670]) fixing a small bug

refs #496

[DarTar]

(In [671]) Fixing call to StaticHref for feed icon that caused fatal error, refs #496

[JavaWoman]

(In [672]) adding DocBlocks to comply with phpDocumentor rules, and someother comments; needs mor ework here and there.

refs #496

[JavaWoman]

(In [673]) adding/updating DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [674]) adding/updating DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [675]) adding/updating DocBlocks to comply with phpDocumentor rules; needs more work here and there.

refs #496

[JavaWoman]

(In [676]) * adding/updating DocBlocks to comply with phpDocumentor rules

• completing use of instantiate() Compatibility function
• some cleanup (coding standards)

refs #496

[JavaWoman]

(In [677]) adding DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [678]) * adding DocBlocks to comply with phpDocumentor rules

• some cleanup (coding standards)

refs #496

[JavaWoman]

(In [680]) just a little cleanup (coding standards) refs #496

[JavaWoman]

(In [681]) just a little cleanup (coding standards, a little whitespace) refs #496

[JavaWoman]

(In [682]) adding DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [683]) * adding/updating DocBlocks to comply with phpDocumentor rules

• completing use of instantiate() Compatibility function

refs #496

[JavaWoman]

(In [684]) * adding DocBlocks to comply with phpDocumentor rules

• a little cleanup (coding standards)

refs #496

[JavaWoman]

(In [685]) adding/updating DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [686]) @todo/@@@ markers added refs #496

[JavaWoman]

(In [687]) adding/updating DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [688]) adding/updating DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [689]) adding/updating DocBlocks to comply with phpDocumentor rules.

refs #496

[JavaWoman]

(In [690]) * making defines conditional

• different title and description for recentchanges and comments feeds
• correct type (integer, boolean) for some defines
• replacement parameters commented in i18n strings

refs #496

[JavaWoman]

(In [691]) * adding/updating DocBlocks to comply with phpDocumentor rules

• a little restructuring in LoadRevisions() to make logic clearer
• added various comments and @todo/@@@ markers
• a little cleanup (coding standards)

refs #496

[JavaWoman]

(In [692]) added todo marker refs #496

[JavaWoman]

(In [693]) small typo fix; cleaned up some commented-out code refs #496

[JavaWoman]

(In [694]) cleanup (coding guidelines, typo)

refs #496

[JavaWoman]

(In [695]) cleanup (coding guidelines)

refs #496

[JavaWoman]

(In [698]) * some cleanup (coding standards) - still more to do

• added todo markers

refs #496

[JavaWoman]

(In [699]) Improved and more structural user handling

New user handling

• new object variables (mainly to support new user handling)
• new methods for more structured user handling:
  • authenticateUserFromCookies() - replaces usage of LoadUser() in Run(); logs in user automatically if authenticated
  • loadUserData() - replaces usage of LoadUser() with only username given, where that was to actually retrieve the data
  • existsUser() - replaces usage of GetUser() when used ony to check if current user is logged in, or LoadUser() with only username given when used to check whethre the given username is a registered user
  • getAnonUserName() - returns IP address or hostname depending on configuration setting - but see #543
  • loginUser() - logs in user; returns result code; if database update failed, user is not logged in (replaces SetUser() but with modified interface
• obsoleted methods (will be removed!):
  • LoadUser() - replaced by different methods depending on usage; left in place for now but returns FALSE only.
• replaced methods (will be removed!):
  • SetUser() - functions as wrapper for loginUser() for now, but with old interface: no result code returned
• methods with modified interface:
  • LoadPage() - $cache parameter is now TRUE: pass FALSE to not use cache; returns only FALSE instead of sometimes NULL if page was not retrieved
  • LoadPageById() - returns only FALSE instead of sometimes NULL if page was not retrieved
  • GetUser() - returns FALSE if user not logged in
  • LogoutUser() - like loginUser, now returns result code; if database update failed, user is not logged out
  • FormatUser() - $link parameter is now boolean: pass FALSE to prevent linking
• renamed methods - (*) indicates change wrt 1.1.6.3:
  • setWikkaCookie() instead of SetACookie()
  • deleteWikkaCookie() instead of DeleteCookie() (*)
  • deleteOldWikkaCookies() instead of DeleteOldCookies()
  • getWikkaCookie() instead of GetCookie() (*)
• methods modified internally to leverage new user handling:
  • Run() - this is what makes it all more efficient: now uses authenticateUserFromCookies(), which logs in user and stores username + registered state if successful, or getAnonUserName(), which stores anonymous user name, if not: this means that username (anonymous or not) is derived just once per page load, slashing page load times for anonymous users when reverse lookup is happening, and generally speeding things up for all users.
  • SavePage() - replaced usage of GetUser()
  • GetUserName() - replaced usage of GetUser(); uses getAnonUserName() if user not logged in
  • LogoutUser() - updates object variable that tracks whether user is registered
  • FormatUser() - replaced usage of LoadUser() by existsUser()
  • UserIsOwner() - replaced usage of GetUser() by existsUser(); replaced usage of GetUserName() by direct retrieval of stored registered user name
  • IsAdmin() - replaced GetUsername() by existsUser() and direct retrieval of stored registered user name; also restructured to avoid looping over array
  • HasAccess() - replaced usage of GetUser() and GetUserName() with existsUser() and direct retrieval of (registered or anonymous) user name

In general:

• object variables rearranged and (mostly) grouped within docblock templates
• many docblocks added/updated
• cleanup (coding guidelines)
• minor tweaks

Still lots of debug code and commented-out code; this will be cleaned up in a later stage!

Fixes #542, fixes #368 (but this time by addressing cause of the problem instead of symptoms); refs #496

[JavaWoman]

(In [700]) * various changes to leverage new user handling

• the usual cleanup, docblocks and todo markers here and there

Fixes #542, fixes #368 (but this time by addressing cause of the problem instead of symptoms); refs #496

[JavaWoman]

(In [701]) * various changes to leverage new user handling

• the usual cleanup, docblocks and todo markers here and there

Fixes #542, fixes #368 (but this time by addressing cause of the problem instead of symptoms); refs #496

[JavaWoman]

(In [702]) Fixing problem in LoadPage() caused by GetCachedPage() returning inconsistent failure (NULL instead of normal FALSE). Leaving dubug code in place for now.

refs #496

[DarTar]

(In [703]) Fixing wrong call to StaticHref() causing fatal error, refs #496

[DarTar]

General issues I noticed today in trunk (as of [703]):

• The PageTitle() method is broken;
• The /diff handler gives an empty output (whereas /history correctly displays additions and deletions)
• The "edit this old revision" button has disappeared in the show.php handler.
• The error message for invalid handler calls outputs literal, not rendered HTML

Some of these issues may result from the debug code introduced by JavaWoman in the last revisions, but let's keep an eye on these problems.

[JavaWoman]

Replying to DarTar:

General issues I noticed today in trunk (as of [703]): * The PageTitle() method is broken;

It was broken anyway :) on my list to fix

* The /diff handler gives an empty output (whereas /history correctly displays additions and deletions) * The "edit this old revision" button has disappeared in the show.php handler. * The error message for invalid handler calls outputs literal, not rendered HTML Some of these issues may result from the debug code introduced by JavaWoman in the last revisions, but let's keep an eye on these problems.

I'll look at the other things as soon as I can , all probably minor hickups

[JavaWoman]

(In [704]) Fixes problem with error display by IncludeBuffered() (escaped HTML instead of HTML); escaping now done in client methods. NOTE: includeBuffered() interface changed with exta parameter!

refs #496

[JavaWoman]

Replying to JavaWoman:

(In [704]) Fixes problem with error display by IncludeBuffered() (escaped HTML instead of HTML); escaping now done in client methods. NOTE: includeBuffered() interface changed with exta parameter! refs #496

Will pick up the other issues referred to in comment 73 after the weekend...

[JavaWoman]

Problems with the diff handler and show handler were actually a knock-on effect of the bug solved in [704], however when analyzing this I'm seeing some small issues in diff, show and revisions handler which I'll fix in the next commits.

[JavaWoman]

(In [706]) * removing commented out code for #312 (done)

• solving notice when there aren't parameters for two pages

refs #496

[JavaWoman]

(In [707]) preventing a diff can be requested (leading to an error) when there are no revisions for a page at all; adding appropriate message for this situation to the language file.

refs #496

[JavaWoman]

(In [709]) solving small bug in SavePage() - refs #496

[DarTar]

(In [712]) Restoring original variable name for "default_write_acl" config setting that was accidentally modified in [662] as "default_post_acl", thus breaking functionality, refs #496

[JavaWoman]

(In [714]) removing "nonsense" input field (which was bad form design): not needed by giving the submit button a name and checking for that to determine whether the button was pressed.

refs #496

[JavaWoman]

(In [717]) updated some todos - needs work, especially on accessibility

refs #496

[JavaWoman]

(In [718]) added todo markers ads reminder to replace needless hidden fields from forms.

refs #496, refs #79

[JavaWoman]

(In [719]) Advanced FormOpen()

• Wakka.class.php:
  • replacing FormOpen() by an adapted version of the "advanced" version available and operational on wikkawiki.org
  • adding a new existsHandler() method to support this
• files.php action:
  • now uses advanced FormOpen() to build upload form - refs #72
• more work on internationalization - refs #340

• language file (en.inc.php)
  • standardized and expanded strings for files action - refs #340

Note:

The new FormOpen() now does away completely with the silly "hidden" field that seems to have been "necessary" at some time in the past to make form submission work when rewrite_mode is not on. It is no longer necessary: FormOpen() uses Href() which provides a complete action URL including a wakka parameter. Another case of replacing addressing symptoms by addressing causes...

refs #496

[JavaWoman]

(In [720]) a little cleanup after changes for relocation.

refs #496

[JavaWoman]

(In [721]) fixes bug in splitting config admin users list.

refs #496

[DarTar]

(In [724]) Adding a link to the homepage in the main wiki heading, refs #227 and #496

[JavaWoman]

(In [726]) * fixes a number of notices that prevented a feed from being displayed directly in the browser, (or as an aggregated feed via the {{rss}} action)

• some other small bugs fixed as well
• added @todo and @@@ markers in the source for further issues to be resolved (see #552 a.o); see also remarks about usage of the $item->source attribute (currently used only in an RSS 1.0 feed as a dc:source element)
• corrects @since tag in recentchanges.xml.php

refs #496, refs #552

[BrianKoontz]

(In [729]) Fixed incorrect template path setup and removed extraneous carriage returns, refs #496.

[DarTar]

As of the latest revision, the "show differences" form in the /revisions handler is broken.

[DarTar]

(In [744]) Replacing obsolete URI (jsnx.com) in phpdoc headers, refs #496

[DarTar]

(In [787]) Applying minimal coding guidelines, replacing a printf() with a sprintf() in language constant substitution. Note that there is some code soup generated by the category action right at the beginning of the action's output. I took a quick look but couldn't figure out the reason - possibly a result of the UNIX line-ending compliance edits by JavaWoman [736]? refs #496

[DotMG]

(In [838]) WikkaEdit should use $this->StaticHref() when linking to scripts.

This part updates the XHTML output, but JS should be also taken into consideration (images linked through JS should use a URL part retrieved through *this->StaticHref()

refs #496, #584

[DarTar]

Mahefa, I think we need to write a short developer tutorial on how to build links in 1.1.7 (also as a function of the changes in the way base_url is stored).

[DarTar]

cc:ing to the whole dev team

[DotMG]

(In [839]) WikkaEdit should use $this->StaticHref() when linking to scripts.

This part addresses the issue with JS part. A global JS variable named Wikkaedit_baseURL was introduced, it should be the URL part before 3rdparty/plugins/...

It is then used inside each JS code generating a URL (of an image).

refs #496, #584 See also r838

[DotMG]

Replying to DarTar:

write a short developer tutorial on how to build links in 1.1.7 (also as a function of the changes in the way base_url is stored

Sure, count on me.

[BrianKoontz]

(In [850]) Ported from 1.1.6.4. Refs #496, #597

[BrianKoontz]

(In [851]) Minor editorial change ('Operative system' -> 'Operating System'). Refs #496.

[DotMG]

(In [892]) Modifications:

• $this->base_domain_url, $this->base_url_path, $this->base_url, $this->wikka_cookie_path were renamed WIKKA_BASE_DOMAIN_URL, WIKKA_BASE_URL_PATH, WIKKA_BASE_URL, WIKKA_COOKIE_PATH, and computed using define() statements. They are defined at top of ./wikka.php, so they can be shared by Wakka and the installer. setup/test/test-mod-rewrite.php needs these too, but this file has to be accessed directly by the browser for the test to be effective, so they were copied into this file.
• DEFAULT_COOKIE_EXPIRATION_HOURS were moved into ./wikka.php, it is now shared by Wakka and the installer (to allow automatic login of admin)
• References to these are changed into the new style.
• removing references to Config::$base_url in docblocks (this param is obsolete).

refs #643, #496, #429

[BrianKoontz]

(In [920]) Ported from 1.1.7-docs to 1.1.7. Refs #655, #496.

[DarTar]

(In [1057]) Fixed missing markup in GeSHi language table, refs #496

[DarTar]

(In [1058]) Fixing broken link in default homepage, refs #496

[BrianKoontz]

(In [1085]) Port of UR validation framework to trunk. Refs #496, #609

[BrianKoontz]

(In [1086]) Commit undo, .htaccess committed in error. We really need to get .htaccess out of the source code tree! Refs #496.

[DarTar]

(In [1123]) Minor restyling of /showcode, refs #496

[DarTar]

(In [1156]) Notice, refs #496

[DarTar]

(In [1157]) Notices, refs #496

[DarTar]

(In [1158]) Notice, refs #496

[DarTar]

(In [1163]) Missing credit and updated copyright notice, refs #496

[NilsLindenberg]

(In [1205]) refs #496: fixing notice in history-handler

[DarTar]

(In [1208]) Testing new logo + serif font scheme for headings (feedback welcome!), refs #380 and #496

[BrianKoontz]

Replying to DarTar:

(In [1208]) Testing new logo + serif font scheme for headings (feedback welcome!), refs #380 and #496

Headings look great...can't wait to see what font changes are in store for the body text!

My logo didn't appear to change...even after clearing my browser cache.

[DarTar]

(In [1209]) Removing unnecessary font declarations from stylesheet, testing Lucida Grande/Lucida Sans Unicode as main body font, refs #380 and #496

[DarTar]

(In [1210]) Adding DejaVu Sans as default body font for Linux users, refs #380 and #496

[DarTar]

(In [1211]) DejaVu Serif as default heading font for Linux users, refs #380 and #496

[DarTar]

(In [1212]) Notice in highscore action, refs #496

[DarTar]

(In [1213]) New logo (reverting to default font weight), refs #496

[DarTar]

(In [1214]) Wrong constant name, refs #496

[DarTar]

(In [1215]) Fixed notice in TraverseComments(), refs #418 and #496

[DarTar]

(In [1216]) Notices in edit screen, refs #496

[DarTar]

(In [1217]) Notice in referrers, refs #1 and #496

[BrianKoontz]

(In [1251]) Refs #496 #821: Full-text search modifications ported from 1.1.6.6 to 1.1.7.

[DarTar]

(In [1293]) [minor] updating copyright notice, refs #496

[DarTar]

(In [1295]) [minor] updating copyright notice, refs #496

[DarTar]

Retargeting to 1.3. Code for this ticket may have already been committed to trunk, from which 1.3 will be branched. Consider backporting urgent issues to 1.2.X

[BrianKoontz]

(In [1344]) Removed wayward debug statement. Refs #496.

[BrianKoontz]

(In [1414]) Updated version file. Refs #496.

[BrianKoontz]

Please do not commit any further code to trunk. Significant trunk changes have been ported to 1.3 (see #912, among others).