GetWiki diff

From Meta, a Wikimedia project coordination wiki
Jump to navigation Jump to search
Ambox outdated content.svg

This page is kept for historical interest. Its content is outdated or may be wrong.

You may find more up-to-date information on the www.mediawiki.org website.

MediaWiki logo

Article.php[edit]

diff mediawiki-fm\Article.php getwiki-fm\Article.php
2,10c2,5
< // Class representing a Wikipedia article and history.
< // See design.doc for an overview.
< // Note: edit user interface and cache support functions have been
< // moved to separate EditPage and CacheManager classes.
< /* CHECK MERGE @@@
<    TEST THIS @@@
< 
<    * s/\$wgTitle/\$this->mTitle/ performed, many replacements
<    * mTitle variable added to class
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
16,20c11,15
<   /* private */ var $mContent, $mContentLoaded;
<   /* private */ var $mUser, $mTimestamp, $mUserText;
<   /* private */ var $mCounter, $mComment, $mCountAdjustment;
<   /* private */ var $mMinorEdit, $mRedirectedFrom;
<   /* private */ var $mTouched, $mFileCache, $mTitle;
---
>   var $mContent, $mContentLoaded;
>   var $mUser, $mTimestamp, $mUserText;
>   var $mCounter, $mComment, $mCountAdjustment;
>   var $mMinorEdit, $mRedirectedFrom;
>   var $mTouched, $mFileCache, $mTitle;
28c23
<   /* private */ function clear ()
---
>   function clear ()
38,39c33
<   // Note that getContent/loadContent may follow redirects if
<   // not told otherwise, and so may cause a change to mTitle.
---
>   // getContent/loadContent may follow redirects if not told otherwise, and so may cause a change to mTitle.
52c46
< 	    return "";		// was "newarticletext", now moved above the box)
---
> 	    return "";
54,55c48,53
< 	wfProfileOut ($fname);
< 	return wfMsg ("noarticletext");
---
> 
> 	require ("getwiki.php");
> 	$title = str_replace ("'", "%27", $title);
> 	//return wfMsg( "noarticletext" ) . preg_replace( "/(I|i)mage:(.*)]/i", " Wikipedia Image! ]]", trim($wiki->xhtml)) . "\n\n[[XML]] Import: [http://en.wikipedia.org/wiki/$title http://en.wikipedia.org/wiki/$title]"; 
> 	return wfMsg ("noarticletext").trim ($wiki->xhtml).
> 	  "\n\n[[XML]] Import: [http://en.wikipedia.org/wiki/$title http://en.wikipedia.org/wiki/$title]";
61,66c59,62
< 	if (
< 	     // check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
< 	     ($this->mTitle->getNamespace () ==
< 	      Namespace::getTalk (Namespace::getUser ()))
< 	     && preg_match ("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",
< 			    $this->mTitle->getText ()) && $action == "view")
---
> 	if (($this->mTitle->getNamespace () ==
> 	     Namespace::getTalk (Namespace::getUser ()))
> 	    && preg_match ("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",
> 			   $this->mTitle->getText ()) && $action == "view")
115,117c111
<     // Pre-fill content with error message so that if something
<     // fails we'll have something telling us what we intended.
< 
---
>     // prefilled if something fails
137,139c131,132
< 	$sql = "SELECT ".
< 	  "cur_text,cur_timestamp,cur_user,cur_counter,cur_restrictions,cur_touched ".
< 	  "FROM cur WHERE cur_id={$id}";
---
> 	$sql =
> 	  "SELECT cur_text,cur_timestamp,cur_user,cur_counter,cur_restrictions,cur_touched FROM cur WHERE cur_id={$id}";
148,151c141,144
< 	// If we got a redirect, follow it (unless we've been told
< 	// not to by either the function parameter or the query
< 	if (("no" != $redirect) && (false == $noredir) &&
< 	    ($wgMwRedir->matchStart ($s->cur_text)))
---
> 
> 	// follow redir (unless told not to by function parameter or query
> 	if (("no" != $redirect) && (false == $noredir)
> 	    && ($wgMwRedir->matchStart ($s->cur_text)))
157,159c150
< 		// Gotta hand redirects to special pages differently:
< 		// Fill the HTTP response "Location" header and ignore
< 		// the rest of the page we're on.
---
> 		// hand redirects to special pages differently,  filling the "Location" header and ignore the rest of the page
174,175c165,166
< 		    $sql = "SELECT cur_text,cur_timestamp,cur_user,".
< 		      "cur_counter,cur_restrictions,cur_touched FROM cur WHERE cur_id={$rid}";
---
> 		    $sql =
> 		      "SELECT cur_text,cur_timestamp,cur_user,cur_counter,cur_restrictions,cur_touched FROM cur WHERE cur_id={$rid}";
198a190
> 
201,202c193,194
< 	$sql = "SELECT old_text,old_timestamp,old_user FROM old ".
< 	  "WHERE old_id={$oldid}";
---
> 	$sql =
> 	  "SELECT old_text,old_timestamp,old_user FROM old WHERE old_id={$oldid}";
241,243c233
<   // Would the given text make this article a "good" article (i.e.,
<   // suitable for including in the article count)?
< 
---
>   // "good" articles are suitable for inclusion in the article count
264,267c254,255
<   // Load the field related to the last edit time of the article.
<   // This isn't necessary for all uses, so it's only done if needed.
< 
<   /* private */ function loadLastEdit ()
---
>   // load the field related to the last edit time of the article, if needed.
>   function loadLastEdit ()
273,274c261,263
<     $sql = "SELECT cur_user,cur_user_text,cur_timestamp,".
<       "cur_comment,cur_minor_edit FROM cur WHERE "."cur_id=".$this->getID ();
---
>     $sql =
>       "SELECT cur_user,cur_user_text,cur_timestamp,cur_comment,cur_minor_edit FROM cur WHERE cur_id=".
>       $this->getID ();
318,320c307
<   // This is the default action of the script: just view the page of
<   // the given title.
< 
---
>   // this is the default action of the class, viewing the page
332,334c319
<     // If we got diff and oldid in the query, we want to see a
<     // diff page instead of the article.
< 
---
>     // get diff page instead of the article.
355,358c340,341
<     $wgOut->setHTMLTitle ($this->mTitle->getPrefixedText ().
< 			  " - ".wfMsg ("wikititlesuffix"));
< 
<     // We're looking at an old revision
---
>     $wgOut->setHTMLTitle ($this->mTitle->getPrefixedText ()." - ".
> 			  wfMsg ("wikititlesuffix"));
359a343
>     // old article revision
368,369c352,353
< 	$redir = $sk->makeKnownLink ($this->mRedirectedFrom, "",
< 				     "redirect=no");
---
> 	$redir =
> 	  $sk->makeKnownLink ($this->mRedirectedFrom, "", "redirect=no");
380,386c364,365
<   // Theoretically we could defer these whole insert and update
<   // functions for after display, but that's taking a big leap
<   // of faith, and we want to be able to report database
<   // errors at some point.
< 
<   /* private */ function insertNewArticle ($text, $summary, $isminor,
< 					   $watchthis)
---
>   // insert now so we can report database errors
>   function insertNewArticle ($text, $summary, $isminor, $watchthis)
411,414c390,391
<     $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,".
<       "cur_comment,cur_user,cur_timestamp,cur_minor_edit,cur_counter,".
<       "cur_restrictions,cur_user_text,cur_is_redirect,".
<       "cur_is_new,cur_random,cur_touched,inverse_timestamp) VALUES ({$ns},'".
---
>     $sql =
>       "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_comment,cur_user,cur_timestamp,cur_minor_edit,cur_counter,cur_restrictions,cur_user_text,cur_is_redirect,cur_is_new,cur_random,cur_touched,inverse_timestamp) VALUES ({$ns},'".
427,428c404
<       {
< 	// Purge related entries in links cache on new page, to heal broken links
---
>       {				// purges related entries in links cache on new page, to heal broken links
430,431c406,408
< 	wfQuery ("DELETE linkscc FROM linkscc,brokenlinks ".
< 		 "WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'", DB_WRITE);
---
> 	wfQuery
> 	  ("DELETE linkscc FROM linkscc,brokenlinks WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'",
> 	   DB_WRITE);
434,440c411,416
<     $sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time,".
<       "rc_namespace,rc_title,rc_new,rc_minor,rc_cur_id,rc_user,".
<       "rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid,rc_bot) VALUES (".
<       "'{$now}','{$now}',{$ns},'".wfStrencode ($ttl)."',1,".
<       ($isminor ? 1 : 0).",{$newid},".$wgUser->getID ().",'".
<       wfStrencode ($wgUser->getName ())."','".
<       wfStrencode ($summary)."',0,0,".($wgUser->isBot ()? 1 : 0).")";
---
>     $sql =
>       "INSERT INTO recentchanges (rc_timestamp,rc_cur_time,rc_namespace,rc_title,rc_new,rc_minor,rc_cur_id,rc_user,rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid,rc_bot) VALUES (".
>       "'{$now}','{$now}',{$ns},'".wfStrencode ($ttl).
>       "',1,".($isminor ? 1 : 0).",{$newid},".$wgUser->getID ().",'".
>       wfStrencode ($wgUser->getName ())."','".wfStrencode ($summary).
>       "',0,0,".($wgUser->isBot ()? 1 : 0).")";
473,474c449
<     // insert updated section into old text if we have only edited part 
<     // of the article               
---
>     // insert updated section into old text if we have only edited part of the article              
525,526c500
<     // Update article, but only if changed.
< 
---
>     // update article
536,537c510,511
< 	$this->mCountAdjustment = $this->isCountable ($text)
< 	  - $this->isCountable ($oldtext);
---
> 	$this->mCountAdjustment =
> 	  $this->isCountable ($text) - $this->isCountable ($oldtext);
541,544c515,518
< 	$sql = "UPDATE cur SET cur_text='".wfStrencode ($text).
< 	  "',cur_comment='".wfStrencode ($summary).
< 	  "',cur_minor_edit={$me2}, cur_user=".$wgUser->getID ().
< 	  ",cur_timestamp='{$now}',cur_user_text='".
---
> 	$sql =
> 	  "UPDATE cur SET cur_text='".wfStrencode ($text)."',cur_comment='".
> 	  wfStrencode ($summary)."',cur_minor_edit={$me2}, cur_user=".
> 	  $wgUser->getID ().",cur_timestamp='{$now}',cur_user_text='".
547,548c521,522
< 	  "WHERE cur_id=".$this->getID ().
< 	  " AND cur_timestamp='".$this->getTimestamp ()."'";
---
> 	  "WHERE cur_id=".$this->getID ()." AND cur_timestamp='".$this->
> 	  getTimestamp ()."'";
553c527
< 	    /* Belated edit conflict! Run away!! */
---
> 	    // edit conflict
557,566c531,538
< 	$sql = "INSERT INTO old (old_namespace,old_title,old_text,".
< 	  "old_comment,old_user,old_user_text,old_timestamp,".
< 	  "old_minor_edit,inverse_timestamp) VALUES (".
< 	  $this->mTitle->getNamespace ().", '".
< 	  wfStrencode ($this->mTitle->getDBkey ())."', '".
< 	  wfStrencode ($oldtext)."', '".
< 	  wfStrencode ($this->getComment ())."', ".
< 	  $this->getUser ().", '".
< 	  wfStrencode ($this->getUserText ())."', '".
< 	  $this->getTimestamp ()."', ".$me1.", '".
---
> 	$sql =
> 	  "INSERT INTO old (old_namespace,old_title,old_text,old_comment,old_user,old_user_text,old_timestamp,old_minor_edit,inverse_timestamp) VALUES (".
> 	  $this->mTitle->getNamespace ().", '".wfStrencode ($this->mTitle->
> 							    getDBkey ()).
> 	  "', '".wfStrencode ($oldtext)."', '".wfStrencode ($this->
> 							    getComment ()).
> 	  "', ".$this->getUser ().", '".wfStrencode ($this->getUserText ()).
> 	  "', '".$this->getTimestamp ()."', ".$me1.", '".
571,573c543,544
< 	$sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time,".
< 	  "rc_namespace,rc_title,rc_new,rc_minor,rc_bot,rc_cur_id,rc_user,".
< 	  "rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid) VALUES (".
---
> 	$sql =
> 	  "INSERT INTO recentchanges (rc_timestamp,rc_cur_time,rc_namespace,rc_title,rc_new,rc_minor,rc_bot,rc_cur_id,rc_user,rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid) VALUES (".
575,579c546,551
< 	  wfStrencode ($this->mTitle->getDBkey ())."',0,{$me2},".
< 	  ($wgUser->isBot ()? 1 : 0).",".
< 	  $this->getID ().",".$wgUser->getID ().",'".
< 	  wfStrencode ($wgUser->getName ())."','".
< 	  wfStrencode ($summary)."',0,{$oldid})";
---
> 	  wfStrencode ($this->mTitle->getDBkey ())."',0,{$me2},".($wgUser->
> 								  isBot ()? 1
> 								  : 0).",".
> 	  $this->getID ().",".$wgUser->getID ().",'".wfStrencode ($wgUser->
> 								  getName ()).
> 	  "','".wfStrencode ($summary)."',0,{$oldid})";
582,585c554,558
< 	$sql = "UPDATE recentchanges SET rc_this_oldid={$oldid} ".
< 	  "WHERE rc_namespace=".$this->mTitle->getNamespace ()." AND ".
< 	  "rc_title='".wfStrencode ($this->mTitle->getDBkey ())."' AND ".
< 	  "rc_timestamp='".$this->getTimestamp ()."'";
---
> 	$sql =
> 	  "UPDATE recentchanges SET rc_this_oldid={$oldid} WHERE rc_namespace=".
> 	  $this->mTitle->getNamespace ()." AND rc_title='".
> 	  wfStrencode ($this->mTitle->getDBkey ())."' AND rc_timestamp='".
> 	  $this->getTimestamp ()."'";
588,589c561,563
< 	$sql = "UPDATE recentchanges SET rc_cur_time='{$now}' ".
< 	  "WHERE rc_cur_id=".$this->getID ();
---
> 	$sql =
> 	  "UPDATE recentchanges SET rc_cur_time='{$now}' WHERE rc_cur_id=".
> 	  $this->getID ();
594,595c568
< 	  {
< 	    // Purge link cache for this page
---
> 	  {			// purges link cache for this page
625,627c598
<   // After we've either updated or inserted the article, update
<   // the link tables and redirect to the new page.
< 
---
>   // update the link tables and redirect to the new page.
642c613
<     // Now update the link cache by parsing the text        
---
>     // update the link cache by parsing the text    
648c619,621
<       $r = "redirect=no";
---
>       {
> 	$r = "redirect=no";
>       }
650c623,625
<       $r = "";
---
>       {
> 	$r = "";
>       }
654,655c629
<   // Add this page to my watchlist
< 
---
>   // adds this page to user watchlist
672c646,648
<       $wgUser->addWatch ($this->mTitle);
---
>       {
> 	$wgUser->addWatch ($this->mTitle);
>       }
674c650,652
<       $wgUser->removeWatch ($this->mTitle);
---
>       {
> 	$wgUser->removeWatch ($this->mTitle);
>       }
683c661,663
<       $text = wfMsg ("addedwatchtext", $link);
---
>       {
> 	$text = wfMsg ("addedwatchtext", $link);
>       }
685c665,667
<       $text = wfMsg ("removedwatchtext", $link);
---
>       {
> 	$text = wfMsg ("removedwatchtext", $link);
>       }
687d668
< 
690d670
< 
699,700c679
<   // This shares a lot of issues (and code) with Recent Changes
< 
---
>   // this shares with Recent Changes
705,706c684
<     // If page hasn't changed, client can cache this
< 
---
>     // if page hasn't changed, client can cache
729,733c707,709
<     $sql = "SELECT old_id,old_user,".
<       "old_comment,old_user_text,old_timestamp,old_minor_edit ".
<       "FROM old USE INDEX (name_title_timestamp) ".
<       "WHERE old_namespace={$namespace} AND ".
<       "old_title='".wfStrencode ($this->mTitle->getDBkey ())."' ".
---
>     $sql =
>       "SELECT old_id,old_user,old_comment,old_user_text,old_timestamp,old_minor_edit FROM old USE INDEX (name_title_timestamp) WHERE old_namespace={$namespace} AND old_title='".
>       wfStrencode ($this->mTitle->getDBkey ())."' ".
753,756c729,732
<       $s. = $sk->historyLine ($this->getTimestamp (), $this->getUser (),
< 			      $this->getUserText (), $namespace,
< 			      $title, 0, $this->getComment (),
< 			      ($this->getMinorEdit () > 0));
---
>       $s. =
> 	$sk->historyLine ($this->getTimestamp (), $this->getUser (),
> 			  $this->getUserText (), $namespace, $title, 0,
> 			  $this->getComment (), ($this->getMinorEdit () > 0));
761,765c737,741
< 	$s. = $sk->historyLine ($line->old_timestamp, $line->old_user,
< 				$line->old_user_text, $namespace,
< 				$title, $line->old_id,
< 				$line->old_comment,
< 				($line->old_minor_edit > 0));
---
> 	$s. =
> 	  $sk->historyLine ($line->old_timestamp, $line->old_user,
> 			    $line->old_user_text, $namespace, $title,
> 			    $line->old_id, $line->old_comment,
> 			    ($line->old_minor_edit > 0));
793c769,770
<     $sql = "UPDATE cur SET cur_touched='".wfTimestampNow ()."',".
---
>     $sql =
>       "UPDATE cur SET cur_touched='".wfTimestampNow ()."',".
838c815
<     // Better double-check that it hasn't been deleted yet!
---
>     // double-check it hasn't been deleted yet
854,856c831
<     // determine whether this page has earlier revisions
<     // and insert a warning if it does
<     // we select the text because it might be useful below
---
>     // determine whether this page has earlier revisions and insert a warning if it does
866,867c841,842
< 	$wgOut->addHTML ("<B>".wfMsg ("historywarning"));
< 	$wgOut->addHTML ($skin->historyLink ()."</B><P>");
---
> 	$wgOut->addHTML ("<b>".wfMsg ("historywarning"));
> 	$wgOut->addHTML ($skin->historyLink ()."</b>");
875,878c850
< 
< 	// if this is a mini-text, we can paste part of it into the deletion reason
< 
< 	//if this is empty, an earlier revision may contain "useful" text
---
> 	// part of this can be inserted into the deletion reason
890d861
< 
895,896c866
< 	// this should not happen, since it is not possible to store an empty, new
< 	// page. Let's insert a standard text in case it does, though
---
> 	// insert standard text in case user saves blank page
902d871
< 
904,907c873
< 	  {
< 
< 	    // comment field=255, let's grep the first 150 to have some user
< 	    // space left
---
> 	  {			//comment field=255, grep the first 150 to have some user space left and strip out newlines and HTML tags
909d874
< 	    // let's strip out newlines and HTML tags
925c890
< 	      }			// we've only pasted part of the text
---
> 	      }			// thus only pasting part of the text
929d893
< 
954,963c918,923
< <table border=0><tr><td align=right>
< {$delcom}:</td><td align=left>
< <input type=text size=60 name=\"wpReason\" value=\"".htmlspecialchars ($wpReason)."\">
< </td></tr><tr><td> </td></tr>
< <tr><td align=right>
< <input type=checkbox name=\"wpConfirm\" value='1' id=\"wpConfirm\">
< </td><td><label for=\"wpConfirm\">{$check}</label></td>
< </tr><tr><td> </td><td>
< <input type=submit name=\"wpConfirmB\" value=\"{$confirm}\">
< </td></tr></table></form>\n");
---
> <label for=\"wpReason\">{$delcom}:</label><br />
> <input type=\"text\" size=\"60\" name=\"wpReason\" value=\"".htmlspecialchars ($wpReason)."\" /><br />
> <input type=\"checkbox\" name=\"wpConfirm\" value=\"1\" id=\"wpConfirm\" /><label for=\"wpConfirm\">{$check}</label><br />
> <input type=\"submit\" name=\"wpConfirmB\" value=\"{$confirm}\" />
> </form>
> ");
985d944
< 
988c947
<     $wgOut->addHTML ("<p>".$text);
---
>     $wgOut->addHTML ("<br /><br />".$text);
1016,1020c975,976
<     $sql = "INSERT INTO archive (ar_namespace,ar_title,ar_text,".
<       "ar_comment,ar_user,ar_user_text,ar_timestamp,ar_minor_edit,".
<       "ar_flags) SELECT cur_namespace,cur_title,cur_text,cur_comment,".
<       "cur_user,cur_user_text,cur_timestamp,cur_minor_edit,0 FROM cur ".
<       "WHERE cur_namespace={$ns} AND cur_title='{$t}'";
---
>     $sql =
>       "INSERT INTO archive (ar_namespace,ar_title,ar_text,ar_comment,ar_user,ar_user_text,ar_timestamp,ar_minor_edit,ar_flags) SELECT cur_namespace,cur_title,cur_text,cur_comment,cur_user,cur_user_text,cur_timestamp,cur_minor_edit,0 FROM cur WHERE cur_namespace={$ns} AND cur_title='{$t}'";
1023,1027c979,980
<     $sql = "INSERT INTO archive (ar_namespace,ar_title,ar_text,".
<       "ar_comment,ar_user,ar_user_text,ar_timestamp,ar_minor_edit,".
<       "ar_flags) SELECT old_namespace,old_title,old_text,old_comment,".
<       "old_user,old_user_text,old_timestamp,old_minor_edit,old_flags ".
<       "FROM old WHERE old_namespace={$ns} AND old_title='{$t}'";
---
>     $sql =
>       "INSERT INTO archive (ar_namespace,ar_title,ar_text,ar_comment,ar_user,ar_user_text,ar_timestamp,ar_minor_edit,ar_flags) SELECT old_namespace,old_title,old_text,old_comment,old_user,old_user_text,old_timestamp,old_minor_edit,old_flags FROM old WHERE old_namespace={$ns} AND old_title='{$t}'";
1030,1033c983,984
<     // Now that it's safely backed up, delete it
< 
<     $sql = "DELETE FROM cur WHERE cur_namespace={$ns} AND ".
<       "cur_title='{$t}'";
---
>     // safely backed up, so delete it
>     $sql = "DELETE FROM cur WHERE cur_namespace={$ns} AND cur_title='{$t}'";
1036,1037c987
<     $sql = "DELETE FROM old WHERE old_namespace={$ns} AND ".
<       "old_title='{$t}'";
---
>     $sql = "DELETE FROM old WHERE old_namespace={$ns} AND old_title='{$t}'";
1040,1041c990,991
<     $sql = "DELETE FROM recentchanges WHERE rc_namespace={$ns} AND ".
<       "rc_title='{$t}'";
---
>     $sql =
>       "DELETE FROM recentchanges WHERE rc_namespace={$ns} AND rc_title='{$t}'";
1044,1045c994
<     // Finally, clean up the link tables
< 
---
>     // clean up the link tables
1048d996
< 
1050d997
< 
1052,1055c999,1002
< 	  {
< 	    // Purge related entries in links cache on delete,
< 	    wfQuery ("DELETE linkscc FROM linkscc,links ".
< 		     "WHERE lcc_title=links.l_from AND l_to={$id}", DB_WRITE);
---
> 	  {			// purges related entries in links cache on delete,
> 	    wfQuery
> 	      ("DELETE linkscc FROM linkscc,links WHERE lcc_title=links.l_from AND l_to={$id}",
> 	       DB_WRITE);
1107c1054
<     // Clear the cached article id so the interface doesn't act like we exist
---
>     // clear cached article id
1127c1074
<     // Replace all this user's current edits with the next one down
---
>     // replace this user's current edits with the next one down
1131c1078
<     // Get the last editor
---
>     // get the last editor
1137d1083
< 	// Something wrong
1157,1158c1103,1105
< 	    $wgOut->addHTML (wfMsg ("editcomment",
< 				    htmlspecialchars ($s->cur_comment)));
---
> 	    $wgOut->
> 	      addHTML (wfMsg
> 		       ("editcomment", htmlspecialchars ($s->cur_comment)));
1163,1168c1110,1112
<     // Get the last edit not by this guy
<     $sql = "SELECT old_text,old_user,old_user_text
< 		FROM old USE INDEX (name_title_timestamp)
< 		WHERE old_namespace={$n} AND old_title='{$tt}'
< 		AND (old_user <> {$uid} OR old_user_text <> '{$ut}')
< 		ORDER BY inverse_timestamp LIMIT 1";
---
>     // get the last edit not by this user
>     $sql =
>       "SELECT old_text,old_user,old_user_text FROM old USE INDEX (name_title_timestamp) WHERE old_namespace={$n} AND old_title='{$tt}' AND (old_user <> {$uid} OR old_user_text <> '{$ut}') ORDER BY inverse_timestamp LIMIT 1";
1172d1115
< 	// Something wrong
1179c1122
<     // Save it!
---
>     // save
1197,1199c1140,1141
<   // Do standard deferred updates after page view
< 
<   /* private */ function viewUpdates ()
---
>   // deferred updates after page view
>   function viewUpdates ()
1213,1214c1155,1157
< 	$u = new UserTalkUpdate (0, $this->mTitle->getNamespace (),
< 				 $this->mTitle->getDBkey ());
---
> 	$u =
> 	  new UserTalkUpdate (0, $this->mTitle->getNamespace (),
> 			      $this->mTitle->getDBkey ());
1219,1222c1162,1163
<   // Do standard deferred updates after page edit.
<   // Every 1000th edit, prune the recent changes table.
< 
<   /* private */ function editUpdates ($text)
---
>   // every 1000th edit, prune the recent changes table.
>   function editUpdates ($text)
1246,1247c1187,1189
< 	$u = new UserTalkUpdate (1, $this->mTitle->getNamespace (),
< 				 $this->mTitle->getDBkey ());
---
> 	$u =
> 	  new UserTalkUpdate (1, $this->mTitle->getNamespace (),
> 			      $this->mTitle->getDBkey ());
1254c1196
< 	    // If another thread is loading, poll
---
> 	    // if another thread is loading, poll
1271c1213
<   /* private */ function setOldSubtitle ()
---
>   function setOldSubtitle ()
1280,1282c1222
<   // This function is called right before saving the wikitext,
<   // so we can do things like signatures and links-in-context.
< 
---
>   // allows signatures and links-in-context at last minute
1305c1245
<   /* private */ function pstPass2 ($text)
---
>   function pstPass2 ($text)
1309,1310d1248
<     // Signatures
<     //
1322c1260
<     /* Note: this is an ugly timezone hack for the European wikis */
---
> 
1336,1337d1273
<     // Context links: [[name]] and [[name (context)|name]]
<     //
1367,1368d1302
<     // <xxx> variables
<     //
1371,1379d1304
< 
< /* Experimental:
< 		// Trim trailing whitespace
< 		// MAG_END (__END__) tag allows for trailing 
< 		// whitespace to be deliberately included
< 		$text = rtrim( $text );
< 		$mw =& MagicWord::get( MAG_END );
< 		$mw->matchAndRemove( $text );
< */
1383,1384d1307
<   /* Caching functions */
< 
1399c1322
< 	    // Expire pages with variable replacements in an hour
---
> 	    // expires pages with variable replacements in an hour
1417,1420d1339
< 		/* For some reason, adding this header line over in
< 		   CacheManager::saveToFileCache() fails on my test
< 		   setup at home, though it works on the live install.
< 		   Make double-sure...  --brion */

Block.php[edit]

diff mediawiki-fm\Block.php getwiki-fm\Block.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
3,9d7
< //
< //TODO: This could be used everywhere, but it isn't.
< //
< // All the functions in this class assume the object is either explicitly 
< // loaded or filled. It is not load-on-demand. There are no accessors.
< //
< // To use delete(), you only need to fill $mAddress
14,15c12,13
<   function Block ($address = "", $user = "", $by = 0, $reason = "",
< 		  $timestamp = "", $auto = 0)
---
>   function Block ($address = "", $user = "", $by = 0, $reason =
> 		  "", $timestamp = "", $auto = 0)
25c23
<   /*static */ function newFromDB ($address, $user = 0, $killExpired = true)
---
>   function newFromDB ($address, $user = 0, $killExpired = true)
119c117
<   /*static */ function enumBlocks ($callback, $tag, $killExpired = true)
---
>   function enumBlocks ($callback, $tag, $killExpired = true)
152,153c150,153
< 	$sql = "DELETE FROM ipblocks WHERE ipb_address='".
< 	  wfStrencode ($this->mAddress)."'";
---
> 	$sql =
> 	  "DELETE FROM ipblocks WHERE ipb_address='".wfStrencode ($this->
> 								  mAddress).
> 	  "'";
160,162c160,163
<     $sql = "INSERT INTO ipblocks 
< 		  (ipb_address, ipb_user, ipb_by, ipb_reason, ipb_timestamp, ipb_auto ) 
< 		  VALUES ('".wfStrencode ($this->mAddress)."', {$this->mUser}, {$this->mBy}, '".wfStrencode ($this->mReason)."','{$this->mTimestamp}', {$this->mAuto})";
---
>     $sql =
>       "INSERT INTO ipblocks (ipb_address, ipb_user, ipb_by, ipb_reason, ipb_timestamp, ipb_auto ) VALUES ('".
>       wfStrencode ($this->mAddress)."', {$this->mUser}, {$this->mBy}, '".
>       wfStrencode ($this->mReason)."','{$this->mTimestamp}', {$this->mAuto})";
213d213
< 

CacheManager.php[edit]


diff mediawiki-fm\CacheManager.php getwiki-fm\CacheManager.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
152,154c157,159
< 	    $rawtext = str_replace ("</html>",
< 				    "<!-- Cached/compressed $now -->\n</html>",
< 				    $text);
---
> 	    $rawtext =
> 	      str_replace ("</html>",
> 			   "<!-- Cached/compressed $now -->\n</html>", $text);
159,160c164,165
< 	    $text = str_replace ("</html>",
< 				 "<!-- Cached $now -->\n</html>", $text);
---
> 	    $text =
> 	      str_replace ("</html>", "<!-- Cached $now -->\n</html>", $text);
183d187
< 

DatabaseFunctions.php[edit]

diff mediawiki-fm\DatabaseFunctions.php getwiki-fm\DatabaseFunctions.php
1c1,7
< < ? include_once ("FulltextStoplist.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("FulltextStoplist.php");
10c16
< /* private */ $wgBufferSQLResults = true;
---
> $wgBufferSQLResults = true;
21,23c27,29
<   $helpme = "\n<p>If this error persists after reloading and clearing ".
<     "your browser cache, please notify the <a href=\"mailto:".
<     $wgEmergencyContact."\">Wikipedia developers</a>.</p>";
---
>   $helpme =
>     "\n<p>If this error persists after reloading and clearing your browser cache, please notify the <a href=\"mailto:".
>     $wgEmergencyContact."\">Wikinfo developers</a>.</p>";
29,30c35,37
<       $wgDBconnection = mysql_connect ($serve, $altuser, $altpassword)
< 	or die ("bad sql user");
---
>       $wgDBconnection =
> 	mysql_connect ($serve, $altuser,
> 		       $altpassword) or die ("bad sql user");
44c51
< 	  /* Persistent connections may become stuck in an unusable state */
---
> 	  // persistent connections may become stuck
46d52
< 
50,52c56,57
< 
< 	  @mysql_select_db ($wgDBname, $wgDBconnection)
< 	    or wfEmergencyAbort ();
---
> 	  @mysql_select_db ($wgDBname,
> 			    $wgDBconnection) or wfEmergencyAbort ();
59,60d63
< /* Call this function if we couldn't contact the database...
<    We'll try to use the cache to display something in the meantime */
92,95c95,98
< 	  $msg = "<p style='color: red'><b>$msg<br>\n".
< 	    wfMsgNoDB ("cachederror")."</b></p>\n";
< 
< 	  $tag = "<div id='article'>";
---
> 	  $msg =
> 	    "<p class=\"error\"'><b>$msg<br>\n".wfMsgNoDB ("cachederror").
> 	    "</b></p>\n";
> 	  $tag = "<div id=\"article\">";
100c103
<   /* Don't cache error pages!  They cause no end of trouble... */
---
>   // stops cache of error pages
108,110c111,114
< //      DB_WRITE = -2    write to master (or only server)
< //      0,1,2,...        query a database with a specific index
< // Replication is not actually implemented just yet
---
> // DB_WRITE = -2    write to master (or only server)
> // 0,1,2,...        query a database with a specific index
> // replication is not actually implemented just yet
> 
272c276
< // Ideally we'd be using actual time fields in the db
---
> // using actual time fields in the db
276,279c280,282
<   return gmmktime (((int) substr ($ts, 8, 2)),
< 		   (int) substr ($ts, 10, 2), (int) substr ($ts, 12, 2),
< 		   (int) substr ($ts, 4, 2), (int) substr ($ts, 6, 2),
< 		   (int) substr ($ts, 0, 4));
---
>   return gmmktime (((int) substr ($ts, 8, 2)), (int) substr ($ts, 10, 2),
> 		   (int) substr ($ts, 12, 2), (int) substr ($ts, 4, 2),
> 		   (int) substr ($ts, 6, 2), (int) substr ($ts, 0, 4));
291d293
<   // return NOW
295c297
< // Sorting hack for MySQL 3, which doesn't use index sorts for DESC
---
> // sorting hack for MySQL 3, which doesn't use index sorts for DESC
302,303c304
< // Removes most variables from an SQL query and replaces them with X or N for numbers.
< // It's only slightly flawed. Don't use for anything important.
---
> // removes most variables from an SQL query and replaces them with X or N for numbers.
307,308c308
<   // This does the same as the regexp below would do, but in such a way
<   // as to avoid crashing php on some large strings.
---
>   // same as the regexp, but avoids crashing php on large strings.
317c317
<   // All newlines, tabs, etc replaced by single space
---
>   // all newlines, tabs, etc replaced by single space
320c320
<   // All numbers => N     
---
>   // all numbers => N     

DateFormatter.php[edit]

diff mediawiki-fm\DateFormatter.php getwiki-fm\DateFormatter.php
1c1,7
< < ? define ("DF_ALL", -1);
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   define ("DF_ALL", -1);
37,39c43
<       {
< 	$this->regexTrail = '(?![a-z])/iu';
<       }
---
>       $this->regexTrail = '(?![a-z])/iu';
41,43c45
<       {
< 	$this->regexTrail = '(?![a-z])/i';
<       }
---
>       $this->regexTrail = '(?![a-z])/i';
88d89
<     //            pref    source      target
140,145c141,144
< 	  {
< 	    $bits[$key
< 		  {
< 		  $p}
< 	    ] = $matches[$p + 1];
< 	  }
---
> 	  $bits[$key
> 		{
> 		$p}
> 	] = $matches[$p + 1];
267c266
< 	// PHP bug note: sprintf( "%04d", -1 ) fails poorly
---
> 	// PHP note: sprintf( "%04d", -1 ) fails poorly

DefaultSettings.php[edit]

diff mediawiki-fm\DefaultSettings.php getwiki-fm\DefaultSettings.php
2,8c2,10
< // DO NOT EDIT THIS FILE!
< // To customize your installation, edit "LocalSettings.php".
< // Note that since all these string interpolations are expanded
< // before LocalSettings is included, if you localize something
< // like $wgScriptPath, you must also localize everything that
< // depends on it.
<   $wgSitename = "Wikipedia";
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // much of these are MediaWiki defaults, customized further in LocalSettings.php
> // if you localize something like $wgScriptPath, you must also localize everything that depends on it.
>   $wgSitename = "GetWiki";
> $wgSiteurlname = "GetWiki";
10d11
< 
12c13
< $wgScriptPath = "/wiki";
---
> $wgScriptPath = "";
21,25c22,25
< $wgMathPath = "{$wgUploadPath}/math";
< $wgMathDirectory = "{$wgUploadDirectory}/math";
< $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
< $wgEmergencyContact = "wikiadmin@".getenv ("SERVER_NAME");
< //$wgPasswordSender     = "Wikipedia Mail <apache@www.wikipedia.org>";
---
> $wgMathPath = "{$wgServer}/exec/math";
> $wgMathDirectory = "exec/math";
> $wgTmpDirectory = "exec/tmp";
> $wgEmergencyContact = "admin@domain.net";
27c27
<   "Wikipedia Mail <apache@www.wikipedia.org>\r\nReply-To: webmaster@www.wikipedia.org";
---
>   "$wgSitename Mail <$wgEmergencyContact>\r\nReply-To: $wgSitename Mail <$wgEmergencyContact>";
30d29
< //
39,40c38,39
< $wgDBtransactions = false;	// Set to true if using InnoDB tables
< $wgDBmysql4 = false;		// Set to true to use enhanced fulltext search
---
> $wgDBtransactions = false;	// set to true if using InnoDB tables
> $wgDBmysql4 = false;		// set to true to use enhanced fulltext search
43,45c42
< // See docs/memcached.doc
< //
< $wgMemCachedDebug = false;	// Will be set to false in Setup.php, if the server isn't working
---
> $wgMemCachedDebug = false;	// will be set to false in Setup.php, if the server isn't working
50c47
< $wgLinkCacheMemcached = false;	// Not fully tested
---
> $wgLinkCacheMemcached = false;	// not fully tested [no surprise there!]
52,53c49
< // Language settings
< //
---
> // language settings
61,64c57,62
< $wgUseDynamicDates = false;	// Enable to allow rewriting dates in page text
< 							 // DOES NOT FORMAT CORRECTLY FOR MOST LANGUAGES
< $wgAmericanDates = false;	// Enable for English module to print dates
< 							 // as eg 'May 12' instead of '12 May'
---
> $wgUseDynamicDates = false;	// enable to allow rewriting dates in page text
> 
> // DOES NOT FORMAT CORRECTLY FOR MOST LANGUAGES
> $wgAmericanDates = false;	// enable for English module to print dates
> // as eg 'May 12' instead of '12 May'
> 
66c64
< $wgShowIPinHeader = true;	// For non-logged in users
---
> $wgShowIPinHeader = true;	// for non-logged in users
68,69c66
< // Translation using MediaWiki: namespace
< // Not recommended unless memcached is installed
---
> // translation using MediaWiki: namespace, not recommended unless memcached is installed
75,76c72
< // Miscellaneous configuration settings
< //
---
> // miscellaneous configuration settings
79,80c75
< // The debug log file should be not be publically accessible if it is
< // used, as it may contain private data.
---
> // the debug log file should be not be publically accessible if it is used, as it may contain private data.
82d76
< 
89c83
< $wgEnablePersistentLC = true;	// Persistent link cache, needs the linkscc table
---
> $wgEnablePersistentLC = true;	// persistent link cache, needs the linkscc table
92c86
< // User rights 
---
> // user rights 
96c90
< $wgSysopUserBans = false;	// Allow sysops to ban logged-in users
---
> $wgSysopUserBans = false;	// allow sysops to ban logged-in users
98c92
< $wgUserBlockExpiration = 0;	// As above, but for logged-in users
---
> $wgUserBlockExpiration = 0;	// as above, but for logged-in users
100,103c94
< // User agent/range blocking
< // Blocks all users using a particular user agent, possibly restricted to a 
< // set of IP ranges. Note: you can't block all user agents by leaving 
< // $wgBadUserAgents blank. That would block nothing.
---
> // user agent/range blocking
106,107c97,98
< $wgRangeBlockUser = 0;		// The block is attributed to this user ID
< $wgRangeBlockReason = "";	// This reason is given (should be in wfMsg, obviously)
---
> $wgRangeBlockUser = 0;		// the block is attributed to this user ID
> $wgRangeBlockReason = "";	// this reason is given, should be in wfMsg
109,110c100,101
< // Client-side caching:
< $wgCachePages = true;		// Allow client-side caching of pages
---
> // client-side caching:
> $wgCachePages = true;		// allow client-side caching of pages
112,113c103
< // Set this to current time to invalidate all prior cached pages.
< // Affects both client- and server-side caching.
---
> // set this to current time to invalidate all prior cached pages, affects both client- and server-side caching.
116,119c106
< // Server-side caching:
< //  This will cache static pages for non-logged-in users
< //  to reduce database traffic on public sites.
< //  Must set $wgShowIPinHeader = false
---
> // server-side caching, will cache static pages for non-logged-in users
123c110
< $wgCookieExpiration = 2592000;
---
> $wgCookieExpiration = 60 * 60 * 24 * 30;	// 30 days
125,127c112,113
< // Set to set an explicit domain on the login cookies
< // eg, "justthis.domain.org" or ".any.subdomain.net"
< $wgCookieDomain = "";
---
> // set to set an explicit domain on the login cookies, eg, "justthis.domain.org" or ".any.subdomain.net"
> //$wgCookieDomain       = "";
132c118
< $wgMiserMode = false;		// Disable database-intensive features
---
> $wgMiserMode = false;		// disable database-intensive features
135,142c121,128
< // Profiling / debugging
< $wgProfiling = false;		// Enable for more detailed by-function times in debug log
< $wgProfileLimit = 0.0;		// Only record profiling info for pages that took longer than this
< $wgProfileOnly = false;		// Don't put non-profiling info into log file
< $wgProfileToDatabase = false;	// Log sums from profiling into "profiling" table in db.
< $wgProfileSampleRate = 1;	// Only profile every n requests when profiling is turned on
< $wgDebugProfiling = false;	// Detects non-matching wfProfileIn/wfProfileOut calls
< $wgDebugFunctionEntry = 0;	// Output debug message on every wfProfileIn/wfProfileOut
---
> // profiling / debugging
> $wgProfiling = false;		// enable for more detailed by-function times in debug log
> $wgProfileLimit = 0.0;		// only record profiling info for pages that took longer than this
> $wgProfileOnly = false;		// don't put non-profiling info into log file
> $wgProfileToDatabase = false;	// log sums from profiling into "profiling" table in db.
> $wgProfileSampleRate = 1;	// only profile every n requests when profiling is turned on
> $wgDebugProfiling = false;	// detects non-matching wfProfileIn/wfProfileOut calls
> $wgDebugFunctionEntry = 0;	// output debug message on every wfProfileIn/wfProfileOut
146,147c132,133
< $wgDisableSearchUpdate = false;	// If you've disabled search semi-permanently, this also disables updates to the table. If you ever re-enable, be sure to rebuild the search table.
< $wgDisableUploads = true;	// Uploads have to be specially set up to be secure
---
> $wgDisableSearchUpdate = false;	// if you've disabled search semi-permanently, this also disables updates to the table. If you ever re-enable, be sure to rebuild the search table.
> $wgDisableUploads = true;	// uploads have to be specially set up to be secure
150,152c136,137
< // We can serve pages compressed in order to save bandwidth,
< // but this will increase CPU usage.
< // Requires zlib support enabled in PHP.
---
> // serve pages compressed in order to save bandwidth, but increase CPU usage.
> // requires zlib support enabled in PHP.
155,166c140
< $wgPasswordSalt = true;		// For compatibility with old installations set to false
< 
< // Which namespaces should support subpages?
< // See Language.php for a list of namespaces.
< //
< $wgNamespacesWithSubpages = array (-1 = >0, 0 = >0, 1 = >1,
< 				   2 = >1, 3 = >1, 4 = >0, 5 = >1, 6 = >0, 7 =
< 				   >1);
< 
< $wgNamespacesToBeSearchedDefault = array (-1 = >0, 0 = >1, 1 = >0,
< 					  2 = >0, 3 = >0, 4 = >0, 5 = >0, 6 =
< 					  >0, 7 = >0);
---
> $wgPasswordSalt = true;		// for compatibility with old installations set to false
167a142,158
> // which namespaces should support subpages?
> // see Language.php for a list of namespaces.
> $wgNamespacesWithSubpages = array (-2 = >0,
> 				   -1 = >0,
> 				   0 = >0,
> 				   1 = >1,
> 				   2 = >1,
> 				   3 = >1,
> 				   4 = >1,
> 				   5 = >1, 6 = >1, 7 = >1, 8 = >1, 9 = >1);
> 
> $wgNamespacesToBeSearchedDefault
>   = array (-2 = >0,
> 	   -1 = >0,
> 	   0 = >1,
> 	   1 = >0,
> 	   2 = >0, 3 = >0, 4 = >0, 5 = >0, 6 = >0, 7 = >0, 8 = >0, 9 = >0);

DifferenceEngine.php[edit]

diff mediawiki-fm\DifferenceEngine.php getwiki-fm\DifferenceEngine.php
2c2,6
< // See diff.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5,7c9,11
<   /* private */ var $mOldid, $mNewid;
<   /* private */ var $mOldtitle, $mNewtitle;
<   /* private */ var $mOldtext, $mNewtext;
---
>   var $mOldid, $mNewid;
>   var $mOldtitle, $mNewtitle;
>   var $mOldtext, $mNewtext;
19c23,24
<     $t = $wgTitle->getPrefixedText ()." (Diff: {$this->mOldid}, ".
---
>     $t =
>       $wgTitle->getPrefixedText ()." (Diff: {$this->mOldid}, ".
36c41
<     $wgOut->addHTML ("<hr><h2>{$this->mNewtitle}</h2>\n");
---
>     $wgOut->addHTML ("<hr /><h2>{$this->mNewtitle}</h2>\n");
44,55c49,60
<     $ota = explode ("\n", str_replace ("\r\n", "\n",
< 				       htmlspecialchars ($otext)));
<     $nta = explode ("\n", str_replace ("\r\n", "\n",
< 				       htmlspecialchars ($ntext)));
< 
<     $wgOut->addHTML ("<table width='98%' border=0
< cellpadding=0 cellspacing='4px'><tr>
< <td colspan=2 width='50%' align=center bgcolor='//cccccc'>
< <strong>{$otitle}</strong></td>
< <td colspan=2 width='50%' align=center bgcolor='//cccccc'>
< <strong>{$ntitle}</strong></td>
< </tr>\n");
---
>     $ota =
>       explode ("\n", str_replace ("\r\n", "\n", htmlspecialchars ($otext)));
>     $nta =
>       explode ("\n", str_replace ("\r\n", "\n", htmlspecialchars ($ntext)));
> 
>     // this table is okay, tabular data
>     $wgOut->addHTML ("
> <table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"4\" summary=\"table shows differences between your text and where it conflicts with another user\">
> 	<tr>
> 	<td colspan=\"2\" width=\"50%\" align=\"center\" class=\"diffhead\"><span class=\"strong\">{$otitle}</span></td>
> 	<td colspan=\"2\" width=\"50%\" align=\"center\" class=\"diffhead\"><span class=\"strong\">{$ntitle}</span></td>
> 	</tr>\n");
63,67c68
<   // Load the text of the articles to compare.  If newid is 0, then compare
<   // the old article in oldid to the current article; if oldid is 0, then
<   // compare the current article to the immediately previous one (ignoring
<   // the value of newid).
<   //
---
>   // load articles to compare.  If newid is 0, compare old to current, if oldid is 0, then compare current to immediately previous (ignore newid)
91,92c92,93
< 	$sql = "SELECT old_timestamp,old_text FROM old WHERE ".
< 	  "old_id={$this->mNewid}";
---
> 	$sql =
> 	  "SELECT old_timestamp,old_text FROM old WHERE old_id={$this->mNewid}";
109,111c110,113
< 	  "SELECT old_timestamp,old_text FROM old USE INDEX (name_title_timestamp) WHERE ".
< 	  "old_namespace=".$wgTitle->getNamespace ()." AND "."old_title='".
< 	  wfStrencode ($wgTitle->getDBkey ()).
---
> 	  "SELECT old_timestamp,old_text FROM old USE INDEX (name_title_timestamp) WHERE old_namespace=".
> 	  $wgTitle->getNamespace ()." AND old_title='".wfStrencode ($wgTitle->
> 								    getDBkey
> 								    ()).
117,118c119,120
< 	$sql = "SELECT old_timestamp,old_text FROM old WHERE ".
< 	  "old_id={$this->mOldid}";
---
> 	$sql =
> 	  "SELECT old_timestamp,old_text FROM old WHERE old_id={$this->mOldid}";
137d138
< //
140d140
< //
233,252c233,242
< /**
<  * Class used internally by Diff to actually compute the diffs.
<  *
<  * The algorithm used here is mostly lifted from the perl module
<  * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
<  *   http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
<  *
<  * More ideas are taken from:
<  *   http://www.ics.uci.edu/~eppstein/161/960229.html
<  *
<  * Some ideas are (and a bit of code) are from from analyze.c, from GNU
<  * diffutils-2.7, which can be found at:
<  *   ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
<  *
<  * Finally, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
<  * are my own.
<  *
<  * @author Geoffrey T. Dairiki
<  * @access private
<  */
---
> /*
>  Class used internally by Diff to actually compute the diffs.  mostly lifted from the perl module
>  Algorithm::Diff (version 1.06) by Ned Konz, which is available at: http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
>  More ideas are taken from: http://www.ics.uci.edu/~eppstein/161/960229.html
>  Some ideas are (and a bit of code) are from from analyze.c, from GNU diffutils-2.7, which can be found at: ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
>  Finally, some ideas (subdivision by NCHUNKS > 2, and some optimizations) are my own.
>  @author Geoffrey T. Dairiki
>  @access private
> */
> 
322,323c312,313
< 	while ($xi < $n_from && $yi < $n_to
< 	       && !$this->xchanged[$xi] && !$this->ychanged[$yi])
---
> 	while ($xi < $n_from && $yi < $n_to && !$this->xchanged[$xi]
> 	       && !$this->ychanged[$yi])
350,363c340,351
<    * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
<    * sized segments.
<    *
<    * Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an
<    * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
<    * sub sequences.  The first sub-sequence is contained in [X0, X1),
<    * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on.  Note
<    * that (X0, Y0) == (XOFF, YOFF) and
<    * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
<    *
<    * This function assumes that the first lines of the specified portions
<    * of the two files do not match, and likewise that the last lines do not
<    * match.  The caller must trim matching lines from the beginning and end
<    * of the portions it is going to specify.
---
>      [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
>      sized segments.
>      Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an
>      array of NCHUNKS+1 (X, Y) indexes giving the diving points between
>      sub sequences.  The first sub-sequence is contained in [X0, X1),
>      [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on.  Note
>      that (X0, Y0) == (XOFF, YOFF) and
>      (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
>      This function assumes that the first lines of the specified portions
>      of the two files do not match, and likewise that the last lines do not
>      match.  The caller must trim matching lines from the beginning and end
>      of the portions it is going to specify.
374,375c362,363
< 	list ($xoff, $xlim, $yoff, $ylim)
< 	  = array ($yoff, $ylim, $xoff, $xlim);
---
> 	list ($xoff, $xlim, $yoff, $ylim) =
> 	  array ($yoff, $ylim, $xoff, $xlim);
477,485c465,470
<    *
<    * The results are recorded in the vectors $this->{x,y}changed[], by
<    * storing a 1 in the element for each line that is an insertion
<    * or deletion (ie. is not in the LCS).
<    *
<    * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
<    *
<    * Note that XLIM, YLIM are exclusive bounds.
<    * All line numbers are origin-0 and discarded lines are not counted.
---
>      The results are recorded in the vectors $this->{x,y}changed[], by
>      storing a 1 in the element for each line that is an insertion
>      or deletion (ie. is not in the LCS).
>      The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
>      Note that XLIM, YLIM are exclusive bounds.
>      All line numbers are origin-0 and discarded lines are not counted.
486a472
> 
513,514c499,500
< 	list ($lcs, $seps)
< 	  = $this->_diag ($xoff, $xlim, $yoff, $ylim, $nchunks);
---
> 	list ($lcs, $seps) =
> 	  $this->_diag ($xoff, $xlim, $yoff, $ylim, $nchunks);
540,549c526,533
<    * as much as possible.
<    *
<    * We do something when a run of changed lines include a
<    * line at one end and has an excluded, identical line at the other.
<    * We are free to choose which identical line is included.
<    * `compareseq' usually chooses the one at the beginning,
<    * but usually it is cleaner to consider the following identical line
<    * to be the "change".
<    *
<    * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
---
>      as much as possible.
>      We do something when a run of changed lines include a
>      line at one end and has an excluded, identical line at the other.
>      We are free to choose which identical line is included.
>      `compareseq' usually chooses the one at the beginning,
>      but usually it is cleaner to consider the following identical line
>      to be the "change".
>      This is extracted verbatim from analyze.c (GNU diffutils-2.7).
550a535
> 
563,571c548,555
< 	 * Scan forwards to find beginning of another run of changes.
< 	 * Also keep track of the corresponding point in the other file.
< 	 *
< 	 * Throughout this code, $i and $j are adjusted together so that
< 	 * the first $i elements of $changed and the first $j elements
< 	 * of $other_changed both contain the same number of zeros
< 	 * (unchanged lines).
< 	 * Furthermore, $j is always kept so that $j == $other_len or
< 	 * $other_changed[$j] == false.
---
> 	   Scan forwards to find beginning of another run of changes.
> 	   Also keep track of the corresponding point in the other file.
> 	   Throughout this code, $i and $j are adjusted together so that
> 	   the first $i elements of $changed and the first $j elements
> 	   of $other_changed both contain the same number of zeros
> 	   (unchanged lines).
> 	   Furthermore, $j is always kept so that $j == $other_len or
> 	   $other_changed[$j] == false.
572a557
> 
597,598c582,583
< 	     * Record the length of this run of changes, so that
< 	     * we can later determine whether the run has grown.
---
> 	       Record the length of this run of changes, so that
> 	       we can later determine whether the run has grown.
603,605c588,590
< 	     * Move the changed region back, so long as the
< 	     * previous unchanged line matches the last changed one.
< 	     * This merges with previous changed regions.
---
> 	       Move the changed region back, so long as the
> 	       previous unchanged line matches the last changed one.
> 	       This merges with previous changed regions.
620,622c605,607
< 	     * Set CORRESPONDING to the end of the changed run, at the last
< 	     * point where it corresponds to a changed run in the other file.
< 	     * CORRESPONDING == LEN means no such point has been found.
---
> 	       Set CORRESPONDING to the end of the changed run, at the last
> 	       point where it corresponds to a changed run in the other file.
> 	       CORRESPONDING == LEN means no such point has been found.
627,631c612,616
< 	     * Move the changed region forward, so long as the
< 	     * first changed line matches the following unchanged one.
< 	     * This merges with following changed regions.
< 	     * Do this second, so that if there are no merges,
< 	     * the changed region is moved forward as far as possible.
---
> 	       Move the changed region forward, so long as the
> 	       first changed line matches the following unchanged one.
> 	       This merges with following changed regions.
> 	       Do this second, so that if there are no merges,
> 	       the changed region is moved forward as far as possible.
654,655c639,640
< 	 * If possible, move the fully-merged run of changes
< 	 * back to a corresponding run in the other file.
---
> 	   If possible, move the fully-merged run of changes
> 	   back to a corresponding run in the other file.
670,672c655
< /**
<  * Class representing a 'diff' between two sequences of strings.
<  */
---
> // class representing a 'diff' between two sequences of strings.
677,684c660,663
<     /**
<      * Constructor.
<      * Computes diff between sequences of strings.
<      *
<      * @param $from_lines array An array of strings.
<      *        (Typically these are lines from a file.)
<      * @param $to_lines array An array of strings.
<      */
---
> /*
>  Constructor. Computes diff between sequences of strings. @param $from_lines array An array of strings.
>  (Typically these are lines from a file.) @param $to_lines array An array of strings.
> */
692,701c671,678
<     /**
<      * Compute reversed Diff.
<      *
<      * SYNOPSIS:
<      *
<      *  $diff = new Diff($lines1, $lines2);
<      *  $rev = $diff->reverse();
<      * @return object A Diff object representing the inverse of the
<      *                original diff.
<      */
---
> /*
>  Compute reversed Diff.
>  SYNOPSIS:
>   $diff = new Diff($lines1, $lines2);
>   $rev = $diff->reverse();
>  @return object A Diff object representing the inverse of the original diff.
> */
> 
713,717c690,694
<     /**
<      * Check for empty diff.
<      *
<      * @return bool True iff two sequences were identical.
<      */
---
> /*
>  Check for empty diff.
>  @return bool True iff two sequences were identical.
> */
> 
728,734c705,710
<     /**
<      * Compute the length of the Longest Common Subsequence (LCS).
<      *
<      * This is mostly for diagnostic purposed.
<      *
<      * @return int The length of the LCS.
<      */
---
> /*
>  Compute the length of the Longest Common Subsequence (LCS).
>  This is mostly for diagnostic purposed.
>  @return int The length of the LCS.
> */
> 
744a721,725
> /*
>  Get the original set of lines.
>  This reconstructs the $from_lines parameter passed to the constructor.
>  @return array The original sequence of strings.
> */
746,753d726
<     /**
<      * Get the original set of lines.
<      *
<      * This reconstructs the $from_lines parameter passed to the
<      * constructor.
<      *
<      * @return array The original sequence of strings.
<      */
766,773c739,744
<     /**
<      * Get the final set of lines.
<      *
<      * This reconstructs the $to_lines parameter passed to the
<      * constructor.
<      *
<      * @return array The sequence of strings.
<      */
---
> /*
>  Get the final set of lines.
>  This reconstructs the $to_lines parameter passed to the constructor.
>  @return array The sequence of strings.
> */
> 
786,790c757,760
<     /**
<      * Check a Diff for validity. 
<      *
<      * This is here only for debugging purposes.
<      */
---
> /*
>  Check a Diff for validity.  This is here only for debugging purposes.
> */
> 
804d773
< 
818,820d786
< /**
<  * FIXME: bad name.
<  */
823,848c789,798
<     /**
<      * Constructor.
<      *
<      * Computes diff between sequences of strings.
<      *
<      * This can be used to compute things like
<      * case-insensitve diffs, or diffs which ignore
<      * changes in white-space.
<      *
<      * @param $from_lines array An array of strings.
<      *  (Typically these are lines from a file.)
<      *
<      * @param $to_lines array An array of strings.
<      *
<      * @param $mapped_from_lines array This array should
<      *  have the same size number of elements as $from_lines.
<      *  The elements in $mapped_from_lines and
<      *  $mapped_to_lines are what is actually compared
<      *  when computing the diff.
<      *
<      * @param $mapped_to_lines array This array should
<      *  have the same number of elements as $to_lines.
<      */
<   function MappedDiff ($from_lines, $to_lines,
< 		       $mapped_from_lines, $mapped_to_lines)
<   {
---
> /*
>  Constructor.
> Computes diff between sequences of strings.
>  This can be used to compute things like case-insensitve diffs, or diffs which ignore changes in white-space.
>  @param $from_lines array An array of strings. (Typically these are lines from a file.)
>  @param $to_lines array An array of strings.
>  @param $mapped_from_lines array This array should have the same size number of elements as $from_lines.
>   The elements in $mapped_from_lines and $mapped_to_lines are what is actually compared when computing the diff.
>  @param $mapped_to_lines array This array should have the same number of elements as $to_lines.
> */
849a800,802
>   function MappedDiff ($from_lines, $to_lines, $mapped_from_lines,
> 		       $mapped_to_lines)
>   {
875,881c828,834
< /**
<  * A class to format Diffs
<  *
<  * This class formats the diff in classic diff format.
<  * It is intended that this class be customized via inheritance,
<  * to obtain fancier outputs.
<  */
---
> /*
>   A class to format Diffs
>  This class formats the diff in classic diff format.
>  It is intended that this class be customized via inheritance,
>  to obtain fancier outputs.
> */
> 
884,889c837,840
<     /**
<      * Number of leading context "lines" to preserve.
<      *
<      * This should be left at zero for this class, but subclasses
<      * may want to set this to other values.
<      */
---
> /*
>  Number of leading context "lines" to preserve. This should be left at zero for this class, but subclasses may want to set this to other values.
> */
> 
892,897c843,846
<     /**
<      * Number of trailing context "lines" to preserve.
<      *
<      * This should be left at zero for this class, but subclasses
<      * may want to set this to other values.
<      */
---
> /*
>  Number of trailing context "lines" to preserve. left at zero for this class, subclasses may want to set other values.
> */
> 
900,905c849,854
<     /**
<      * Format a diff.
<      *
<      * @param $diff object A Diff object.
<      * @return string The formatted output.
<      */
---
> /*
>  Format a diff.
>  @param $diff object A Diff object.
>  @return string The formatted output.
> */
> 
935,936c884,885
< 		  $this->_block ($x0, $ntrail + $xi - $x0,
< 				 $y0, $ntrail + $yi - $y0, $block);
---
> 		  $this->_block ($x0, $ntrail + $xi - $x0, $y0,
> 				 $ntrail + $yi - $y0, $block);
964d912
< 
977,978c925,926
<       elseif ($edit->type == 'change')
< 	$this->_changed ($edit->orig, $edit->final);
---
>       elseif ($edit->type == 'change') $this->_changed ($edit->orig,
> 							$edit->final);
1003d950
< 
1029a977
> 
1044,1048c992
< /**
<  *  Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
<  * 
<  */
< 
---
> // Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
1066c1010
< 	  $this->_line. = "<font color=\"red\">$this->_group</font>";
---
> 	  $this->_line. = "<span class=\"error\">$this->_group</span>";
1117,1119c1061,1062
< 
<     $this->MappedDiff ($orig_words, $final_words,
< 		       $orig_stripped, $final_stripped);
---
>     $this->MappedDiff ($orig_words, $final_words, $orig_stripped,
> 		       $final_stripped);
1124,1125c1067
<     // FIXME: fix POSIX char class.
< //        if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
---
>     //if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
1162,1165c1104
< /**
<  *  Wikipedia Table style diff formatter.
<  * 
<  */
---
> // diff formatter
1179,1180c1118,1119
<     $r = "<tr><td colspan=2 align=left><strong>{$l1}</strong></td>\n".
<       "<td colspan=2 align=left><strong>{$l2}</strong></td></tr>\n";
---
>     $r =
>       "<tr>\n<td colspan=\"2\" align=\"left\"><span class=\"strong\">{$l1}</span></td>\n<td colspan=\"2\" align=\"left\"><span class=\"strong\">{$l2}</span></td>\n</tr>\n";
1200c1139
<     return "<td>+</td><td bgcolor='//ccffcc'>"."<small>{$line}</small></td>";
---
>     return "<td class=\"diffsign\">+</td><td class=\"diffadd\">{$line}</td>";
1205c1144
<     return "<td>-</td><td bgcolor='//ffffaa'>"."<small>{$line}</small></td>";
---
>     return "<td class=\"diffsign\">-</td><td class=\"diffdel\">{$line}</td>";
1210c1149
<     return "<td colspan=2> </td>";
---
>     return "<td colspan=\"2\"> </td>";
1215c1154,1155
<     return "<td> </td><td bgcolor='white'><small>{$line}</small></td>";
---
>     return
>       "<td class=\"diffsign\"> </td><td class=\"nodiff\">{$line}</td>";
1223,1224c1163,1164
<       $wgOut->addHTML ("<tr>".$this->emptyLine ().
< 		       $this->addedLine ($line)."</tr>\n");
---
>       $wgOut->addHTML ("<tr>".$this->emptyLine ().$this->addedLine ($line).
> 		       "</tr>\n");
1233,1234c1173,1174
<       $wgOut->addHTML ("<tr>".$this->deletedLine ($line).
< 		       $this->emptyLine ()."</tr>\n");
---
>       $wgOut->addHTML ("<tr>".$this->deletedLine ($line).$this->emptyLine ().
> 		       "</tr>\n");
1243,1244c1183,1184
<       $wgOut->addHTML ("<tr>".$this->contextLine ($line).
< 		       $this->contextLine ($line)."</tr>\n");
---
>       $wgOut->addHTML ("<tr>".$this->contextLine ($line).$this->
> 		       contextLine ($line)."</tr>\n");
1258,1259c1198,1199
< 	$wgOut->addHTML ("<tr>".$this->deletedLine ($line).
< 			 $this->addedLine ($aline)."</tr>\n");
---
> 	$wgOut->addHTML ("<tr>".$this->deletedLine ($line).$this->
> 			 addedLine ($aline)."</tr>\n");
1261c1201
<     $this->_added ($add);	// If any leftovers
---
>     $this->_added ($add);

EditPage.php[edit]

diff mediawiki-fm\EditPage.php getwiki-fm\EditPage.php
2,5c2,7
< // Splitting edit page/HTML interface from Article...
< // The actual database and text munging is still in Article,
< // but it should get easier to call those from alternate
< // interfaces.
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // edit page/HTML interface (originally from Article.php)
10a13,22
>   /*function ebSetting()
>      {
>      global $wgOut, $wgUser;
> 
>      if ( $wgOut->showEditbar() ) { return "1"; }
>      $q = $wgUser->getOption( "editbar" );
>      if ( "" == $q ) { $q = "0"; }
>      return $q;
>      } */
> 
18,19c30
<   // This is the function that gets called for "action=edit".
< 
---
>   // called for "action=edit".
39,43d49
<     if (!$wgUser->getID () && $wgWhitelistEdit)
<       {
< 	$this->userNotLoggedInPage ();
< 	return;
<       }
59,61c65
<       {
< 	$this->editForm ("save");
<       }
---
>       $this->editForm ("save");
63,65c67
<       {
< 	$this->editForm ("preview");
<       }
---
>       $this->editForm ("preview");
67,69c69
<       {				// First time through
< 	$this->editForm ("initial");
<       }
---
>       $this->editForm ("initial");
72,77c72,73
<   // Since there is only one text field on the edit form,
<   // pressing <enter> will cause the form to be submitted, but
<   // the submit button value won't appear in the query, so we
<   // Fake it here before going back to edit().  This is kind of
<   // ugly, but it helps some old URLs to still work.
< 
---
>   // since only one text field on the edit form, pressing <enter> will cause the form to be submitted, but
>   // the submit button value won't appear in the query, so we fake it
82,85c78
<       {
< 	$wpSave = 1;
<       }
< 
---
>       $wpSave = 1;
89,94c82
<   // The edit form is self-submitting, so that when things like
<   // preview and edit conflicts occur, we get the same form back
<   // with the extra stuff added.  Only when the final submission
<   // is made and all is well do we actually save and redirect to
<   // the newly-edited page.
< 
---
>   // the edit form is self-submitting, and when edit conflicts occur, we get the same form back
105,107c93
<       {
< 	$section = $wpSection;
<       }
---
>       $section = $wpSection;
109,111c95
<       {
< 	$wpSection = $section;
<       }
---
>       $wpSection = $section;
115c99
<     $wpTextbox1 = rtrim ($wpTextbox1);	// To avoid text getting longer on each preview
---
>     $wpTextbox1 = rtrim ($wpTextbox1);	// avoid text getting longer on each preview
116a101
>     // fetch wiki from WP using 'getwiki' - proteus
119d103
< 
121c105,115
< 
---
> 	require ("getwiki.php");
> 	$wikixml = trim ($wiki->xhtml);
> 	if ($wikixml != "")
> 	  {
> 	    $title2 = $title;
> 	    $title = str_replace ("'", "%27", $title);
> 	    $boiler =
> 	      "\n\n<!--  NOTE TO EDITORS: \nPer the GNU Free Documentation License, please include the live link below to the adapted Wikipedia article:\n//-->\n\n====References====\n* Adapted from the [[Wikipedia]] article, \"$title2\" [http://en.wikipedia.org/wiki/$title http://en.wikipedia.org/wiki/$title], used under the [[GNU Free Documentation License]]\n\n";
> 	    $wikixml. = $boiler;
> 	    $xmlsum = "from wikipedia (note changes here)";
> 	  }
124,128c118
<     // Attempt submission here.  This will check for edit conflicts,
<     // and redundantly check for locked database, blocked IPs, etc.
<     // that edit() already checked just in case someone tries to sneak
<     // in the back door with a hand-edited submission URL.
< 
---
>     // attempt submission here, check for edit conflicts, locked database, blocked IPs, etc
146d135
< 	// If article is new, insert it.
147a137
> 	// if article is new, insert it.
151,155c141,144
< 	    // we need to strip Windoze linebreaks because some browsers 
< 	    // append them and the string comparison fails
< 	    if (("" == $wpTextbox1) ||
< 		(wfMsg ("newarticletext") ==
< 		 rtrim (preg_replace ("/\r/", "", $wpTextbox1))))
---
> 	    // strip Win32 linebreaks because some browsers append them and the string comparison fails
> 	    if (("" == $wpTextbox1)
> 		|| (wfMsg ("newarticletext") ==
> 		    rtrim (preg_replace ("/\r/", "", $wpTextbox1))))
165c154
< 	// Article exists. Check for edit conflict.
---
> 	// article exists. Check for edit conflict.
176,177c165
< 	// Supress edit conflict with self
< 
---
> 	// supress edit conflict with self
190d177
< 
194c181
< 	    // All's well: update the article here
---
> 	    // update the article here
203,204d189
<     // First time through: get contents, set time for conflict
<     // checking, etc.
205a191
>     // get contents, set time for conflict checking, etc.
261,262c247,248
< 	$wgOut->addHTML ("<strong>".
< 			 wfMsg ("longpagewarning", $kblength)."</strong>");
---
> 	$wgOut->addHTML ("<strong>".wfMsg ("longpagewarning", $kblength).
> 			 "</strong>");
276,278c262
<       {
< 	$q. = "&redirect=no";
<       }
---
>       $q. = "&redirect=no";
289,292c273,276
<     $cancel = $sk->makeKnownLink ($this->mTitle->getPrefixedURL (),
< 				  wfMsg ("cancel"));
<     $edithelp = $sk->makeKnownLink (wfMsg ("edithelppage"),
< 				    wfMsg ("edithelp"));
---
>     $cancel =
>       $sk->makeKnownLink ($this->mTitle->getPrefixedURL (), wfMsg ("cancel"));
>     $edithelp =
>       $sk->makeKnownLink (wfMsg ("edithelppage"), wfMsg ("edithelp"));
313c297
<     if (0 != $wgUser->getID ())
---
>     if ((0 != $wgUser->getID ()) || ($xmlsum))
316,324c300,304
< 	  "<input tabindex=3 type=checkbox value=1 name='wpMinoredit'".
< 	  ($wpMinoredit ? " checked" : "")." id='wpMinoredit'>".
< 	  "<label for='wpMinoredit'>{$minor}</label>".
< 	  "<input tabindex=4 type=checkbox name='wpWatchthis'".($wpWatchthis ?
< 								" checked" :
< 								"").
< 	  " id='wpWatchthis'>".
< 	  "<label for='wpWatchthis'>{$watchthis}</label><br>";
< 
---
> 	  "<input tabindex=\"3\" type=\"checkbox\" class=\"fill\" value=\"1\" name=\"wpMinoredit\"".
> 	  ($wpMinoredit ? " checked" : "").
> 	  " id=\"wpMinoredit\"> <label for=\"wpMinoredit\">{$minor}</label>   <input tabindex=\"4\" type=\"checkbox\" class=\"fill\" name=\"wpWatchthis\"".
> 	  ($wpWatchthis ? " checked" : "").
> 	  " id=\"wpWatchthis\"> <label for=\"wpWatchthis\">{$watchthis}</label><br />";
331d310
< 
334d312
< 
336,338c314,315
< 	  "<h2>".wfMsg ("preview").
< 	  "</h2>\n<p><large><center><font color=\"//cc0000\">".wfMsg ("note").
< 	  wfMsg ("previewnote")."</font></center></large><P>\n";
---
> 	  "<h2>".wfMsg ("preview")."</h2><br />\n<span class=\"error\">".
> 	  wfMsg ("note").wfMsg ("previewnote")."</span><br /><br />\n";
349c326
< 				 preSaveTransform ($previewtext)."\n\n");
---
> 				 preSaveTransform ($previewtext)."");
351c328
< 	$wgOut->addHTML ("<br clear=\"all\" />\n");
---
> 	//$wgOut->addHTML( "<br />\n" );
354,355c331
<     // if this is a comment, show a subject line at the top, which is also the edit summary.
<     // Otherwise, show a summary field at the bottom
---
>     // if this is a comment, show a subject line at the top, which is also the edit summary. otherwise, show a summary field at the bottom
358d333
< 
360c335
< 	  "{$subject}: <input tabindex=1 type=text value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=200 size=60><br>";
---
> 	  "{$subject}:<br /><input tabindex=\"1\" type=\"text\" value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=\"200\" size=\"60\"><br />";
364,366c339,348
< 
< 	$editsummary =
< 	  "{$summary}: <input tabindex=3 type=text value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=200 size=60><br>";
---
> 	if ($xmlsum)
> 	  {
> 	    $editsummary =
> 	      "<b>{$summary}</b>:<br /><input tabindex=\"3\" type=\"text\" value=\"{$xmlsum}\" name=\"wpSummary\" maxlength=\"200\" size=\"60\"><br />";
> 	  }
> 	else
> 	  {
> 	    $editsummary =
> 	      "<b>{$summary}</b>:<br /><input tabindex=\"3\" type=\"text\" value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=\"200\" size=\"60\"><br />";
> 	  }
368a351,358
>     /*      could not get this to work for non-IE/Win32 users.  Shoulda known.  Script-kiddy crap anyway - proteus
>        $eb = $wgUser->getOption( "editbar" );
>        if ($eb)
>        {
>        $editbar = "<a name=\"editform\"></a>\n<script language=\"javascript\">addToolbar();</script>\n<noscript></noscript>\n";
>        }
>      */
> 
370,371c360
< <form id=\"editform\" name=\"editform\" method=\"post\" action=\"$action\"
< enctype=\"application/x-www-form-urlencoded\">
---
> <form id=\"editform\" name=\"editform\" method=\"post\" action=\"$action\" enctype=\"application/x-www-form-urlencoded\">
373,383c362,370
< <textarea tabindex=2 name=\"wpTextbox1\" rows={$rows}
< cols={$cols}{$ew} wrap=\"virtual\">".$wgLang->recodeForEdit ($wpTextbox1)."
< </textarea>
< <br>{$editsummary}
< {$checkboxhtml}
< <input tabindex=5 type=submit value=\"{$save}\" name=\"wpSave\">
< <input tabindex=6 type=submit value=\"{$prev}\" name=\"wpPreview\">
< <em>{$cancel}</em> | <em>{$edithelp}</em>
< <br><br>{$copywarn}
< <input type=hidden value=\"{$section}\" name=\"wpSection\">
< <input type=hidden value=\"{$wpEdittime}\" name=\"wpEdittime\">\n");
---
> {$editbar}
> <textarea tabindex=\"2\" name=\"wpTextbox1\" rows=\"{$rows}\" cols=\"{$cols}{$ew}\" wrap=\"virtual\">".$wgLang->recodeForEdit ($wpTextbox1).$wikixml."</textarea>
> <br />{$editsummary} {$checkboxhtml}
> <input tabindex=\"5\" type=\"submit\" value=\"{$save}\" name=\"wpSave\">
> <input tabindex=\"6\" type=\"submit\" value=\"{$prev}\" name=\"wpPreview\">
> <b>{$cancel}</b> | <b>{$edithelp}</b>
> <br /><br />{$copywarn}
> <input type=\"hidden\" value=\"{$section}\" name=\"wpSection\">
> <input type=\"hidden\" value=\"{$wpEdittime}\" name=\"wpEdittime\">\n");
393,394c380
< <textarea tabindex=6 name=\"wpTextbox2\" rows={$rows} cols={$cols} wrap=virtual>".$wgLang->recodeForEdit ($wpTextbox2)."
< </textarea>");
---
> <textarea tabindex=\"6\" name=\"wpTextbox2\" rows=\"{$rows}\" cols=\"{$cols}\" wrap=\"virtual\">".$wgLang->recodeForEdit ($wpTextbox2)."</textarea>");
403d388
< 
409d393
< 
418,419c402,403
<     $link = "[[".$wgLang->getNsText (Namespace::getUser ()).
<       ":{$name}|{$name}]]";
---
>     $link =
>       "[[".$wgLang->getNsText (Namespace::getUser ()).":{$name}|{$name}]]";
425,426d408
< 
< 
434d415
< 
438,439d418
< 
< 

FulltextStoplist.php[edit]

diff mediawiki-fm\FulltextStoplist.php getwiki-fm\FulltextStoplist.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5,573c10,576
< /* private */ $wgFulltextStoplist = array (
< 					    "a",
< 					    "a's",
< 					    "able",
< 					    "about",
< 					    "above",
< 					    "according",
< 					    "accordingly",
< 					    "across",
< 					    "actually",
< 					    "after",
< 					    "afterwards",
< 					    "again",
< 					    "against",
< 					    "ain't",
< 					    "all",
< 					    "allow",
< 					    "allows",
< 					    "almost",
< 					    "alone",
< 					    "along",
< 					    "already",
< 					    "also",
< 					    "although",
< 					    "always",
< 					    "am",
< 					    "among",
< 					    "amongst",
< 					    "an",
< 					    "and",
< 					    "another",
< 					    "any",
< 					    "anybody",
< 					    "anyhow",
< 					    "anyone",
< 					    "anything",
< 					    "anyway",
< 					    "anyways",
< 					    "anywhere",
< 					    "apart",
< 					    "appear",
< 					    "appreciate",
< 					    "appropriate",
< 					    "are",
< 					    "aren't",
< 					    "around",
< 					    "as",
< 					    "aside",
< 					    "ask",
< 					    "asking",
< 					    "associated",
< 					    "at",
< 					    "available",
< 					    "away",
< 					    "awfully",
< 					    "b",
< 					    "be",
< 					    "became",
< 					    "because",
< 					    "become",
< 					    "becomes",
< 					    "becoming",
< 					    "been",
< 					    "before",
< 					    "beforehand",
< 					    "behind",
< 					    "being",
< 					    "believe",
< 					    "below",
< 					    "beside",
< 					    "besides",
< 					    "best",
< 					    "better",
< 					    "between",
< 					    "beyond",
< 					    "both",
< 					    "brief",
< 					    "but",
< 					    "by",
< 					    "c",
< 					    "c'mon",
< 					    "c's",
< 					    "came",
< 					    "can",
< 					    "can't",
< 					    "cannot",
< 					    "cant",
< 					    "cause",
< 					    "causes",
< 					    "certain",
< 					    "certainly",
< 					    "changes",
< 					    "clearly",
< 					    "co",
< 					    "com",
< 					    "come",
< 					    "comes",
< 					    "concerning",
< 					    "consequently",
< 					    "consider",
< 					    "considering",
< 					    "contain",
< 					    "containing",
< 					    "contains",
< 					    "corresponding",
< 					    "could",
< 					    "couldn't",
< 					    "course",
< 					    "currently",
< 					    "d",
< 					    "definitely",
< 					    "described",
< 					    "despite",
< 					    "did",
< 					    "didn't",
< 					    "different",
< 					    "do",
< 					    "does",
< 					    "doesn't",
< 					    "doing",
< 					    "don't",
< 					    "done",
< 					    "down",
< 					    "downwards",
< 					    "during",
< 					    "e",
< 					    "each",
< 					    "edu",
< 					    "eg",
< 					    "eight",
< 					    "either",
< 					    "else",
< 					    "elsewhere",
< 					    "enough",
< 					    "entirely",
< 					    "especially",
< 					    "et",
< 					    "etc",
< 					    "even",
< 					    "ever",
< 					    "every",
< 					    "everybody",
< 					    "everyone",
< 					    "everything",
< 					    "everywhere",
< 					    "ex",
< 					    "exactly",
< 					    "example",
< 					    "except",
< 					    "f",
< 					    "far",
< 					    "few",
< 					    "fifth",
< 					    "first",
< 					    "five",
< 					    "followed",
< 					    "following",
< 					    "follows",
< 					    "for",
< 					    "former",
< 					    "formerly",
< 					    "forth",
< 					    "four",
< 					    "from",
< 					    "further",
< 					    "furthermore",
< 					    "g",
< 					    "get",
< 					    "gets",
< 					    "getting",
< 					    "given",
< 					    "gives",
< 					    "go",
< 					    "goes",
< 					    "going",
< 					    "gone",
< 					    "got",
< 					    "gotten",
< 					    "greetings",
< 					    "h",
< 					    "had",
< 					    "hadn't",
< 					    "happens",
< 					    "hardly",
< 					    "has",
< 					    "hasn't",
< 					    "have",
< 					    "haven't",
< 					    "having",
< 					    "he",
< 					    "he's",
< 					    "hello",
< 					    "help",
< 					    "hence",
< 					    "her",
< 					    "here",
< 					    "here's",
< 					    "hereafter",
< 					    "hereby",
< 					    "herein",
< 					    "hereupon",
< 					    "hers",
< 					    "herself",
< 					    "hi",
< 					    "him",
< 					    "himself",
< 					    "his",
< 					    "hither",
< 					    "hopefully",
< 					    "how",
< 					    "howbeit",
< 					    "however",
< 					    "i",
< 					    "i'd",
< 					    "i'll",
< 					    "i'm",
< 					    "i've",
< 					    "ie",
< 					    "if",
< 					    "ignored",
< 					    "immediate",
< 					    "in",
< 					    "inasmuch",
< 					    "inc",
< 					    "indeed",
< 					    "indicate",
< 					    "indicated",
< 					    "indicates",
< 					    "inner",
< 					    "insofar",
< 					    "instead",
< 					    "into",
< 					    "inward",
< 					    "is",
< 					    "isn't",
< 					    "it",
< 					    "it'd",
< 					    "it'll",
< 					    "it's",
< 					    "its",
< 					    "itself",
< 					    "j",
< 					    "just",
< 					    "k",
< 					    "keep",
< 					    "keeps",
< 					    "kept",
< 					    "know",
< 					    "knows",
< 					    "known",
< 					    "l",
< 					    "last",
< 					    "lately",
< 					    "later",
< 					    "latter",
< 					    "latterly",
< 					    "least",
< 					    "less",
< 					    "lest",
< 					    "let",
< 					    "let's",
< 					    "like",
< 					    "liked",
< 					    "likely",
< 					    "little",
< 					    "look",
< 					    "looking",
< 					    "looks",
< 					    "ltd",
< 					    "m",
< 					    "mainly",
< 					    "many",
< 					    "may",
< 					    "maybe",
< 					    "me",
< 					    "mean",
< 					    "meanwhile",
< 					    "merely",
< 					    "might",
< 					    "more",
< 					    "moreover",
< 					    "most",
< 					    "mostly",
< 					    "much",
< 					    "must",
< 					    "my",
< 					    "myself",
< 					    "n",
< 					    "name",
< 					    "namely",
< 					    "nd",
< 					    "near",
< 					    "nearly",
< 					    "necessary",
< 					    "need",
< 					    "needs",
< 					    "neither",
< 					    "never",
< 					    "nevertheless",
< 					    "new",
< 					    "next",
< 					    "nine",
< 					    "no",
< 					    "nobody",
< 					    "non",
< 					    "none",
< 					    "noone",
< 					    "nor",
< 					    "normally",
< 					    "not",
< 					    "nothing",
< 					    "novel",
< 					    "now",
< 					    "nowhere",
< 					    "o",
< 					    "obviously",
< 					    "of",
< 					    "off",
< 					    "often",
< 					    "oh",
< 					    "ok",
< 					    "okay",
< 					    "old",
< 					    "on",
< 					    "once",
< 					    "one",
< 					    "ones",
< 					    "only",
< 					    "onto",
< 					    "or",
< 					    "other",
< 					    "others",
< 					    "otherwise",
< 					    "ought",
< 					    "our",
< 					    "ours",
< 					    "ourselves",
< 					    "out",
< 					    "outside",
< 					    "over",
< 					    "overall",
< 					    "own",
< 					    "p",
< 					    "particular",
< 					    "particularly",
< 					    "per",
< 					    "perhaps",
< 					    "placed",
< 					    "please",
< 					    "plus",
< 					    "possible",
< 					    "presumably",
< 					    "probably",
< 					    "provides",
< 					    "q",
< 					    "que",
< 					    "quite",
< 					    "qv",
< 					    "r",
< 					    "rather",
< 					    "rd",
< 					    "re",
< 					    "really",
< 					    "reasonably",
< 					    "regarding",
< 					    "regardless",
< 					    "regards",
< 					    "relatively",
< 					    "respectively",
< 					    "right",
< 					    "s",
< 					    "said",
< 					    "same",
< 					    "saw",
< 					    "say",
< 					    "saying",
< 					    "says",
< 					    "second",
< 					    "secondly",
< 					    "see",
< 					    "seeing",
< 					    "seem",
< 					    "seemed",
< 					    "seeming",
< 					    "seems",
< 					    "seen",
< 					    "self",
< 					    "selves",
< 					    "sensible",
< 					    "sent",
< 					    "serious",
< 					    "seriously",
< 					    "seven",
< 					    "several",
< 					    "shall",
< 					    "she",
< 					    "should",
< 					    "shouldn't",
< 					    "since",
< 					    "six",
< 					    "so",
< 					    "some",
< 					    "somebody",
< 					    "somehow",
< 					    "someone",
< 					    "something",
< 					    "sometime",
< 					    "sometimes",
< 					    "somewhat",
< 					    "somewhere",
< 					    "soon",
< 					    "sorry",
< 					    "specified",
< 					    "specify",
< 					    "specifying",
< 					    "still",
< 					    "sub",
< 					    "such",
< 					    "sup",
< 					    "sure",
< 					    "t",
< 					    "t's",
< 					    "take",
< 					    "taken",
< 					    "tell",
< 					    "tends",
< 					    "th",
< 					    "than",
< 					    "thank",
< 					    "thanks",
< 					    "thanx",
< 					    "that",
< 					    "that's",
< 					    "thats",
< 					    "the",
< 					    "their",
< 					    "theirs",
< 					    "them",
< 					    "themselves",
< 					    "then",
< 					    "thence",
< 					    "there",
< 					    "there's",
< 					    "thereafter",
< 					    "thereby",
< 					    "therefore",
< 					    "therein",
< 					    "theres",
< 					    "thereupon",
< 					    "these",
< 					    "they",
< 					    "they'd",
< 					    "they'll",
< 					    "they're",
< 					    "they've",
< 					    "think",
< 					    "third",
< 					    "this",
< 					    "thorough",
< 					    "thoroughly",
< 					    "those",
< 					    "though",
< 					    "three",
< 					    "through",
< 					    "throughout",
< 					    "thru",
< 					    "thus",
< 					    "to",
< 					    "together",
< 					    "too",
< 					    "took",
< 					    "toward",
< 					    "towards",
< 					    "tried",
< 					    "tries",
< 					    "truly",
< 					    "try",
< 					    "trying",
< 					    "twice",
< 					    "two",
< 					    "u",
< 					    "un",
< 					    "under",
< 					    "unfortunately",
< 					    "unless",
< 					    "unlikely",
< 					    "until",
< 					    "unto",
< 					    "up",
< 					    "upon",
< 					    "us",
< 					    "use",
< 					    "used",
< 					    "useful",
< 					    "uses",
< 					    "using",
< 					    "usually",
< 					    "v",
< 					    "value",
< 					    "various",
< 					    "very",
< 					    "via",
< 					    "viz",
< 					    "vs",
< 					    "w",
< 					    "want",
< 					    "wants",
< 					    "was",
< 					    "wasn't",
< 					    "way",
< 					    "we",
< 					    "we'd",
< 					    "we'll",
< 					    "we're",
< 					    "we've",
< 					    "welcome",
< 					    "well",
< 					    "went",
< 					    "were",
< 					    "weren't",
< 					    "what",
< 					    "what's",
< 					    "whatever",
< 					    "when",
< 					    "whence",
< 					    "whenever",
< 					    "where",
< 					    "where's",
< 					    "whereafter",
< 					    "whereas",
< 					    "whereby",
< 					    "wherein",
< 					    "whereupon",
< 					    "wherever",
< 					    "whether",
< 					    "which",
< 					    "while",
< 					    "whither",
< 					    "who",
< 					    "who's",
< 					    "whoever",
< 					    "whole",
< 					    "whom",
< 					    "whose",
< 					    "why",
< 					    "will",
< 					    "willing",
< 					    "wish",
< 					    "with",
< 					    "within",
< 					    "without",
< 					    "won't",
< 					    "wonder",
< 					    "would",
< 					    "would",
< 					    "wouldn't",
< 					    "x",
< 					    "y",
< 					    "yes",
< 					    "yet",
< 					    "you",
< 					    "you'd",
< 					    "you'll",
< 					    "you're",
< 					    "you've",
< 					    "your",
< 					    "yours",
< 					    "yourself",
< 					    "yourselves", "z", "zero");
---
>   $wgFulltextStoplist = array ("a",
> 			       "a's",
> 			       "able",
> 			       "about",
> 			       "above",
> 			       "according",
> 			       "accordingly",
> 			       "across",
> 			       "actually",
> 			       "after",
> 			       "afterwards",
> 			       "again",
> 			       "against",
> 			       "ain't",
> 			       "all",
> 			       "allow",
> 			       "allows",
> 			       "almost",
> 			       "alone",
> 			       "along",
> 			       "already",
> 			       "also",
> 			       "although",
> 			       "always",
> 			       "am",
> 			       "among",
> 			       "amongst",
> 			       "an",
> 			       "and",
> 			       "another",
> 			       "any",
> 			       "anybody",
> 			       "anyhow",
> 			       "anyone",
> 			       "anything",
> 			       "anyway",
> 			       "anyways",
> 			       "anywhere",
> 			       "apart",
> 			       "appear",
> 			       "appreciate",
> 			       "appropriate",
> 			       "are",
> 			       "aren't",
> 			       "around",
> 			       "as",
> 			       "aside",
> 			       "ask",
> 			       "asking",
> 			       "associated",
> 			       "at",
> 			       "available",
> 			       "away",
> 			       "awfully",
> 			       "b",
> 			       "be",
> 			       "became",
> 			       "because",
> 			       "become",
> 			       "becomes",
> 			       "becoming",
> 			       "been",
> 			       "before",
> 			       "beforehand",
> 			       "behind",
> 			       "being",
> 			       "believe",
> 			       "below",
> 			       "beside",
> 			       "besides",
> 			       "best",
> 			       "better",
> 			       "between",
> 			       "beyond",
> 			       "both",
> 			       "brief",
> 			       "but",
> 			       "by",
> 			       "c",
> 			       "c'mon",
> 			       "c's",
> 			       "came",
> 			       "can",
> 			       "can't",
> 			       "cannot",
> 			       "cant",
> 			       "cause",
> 			       "causes",
> 			       "certain",
> 			       "certainly",
> 			       "changes",
> 			       "clearly",
> 			       "co",
> 			       "com",
> 			       "come",
> 			       "comes",
> 			       "concerning",
> 			       "consequently",
> 			       "consider",
> 			       "considering",
> 			       "contain",
> 			       "containing",
> 			       "contains",
> 			       "corresponding",
> 			       "could",
> 			       "couldn't",
> 			       "course",
> 			       "currently",
> 			       "d",
> 			       "definitely",
> 			       "described",
> 			       "despite",
> 			       "did",
> 			       "didn't",
> 			       "different",
> 			       "do",
> 			       "does",
> 			       "doesn't",
> 			       "doing",
> 			       "don't",
> 			       "done",
> 			       "down",
> 			       "downwards",
> 			       "during",
> 			       "e",
> 			       "each",
> 			       "edu",
> 			       "eg",
> 			       "eight",
> 			       "either",
> 			       "else",
> 			       "elsewhere",
> 			       "enough",
> 			       "entirely",
> 			       "especially",
> 			       "et",
> 			       "etc",
> 			       "even",
> 			       "ever",
> 			       "every",
> 			       "everybody",
> 			       "everyone",
> 			       "everything",
> 			       "everywhere",
> 			       "ex",
> 			       "exactly",
> 			       "example",
> 			       "except",
> 			       "f",
> 			       "far",
> 			       "few",
> 			       "fifth",
> 			       "first",
> 			       "five",
> 			       "followed",
> 			       "following",
> 			       "follows",
> 			       "for",
> 			       "former",
> 			       "formerly",
> 			       "forth",
> 			       "four",
> 			       "from",
> 			       "further",
> 			       "furthermore",
> 			       "g",
> 			       "get",
> 			       "gets",
> 			       "getting",
> 			       "given",
> 			       "gives",
> 			       "go",
> 			       "goes",
> 			       "going",
> 			       "gone",
> 			       "got",
> 			       "gotten",
> 			       "greetings",
> 			       "h",
> 			       "had",
> 			       "hadn't",
> 			       "happens",
> 			       "hardly",
> 			       "has",
> 			       "hasn't",
> 			       "have",
> 			       "haven't",
> 			       "having",
> 			       "he",
> 			       "he's",
> 			       "hello",
> 			       "help",
> 			       "hence",
> 			       "her",
> 			       "here",
> 			       "here's",
> 			       "hereafter",
> 			       "hereby",
> 			       "herein",
> 			       "hereupon",
> 			       "hers",
> 			       "herself",
> 			       "hi",
> 			       "him",
> 			       "himself",
> 			       "his",
> 			       "hither",
> 			       "hopefully",
> 			       "how",
> 			       "howbeit",
> 			       "however",
> 			       "i",
> 			       "i'd",
> 			       "i'll",
> 			       "i'm",
> 			       "i've",
> 			       "ie",
> 			       "if",
> 			       "ignored",
> 			       "immediate",
> 			       "in",
> 			       "inasmuch",
> 			       "inc",
> 			       "indeed",
> 			       "indicate",
> 			       "indicated",
> 			       "indicates",
> 			       "inner",
> 			       "insofar",
> 			       "instead",
> 			       "into",
> 			       "inward",
> 			       "is",
> 			       "isn't",
> 			       "it",
> 			       "it'd",
> 			       "it'll",
> 			       "it's",
> 			       "its",
> 			       "itself",
> 			       "j",
> 			       "just",
> 			       "k",
> 			       "keep",
> 			       "keeps",
> 			       "kept",
> 			       "know",
> 			       "knows",
> 			       "known",
> 			       "l",
> 			       "last",
> 			       "lately",
> 			       "later",
> 			       "latter",
> 			       "latterly",
> 			       "least",
> 			       "less",
> 			       "lest",
> 			       "let",
> 			       "let's",
> 			       "like",
> 			       "liked",
> 			       "likely",
> 			       "little",
> 			       "look",
> 			       "looking",
> 			       "looks",
> 			       "ltd",
> 			       "m",
> 			       "mainly",
> 			       "many",
> 			       "may",
> 			       "maybe",
> 			       "me",
> 			       "mean",
> 			       "meanwhile",
> 			       "merely",
> 			       "might",
> 			       "more",
> 			       "moreover",
> 			       "most",
> 			       "mostly",
> 			       "much",
> 			       "must",
> 			       "my",
> 			       "myself",
> 			       "n",
> 			       "name",
> 			       "namely",
> 			       "nd",
> 			       "near",
> 			       "nearly",
> 			       "necessary",
> 			       "need",
> 			       "needs",
> 			       "neither",
> 			       "never",
> 			       "nevertheless",
> 			       "new",
> 			       "next",
> 			       "nine",
> 			       "no",
> 			       "nobody",
> 			       "non",
> 			       "none",
> 			       "noone",
> 			       "nor",
> 			       "normally",
> 			       "not",
> 			       "nothing",
> 			       "novel",
> 			       "now",
> 			       "nowhere",
> 			       "o",
> 			       "obviously",
> 			       "of",
> 			       "off",
> 			       "often",
> 			       "oh",
> 			       "ok",
> 			       "okay",
> 			       "old",
> 			       "on",
> 			       "once",
> 			       "one",
> 			       "ones",
> 			       "only",
> 			       "onto",
> 			       "or",
> 			       "other",
> 			       "others",
> 			       "otherwise",
> 			       "ought",
> 			       "our",
> 			       "ours",
> 			       "ourselves",
> 			       "out",
> 			       "outside",
> 			       "over",
> 			       "overall",
> 			       "own",
> 			       "p",
> 			       "particular",
> 			       "particularly",
> 			       "per",
> 			       "perhaps",
> 			       "placed",
> 			       "please",
> 			       "plus",
> 			       "possible",
> 			       "presumably",
> 			       "probably",
> 			       "provides",
> 			       "q",
> 			       "que",
> 			       "quite",
> 			       "qv",
> 			       "r",
> 			       "rather",
> 			       "rd",
> 			       "re",
> 			       "really",
> 			       "reasonably",
> 			       "regarding",
> 			       "regardless",
> 			       "regards",
> 			       "relatively",
> 			       "respectively",
> 			       "right",
> 			       "s",
> 			       "said",
> 			       "same",
> 			       "saw",
> 			       "say",
> 			       "saying",
> 			       "says",
> 			       "second",
> 			       "secondly",
> 			       "see",
> 			       "seeing",
> 			       "seem",
> 			       "seemed",
> 			       "seeming",
> 			       "seems",
> 			       "seen",
> 			       "self",
> 			       "selves",
> 			       "sensible",
> 			       "sent",
> 			       "serious",
> 			       "seriously",
> 			       "seven",
> 			       "several",
> 			       "shall",
> 			       "she",
> 			       "should",
> 			       "shouldn't",
> 			       "since",
> 			       "six",
> 			       "so",
> 			       "some",
> 			       "somebody",
> 			       "somehow",
> 			       "someone",
> 			       "something",
> 			       "sometime",
> 			       "sometimes",
> 			       "somewhat",
> 			       "somewhere",
> 			       "soon",
> 			       "sorry",
> 			       "specified",
> 			       "specify",
> 			       "specifying",
> 			       "still",
> 			       "sub",
> 			       "such",
> 			       "sup",
> 			       "sure",
> 			       "t",
> 			       "t's",
> 			       "take",
> 			       "taken",
> 			       "tell",
> 			       "tends",
> 			       "th",
> 			       "than",
> 			       "thank",
> 			       "thanks",
> 			       "thanx",
> 			       "that",
> 			       "that's",
> 			       "thats",
> 			       "the",
> 			       "their",
> 			       "theirs",
> 			       "them",
> 			       "themselves",
> 			       "then",
> 			       "thence",
> 			       "there",
> 			       "there's",
> 			       "thereafter",
> 			       "thereby",
> 			       "therefore",
> 			       "therein",
> 			       "theres",
> 			       "thereupon",
> 			       "these",
> 			       "they",
> 			       "they'd",
> 			       "they'll",
> 			       "they're",
> 			       "they've",
> 			       "think",
> 			       "third",
> 			       "this",
> 			       "thorough",
> 			       "thoroughly",
> 			       "those",
> 			       "though",
> 			       "three",
> 			       "through",
> 			       "throughout",
> 			       "thru",
> 			       "thus",
> 			       "to",
> 			       "together",
> 			       "too",
> 			       "took",
> 			       "toward",
> 			       "towards",
> 			       "tried",
> 			       "tries",
> 			       "truly",
> 			       "try",
> 			       "trying",
> 			       "twice",
> 			       "two",
> 			       "u",
> 			       "un",
> 			       "under",
> 			       "unfortunately",
> 			       "unless",
> 			       "unlikely",
> 			       "until",
> 			       "unto",
> 			       "up",
> 			       "upon",
> 			       "us",
> 			       "use",
> 			       "used",
> 			       "useful",
> 			       "uses",
> 			       "using",
> 			       "usually",
> 			       "v",
> 			       "value",
> 			       "various",
> 			       "very",
> 			       "via",
> 			       "viz",
> 			       "vs",
> 			       "w",
> 			       "want",
> 			       "wants",
> 			       "was",
> 			       "wasn't",
> 			       "way",
> 			       "we",
> 			       "we'd",
> 			       "we'll",
> 			       "we're",
> 			       "we've",
> 			       "welcome",
> 			       "well",
> 			       "went",
> 			       "were",
> 			       "weren't",
> 			       "what",
> 			       "what's",
> 			       "whatever",
> 			       "when",
> 			       "whence",
> 			       "whenever",
> 			       "where",
> 			       "where's",
> 			       "whereafter",
> 			       "whereas",
> 			       "whereby",
> 			       "wherein",
> 			       "whereupon",
> 			       "wherever",
> 			       "whether",
> 			       "which",
> 			       "while",
> 			       "whither",
> 			       "who",
> 			       "who's",
> 			       "whoever",
> 			       "whole",
> 			       "whom",
> 			       "whose",
> 			       "why",
> 			       "will",
> 			       "willing",
> 			       "wish",
> 			       "with",
> 			       "within",
> 			       "without",
> 			       "won't",
> 			       "wonder",
> 			       "would",
> 			       "would",
> 			       "wouldn't",
> 			       "x",
> 			       "y",
> 			       "yes",
> 			       "yet",
> 			       "you",
> 			       "you'd",
> 			       "you'll",
> 			       "you're",
> 			       "you've",
> 			       "your",
> 			       "yours",
> 			       "yourself", "yourselves", "z", "zero");
578c581
<   /* static */ function inList ($word)
---
>   function inList ($word)
587d589
< 
Only in getwiki-fm: getwiki.php

GlobalFunctions.php[edit]

diff mediawiki-fm\GlobalFunctions.php getwiki-fm\GlobalFunctions.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
3c8,9
<   $wgNumberOfArticles = -1;	// Unset
---
>   error_reporting (0);
> $wgNumberOfArticles = -1;	// Unset
11,13c17
< /*
<  * Compatibility functions
<  */
---
> // compatibility functions
133c137
<   $hash = md5 (substr ($name, 15));
---
>   $hash = md5 ($name);
140a145,199
> wfImageArchiveDir ($fname)
> {
>   global $wgUploadDirectory;
> 
>   $hash = md5 ($fname);
>   $oldumask = umask (0);
>   $archive = "{$wgUploadDirectory}/archive";
>   if (!is_dir ($archive))
>     {
>       mkdir ($archive, 0777);
>     }
>   $archive. = "/".$hash
>   {
>   0};
> }
> 
> function
> wfImagePath ($img)
> {
>   global $wgUploadDirectory;
> 
>   $nt = Title::newFromText ($img);
>   if (!$nt)
>     return "";
> 
>   $name = $nt->getDBkey ();
>   $hash = md5 ($name);
> 
>   $url = "{$wgUploadDirectory}/".$hash
>   {
>   0}
>   ."/".substr ($hash, 0, 2)."/{$name}";
>   return wfUrlencode ($url);
> }
> 
> function
> wfThumbUrl ($img)
> {
>   global $wgUploadPath;
> 
>   $nt = Title::newFromText ($img);
>   if (!$nt)
>     return "";
> 
>   $name = $nt->getDBkey ();
>   $hash = md5 ($name);
> 
>   $url = "{$wgUploadPath}/thumb/".$hash
>   {
>   0}
>   ."/".substr ($hash, 0, 2)."/{$name}";
>   return wfUrlencode ($url);
> }
> 
> function
160c219
<     return chr ($codepoint >> 18 & 0x07 | 0xf0).	// Double-check this
---
>     return chr ($codepoint >> 18 & 0x07 | 0xf0).
200,202c259
<     {
<       return false;
<     }
---
>     return false;
252,258c309,311
<     {
<       $message = $messageCache[$title];
<     }
<   elseif (!$wgUseDatabaseMessages || !$useDB)
<   {
<     $message = $wgLang->getMessage ($key);
<   }
---
>     $message = $messageCache[$title];
>   elseif (!$wgUseDatabaseMessages
> 	  || !$useDB) $message = $wgLang->getMessage ($key);
278,279d330
< 
< 
297c348,349
< 	  $sql = "SELECT cur_text FROM cur WHERE cur_namespace=".NS_MEDIAWIKI.
---
> 	  $sql =
> 	    "SELECT cur_text FROM cur WHERE cur_namespace=".NS_MEDIAWIKI.
446,448c498,500
<   if (array_key_exists ($t, $validSP) ||
<       ($wgUser->isSysop () && array_key_exists ($t, $sysopSP)) ||
<       ($wgUser->isDeveloper () && array_key_exists ($t, $devSP)))
---
>   if (array_key_exists ($t, $validSP)
>       || ($wgUser->isSysop () && array_key_exists ($t, $sysopSP))
>       || ($wgUser->isDeveloper () && array_key_exists ($t, $devSP)))
452d503
< 
497c548
< /* private */ function
---
> function
509,511c560
<     {
<       return;
<     }
---
>     return;
569,592c618,621
< function
< wfImageArchiveDir ($fname)
< {
<   global $wgUploadDirectory;
< 
<   $hash = md5 ($fname);
<   $oldumask = umask (0);
<   $archive = "{$wgUploadDirectory}/archive";
<   if (!is_dir ($archive))
<     {
<       mkdir ($archive, 0777);
<     }
<   $archive. = "/".$hash
<   {
<   0};
<   if (!is_dir ($archive))
<     {
<       mkdir ($archive, 0777);
<     }
<   $archive. = "/".substr ($hash, 0, 2);
<   if (!is_dir ($archive))
<     {
<       mkdir ($archive, 0777);
<     }
---
> /*
> function wfImageArchiveDir( $fname )
> 	{
> 	global $wgUploadDirectory;
594,596c623,630
<   umask ($oldumask);
<   return $archive;
< }
---
> 	$hash = md5( $fname );
> 	$oldumask = umask(0);
> 	$archive = "{$wgUploadDirectory}/archive";
> 	if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); }
> 	$archive .= "/" . $hash{0};
> 	if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); }
> 	$archive .= "/" . substr( $hash, 0, 2 );
> 	if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); }
597a632,635
> 	umask( $oldumask );
> 	return $archive;
> 	}
> */
616,618c654,657
<       $textdesc = "== ".wfMsg ("filedesc")." ==\n".$desc."\n".
< 	"== ".wfMsg ("filestatus")." ==\n".$wpUploadCopyStatus."\n".
< 	"== ".wfMsg ("filesource")." ==\n".$wpUploadSource;
---
>       $textdesc =
> 	"== ".wfMsg ("filedesc")." ==\n".$desc."\n"."== ".
> 	wfMsg ("filestatus")." ==\n".$wpUploadCopyStatus."\n"."== ".
> 	wfMsg ("filesource")." ==\n".$wpUploadSource;
628,632c667,670
<       $sql = "INSERT INTO image (img_name,img_size,img_timestamp,".
< 	"img_description,img_user,img_user_text) VALUES ('".
< 	wfStrencode ($name)."',$size,'{$now}','".
< 	wfStrencode ($desc)."', '".$wgUser->getID ().
< 	"', '".wfStrencode ($wgUser->getName ())."')";
---
>       $sql =
> 	"INSERT INTO image (img_name,img_size,img_timestamp,img_description,img_user,img_user_text) VALUES ('".
> 	wfStrencode ($name)."',$size,'{$now}','".wfStrencode ($desc)."', '".
> 	$wgUser->getID ()."', '".wfStrencode ($wgUser->getName ())."')";
635c673,674
<       $sql = "SELECT cur_id,cur_text FROM cur WHERE cur_namespace=".
---
>       $sql =
> 	"SELECT cur_id,cur_text FROM cur WHERE cur_namespace=".
641,642c680
< 	    Namespace::getImage ().",'".
< 	    wfStrencode ($name)."','".
---
> 	    Namespace::getImage ().",'".wfStrencode ($name)."','".
645,647c683,684
< 	  $sql = "INSERT INTO cur (cur_namespace,cur_title,".
< 	    "cur_comment,cur_user,cur_user_text,cur_timestamp,cur_is_new,".
< 	    "cur_text,inverse_timestamp,cur_touched) VALUES (".
---
> 	  $sql =
> 	    "INSERT INTO cur (cur_namespace,cur_title,cur_comment,cur_user,cur_user_text,cur_timestamp,cur_is_new,cur_text,inverse_timestamp,cur_touched) VALUES (".
651,653c688,689
< 	  $sql = "INSERT INTO recentchanges (rc_namespace,rc_title,
< 				rc_comment,rc_user,rc_user_text,rc_timestamp,rc_new,
< 				rc_cur_id,rc_cur_time) VALUES ({$common},{$id},'{$now}')";
---
> 	  $sql =
> 	    "INSERT INTO recentchanges (rc_namespace,rc_title,rc_comment,rc_user,rc_user_text,rc_timestamp,rc_new,rc_cur_id,rc_cur_time) VALUES ({$common},{$id},'{$now}')";
663,669c699,706
<       $sql = "INSERT INTO oldimage (oi_name,oi_archive_name,oi_size,".
< 	"oi_timestamp,oi_description,oi_user,oi_user_text) VALUES ('".
< 	wfStrencode ($s->img_name)."','".
< 	wfStrencode ($oldver).
< 	"',{$s->img_size},'{$s->img_timestamp}','".
< 	wfStrencode ($s->img_description)."','".
< 	wfStrencode ($s->img_user)."','".wfStrencode ($s->img_user_text)."')";
---
>       $sql =
> 	"INSERT INTO oldimage (oi_name,oi_archive_name,oi_size,oi_timestamp,oi_description,oi_user,oi_user_text) VALUES ('".
> 	wfStrencode ($s->img_name)."','".wfStrencode ($oldver).
> 	"',{$s->img_size},'{$s->img_timestamp}','".wfStrencode ($s->
> 								img_description).
> 	"','".wfStrencode ($s->img_user)."','".wfStrencode ($s->
> 							    img_user_text).
> 	"')";
672,674c709,711
<       $sql = "UPDATE image SET img_size={$size},".
< 	"img_timestamp='".wfTimestampNow ()."',img_user='".
< 	$wgUser->getID ()."',img_user_text='".
---
>       $sql =
> 	"UPDATE image SET img_size={$size},img_timestamp='".wfTimestampNow ().
> 	"',img_user='".$wgUser->getID ()."',img_user_text='".
679c716,717
<       $sql = "UPDATE cur SET cur_touched='{$now}' WHERE cur_namespace=".
---
>       $sql =
> 	"UPDATE cur SET cur_touched='{$now}' WHERE cur_namespace=".
720,722c758
< 	{
< 	  $po = 0;
< 	}
---
> 	$po = 0;
725,727c761
< 	{
< 	  $q. = "&{$query}";
< 	}
---
> 	$q. = "&{$query}";
731,733c765
<     {
<       $plink = $prev;
<     }
---
>     $plink = $prev;
738,740c770
<     {
<       $q. = "&{$query}";
<     }
---
>     $q. = "&{$query}";
743,746c773,779
<   $nums = wfNumLink ($offset, 20, $link, $query)." | ".
<     wfNumLink ($offset, 50, $link, $query)." | ".
<     wfNumLink ($offset, 100, $link, $query)." | ".
<     wfNumLink ($offset, 250, $link, $query)." | ".
---
>   $nums =
>     wfNumLink ($offset, 20, $link, $query)." | ".wfNumLink ($offset, 50,
> 							    $link,
> 							    $query)." | ".
>     wfNumLink ($offset, 100, $link, $query)." | ".wfNumLink ($offset, 250,
> 							     $link,
> 							     $query)." | ".
817,822c850,857
< // Escapes the given text so that it may be output using addWikiText() 
< // without any linking, formatting, etc. making its way through. This 
< // is achieved by substituting certain characters with HTML entities.
< // As required by the callers, <nowiki> is not used. It currently does
< // not filter out characters which have special meaning only at the
< // start of a line, such as "*".
---
> /* Escapes the given text so that it may be output using addWikiText() 
>  without any linking, formatting, etc. making its way through. This 
>  is achieved by substituting certain characters with HTML entities.
>  As required by the callers, <nowiki> is not used. It currently does
>  not filter out characters which have special meaning only at the
>  start of a line, such as "*".
> */
> 

ImagePage.php[edit]

diff mediawiki-fm\ImagePage.php getwiki-fm\ImagePage.php
2,3c2,5
< /*
< 	Special handling for image description pages
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
4a7
> // special handling for image description pages
7d9
< 
10c12,15
<     Article::view ();
---
>     if (Namespace::getImage () == $this->mTitle->getNamespace ())
>       {
> 	$this->openShowImage ();
>       }
12,14c17
<     // If the article we've just shown is in the "Image" namespace,
<     // follow it with the history list and link list for the image
<     // it describes.
---
>     Article::view ();
17a21
> 	$this->closeShowImage ();
22a27,58
>   function openShowImage ()
>   {
>     global $wgOut, $wgUser;
>     $name = $this->mTitle->getText ();
>     $path = wfImagePath ($name);
>     $url = wfImageUrl ($name);
> 
>     list ($width, $height, $type, $attr) = getimagesize ($path);
> 
>     $sk = $wgUser->getSkin ();
>     if ($type != "")
>       {
> 	// image
> 	$s. =
> 	  "<div align=\"center\"><img src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"\" /></div>";
>       }
>     else
>       {
> 	$s. =
> 	  "<div align=\"center\">".$sk->makeMediaLink ($name, "")."</div>";
>       }
>     $wgOut->AddHTML ($s);
>   }
> 
>   function closeShowImage ()
>   {
>     global $wgOut, $wgUser;
>     $sk = $wgUser->getSkin ();
>     //$s = "</center>";
>     $wgOut->AddHTML ($s);
>   }
> 
31,33c67,69
<     $sql = "SELECT img_size,img_description,img_user,".
<       "img_user_text,img_timestamp FROM image WHERE ".
<       "img_name='".wfStrencode ($this->mTitle->getDBkey ())."'";
---
>     $sql =
>       "SELECT img_size,img_description,img_user,img_user_text,img_timestamp FROM image WHERE img_name='".
>       wfStrencode ($this->mTitle->getDBkey ())."'";
45,52c81,89
<     $s. = $sk->imageHistoryLine (true, $line->img_timestamp,
< 				 $this->mTitle->getText (), $line->img_user,
< 				 $line->img_user_text, $line->img_size,
< 				 $line->img_description);
< 
<     $sql = "SELECT oi_size,oi_description,oi_user,".
<       "oi_user_text,oi_timestamp,oi_archive_name FROM oldimage WHERE ".
<       "oi_name='".wfStrencode ($this->mTitle->getDBkey ())."' ".
---
>     $s. =
>       $sk->imageHistoryLine (true, $line->img_timestamp,
> 			     $this->mTitle->getText (), $line->img_user,
> 			     $line->img_user_text, $line->img_size,
> 			     $line->img_description);
> 
>     $sql =
>       "SELECT oi_size,oi_description,oi_user,oi_user_text,oi_timestamp,oi_archive_name FROM oldimage WHERE oi_name='".
>       wfStrencode ($this->mTitle->getDBkey ())."' ".
58,61c95,99
< 	$s. = $sk->imageHistoryLine (false, $line->oi_timestamp,
< 				     $line->oi_archive_name, $line->oi_user,
< 				     $line->oi_user_text, $line->oi_size,
< 				     $line->oi_description);
---
> 	$s. =
> 	  $sk->imageHistoryLine (false, $line->oi_timestamp,
> 				 $line->oi_archive_name, $line->oi_user,
> 				 $line->oi_user_text, $line->oi_size,
> 				 $line->oi_description);
73,74c111,115
<     $sql = "SELECT il_from FROM imagelinks WHERE il_to='".
<       wfStrencode ($this->mTitle->getDBkey ())."'";
---
>     $sql =
>       "SELECT il_from FROM imagelinks WHERE il_to='".wfStrencode ($this->
> 								  mTitle->
> 								  getDBkey
> 								  ())."'";
79c120
< 	$wgOut->addHtml ("<p>".wfMsg ("nolinkstoimage")."\n");
---
> 	$wgOut->addHtml ("<p>".wfMsg ("nolinkstoimage")."</p>\n");
91c132
<     $wgOut->addHTML ("</ul>\n");
---
>     $wgOut->addHTML ("</ul></p>\n");
160c201,202
< 	$sql = "SELECT oi_archive_name FROM oldimage WHERE oi_name='".
---
> 	$sql =
> 	  "SELECT oi_archive_name FROM oldimage WHERE oi_name='".
168,169c210,211
< 	$sql = "DELETE FROM oldimage WHERE oi_name='".
< 	  wfStrencode ($image)."'";
---
> 	$sql =
> 	  "DELETE FROM oldimage WHERE oi_name='".wfStrencode ($image)."'";
185c227,228
< 	$sql = "DELETE FROM oldimage WHERE oi_archive_name='".
---
> 	$sql =
> 	  "DELETE FROM oldimage WHERE oi_archive_name='".
Only in getwiki-fm: index.phtml
Only in mediawiki-fm: Interwiki.php

Language.php[edit]

diff mediawiki-fm\Language.php getwiki-fm\Language.php
2,29c2,8
< //--------------------------------------------------------------------------
< // Constants
< //--------------------------------------------------------------------------
< // Magic words
<   define ("MAG_REDIRECT", 0);
< define ("MAG_NOTOC", 1);
< define ("MAG_START", 2);
< define ("MAG_CURRENTMONTH", 3);
< define ("MAG_CURRENTMONTHNAME", 4);
< define ("MAG_CURRENTDAY", 5);
< define ("MAG_CURRENTDAYNAME", 6);
< define ("MAG_CURRENTYEAR", 7);
< define ("MAG_CURRENTTIME", 8);
< define ("MAG_NUMBEROFARTICLES", 9);
< define ("MAG_CURRENTMONTHNAMEGEN", 10);
< define ("MAG_MSG", 11);
< define ("MAG_SUBST", 12);
< define ("MAG_MSGNW", 13);
< define ("MAG_NOEDITSECTION", 14);
< define ("MAG_END", 15);
< 
< //--------------------------------------------------------------------------
< // Language-specific text
< //--------------------------------------------------------------------------
< 
< // NOTE: To turn off "Current Events" in the sidebar,
< // set "currentevents" => "-"
< 
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // constants/text used all over
> // NOTE: To turn off "Current Events" in the sidebar, set "currentevents" => "-"
31,35c10,11
< // are magical, so don't change or move them!  The Namespace class
< // encapsulates some of the magic-ness.
< //
< 
< if ($wgMetaNamespace == = FALSE)
---
> // are magical, so don't change or move them!  (Namespace class)
>   if ($wgMetaNamespace == = FALSE)
36a13,146
> $wgNamespaceNamesEn = array (-2 = >"Media",
> 			     -1 = >"Special",
> 			     0 = >"",
> 			     1 = >"Talk",
> 			     2 = >"User",
> 			     3 = >"User_talk",
> 			     4 = >"Internet_Encyclopedia",
> 			     5 = >"Internet_Encyclopedia_talk",
> 			     6 = >"Image",
> 			     7 = >"Image_talk",
> 			     8 = >"Wikinfo", 9 = >"Wikinfo_talk"
> //      10      => "Alternate", // you might use these for alternative viewpoints
> //      11      => "Alternate_talk"
>   );
> 
> $wgDefaultUserOptionsEn = array ("quickbar" = >1, "underline" = >0, "hover" =
> 				 >1, "cols" = >80, "rows" =
> 				 >25, "searchlimit" = >20, "contextlines" =
> 				 >5, "contextchars" = >50, "skin" =
> 				 >0, "math" = >1, "rcdays" = >7, "rclimit" =
> 				 >50, "highlightbroken" =
> 				 >1, "stubthreshold" = >0, "previewontop" =
> 				 >1, "editsection" =
> 				 >1, "editsectiononrightclick" =
> 				 >0, "showtoc" = >1, "date" = >0
> 				 //, "editbar" => 1      // removed
>   );
> 
> $wgQuickbarSettingsEn = array ("Not visible", "Fixed left", "Fixed right");	// "Float left" - deprecated
> $wgSkinNamesEn =
> array ("Wiki Standard", "\"Nostalgia\" (Simpler Layout)",
>        "\"Cologne Blue\" (Bolder Layout)");
> 
> $wgMathNamesEn = array ("Always render PNG (Images)",
> 			"HTML if very simple or else PNG",
> 			"HTML if possible or else PNG",
> 			"Leave it as TeX (Text Browsers)",
> 			"Let my browser decide");
> 
> $wgDateFormatsEn =
> array ("No preference", "January 15, 2001", "15 January 2001",
>        "2001 January 15", "2001-01-15");
> 
> $wgUserTogglesEn = array ("hover" = >"Show hoverbox over wiki links",
> 			  "underline" = >"Underline links",
> 			  "highlightbroken" =
> 			  >"Format <a href=\"//\" class=\"new\">imported/new</a> links, uncheck to mark them<a href=\"//\" class=\"new\"><span class=\"newmark\">?</span></a>",
> 			  "justify" = >"Justify paragraphs", "hideminor" =
> 			  >"Hide minor edits in recent changes", "usenewrc" =
> 			  >"Enhanced recent changes (not for all browsers)",
> 			  "numberheadings" = >"Auto-number headings",
> 			  //"editbar"                     => "Show edit formatting buttons*",
> 			  "editondblclick" = >"Edit pages on double click*",
> 			  "editsection" =
> 			  >"Enable section editing via [edit] links",
> 			  "editsectiononrightclick" =
> 			  >"Enable section editing via right click on section titles*",
> 			  "showtoc" =
> 			  >"Show table of contents (3 or more headings)",
> 			  "rememberpassword" =
> 			  >"Remember password across sessions", "editwidth" =
> 			  >"Edit box has full width", "watchdefault" =
> 			  >"Add pages you edit to your watchlist",
> 			  "minordefault" =
> 			  >"Mark all edits minor by default", "previewontop" =
> 			  >"Show preview before edit box and not after it",
> 			  "nocache" = >"Disable page caching");
> 
> $wgBookstoreListEn = array ("AddALL" =
> 			    >"http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
> 			    "PriceSCAN" =
> 			    >"http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
> 			    "Barnes & Noble" =
> 			    >"http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
> 			    "Amazon.com" =
> 			    >"http://www.amazon.com/exec/obidos/ISBN=$1");
> 
> $wgWeekdayNamesEn =
> array ("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
>        "Saturday");
> $wgMonthNamesEn =
> array ("January", "February", "March", "April", "May", "June", "July",
>        "August", "September", "October", "November", "December");
> $wgMonthAbbreviationsEn =
> array ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
>        "Nov", "Dec");
> 
> // All special pages MUST be listed here on left side: a description of "" will make them 
> // not show up on the "Special Pages" page
> 
> $wgValidSpecialPagesEn = array ("Userlogin" = >"Log in",
> 				"Userlogout" = >"Log out",
> 				"Preferences" = >"Set my user preferences",
> 				"Watchlist" = >"My watchlist",
> 				"Recentchanges" = >"Recently updated pages",
> 				"Upload" = >"Upload image files",
> 				"Imagelist" = >"Image list",
> 				"Listusers" = >"Registered users",
> 				"Statistics" = >"Site statistics",
> 				"Randompage" = >"Random article",
> 				"Lonelypages" = >"Orphaned articles",
> 				"Unusedimages" = >"Orphaned images",
> 				"Popularpages" = >"Popular articles",
> 				"Wantedpages" = >"Most wanted articles",
> 				"Shortpages" = >"Short articles",
> 				"Longpages" = >"Long articles",
> 				"Newpages" = >"Newly created articles",
> 				"Ancientpages" = >"Oldest articles",
> 				"Deadendpages" = >"Dead-end pages",
> 				"Allpages" = >"All pages by title",
> 				"Ipblocklist" = >"Blocked users/IP addresses",
> 				"Maintenance" = >"Maintenance page",
> 				"Specialpages" = >"",
> 				"Contributions" = >"",
> 				"Emailuser" = >"",
> 				"Whatlinkshere" = >"",
> 				"Recentchangeslinked" = >"",
> 				"Movepage" = >"",
> 				"Booksources" = >"External book sources",
> 				"Categories" = >"",
> 				"Export" = >"XML page export",
> 				"Missingimages" =
> 				>"TODO: Missing images from pages",
> 				"Neglectedpages" =
> 				>"TODO: Least recently edited pages", "Vote" =
> 				>"TODO: User votes",);
> 
> $wgSysopSpecialPagesEn = array ("Blockip" = >"Block a user/IP address",
> 				"Asksql" = >"Query the database",
> 				"Undelete" = >"Restore deleted pages");
> 
> $wgDeveloperSpecialPagesEn = array ("Lockdb" = >"Make database read-only",
> 				    "Unlockdb" = >"Restore DB write access",
> 				    "Debug" = >"Debugging information");
38,359d147
< /* private */ $wgNamespaceNamesEn = array (
< 					    -2 = >"Media",
< 					    -1 = >"Special",
< 					    0 = >"",
< 					    1 = >"Talk",
< 					    2 = >"User",
< 					    3 = >"User_talk",
< 					    4 = >$wgMetaNamespace,
< 					    5 = >$wgMetaNamespace."_talk",
< 					    6 = >"Image",
< 					    7 = >"Image_talk",
< 					    8 = >"MediaWiki",
< 					    9 = >"MediaWiki_talk");
< 
< /* private */ $wgDefaultUserOptionsEn = array (
< 						"quickbar" = >1, "underline" =
< 						>1, "hover" = >1, "cols" =
< 						>80, "rows" =
< 						>25, "searchlimit" =
< 						>20, "contextlines" =
< 						>5, "contextchars" =
< 						>50, "skin" = >0, "math" =
< 						>1, "rcdays" = >7, "rclimit" =
< 						>50, "highlightbroken" =
< 						>1, "stubthreshold" =
< 						>0, "previewontop" =
< 						>1, "editsection" =
< 						>1,
< 						"editsectiononrightclick" =
< 						>0, "showtoc" = >1, "date" =
< 						>0);
< 
< /* private */ $wgQuickbarSettingsEn = array (
< 					      "None", "Fixed left",
< 					      "Fixed right", "Floating left");
< 
< /* private */ $wgSkinNamesEn = array (
< 				       "Standard", "Nostalgia",
< 				       "Cologne Blue", "Paddington",
< 				       "Montparnasse");
< 
< /* private */ $wgMathNamesEn = array (
< 				       "Always render PNG",
< 				       "HTML if very simple or else PNG",
< 				       "HTML if possible or else PNG",
< 				       "Leave it as TeX (for text browsers)",
< 				       "Recommended for modern browsers");
< 
< /* private */ $wgDateFormatsEn = array (
< 					 "No preference",
< 					 "January 15, 2001",
< 					 "15 January 2001",
< 					 "2001 January 15", "2001-01-15");
< 
< /* private */ $wgUserTogglesEn = array (
< 					 "hover" = >"Show hoverbox over wiki links", "underline" = >"Underline links", "highlightbroken" = >"Format broken links <a href=\"\" class=\"new\">like
< this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
< 					 "justify" = >"Justify paragraphs", "hideminor" = >"Hide minor edits in recent changes", "usenewrc" = >"Enhanced recent changes (not for all browsers)", "numberheadings" = >"Auto-number headings",
< 					 "editondblclick" = >"Edit pages on double click (JavaScript)", "editsection" = >"Enable section editing via [edit] links", "editsectiononrightclick" = >"Enable section editing by right clicking<br> on section titles (JavaScript)",
< 					 "showtoc" = >"Show table of contents<br>(for articles with more than 3 headings)", "rememberpassword" = >"Remember password across sessions", "editwidth" = >"Edit box has full width", "watchdefault" =
< 					 >"Add pages you edit to your watchlist", "minordefault" = >"Mark all edits minor by default", "previewontop" = >"Show preview before edit box and not after it", "nocache" = >"Disable page caching");
< 
< /* private */ $wgBookstoreListEn = array (
< 					   "AddALL" =
< 					   >"http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
< 					   "PriceSCAN" =
< 					   >"http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
< 					   "Barnes & Noble" =
< 					   >"http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
< 					   "Amazon.com" =
< 					   >"http://www.amazon.com/exec/obidos/ISBN=$1");
< 
< /* private */ $wgLanguageNamesEn = array (
< 					   "aa" = >"Afar", "ab" = >"&//1040;&//1191;&//1089;&//1085;&//1099; (Apsny)", "af" = >"Afrikaans", "als" = >"Elsässisch",	// FIXME: not a real language code; is subsumed under 'gem'
< 					   "am" = >"Amharic", "ar" = >"&//8238;&//1575;&//1604;&//1593;&//1585;&//1576;&//1610;&//1577;&//8236; (Araby)", "as" = >"Assamese", "ay" = >"Aymara", "az" = >"&//1040;&//1079;&//1241;&//1088;&//1073;&//1072;&//1112;&//1209;&//1072;&//1085; (Azerbajan)", "ba" = >"&//1041;&//1072;&//1096;&//1082;&//1086;&//1088;&//1090; (Bashkort)", "be" = >"&//1041;&//1077;&//1083;&//1072;&//1088;&//1091;&//1089;&//1082;&//1080;", "bh" = >"Bihara", "bi" = >"Bislama", "bn" = >"Bengali", "bo" = >"Tibetan", "br" = >"Brezhoneg", "bs" = >"Bosnian", "ca" = >"Catal&//224;", "ch" = >"Chamoru", "co" = >"Corsican", "cs" = >"&//268;esk&//225;", "cy" = >"Cymraeg", "da" = >"Dansk",	// Note two different subdomains.
< 					   "dk" = >"Dansk",	// 'da' is correct for the language.
< 					   "de" = >"Deutsch",
< 					   "dz" = >"Bhutani",
< 					   "el" =
< 					   >"&//917;&//955;&//955;&//951;&//957;&//953;&//954;&//940; (Ellenika)",
< 					   "en" = >"English", "eo" =
< 					   >"Esperanto", "es" =
< 					   >"Espa&//241;ol", "et" =
< 					   >"Eesti", "eu" = >"Euskara", "fa" =
< 					   >"&//8238;&//1601;&//1585;&//1587;&//1609;&//8236; (Farsi)",
< 					   "fi" = >"Suomi", "fj" =
< 					   >"Fijian", "fo" =
< 					   >"Faeroese", "fr" =
< 					   >"Fran&//231;ais", "fy" =
< 					   >"Frysk", "ga" = >"Gaelige", "gd" =
< 					   >"Gàidhlig", "gl" =
< 					   >"Galician", "gn" =
< 					   >"Guarani", "gu" =
< 					   >"&//2711;&//2753;&//2716;&//2736;&//2750;&//2724;&//2752; (Gujarati)",
< 					   "gv" = >"Gaelg", "ha" =
< 					   >"Hausa", "he" =
< 					   >"&//1506;&//1489;&//1512;&//1497;&//1514; (Ivrit)",
< 					   "hi" =
< 					   >"&//2361;&//2367;&//2344;&//2381;&//2342;&//2368; (Hindi)",
< 					   "hr" = >"Hrvatski", "hu" =
< 					   >"Magyar", "hy" =
< 					   >"&//1344;&//1377;&//1397;&//1381;&//1408;&//1383;&//1398; (Armjan)",
< 					   "ia" = >"Interlingua", "id" =
< 					   >"Indonesia", "ik" =
< 					   >"Inupiak", "is" =
< 					   >"&//205;slenska", "it" =
< 					   >"Italiano", "iu" =
< 					   >"Inuktitut", "ja" =
< 					   >"&//26085;&//26412;&//35486; (Nihongo)",
< 					   "jv" = >"Javanese", "ka" =
< 					   >"&//4325;&//4304;&//4320;&//4311;&//4309;&//4308;&//4314;&//4312; (Kartuli)",
< 					   "kk" =
< 					   >"&//1178;&//1072;&//1079;&//1072;&//1179; (Kazakh)",
< 					   "kl" = >"Greenlandic", "km" =
< 					   >"Cambodian", "kn" =
< 					   >"&//3221;&//3240;&//3277;&//3240;&//3233; (Kannada)",
< 					   "ko" =
< 					   >"&//54620;&//44397;&//50612; (Hangukeo)",
< 					   "ks" = >"Kashmiri", "kw" =
< 					   >"Kernewek", "ky" =
< 					   >"Kirghiz", "la" =
< 					   >"Latina", "ln" =
< 					   >"Lingala", "lo" =
< 					   >"Laotian", "lt" =
< 					   >"Lietuvi&//371;", "lv" =
< 					   >"Latviešu", "mg" =
< 					   >"Malagasy", "mi" =
< 					   >"Maori", "mk" =
< 					   >"Makedonš&//269;ina", "ml" =
< 					   >"Malayalam", "mn" =
< 					   >"Mongolian", "mo" =
< 					   >"Moldavian", "mr" =
< 					   >"Marathi", "ms" =
< 					   >"Bahasa Melayu", "my" =
< 					   >"Burmese", "na" =
< 					   >"Nauru", "nah" =
< 					   >"Nahuatl", "nds" =
< 					   >"Plattdüütsch", "ne" =
< 					   >"&//2344;&//2375;&//2346;&//2366;&//2354;&//2368; (Nepali)",
< 					   "nl" = >"Nederlands", "no" =
< 					   >"Norsk", "oc" = >"Occitan", "om" =
< 					   >"Oromo", "or" = >"Oriya", "pa" =
< 					   >"Punjabi", "pl" =
< 					   >"Polski", "ps" = >"Pashto", "pt" =
< 					   >"Portugu&//234;s", "qu" =
< 					   >"Quechua", "rm" =
< 					   >"Rhaeto-Romance", "rn" =
< 					   >"Kirundi", "ro" =
< 					   >"Rom&//226;n&//259;", "ru" =
< 					   >"&//1056;&//1091;&//1089;&//1089;&//1082;&//1080;&//1081; (Russkij)",
< 					   "rw" = >"Kinyarwanda", "sa" =
< 					   >"&//2360;&//2306;&//2360;&//2381;&//2325;&//2371;&//2340; (Samskrta)",
< 					   "sd" = >"Sindhi", "sg" =
< 					   >"Sangro", "sh" =
< 					   >"&//1057;&//1088;&//1087;&//1089;&//1082;&//1086;&//1093;&//1088;&//1074;&//1072;&//1090;&//1089;&//1082;&//1080; (Srbskohrvatski)",
< 					   "si" = >"Sinhalese", "simple" =
< 					   >"Simple English", "sk" =
< 					   >"Slovak", "sl" =
< 					   >"Slovensko", "sm" =
< 					   >"Samoan", "sn" = >"Shona", "so" =
< 					   >"Soomaali", "sq" =
< 					   >"Shqip", "sr" =
< 					   >"&//1057;&//1088;&//1087;&//1089;&//1082;&//1080; (Srpski)",
< 					   "ss" = >"Siswati", "st" =
< 					   >"Sesotho", "su" =
< 					   >"Sundanese", "sv" =
< 					   >"Svenska", "sw" =
< 					   >"Kiswahili", "ta" =
< 					   >"&//2980;&//2990;&//3007;&//2996;&//3021; (Tamil)",
< 					   "te" =
< 					   >"&//3108;&//3142;&//3122;&//3137;&//3095;&//3137; (Telugu)",
< 					   "tg" = >"Tajik", "th" =
< 					   >"Thai", "ti" = >"Tigrinya", "tk" =
< 					   >"Turkmen", "tl" =
< 					   >"Tagalog", "tn" =
< 					   >"Setswana", "to" =
< 					   >"Tonga", "tr" =
< 					   >"T&//252;rk&//231;e", "ts" =
< 					   >"Tsonga", "tt" =
< 					   >"&//1058;&//1072;&//1090;&//1072;&//1088; (Tatar)",
< 					   "tw" = >"Twi", "ug" =
< 					   >"Uighur", "uk" =
< 					   >"&//1059;&//1082;&//1088;&//1072;&//1111;&//1085;&//1089;&//1100;&//1082;&//1072; (Ukrayins`ka)",
< 					   "ur" = >"Urdu", "uz" =
< 					   >"&//1038;&//1079;&//1073;&//1077;&//1082; (Uzbek)",
< 					   "vi" =
< 					   >"Ti&//7871;ng Vi&//7879;t", "vo" =
< 					   >"Volap&//252;k", "wo" =
< 					   >"Wolof", "xh" =
< 					   >"isiXhosa", "yi" =
< 					   >"Yiddish", "yo" =
< 					   >"Yoruba", "za" = >"Zhuang", "zh" =
< 					   >"&//20013;&//25991; (Zhongwen)",
< 					   "zh-cn" =
< 					   >"&//20013;&//25991;(&//31616;&//20307;) (Simplified Chinese)",
< 					   "zh-tw" =
< 					   >"&//20013;&//25991;(&//32321;&//20307;) (Traditional Chinese)",
< 					   "zu" = >"Zulu");
< 
< /* private */ $wgWeekdayNamesEn = array (
< 					  "Sunday", "Monday", "Tuesday",
< 					  "Wednesday", "Thursday", "Friday",
< 					  "Saturday");
< 
< /* private */ $wgMonthNamesEn = array (
< 					"January", "February", "March",
< 					"April", "May", "June", "July",
< 					"August", "September", "October",
< 					"November", "December");
< 
< /* private */ $wgMonthAbbreviationsEn = array (
< 						"Jan", "Feb", "Mar", "Apr",
< 						"May", "Jun", "Jul", "Aug",
< 						"Sep", "Oct", "Nov", "Dec");
< 
< /* private */ $wgMagicWordsEn = array (
< //   ID                                 CASE  SYNONYMS
< 					MAG_REDIRECT =
< 					>array (0, "//redirect"), MAG_NOTOC =
< 					>array (0, "__NOTOC__"),
< 					MAG_NOEDITSECTION =
< 					>array (0, "__NOEDITSECTION__"),
< 					MAG_START =
< 					>array (0, "__START__"),
< 					MAG_CURRENTMONTH =
< 					>array (1, "{{CURRENTMONTH}}"),
< 					MAG_CURRENTMONTHNAME =
< 					>array (1, "{{CURRENTMONTHNAME}}"),
< 					MAG_CURRENTDAY =
< 					>array (1, "{{CURRENTDAY}}"),
< 					MAG_CURRENTDAYNAME =
< 					>array (1, "{{CURRENTDAYNAME}}"),
< 					MAG_CURRENTYEAR =
< 					>array (1, "{{CURRENTYEAR}}"),
< 					MAG_CURRENTTIME =
< 					>array (1, "{{CURRENTTIME}}"),
< 					MAG_NUMBEROFARTICLES =
< 					>array (1, "{{NUMBEROFARTICLES}}"),
< 					MAG_CURRENTMONTHNAMEGEN =
< 					>array (1, "{{CURRENTMONTHNAMEGEN}}"),
< 					MAG_MSG =
< 					>array (0, "{{MSG:$1}}"), MAG_SUBST =
< 					>array (0, "{{SUBST:$1}}"),
< 					MAG_MSGNW =
< 					>array (0, "{{MSGNW:$1}}"), MAG_END =
< 					>array (0, "__END__"));
< 
< // All special pages have to be listed here: a description of ""
< // will make them not show up on the "Special Pages" page, which
< // is the right thing for some of them (such as the "targeted" ones).
< //
< /* private */ $wgValidSpecialPagesEn = array (
< 					       "Userlogin" = >"",
< 					       "Userlogout" = >"",
< 					       "Preferences" =
< 					       >"Set my user preferences",
< 					       "Watchlist" =
< 					       >"My watchlist",
< 					       "Recentchanges" =
< 					       >"Recently updated pages",
< 					       "Upload" =
< 					       >"Upload image files",
< 					       "Imagelist" =
< 					       >"Image list", "Listusers" =
< 					       >"Registered users",
< 					       "Statistics" =
< 					       >"Site statistics",
< 					       "Randompage" =
< 					       >"Random article",
< 					       "Lonelypages" =
< 					       >"Orphaned articles",
< 					       "Unusedimages" =
< 					       >"Orphaned images",
< 					       "Popularpages" =
< 					       >"Popular articles",
< 					       "Wantedpages" =
< 					       >"Most wanted articles",
< 					       "Shortpages" =
< 					       >"Short articles",
< 					       "Longpages" =
< 					       >"Long articles", "Newpages" =
< 					       >"Newly created articles",
< 					       "Ancientpages" =
< 					       >"Oldest articles",
< 					       "Deadendpages" =
< 					       >"Dead-end pages",
< //      "Intl"                => "Interlanguage Links",
< 					       "Allpages" =
< 					       >"All pages by title",
< 					       "Ipblocklist" =
< 					       >"Blocked users/IP addresses",
< 					       "Maintenance" =
< 					       >"Maintenance page",
< 					       "Specialpages" =
< 					       >"", "Contributions" =
< 					       >"", "Emailuser" =
< 					       >"", "Whatlinkshere" =
< 					       >"", "Recentchangeslinked" =
< 					       >"", "Movepage" =
< 					       >"", "Booksources" =
< 					       >"External book sources",
< //      "Categories"    => "Page categories",
< 					       "Export" =
< 					       >"XML page export",);
< 
< /* private */ $wgSysopSpecialPagesEn = array (
< 					       "Blockip" =
< 					       >"Block a user/IP address",
< 					       "Asksql" =
< 					       >"Query the database",
< 					       "Undelete" =
< 					       >"Restore deleted pages");
< 
< /* private */ $wgDeveloperSpecialPagesEn = array (
< 						   "Lockdb" =
< 						   >"Make database read-only",
< 						   "Unlockdb" =
< 						   >"Restore DB write access",
< 						   "Debug" =
< 						   >"Debugging information");
< 
< //-------------------------------------------------------------------
361d148
< //-------------------------------------------------------------------
366d152
< /* private */ $wgAllMessagesEn = array (
368,380c154,185
< //
< 					 "categories" = >"Page categories", "category" = >"category", "category_header" = >"Articles in category \"$1\"", "subcategories" = >"Subcategories", "linktrail" = >"/^([a-z]+)(.*)\$/sD", "mainpage" = >"Main Page", "mainpagetext" = >"Wiki software successfully installed.", "about" = >"About", "aboutwikipedia" = >"About $wgSitename", "aboutpage" = >"$wgMetaNamespace:About", "help" = >"Help", "helppage" = >"$wgMetaNamespace:Help", "wikititlesuffix" = >"$wgSitename", "bugreports" = >"Bug reports", "bugreportspage" = >"$wgMetaNamespace:Bug_reports", "sitesupport" = >"Donations", "sitesupportpage" = >"",	// If not set, won't appear. Can be wiki page or URL
< 					 "faq" = >"FAQ", "faqpage" = >"$wgMetaNamespace:FAQ", "edithelp" = >"Editing help", "edithelppage" = >"$wgMetaNamespace:How_does_one_edit_a_page", "cancel" = >"Cancel", "qbfind" = >"Find", "qbbrowse" = >"Browse", "qbedit" = >"Edit", "qbpageoptions" = >"This page", "qbpageinfo" = >"Context", "qbmyoptions" = >"My pages", "qbspecialpages" = >"Special pages", "moredotdotdot" = >"More...", "mypage" = >"My page", "mytalk" = >"My talk", "currentevents" = >"Current events", "errorpagetitle" = >"Error", "returnto" = >"Return to $1.", "fromwikipedia" = >"From $wgSitename, the free encyclopedia.", "whatlinkshere" = >"Pages that link here", "help" = >"Help", "search" = >"Search", "go" = >"Go", "history" = >"Page history", "printableversion" = >"Printable version", "editthispage" = >"Edit this page", "deletethispage" = >"Delete this page", "protectthispage" = >"Protect this page", "unprotectthispage" = >"Unprotect this page", "newpage" = >"New page", "talkpage" = >"Discuss this page", "postcomment" = >"Post a comment", "articlepage" = >"View article", "subjectpage" = >"View subject",	// For compatibility
< 					 "userpage" = >"View user page",
< 					 "wikipediapage" = >"View meta page",
< 					 "imagepage" = >"View image page",
< 					 "viewtalkpage" = >"View discussion",
< 					 "otherlanguages" = >"Other languages", "redirectedfrom" = >"(Redirected from $1)", "lastmodified" = >"This page was last modified $1.", "viewcount" = >"This page has been accessed $1 times.", "gnunote" = >"All text is available under the terms of the <a class=internal href='/wiki/GNU_FDL'>GNU Free Documentation License</a>.", "printsubtitle" = >"(From http://www.wikipedia.org)", "protectedpage" = >"Protected page", "administrators" = >"$wgMetaNamespace:Administrators", "sysoptitle" = >"Sysop access required", "sysoptext" = >"The action you have requested can only be
< performed by users with \"sysop\" status.
< See $1.", "developertitle" = >"Developer access required", "developertext" = >"The action you have requested can only be
< performed by users with \"developer\" status.
< See $1.", "nbytes" = >"$1 bytes", "go" = >"Go", "ok" = >"OK", "sitetitle" = >"$wgSitename", "sitesubtitle" = >"The Free Encyclopedia", "retrievedfrom" = >"Retrieved from \"$1\"", "newmessages" = >"You have $1.",
< 					 "newmessageslink" = >"new messages", "editsection" = >"edit", "toc" = >"Table of contents", "showtoc" = >"show", "hidetoc" = >"hide", "thisisdeleted" = >"View or restore $1?", "restorelink" = >"$1 deleted edits",
---
> $wgAllMessagesEn = array ("categories" = >"Page categories", "category" = >"category", "category_header" = >"Articles in category \"$1\"", "subcategories" = >"Subcategories", "linktrail" = >"/^([a-z]+)(.*)\$/sD", "mainlogoalt" = >"$wgSiteurlname | Main Page", "mainpage" = >"Main Page", "mainpagetext" = >"Wiki software successfully installed.", "about" = >"About", "aboutwikipedia" = >"About $wgSitename", "aboutpage" = >"$wgMetaNamespace:About", "help" = >"Help", "helppage" = >"$wgMetaNamespace:Help", "wikititlesuffix" = >"$wgSitename", "bugreports" = >"Bug reports", "bugreportspage" = >"Wikinfo:Bug_reports", "sitesupport" = >"Donations", "sitesupportpage" = >"",	// If not set, won't appear. Can be wiki page or URL
> 			  "announcetext" = >"Announcements", "announcelink" = >"Wikinfo:Announcements", "faq" = >"FAQ", "faqpage" = >"$wgMetaNamespace:FAQ", "edithelp" = >"Editing help", "edithelppage" = >"$wgMetaNamespace:How to edit a page", "cancel" = >"Cancel", "qbfind" = >"Find", "qbbrowse" = >"Browse", "qbedit" = >"Edit", "qbpageoptions" = >"This page", "qbpageinfo" = >"Context", "qbmyoptions" = >"My pages", "qbspecialpages" = >"Special pages", "moredotdotdot" = >"More...", "mypage" = >"My page", "mytalk" = >"My talk", "currentevents" = >"Current events", "errorpagetitle" = >"Error", "returnto" = >"Return to $1.", "fromwikipedia" = >"from <b>$wgSitename</b>, an internet encyclopedia", "whatlinkshere" = >"Pages that link here", "help" = >"Help", "search" = >"SEARCH", "go" = >"GO", "history" = >"Page history", "printableversion" = >"Printable version", "editthispage" = >"Edit this page", "deletethispage" = >"Delete this page", "protectthispage" = >"Protect this page", "unprotectthispage" = >"Unprotect this page", "newpage" = >"New page", "talkpage" = >"Discuss this page", "postcomment" = >"Post a comment", "articlepage" = >"View article", "subjectpage" = >"View subject",	// For compatibility
> 			  "userpage" = >"View user page",
> 			  "wikipediapage" = >"View meta page",
> 			  "imagepage" = >"View image page",
> 			  "viewtalkpage" = >"View discussion",
> 			  "otherlanguages" = >"Other languages",
> 			  "redirectedfrom" = >"(Redirected from $1)",
> 			  "lastmodified" = >"Last modified $1",
> 			  "viewcount" = >"Page accessed: $1 times",
> 			  "gnunote" =
> 			  >"<span class=\"small\">Unless used with permission of the copyright holder under the terms set forth in the article or licensed under a version of the <a class=\"internal\" href=\"?title=Creative_Commons_License\">Creative Commons</a>, or some other <a class=\"internal\" href=\"?title=Open_Source\">Open Source</a> License, all text is available under the terms of the <a class=\"internal\" href=\"?title=GNU_FDL\">GNU Free Documentation License</a>.  Images, some of which are used under the doctrine of <a class=\"internal\" href=\"?title=Fair_use\">Fair use</a> doctrine or used with permission may not be available.</span>",
> 			  "printsubtitle" =
> 			  >"(From http://www.wikinfo.org)", "protectedpage" =
> 			  >"Protected page", "administrators" =
> 			  >"$wgMetaNamespace:Administrators", "sysoptitle" =
> 			  >"Sysop access required", "sysoptext" =
> 			  >"The action you have requested can only be performed by users with \"sysop\" status. See $1.",
> 			  "developertitle" =
> 			  >"Developer access required", "developertext" =
> 			  >"The action you have requested can only be performed by users with \"developer\" status. See $1.",
> 			  "nbytes" = >"$1 bytes", "go" = >"GO", "ok" =
> 			  >"OK", "sitetitle" =
> 			  >"$wgSitename", "sitesubtitle" =
> 			  >"an internet encyclopedia", "retrievedfrom" =
> 			  >"Retrieved from \"$1\"", "newmessages" =
> 			  >"You have $1.", "newmessageslink" =
> 			  >"new messages", "editsection" = >"edit", "toc" =
> 			  >"Table of contents", "showtoc" =
> 			  >"show", "hidetoc" = >"hide", "thisisdeleted" =
> 			  >"View or restore $1?", "restorelink" =
> 			  >"$1 deleted edits",
382,387c187,192
< //
< 					 "nosuchaction" = >"No such action",
< 					 "nosuchactiontext" = >"The action specified by the URL is not
< recognized by the wiki", "nosuchspecialpage" = >"No such special page", "nospecialpagetext" =
< 					 >"You have requested a special page that is not
< recognized by the wiki.",
---
> 			  "nosuchaction" = >"No such action",
> 			  "nosuchactiontext" =
> 			  >"The action specified by the URL is not recognized by the wiki",
> 			  "nosuchspecialpage" =
> 			  >"No such special page", "nospecialpagetext" =
> 			  >"You have requested a special page that is not recognized by the wiki.",
389,423c194,234
< //
< 					 "error" = >"Error",
< 					 "databaseerror" = >"Database error",
< 					 "dberrortext" = >"A database query syntax error has occurred.
< This could be because of an illegal search query (see $5),
< or it may indicate a bug in the software.
< The last attempted database query was:
< <blockquote><tt>$1</tt></blockquote>
< from within function \"<tt>$2</tt>\".
< MySQL returned error \"<tt>$3: $4</tt>\".", "dberrortextcl" = >"A database query syntax error has occurred.
< The last attempted database query was:
< \"$1\"
< from within function \"$2\".
< MySQL returned error \"$3: $4\".\n", "noconnect" = >"Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server.", "nodb" = >"Could not select database $1", "cachederror" = >"The following is a cached copy of the requested page, and may not be up to date.", "readonly" = >"Database locked", "enterlockreason" = >"Enter a reason for the lock, including an estimate
< of when the lock will be released", "readonlytext" = >"The database is currently locked to new
< entries and other modifications, probably for routine database maintenance,
< after which it will be back to normal.
< The administrator who locked it offered this explanation:
< <p>$1", "missingarticle" = >"The database did not find the text of a page
< that it should have found, named \"$1\".
< 
< <p>This is usually caused by following an outdated diff or history link to a
< page that has been deleted.
< 
< <p>If this is not the case, you may have found a bug in the software.
< Please report this to an administrator, making note of the URL.", "internalerror" = >"Internal error",
< 					 "filecopyerror" = >"Could not copy file \"$1\" to \"$2\".", "filerenameerror" = >"Could not rename file \"$1\" to \"$2\".", "filedeleteerror" = >"Could not delete file \"$1\".", "filenotfound" = >"Could not find file \"$1\".", "unexpected" = >"Unexpected value: \"$1\"=\"$2\".", "formerror" = >"Error: could not submit form", "badarticleerror" = >"This action cannot be performed on this page.", "cannotdelete" = >"Could not delete the page or image specified. (It may have already been deleted by someone else.)", "badtitle" = >"Bad title", "badtitletext" = >"The requested page title was invalid, empty, or
< an incorrectly linked inter-language or inter-wiki title.", "perfdisabled" = >"Sorry! This feature has been temporarily disabled
< because it slows the database down to the point that no one can use
< the wiki.", "perfdisabledsub" = >"Here's a saved copy from $1:", "wrong_wfQuery_params" = >"Incorrect parameters to wfQuery()<br>
< Function: $1<br>
< Query: $2
< ", "viewsource" = >"View source", "protectedtext" = >"This page has been locked to prevent editing; there are
< a number of reasons why this may be so, please see
< [[$wgMetaNamespace:Protected page]].
---
> 			  "error" = >"Error",
> 			  "databaseerror" = >"Database error",
> // errors made nice for better security
> 			  "dberrortext" =
> 			  >"A database query syntax error has occurred, which could be due to an illegal search query, or due to a temporary database overload.  Please try again.",
> 			  "dberrortextcl" =
> 			  >"A database query syntax error has occurred.  Please try again.",
> 			  "noconnect" =
> 			  >"Sorry! The wiki is experiencing temporary technical difficulty, and cannot contact the database server.",
> 			  "nodb" =
> 			  >"Could not select database.", "cachederror" =
> 			  >"The following is a cached copy of the requested page, and may not be up to date.",
> 			  "readonly" = >"Database locked", "enterlockreason" =
> 			  >"Enter a reason for the lock. Include an estimate of when the database will be released for writing:",
> 			  "readonlytext" =
> 			  >"The database is currently locked to new entries and other modifications, probably for routine database maintenance, after which it will be back to normal. The administrator who locked it offered this explanation: <p$1</p>",
> 			  "missingarticle" =
> 			  >"The database did not find the text of a page that it should have found, named \"$1\".<br /><br />This is usually caused by following an outdated difference or a \"history\" link to a now deleted page. <p>If this is not the case, you may have found a bug in the software. Please report this to an administrator, making note of the URL.",
> 			  "internalerror" =
> 			  >"Internal error", "filecopyerror" =
> 			  >"Could not copy file \"$1\" to \"$2\".",
> 			  "filerenameerror" =
> 			  >"Could not rename file \"$1\" to \"$2\".",
> 			  "filedeleteerror" =
> 			  >"Could not delete file \"$1\".", "filenotfound" =
> 			  >"Could not find file \"$1\".", "unexpected" =
> 			  >"Unexpected value: \"$1\"=\"$2\".", "formerror" =
> 			  >"Error: could not submit form", "badarticleerror" =
> 			  >"This action cannot be performed on this page.",
> 			  "cannotdelete" =
> 			  >"Could not delete the page or image specified. (It may have already been deleted by someone else.)",
> 			  "badtitle" = >"Bad title", "badtitletext" =
> 			  >"The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title.",
> 			  "perfdisabled" =
> 			  >"Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.",
> 			  "perfdisabledsub" =
> 			  >"Here's a saved copy from $1:",
> 			  "wrong_wfQuery_params" =
> 			  >"Incorrect parameters to wfQuery()<br />Function: $1<br />Query: $2",
> 			  "viewsource" = >"View source", "protectedtext" =
> 			  >"This page has been locked to prevent editing; there are a number of reasons why this may be so, please see [[$wgMetaNamespace:Protected page]].
427,444c238,275
< //
< 					 "logouttitle" = >"User logout",
< 					 "logouttext" = >"You are now logged out.
< You can continue to use $wgSitename anonymously, or you can log in
< again as the same or as a different user. Note that some pages may
< continue to be displayed as if you were still logged in, until you clear
< your browser cache\n", "welcomecreation" = >"<h2>Welcome, $1!</h2><p>Your account has been created.
< Don't forget to personalize your wikipedia preferences.", "loginpagetitle" = >"User login",
< 					 "yourname" = >"Your user name", "yourpassword" = >"Your password", "yourpasswordagain" = >"Retype password", "newusersonly" = >" (new users only)", "remembermypassword" = >"Remember my password across sessions.", "loginproblem" = >"<b>There has been a problem with your login.</b><br>Try again!", "alreadyloggedin" = >"<font color=red><b>User $1, you are already logged in!</b></font><br>\n", "login" = >"Log in", "loginprompt" = >"You must have cookies enabled to log in to $wgSitename.", "userlogin" = >"Log in", "logout" = >"Log out", "userlogout" = >"Log out", "notloggedin" = >"Not logged in", "createaccount" = >"Create new account", "createaccountmail" = >"by eMail", "badretype" = >"The passwords you entered do not match.", "userexists" = >"The user name you entered is already in use. Please choose a different name.", "youremail" = >"Your e-mail*", "yournick" = >"Your nickname (for signatures)", "emailforlost" = >"* Entering an email address is optional.  But it enables people to
< contact you through the website without you having to reveal your 
< email address to them, and it also helps you if you forget your   
< password.", "loginerror" = >"Login error", "nocookiesnew" = >"The user account was created, but you are not logged in. $wgSitename uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.", "nocookieslogin" = >"$wgSitename uses cookies to log in users. You have cookies disabled. Please enable them and try again.", "noname" = >"You have not specified a valid user name.", "loginsuccesstitle" = >"Login successful", "loginsuccess" = >"You are now logged in to $wgSitename as \"$1\".", "nosuchuser" = >"There is no user by the name \"$1\".
< Check your spelling, or use the form below to create a new user account.", "wrongpassword" = >"The password you entered is incorrect. Please try again.", "mailmypassword" = >"Mail me a new password", "passwordremindertitle" = >"Password reminder from $wgSitename", "passwordremindertext" = >"Someone (probably you, from IP address $1)
< requested that we send you a new $wgSitename login password.
< The password for user \"$2\" is now \"$3\".
< You should log in and change your password now.", "noemail" = >"There is no e-mail address recorded for user \"$1\".", "passwordsent" = >"A new password has been sent to the e-mail address
< registered for \"$1\".
< Please log in again after you receive it.",
---
> 			  "logouttitle" = >"User logout", "logouttext" = >"You are now logged out. You can continue to use $wgSitename anonymously, or you can log in again as the same or as a different user. Note that some pages may continue to be displayed as if you were still logged in, until you clear your browser cache\n", "welcomecreation" = >"<h2>Welcome, $1!</h2><p>Your account has been created. Don't forget to personalize your wikipedia preferences.</p>", "loginpagetitle" = >"User login", "yourname" = >"Your user name", "yourpassword" = >"Your password", "yourpasswordagain" = >"Retype password", "newusersonly" = >"New users", "remembermypassword" = >"Remember my password across sessions.", "loginproblem" = >"<b>There has been a problem with your login.</b><br />Try again!", "alreadyloggedin" = >"<span class=\"error\"><b>User $1, you are already logged in!</b></span><br />\n", "login" = >"Log in", "loginbutton" = >"LOG IN", "loginprompt" = >"<ul><li>log in <b>separately</b> for each domain, wikinfo or internet-encyclopedia (cookie security)</li><li>login refusals can be solved by <i>deleting the cookie</i> in your browser and trying again. <a class=\"internal\" href=\"?title=Wikinfo:Bug_reports\">More</a></li></ul>",	//  You must have cookies enabled to log in to $wgSitename.
> 			  "userlogin" = >"Log in",
> 			  "logout" = >"Log out",
> 			  "userlogout" = >"Log out",
> 			  "notloggedin" = >"Not logged in",
> 			  "createaccount" = >"NEW ACCOUNT",
> 			  "createaccountmail" = >"CREATE BY EMAIL",
> 			  "badretype" =
> 			  >"The passwords you entered do not match.",
> 			  "userexists" =
> 			  >"The user name you entered is already in use. Please choose a different name.",
> 			  "youremail" = >"Your email address", "youremail2" =
> 			  >"Your email", "yournick" =
> 			  >"Your Nickname (For Signatures)", "emailforlost" =
> 			  >"Note: Entering an email address is optional.  But it enables people to contact you through the website without you having to reveal your email address to them, and it also helps you if you forget your password.",
> 			  "loginerror" = >"Login Error", "nocookiesnew" =
> 			  >"The user account was created, but you are not logged in. $wgSitename uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.",
> 			  "nocookieslogin" =
> 			  >"$wgSitename uses cookies to log in users. You have cookies disabled. Please enable them and try again.",
> 			  "noname" =
> 			  >"You have not specified a valid user name.",
> 			  "loginsuccesstitle" =
> 			  >"Login successful", "loginsuccess" =
> 			  >"You are now logged in to $wgSitename as \"$1\".",
> 			  "nosuchuser" =
> 			  >"There is no user by the name \"$1\". Check your spelling, or use the form below to create a new user account.",
> 			  "wrongpassword" =
> 			  >"The password you entered is incorrect. Please try again.",
> 			  "mailmypassword" =
> 			  >"EMAIL ME A NEW PASSWORD",
> 			  "passwordremindertitle" =
> 			  >"Password reminder from $wgSitename",
> 			  "passwordremindertext" =
> 			  >"Someone (probably you, from IP address $1) requested that we send you a new $wgSitename login password. The password for user \"$2\" is now \"$3\". You should log in and change your password now.",
> 			  "noemail" =
> 			  >"There is no email address recorded for user \"$1\".",
> 			  "passwordsent" =
> 			  >"A new password has been sent to the email address registered for \"$1\". Please log in again after you receive it.",
446,451c277,287
< //
< 					 "summary" = >"Summary",
< 					 "subject" = >"Subject/headline",
< 					 "minoredit" = >"This is a minor edit", "watchthis" = >"Watch this article", "savearticle" = >"Save page", "preview" = >"Preview", "showpreview" = >"Show preview", "blockedtitle" = >"User is blocked", "blockedtext" = >"Your user name or IP address has been blocked by $1.
< The reason given is this:<br>''$2''<p>You may contact $1 or one of the other
< [[$wgMetaNamespace:Administrators|administrators]] to discuss the block. 
---
> 			  "summary" = >"Summary",
> 			  "subject" = >"Subject/headline",
> 			  "minoredit" = >"This is a minor edit",
> 			  "watchthis" = >"Watch this article",
> 			  "savearticle" = >"SAVE PAGE",
> 			  "preview" = >"Preview",
> 			  "showpreview" = >"SHOW PREVIEW",
> 			  "blockedtitle" = >"User is blocked",
> 			  "blockedtext" = >"Your user name or IP address has been blocked by $1. The reason given is:<br />''$2''
> 
> You may contact $1 or one of the other [[$wgMetaNamespace:Administrators|administrators]] to discuss the block.
457,458c293,294
< ==Note to AOL users==
< Due to continuing acts of vandalism by one particular AOL user, Wikipedia often blocks AOL proxies. Unfortunately, a single proxy server may be used by a large number of AOL users, and hence innocent AOL users are often inadvertently blocked. We apologise for any inconvenience caused. 
---
> ===Note to AOL users===
> Due to acts of vandalism by some AOL users, we can and may often block AOL proxies. Unfortunately, a single proxy server may be used by a large number of AOL users, and hence innocent AOL users are often inadvertently blocked. We apologise for any inconvenience caused. 
460,491c296,301
< If this happens to you, please email an administrator, using an AOL email address. Be sure to include the IP address given above.
< ", "whitelistedittitle" = >"Login required to edit", "whitelistedittext" = >"You have to [[Special:Userlogin|login]] to edit articles.", "whitelistreadtitle" = >"Login required to read", "whitelistreadtext" = >"You have to [[Special:Userlogin|login]] to read articles.", "whitelistacctitle" = >"You are not allowed to create an account", "whitelistacctext" = >"To be allowed to create accounts in this Wiki you have to [[Special:Userlogin|log]] in and have the appropriate permissions.", "accmailtitle" = >"Password sent.", "accmailtext" = >"The Password for '$1' has been sent to $2.", "newarticle" = >"(New)", "newarticletext" = >"You've followed a link to a page that doesn't exist yet.
< To create the page, start typing in the box below 
< (see the [[$wgMetaNamespace:Help|help page]] for more info).
< If you are here by mistake, just click your browser's '''back''' button.", "anontalkpagetext" = >"---- ''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical [[IP address]] to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.'' ", "noarticletext" = >"(There is currently no text in this page)", "updated" = >"(Updated)", "note" = >"<strong>Note:</strong> ", "previewnote" = >"Remember that this is only a preview, and has not yet been saved!", "previewconflict" = >"This preview reflects the text in the upper
< text editing area as it will appear if you choose to save.", "editing" = >"Editing $1", "sectionedit" = >" (section)",
< 					 "commentedit" = >" (comment)", "editconflict" = >"Edit conflict: $1", "explainconflict" = >"Someone else has changed this page since you
< started editing it.
< The upper text area contains the page text as it currently exists.
< Your changes are shown in the lower text area.
< You will have to merge your changes into the existing text.
< <b>Only</b> the text in the upper text area will be saved when you
< press \"Save page\".\n<p>", "yourtext" = >"Your text", "storedversion" = >"Stored version", "editingold" = >"<strong>WARNING: You are editing an out-of-date
< revision of this page.
< If you save it, any changes made since this revision will be lost.</strong>\n", "yourdiff" = >"Differences",
< // FIXME: This is inappropriate for third-party use!
< 					 "copyrightwarning" = >"Please note that all contributions to $wgSitename are
< considered to be released under the GNU Free Documentation License
< (see $1 for details).
< If you don't want your writing to be edited mercilessly and redistributed
< at will, then don't submit it here.<br>
< You are also promising us that you wrote this yourself, or copied it from a
< public domain or similar free resource.
< <strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>",
< 					 "longpagewarning" = >"WARNING: This page is $1 kilobytes long; some
< browsers may have problems editing pages approaching or longer than 32kb.
< Please consider breaking the page into smaller sections.", "readonlywarning" = >"WARNING: The database has been locked for maintenance,
< so you will not be able to save your edits right now. You may wish to cut-n-paste
< the text into a text file and save it for later.", "protectedpagewarning" = >"WARNING:  This page has been locked so that only
< users with sysop privileges can edit it. Be sure you are following the
< <a href='/wiki/$wgMetaNamespace:Protected_page_guidelines'>protected page
< guidelines</a>.",
---
> If this happens to you, please email an administrator, using an AOL email address. Be sure to include the IP address given above.", "whitelistedittitle" = >"Login required to edit", "whitelistedittext" = >"You have to [[Special:Userlogin|login]] to edit articles.", "whitelistreadtitle" = >"Login required to read",
> 			  "whitelistreadtext" = >"You have to [[Special:Userlogin|login]] to read articles.", "whitelistacctitle" = >"You are not allowed to create an account", "whitelistacctext" = >"To be allowed to create accounts in this Wiki you have to [[Special:Userlogin|log]] in and have the appropriate permissions.", "accmailtitle" = >"Password sent.", "accmailtext" = >"The Password for '$1' has been sent to $2.", "newarticle" = >"(New)", "newarticletext" = >"<em>The article requested does not yet exist on Internet-Encyclopedia, however, if a Wikipedia article currently exists by the same name, it is included below. To save or create the article, press \"Save Page\" or edit/type within the box and then Save. (see the [[$wgMetaNamespace:Help|help page]] for more info).</em>", "anontalkpagetext" = >"---- ''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical [[IP address]] to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.'' ", "noarticletext" = >"<em>This article needs your help.  If available, it has been imported from Wikipedia without images (below).  Click on \"Edit this Page\" to re-import the latest Wikipedia version and begin editing for $wgSitename.  If no Wikipedia article is available by the same name, you can create one for $wgSitename.</em>", "updated" = >"(Updated)", "note" = >"<span class=\"strong\">Note:</span> ", "previewnote" = >"This is only a <b>preview</b>, and has not yet been saved!", "previewconflict" = >"This preview reflects the text in the upper text editing area as it will appear if you choose to save.", "editing" = >"Editing $1", "sectionedit" = >" (section)", "commentedit" = >" (comment)", "editconflict" = >"Edit conflict: $1", "explainconflict" = >"Someone else has changed this page since you started editing it. The upper text area contains the page text as it currently exists. Your changes are shown in the lower text area. You will have to merge your changes into the existing text. <b>Only</b> the text in the upper text area will be saved when you press \"Save page\".\n<br /><br />", "yourtext" = >"Your text", "storedversion" = >"Stored version", "editingold" = >"<strong>WARNING: You are editing an out-of-date revision of this page. If you save it, any changes made since this revision will be lost.</strong>\n", "yourdiff" = >"Differences", "copyrightwarning" = >"<b>NOTE</b>: Your contributions to $wgSitename, if not licensed under another <a class=\"internal\" href=\"?title=Open_Source\">Open Source</a> license such as <a class=\"internal\" href=\"?title=Creative_Commons_License\">Creative Commons</a>, or used with permission of the copyright holder, are considered released under the <a class=\"internal\" href=\"?title=GNU_FDL\">GNU Free Documentation License</a>.  Articles released under GNU may be edited by others and redistributed.  If you are not releasing your contributions under these terms, you need to explicitly set forth your terms of release within this article. You represent that contributions are yours, public domain, fair use copies, or that you have obtained permission of the copyright holder for <i>this</i> use.
> <ul>
> 	<li><b>DO NOT</b> SUBMIT COPYRIGHT PROTECTED WORK WITHOUT PERMISSION!</li>
> 	<li>Please see <a class=\"internal\" href=\"?title=Wikinfo:Copyrights\">Copyrights</a> for details.</li>
> </ul>", "longpagewarning" = >"NOTE: This page is $1 kilobytes long.  If your browser has problems editing pages approaching or longer than 32kb, edit this page within sections.", "readonlywarning" = >"WARNING: The database has been locked for maintenance, so you will not be able to save your edits right now. You may wish to cut-n-paste the text into a text file and save it for later.", "protectedpagewarning" = >"WARNING:  This page has been locked so that only users with sysop privileges can edit it. Be sure you are following the <a href=\"title=?$wgMetaNamespace:Policies_and_guidelines\">guidelines</a>.",
493,498c303,314
< //
< 					 "revhistory" = >"Revision history",
< 					 "nohistory" = >"There is no edit history for this page.", "revnotfound" = >"Revision not found", "revnotfoundtext" = >"The old revision of the page you asked for could not be found.
< Please check the URL you used to access this page.\n", "loadhist" = >"Loading page history",
< 					 "currentrev" = >"Current revision", "revisionasof" = >"Revision as of $1", "cur" = >"cur", "next" = >"next", "last" = >"last", "orig" = >"orig", "histlegend" = >"Legend: (cur) = difference with current version,
< (last) = difference with preceding version, M = minor edit",
---
> 			  "revhistory" = >"Revision history",
> 			  "nohistory" =
> 			  >"There is no edit history for this page.",
> 			  "revnotfound" =
> 			  >"Revision not found", "revnotfoundtext" =
> 			  >"The old revision of the page you asked for could not be found. Please check the URL you used to access this page.\n",
> 			  "loadhist" = >"Loading page history", "currentrev" =
> 			  >"Current Revision", "revisionasof" =
> 			  >"Revision as of $1", "cur" = >"cur", "next" =
> 			  >"next", "last" = >"last", "orig" =
> 			  >"orig", "histlegend" =
> 			  >"Legend: (cur) = difference with current version, (last) = difference with preceding version, M = minor edit",
500,507c316,320
< //
< 					 "difference" =
< 					 >"(Difference between revisions)",
< 					 "loadingrev" =
< 					 >"loading revision for diff",
< 					 "lineno" =
< 					 >"Line $1:", "editcurrent" =
< 					 >"Edit the current version of this page",
---
> 			  "difference" = >"(Difference between revisions)",
> 			  "loadingrev" = >"loading revision for diff",
> 			  "lineno" = >"Line $1:",
> 			  "editcurrent" =
> 			  >"Edit the current version of this page",
509,524c322,328
< //
< 					 "searchresults" = >"Search results",
< 					 "searchhelppage" = >"$wgMetaNamespace:Searching", "searchingwikipedia" = >"Searching $wgSitename", "searchresulttext" = >"For more information about searching $wgSitename, see $1.", "searchquery" = >"For query \"$1\"", "badquery" = >"Badly formed search query", "badquerytext" = >"We could not process your query.
< This is probably because you have attempted to search for a
< word fewer than three letters long, which is not yet supported.
< It could also be that you have mistyped the expression, for
< example \"fish and and scales\".
< Please try another query.", "matchtotals" = >"The query \"$1\" matched $2 article titles
< and the text of $3 articles.", "nogomatch" = >"No page with this exact title exists, trying full text search.",
< 					 "titlematches" = >"Article title matches", "notitlematches" = >"No article title matches", "textmatches" = >"Article text matches", "notextmatches" = >"No article text matches", "prevn" = >"previous $1", "nextn" = >"next $1", "viewprevnext" = >"View ($1) ($2) ($3).", "showingresults" = >"Showing below <b>$1</b> results starting with //<b>$2</b>.", "showingresultsnum" = >"Showing below <b>$3</b> results starting with //<b>$2</b>.", "nonefound" = >"<strong>Note</strong>: unsuccessful searches are
< often caused by searching for common words like \"have\" and \"from\",
< which are not indexed, or by specifying more than one search term (only pages
< containing all of the search terms will appear in the result).", "powersearch" = >"Search", "powersearchtext" = >"
< Search in namespaces :<br>
< $1<br>
< $2 List redirects   Search for $3 $9", "searchdisabled" = >"<p>Sorry! Full text search has been disabled temporarily, for performance reasons. In the meantime, you can use the Google search below, which may be out of date.</p>
---
> 			  "searchresults" = >"Search results",
> 			  "searchhelppage" = >"$wgMetaNamespace:Searching",
> 			  "searchingwikipedia" = >"Searching $wgSitename",
> 			  "searchresulttext" = >"For more information about searching $wgSitename, see $1.", "searchquery" = >"For query \"$1\"", "badquery" = >"Badly formed search query", "badquerytext" = >"We could not process your query. This is probably because you have attempted to search for a word fewer than three letters long, which is not yet supported. It could also be that you have mistyped the expression, for example \"fish and and scales\". Please try another query.", "matchtotals" = >"The query \"$1\" matched $2 article titles and the text of $3 articles.", "nogomatch" = >"No page with this exact title exists, trying full text search.", "titlematches" = >"Article title matches", "notitlematches" = >"No article title matches", "textmatches" = >"Article text matches", "notextmatches" = >"No article text matches", "prevn" = >"previous $1", "nextn" = >"next $1", "viewprevnext" = >"View ($1) ($2) ($3).", "showingresults" = >"Showing below <b>$1</b> results starting with //<b>$2</b>.", "showingresultsnum" = >"Showing below <b>$3</b> results starting with //<b>$2</b>.", "nonefound" = >"<span class=\"strong\">Note</span>: unsuccessful searches are often caused by searching for common words like \"have\" and \"from\", which are not indexed, or by specifying more than one search term (only pages containing all of the search terms will appear in the result).", "powersearch" = >"SEARCH", "powersearchtext" = >"<b>Search Namespaces</b><br />
> $1
> <hr />
> $3 $9     $2 list redirects", "searchdisabled" = >"<p>Sorry! Full text search has been disabled temporarily, for performance reasons. In the meantime, you can use the Google search below, which may be out of date.</p>
527,543c331,343
< <FORM method=GET action=\"http://www.google.com/search\">
< <TABLE bgcolor=\"//FFFFFF\"><tr><td>
< <A HREF=\"http://www.google.com/\">
< <IMG SRC=\"http://www.google.com/logos/Logo_40wht.gif\"
< border=\"0\" ALT=\"Google\"></A>
< </td>
< <td>
< <INPUT TYPE=text name=q size=31 maxlength=255 value=\"$1\">
< <INPUT type=submit name=btnG VALUE=\"Google Search\">
< <font size=-1>
< <input type=hidden name=domains value=\"{$wgServer}\"><br><input type=radio name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch value=\"{$wgServer}\" checked> {$wgServer} <br>
< <input type='hidden' name='ie' value='$2'>
< <input type='hidden' name='oe' value='$2'>
< </font>
< </td></tr></TABLE>
< </FORM>
< <!-- SiteSearch Google -->", "blanknamespace" = >"(Main)",
---
> <a href=\"http://www.google.com/\"><img src=\"http://www.google.com/logos/Logo_40wht.gif\" alt=\"Google\" /></a>
> <form method=\"get\" action=\"http://www.google.com/search\">
> 	<input type=\"text\" name=\"q\" size=\"31\" maxlength=\"255\" value=\"$1\" />
> 	<INPUT type=\"submit\" name=\"btnG\" VALUE=\"Google Search\" />
> 	<input type=\"hidden\" name=\"domains\" value=\"{$wgServer}\" /><br />
> 	<input type=\"radio\" name=\"sitesearch\" value=\"\"> WWW 
> 	<input type=\"radio\" name=\"sitesearch\" value=\"{$wgServer}\" checked=\"checked\" /> {$wgServer} <br />
> 	<input type=\"hidden\" name=\"ie\" value=\"$2\" />
> 	<input type=\"hidden\" name=\"oe\" value=\"$2\" />
> </form>
> <!-- SiteSearch Google -->
> 
> ", "blanknamespace" = >"(Main)",
545,556c345,354
< //
< 					 "preferences" = >"Preferences",
< 					 "prefsnologin" = >"Not logged in",
< 					 "prefsnologintext" = >"You must be <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a>
< to set user preferences.", "prefslogintext" = >"You are logged in as \"$1\".
< Your internal ID number is $2.
< 
< See [[$wgMetaNamespace:User preferences help]] for help deciphering the options.", "prefsreset" = >"Preferences have been reset from storage.",
< 					 "qbsettings" = >"Quickbar settings", "changepassword" = >"Change password", "skin" = >"Skin", "math" = >"Rendering math", "dateformat" = >"Date format", "math_failure" = >"Failed to parse", "math_unknown_error" = >"unknown error", "math_unknown_function" = >"unknown function ", "math_lexing_error" = >"lexing error",
< 					 "math_syntax_error" = >"syntax error", "saveprefs" = >"Save preferences", "resetprefs" = >"Reset preferences", "oldpassword" = >"Old password", "newpassword" = >"New password", "retypenew" = >"Retype new password", "textboxsize" = >"Textbox dimensions", "rows" = >"Rows", "columns" = >"Columns", "searchresultshead" = >"Search result settings",
< 					 "resultsperpage" = >"Hits to show per page", "contextlines" = >"Lines to show per hit", "contextchars" = >"Characters of context per line", "stubthreshold" = >"Threshold for stub display", "recentchangescount" = >"Number of titles in recent changes", "savedprefs" = >"Your preferences have been saved.", "timezonetext" = >"Enter number of hours your local time differs
< from server time (UTC).", "localtime" = >"Local time display", "timezoneoffset" = >"Offset", "servertime" = >"Server time is now", "guesstimezone" = >"Fill in from browser", "emailflag" = >"Disable e-mail from other users", "defaultns" = >"Search in these namespaces by default:",
---
> 			  "preferences" = >"Preferences",
> 			  "prefsnologin" = >"Not logged in",
> 			  "prefsnologintext" = >"You must be <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a> to set user preferences.", "prefslogintext" = >"<li>You are logged in as [[User:$1|$1]] ([[User_Talk:$1|Talk]])</li>
> 	<li>Incidentally, your user ID is $2</li>
> 	<li>See [[$wgMetaNamespace:User preferences help|User preferences help]] for tips about the options below</li>",
> 			  "prefsreset" = >"Preferences have been reset from storage.", "qbsettings" = >"Quickbar Placement (Main Links)", "changepassword" = >"Change Password", "skin" = >"Skin (Visual Style)", "math" = >"Math Formula Rendering", "dateformat" = >"Date format", "math_failure" = >"Failed to parse", "math_unknown_error" = >"unknown error", "math_unknown_function" = >"unknown function ",
> 			  "math_lexing_error" = >"lexing error", "math_syntax_error" = >"syntax error", "saveprefs" = >"SAVE ALL", "resetprefs" = >"RESET ALL", "oldpassword" = >"Old Password", "newpassword" = >"New Password", "retypenew" = >"Retype New Password", "textboxsize" = >"Textbox Dimensions (Editbox)", "rows" = >"Rows", "columns" = >"Columns", "interactivefeatures" = >"Interactive Features",
> 			  "searchresultshead" = >"Search Result Settings", "resultsperpage" = >"Hits to show per search page", "contextlines" = >"Lines to show per hit", "contextchars" = >"Characters of context per line", "stubthreshold" = >"Threshold for stub display", "recentchangescount" = >"Default items in <a href=\"?title=Special:Specialpages\">Special Pages</a>",
> 			  "savedprefs" = >"Your preferences have been saved.", "timezonetext" = >"number of hours your local time differs from GMT/UTC", "localtime" = >"Your 24 Hour Local Time", "timezoneoffset" = >"Your hours of difference from GMT/UTC", "servertime" = >"24 Hour Server Time (GMT/UTC)", "guesstimezone" = >"SET FROM BROWSER", "emailflag" = >"Disable e-mail from other users",
> 			  "defaultns" = >"Default Namespaces (For Searches)",
558,569c356,364
< //
< 					 "changes" = >"changes",
< 					 "recentchanges" = >"Recent changes",
< 					 "recentchangestext" =
< 					 >"Track the most recent changes to the wiki on this page.",
< 					 "rcloaderr" =
< 					 >"Loading recent changes", "rcnote" =
< 					 >"Below are the last <strong>$1</strong> changes in last <strong>$2</strong> days.",
< 					 "rcnotefrom" =
< 					 >"Below are the changes since <b>$2</b> (up to <b>$1</b> shown).",
< 					 "rclistfrom" =
< 					 >"Show new changes starting from $1",
---
> 			  "changes" = >"changes",
> 			  "recentchanges" = >"Recent changes",
> 			  "recentchangestext" =
> 			  >"Track the most recent changes to the wiki on this page.",
> 			  "rcloaderr" = >"Loading recent changes", "rcnote" =
> 			  >"Below are the last <strong>$1</strong> changes in last <strong>$2</strong> days.",
> 			  "rcnotefrom" =
> 			  >"Below are the changes since <b>$2</b> (up to <b>$1</b> shown).",
> 			  "rclistfrom" = >"Show new changes starting from $1",
572,585c367,378
< 					 "showhideminor" = >"$1 minor edits",
< 					 "rclinks" =
< 					 >"Show last $1 changes in last $2 days; $3",
< 					 "rchide" =
< 					 >"in $4 form; $1 minor edits; $2 secondary namespaces; $3 multiple edits.",
< 					 "rcliu" =
< 					 >"; $1 edits from logged in users",
< 					 "diff" = >"diff", "hist" =
< 					 >"hist", "hide" = >"hide", "show" =
< 					 >"show", "tableform" =
< 					 >"table", "listform" =
< 					 >"list", "nchanges" =
< 					 >"$1 changes", "minoreditletter" =
< 					 >"M", "newpageletter" = >"N",
---
> 			  "showhideminor" = >"$1 minor edits",
> 			  "rclinks" =
> 			  >"Show last $1 changes in last $2 days; $3",
> 			  "rchide" =
> 			  >"in $4 form; $1 minor edits; $2 secondary namespaces; $3 multiple edits.",
> 			  "rcliu" =
> 			  >"; $1 edits from logged in users", "diff" =
> 			  >"diff", "hist" = >"hist", "hide" =
> 			  >"hide ", "show" = >"show", "tableform" =
> 			  >"table", "listform" = >"list", "nchanges" =
> 			  >"$1 changes", "minoreditletter" =
> 			  >"M", "newpageletter" = >"N",
587,621c380,394
< //
< 					 "upload" = >"Upload file",
< 					 "uploadbtn" = >"Upload file",
< 					 "uploadlink" = >"Upload images",
< 					 "reupload" = >"Re-upload",
< 					 "reuploaddesc" = >"Return to the upload form.", "uploadnologin" = >"Not logged in", "uploadnologintext" = >"You must be <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a>
< to upload files.", "uploadfile" = >"Upload images, sounds, documents etc.", "uploaderror" = >"Upload error", "uploadtext" = >"<strong>STOP!</strong> Before you upload here,
< make sure to read and follow the <a href=\"".wfLocalUrlE ("$wgMetaNamespace:Image_use_policy")."\">image use policy</a>.
< <p>If a file with the name you are specifying already
< exists on the wiki, it'll be replaced without warning.
< So unless you mean to update a file, it's a good idea
< to first check if such a file exists.
< <p>To view or search previously uploaded images,
< go to the <a href=\"".wfLocalUrlE ("Special:Imagelist")."\">list of uploaded images</a>.
< Uploads and deletions are logged on the <a href=\"".wfLocalUrlE ("$wgMetaNamespace:Upload_log")."\">upload log</a>.
< <p>Use the form below to upload new image files for use in
< illustrating your articles.
< On most browsers, you will see a \"Browse...\" button, which will
< bring up your operating system's standard file open dialog.
< Choosing a file will fill the name of that file into the text
< field next to the button.
< You must also check the box affirming that you are not
< violating any copyrights by uploading the file.
< Press the \"Upload\" button to finish the upload.
< This may take some time if you have a slow internet connection.
< <p>The preferred formats are JPEG for photographic images, PNG
< for drawings and other iconic images, and OGG for sounds.
< Please name your files descriptively to avoid confusion.
< To include the image in an article, use a link in the form
< <b>[[image:file.jpg]]</b> or <b>[[image:file.png|alt text]]</b>
< or <b>[[media:file.ogg]]</b> for sounds.
< <p>Please note that as with wiki pages, others may edit or
< delete your uploads if they think it serves the encyclopedia, and
< you may be blocked from uploading if you abuse the system.", "uploadlog" = >"upload log", "uploadlogpage" = >"Upload_log", "uploadlogpagetext" = >"Below is a list of the most recent file uploads.
< All times shown are server time (UTC).
---
> 			  "upload" = >"Upload File", "uploadbtn" = >"UPLOAD FILE", "uploadlink" = >"Upload images", "reupload" = >"RE-UPLOAD", "reuploaddesc" = >"Return to the upload form.", "uploadnologin" = >"Not logged in", "uploadnologintext" = >"You must be <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a> to upload files.", "uploadfile" = >"Upload form",	// change to suit
> 			  "uploaderror" = >"Upload error",
> 			  "uploadexplain" = >"Enhance your articles with images (200k or smaller)", "uploadtext" = >"
> <ul>
> 	<li><b>WAIT</b>: Before you upload a file, make sure you <b>read and follow</b> the <a href=\"".wfLocalUrlE ("$wgMetaNamespace:Image_use_policy")."\">image use policy</a>.</li>  
> 	<li>If a file with the name you are specifying already exists on the wiki, it will be replaced without warning.  Unless you are updating a file, first check if such a file already exists.</li>
> 	<li>To view or search previously uploaded images, go to the <a href=\"".wfLocalUrlE ("Special:Imagelist")."\">list of uploaded images</a>.  Uploads and deletions are not currrently logged.</li>
> 	<li>You should see a \"Browse...\" button above, which opens a file open dialog. Choosing a file will fill the name of that file into the text field next to the button.</li>
> 	<li>You must also check the box affirming you are <b>not</b> violating any copyrights by uploading the file.</li>
> 	<li>Press the \"Upload\" button ONCE, and depending upon your internet connection and the file's size, you will be shown a status.</li>
> 	<li>Recommended formats are JPG for photos, PNG for drawings, GIF for animations. Please name your files descriptively to avoid confusion.</li>
> 	<li>Use links in the form <b>[[image:file.jpg]]</b> or  <b>[[image:file.png|description]]</b>, and <b>[[image:file.jpg|thumb|right|scale:50|description]]</b> for thumbnails.</li>
> 	<li>Remember, as with wiki pages, others may edit or delete your uploads if it would better serve the encyclopedia, and you may be blocked from uploading again if you abuse it.</li>
> </ul>", "uploadlog" = >"upload log", "uploadlogpage" = >"Upload_log",
> 			  "uploadlogpagetext" = >"Below is a list of the most recent file uploads. All times shown are server time (UTC).
624,630c397
< ", "filename" = >"Filename", "filedesc" = >"Summary", "filestatus" = >"Copyright status", "filesource" = >"Source", "affirmation" = >"I affirm that the copyright holder of this file
< agrees to license it under the terms of the $1.", "copyrightpage" = >"$wgMetaNamespace:Copyrights", "copyrightpagename" = >"$wgSitename copyright", "uploadedfiles" = >"Uploaded files",
< 					 "noaffirmation" = >"You must affirm that your upload does not violate
< any copyrights.", "ignorewarning" = >"Ignore warning and save file anyway.", "minlength" = >"Image names must be at least three letters.", "badfilename" = >"Image name has been changed to \"$1\".", "badfiletype" = >"\".$1\" is not a recommended image file format.", "largefile" = >"It is recommended that images not exceed 100k in size.", "successfulupload" = >"Successful upload", "fileuploaded" = >"File \"$1\" uploaded successfully.
< Please follow this link: ($2) to the description page and fill
< in information about the file, such as where it came from, when it was
< created and by whom, and anything else you may know about it.", "uploadwarning" = >"Upload warning", "savefile" = >"Save file", "uploadedimage" = >"uploaded \"$1\"",
---
> ", "filename" = >"Filename", "filedesc" = >"Summary", "filestatus" = >"Copyright status", "filesource" = >"Source", "affirmation" = >"<b>I affirm</b>: file is available under <a href=\"?title=Fair_use\">Fair use</a> or copyright holder releases it for $wgSitename.", "copyrightpage" = >"$wgMetaNamespace:Copyrights", "copyrightpagename" = >"$wgSitename copyright", "uploadedfiles" = >"Uploaded files", "noaffirmation" = >"You must affirm that your upload does not violate any copyrights.", "ignorewarning" = >"Ignore warning and save file anyway.", "minlength" = >"Image names must be at least three letters.", "badfilename" = >"Image name has been changed to \"$1\".", "badfiletype" = >"\".$1\" is not a recommended image file format.", "largefile" = >"Files cannot exceed 150k in size.", "successfulupload" = >"Successful upload", "fileuploaded" = >"File \"$1\" uploaded successfully. Please follow this link: ($2) to the description page and fill in information about the file, such as where it came from, when it was created and by whom, and anything else you may know about it.", "uploadwarning" = >"Upload warning", "savefile" = >"SAVE FILE", "uploadedimage" = >"uploaded \"$1\"",
632,637c399,417
< //
< 					 "imagelist" = >"Image list",
< 					 "imagelisttext" = >"Below is a list of $1 images sorted $2.", "getimagelist" = >"fetching image list", "ilshowmatch" = >"Show all images with names matching", "ilsubmit" = >"Search", "showlast" = >"Show last $1 images sorted $2.", "all" = >"all", "byname" = >"by name", "bydate" = >"by date", "bysize" = >"by size", "imgdelete" = >"del", "imgdesc" = >"desc", "imglegend" = >"Legend: (desc) = show/edit image description.", "imghistory" = >"Image history", "revertimg" = >"rev", "deleteimg" = >"del", "imghistlegend" = >"Legend: (cur) = this is the current image, (del) = delete
< this old version, (rev) = revert to this old version.
< <br><i>Click on date to see image uploaded on that date</i>.", "imagelinks" = >"Image links",
< 					 "linkstoimage" = >"The following pages link to this image:", "nolinkstoimage" = >"There are no pages that link to this image.",
---
> 			  "imagelist" = >"Image list",
> 			  "imagelisttext" =
> 			  >"Below is a list of $1 images sorted $2.",
> 			  "getimagelist" =
> 			  >"fetching image list", "ilshowmatch" =
> 			  >"Show all images with names matching", "ilsubmit" =
> 			  >"SEARCH", "showlast" =
> 			  >"Show last $1 images sorted $2.", "all" =
> 			  >"all", "byname" = >"by name", "bydate" =
> 			  >"by date", "bysize" = >"by size", "imgdelete" =
> 			  >"del", "imgdesc" = >"more", "imglegend" =
> 			  >"Legend: (more) = show/edit image description.",
> 			  "imghistory" = >"Image history", "revertimg" =
> 			  >"rev", "deleteimg" = >"del", "imghistlegend" =
> 			  >"Legend: (cur) = this is the current image, (del) = delete this old version, (rev) = revert to this old version. <br /><i>Click on date to see image uploaded on that date</i>.",
> 			  "imagelinks" = >"Image links", "linkstoimage" =
> 			  >"The following pages link to this image:",
> 			  "nolinkstoimage" =
> 			  >"There are no pages that link to this image.",
639,651c419,425
< //
< 					 "statistics" = >"Statistics",
< 					 "sitestats" = >"Site statistics",
< 					 "userstats" = >"User statistics",
< 					 "sitestatstext" = >"There are <b>$1</b> total pages in the database.
< This includes \"talk\" pages, pages about $wgSitename, minimal \"stub\"
< pages, redirects, and others that probably don't qualify as articles.
< Excluding those, there are <b>$2</b> pages that are probably legitimate
< articles.<p>
< There have been a total of <b>$3</b> page views, and <b>$4</b> page edits
< since the software was upgraded (July 20, 2002).
< That comes to <b>$5</b> average edits per page, and <b>$6</b> views per edit.", "userstatstext" = >"There are <b>$1</b> registered users.
< <b>$2</b> of these are administrators (see $3).",
---
> 			  "statistics" = >"Statistics",
> 			  "sitestats" = >"Site statistics",
> 			  "userstats" = >"User statistics",
> 			  "sitestatstext" =
> 			  >"There are <b>$1</b> total pages in the database. This includes \"talk\" pages, pages about $wgSitename, minimal \"stub\" pages, redirects, and others which generally do not qualify as articles. Excluding those, there are <b>$2</b> pages which appear to be articles proper.  There have been a total of <b>$3</b> page views, and <b>$4</b> page edits since the database was initialized (July, 2003). That comes to <b>$5</b> average edits per page, and <b>$6</b> views per edit.",
> 			  "userstatstext" =
> 			  >"There are <b>$1</b> registered users. <b>$2</b> of these are administrators (see $3).",
653,688c427,455
< //
< 					 "maintenance" = >"Maintenance page",
< 					 "maintnancepagetext" =
< 					 >"This page includes several handy tools for everyday maintenance. Some of these functions tend to stress the database, so please do not hit reload after every item you fixed ;-)",
< 					 "maintenancebacklink" =
< 					 >"Back to Maintenance Page",
< 					 "disambiguations" =
< 					 >"Disambiguation pages",
< 					 "disambiguationspage" =
< 					 >"$wgMetaNamespace:Links_to_disambiguating_pages",
< 					 "disambiguationstext" =
< 					 >"The following articles link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br>A page is treated as disambiguation if it is linked from $1.<br>Links from other namespaces are <i>not</i> listed here.",
< 					 "doubleredirects" =
< 					 >"Double Redirects",
< 					 "doubleredirectstext" =
< 					 >"<b>Attention:</b> This list may contain false positives. That usually means there is additional text with links below the first //REDIRECT.<br>\nEach row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" taget article, which the first redirect should point to.",
< 					 "brokenredirects" =
< 					 >"Broken Redirects",
< 					 "brokenredirectstext" =
< 					 >"The following redirects link to a non-existing article.",
< 					 "selflinks" =
< 					 >"Pages with Self Links",
< 					 "selflinkstext" =
< 					 >"The following pages contain a link to themselves, which they should not.",
< 					 "mispeelings" =
< 					 >"Pages with misspellings",
< 					 "mispeelingstext" =
< 					 >"The following pages contain a common misspelling, which are listed on $1. The correct spelling might be given (like this).",
< 					 "mispeelingspage" =
< 					 >"List of common misspellings",
< 					 "missinglanguagelinks" =
< 					 >"Missing Language Links",
< 					 "missinglanguagelinksbutton" =
< 					 >"Find missing language links for",
< 					 "missinglanguagelinkstext" =
< 					 >"These articles do <i>not</i> link to their counterpart in $1. Redirects and subpages are <i>not</i> shown.",
---
> 			  "maintenance" = >"Maintenance page",
> 			  "maintnancepagetext" =
> 			  >"This page includes several handy tools for everyday maintenance. Some of these functions stress the database server, and may take longer to render.",
> 			  "maintenancebacklink" =
> 			  >"Back to Maintenance Page", "disambiguations" =
> 			  >"Disambiguation pages", "disambiguationspage" =
> 			  >"$wgMetaNamespace:Disambiguation",
> 			  "disambiguationstext" =
> 			  >"The following articles link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br>A page is treated as disambiguation if it is linked from $1.<br />Links from other namespaces are <i>not</i> listed here.",
> 			  "doubleredirects" =
> 			  >"Double Redirects", "doubleredirectstext" =
> 			  >"<b>Attention:</b> This list may contain false positives. That usually means there is additional text with links below the first //REDIRECT.<br />\nEach row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" taget article, which the first redirect should point to.",
> 			  "brokenredirects" =
> 			  >"Broken Redirects", "brokenredirectstext" =
> 			  >"The following redirects link to a non-existing article.",
> 			  "selflinks" =
> 			  >"Pages with Self Links", "selflinkstext" =
> 			  >"The following pages contain a link to themselves, which they should not.",
> 			  "mispeelings" =
> 			  >"Pages with misspellings", "mispeelingstext" =
> 			  >"The following pages contain common misspellings, listed on $1. The correct spelling might be given (like this).",
> 			  "mispeelingspage" =
> 			  >"List of common misspellings",
> 			  "missinglanguagelinks" =
> 			  >"Missing Language Links",
> 			  "missinglanguagelinksbutton" =
> 			  >"FIND MISSING LANGUAGE LINKS",
> 			  "missinglanguagelinkstext" =
> 			  >"These articles do <i>not</i> link to their counterpart in $1. Redirects and subpages are <i>not</i> shown.",
690,715c457,489
< //
< 					 "orphans" = >"Orphaned pages",
< 					 "lonelypages" = >"Orphaned pages",
< 					 "unusedimages" = >"Unused images",
< 					 "popularpages" = >"Popular pages",
< 					 "nviews" = >"$1 views",
< 					 "wantedpages" = >"Wanted pages",
< 					 "nlinks" = >"$1 links",
< 					 "allpages" = >"All pages",
< 					 "randompage" = >"Random page",
< 					 "shortpages" = >"Short pages",
< 					 "longpages" = >"Long pages",
< 					 "deadendpages" = >"Dead-end pages",
< 					 "listusers" = >"User list",
< 					 "specialpages" = >"Special pages",
< 					 "spheading" = >"Special pages for all users", "sysopspheading" = >"For sysop use only", "developerspheading" = >"For developer use only", "protectpage" = >"Protect page", "recentchangeslinked" = >"Related changes", "rclsub" = >"(to pages linked from \"$1\")", "debug" = >"Debug", "newpages" = >"New pages", "ancientpages" = >"Oldest articles", "intl" = >"Interlanguage links", "movethispage" = >"Move this page", "unusedimagestext" = >"<p>Please note that other web sites
< such as the international Wikipedias may link to an image with
< a direct URL, and so may still be listed here despite being
< in active use.", "booksources" = >"Book sources",
< // FIXME: Other sites, of course, may have affiliate relations with the booksellers list
< 					 "booksourcetext" = >"Below is a list of links to other sites that
< sell new and used books, and may also have further information
< about books you are looking for.
< $wgSitename is not affiliated with any of these businesses, and
< this list should not be construed as an endorsement.",
< 					 "alphaindexline" = >"$1 to $2",
---
> 			  "orphans" = >"Orphaned pages",
> 			  "lonelypages" = >"Orphaned pages",
> 			  "unusedimages" = >"Unused images",
> 			  "missingimages" = >"Missing images",
> 			  "neglectedpages" = >"Neglected pages",
> 			  "vote" = >"User Votes",
> 			  "popularpages" = >"Popular pages",
> 			  "nviews" = >"$1 views",
> 			  "wantedpages" = >"Wanted pages",
> 			  "nlinks" = >"$1 links",
> 			  "allpages" = >"All pages",
> 			  "randompage" = >"Random page",
> 			  "shortpages" = >"Short pages",
> 			  "longpages" = >"Long pages",
> 			  "deadendpages" = >"Dead-end pages",
> 			  "listusers" = >"User list",
> 			  "specialpages" = >"Special pages",
> 			  "spheading" = >"Special pages for all users",
> 			  "sysopspheading" = >"For sysop use only",
> 			  "developerspheading" = >"For developer use only",
> 			  "protectpage" = >"Protect page",
> 			  "recentchangeslinked" = >"Related changes",
> 			  "rclsub" = >"(to pages linked from \"$1\")",
> 			  "debug" = >"Debug",
> 			  "newpages" = >"New pages",
> 			  "ancientpages" = >"Oldest articles",
> 			  "intl" = >"Interlanguage links",
> 			  "movethispage" = >"Move this page",
> 			  "unusedimagestext" =
> 			  >"<p>Please note that other websites, such as the international Wikipedias, may link to an image with a direct URL, and so may still be listed here despite being in active use.</p>",
> 			  "booksources" = >"Book sources", "booksourcetext" =
> 			  >"Below is a list of links to other sites that sell new and used books, and may also have further information about books you are looking for. $wgSitename is not affiliated with any of these businesses, and this list should not be construed as an endorsement.",
> 			  "alphaindexline" = >"$1 to $2",
717,727c491,508
< //
< 					 "mailnologin" = >"No send address",
< 					 "mailnologintext" = >"You must be <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a>
< and have a valid e-mail address in your <a href=\"".wfLocalUrl ("Special:Preferences")."\">preferences</a>
< to send e-mail to other users.", "emailuser" = >"E-mail this user", "emailpage" = >"E-mail user",
< 					 "emailpagetext" = >"If this user has entered a valid e-mail address in
< his or her user preferences, the form below will send a single message.
< The e-mail address you entered in your user preferences will appear
< as the \"From\" address of the mail, so the recipient will be able
< to reply.", "noemailtitle" = >"No e-mail address", "noemailtext" = >"This user has not specified a valid e-mail address,
< or has chosen not to receive e-mail from other users.", "emailfrom" = >"From", "emailto" = >"To", "emailsubject" = >"Subject", "emailmessage" = >"Message", "emailsend" = >"Send", "emailsent" = >"E-mail sent", "emailsenttext" = >"Your e-mail message has been sent.",
---
> 			  "mailnologin" = >"No send address",
> 			  "mailnologintext" =
> 			  >"You must be <a href=\"".
> 			  wfLocalUrl ("Special:Userlogin").
> 			  "\">logged in</a> and have a valid email address in your <a href=\"".
> 			  wfLocalUrl ("Special:Preferences").
> 			  "\">preferences</a> to send email to other users.",
> 			  "emailuser" = >"Email this user", "emailpage" =
> 			  >"Email User", "emailpagetext" =
> 			  >"If the user has a valid email address in their preferences, the form below will send a message directly to it. The email address you entered in your user preferences will appear as the \"From\" address of the mail, so the recipient will be able to reply.",
> 			  "noemailtitle" =
> 			  >"No email address", "noemailtext" =
> 			  >"This user has not specified a valid email address, or has chosen not to receive email from other users.",
> 			  "emailfrom" = >"From", "emailto" =
> 			  >"To", "emailsubject" = >"Subject", "emailmessage" =
> 			  >"Message", "emailsend" = >"SEND", "emailsent" =
> 			  >"Email sent", "emailsenttext" =
> 			  >"Your email message has been sent.",
729,744c510,552
< //
< 					 "watchlist" = >"My watchlist",
< 					 "watchlistsub" = >"(for user \"$1\")", "nowatchlist" = >"You have no items on your watchlist.", "watchnologin" = >"Not logged in", "watchnologintext" = >"You must be <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a>
< to modify your watchlist.", "addedwatch" = >"Added to watchlist", "addedwatchtext" = >"The page \"$1\" has been added to your <a href=\"".wfLocalUrl ("Special:Watchlist")."\">watchlist</a>.
< Future changes to this page and its associated Talk page will be listed there,
< and the page will appear <b>bolded</b> in the <a href=\"".wfLocalUrl ("Special:Recentchanges")."\">list of recent changes</a> to
< make it easier to pick out.</p>
< 
< <p>If you want to remove the page from your watchlist later, click \"Stop watching\" in the sidebar.",
< 					 "removedwatch" = >"Removed from watchlist", "removedwatchtext" = >"The page \"$1\" has been removed from your watchlist.", "watchthispage" = >"Watch this page", "unwatchthispage" = >"Stop watching", "notanarticle" = >"Not an article", "watchnochange" = >"None of your watched items were edited in the time period displayed.", "watchdetails" = >"($1 pages watched not counting talk pages;
< $2 total pages edited since cutoff;
< $3...
< <a href='$4'>show and edit complete list</a>.)", "watchmethod-recent" = >"checking recent edits for watched pages", "watchmethod-list" = >"checking watched pages for recent edits", "removechecked" = >"Remove checked items from watchlist", "watchlistcontains" = >"Your watchlist contains $1 pages.", "watcheditlist" = >"Here's an alphabetical list of your
< watched pages. Check the boxes of pages you want to remove
< from your watchlist and click the 'remove checked' button
< at the bottom of the screen.", "removingchecked" = >"Removing requested items from watchlist...", "couldntremove" = >"Couldn't remove item '$1'...", "iteminvalidname" = >"Problem with item '$1', invalid name...", "wlnote" = >"Below are the last $1 changes in the last <b>$2</b> hours.", "wlshowlast" = >"Show last $1 hours $2 days $3",
---
> 			  "watchlist" = >"My watchlist",
> 			  "watchlistsub" = >"(for user \"$1\")",
> 			  "nowatchlist" =
> 			  >"You have no items on your watchlist.",
> 			  "watchnologin" =
> 			  >"Not logged in", "watchnologintext" =
> 			  >"You must be <a href=\"".
> 			  wfLocalUrl ("Special:Userlogin").
> 			  "\">logged in</a> to modify your watchlist.",
> 			  "addedwatch" =
> 			  >"Added to watchlist", "addedwatchtext" =
> 			  >"<p>The page \"$1\" has been added to your <a href=\"".
> 			  wfLocalUrl ("Special:Watchlist").
> 			  "\">watchlist</a>. Future changes to this page and its associated Talk page will be listed there, and the page will appear <b>bolded</b> in the <a href=\"".
> 			  wfLocalUrl ("Special:Recentchanges").
> 			  "\">list of recent changes</a> to make it easier to pick out.</p>\n<p>If you want to remove the page from your watchlist later, click \"Stop watching\" in the sidebar.</p>",
> 			  "removedwatch" =
> 			  >"Removed from watchlist", "removedwatchtext" =
> 			  >"The page \"$1\" has been removed from your watchlist.",
> 			  "watchthispage" =
> 			  >"Watch this page", "unwatchthispage" =
> 			  >"Stop watching", "notanarticle" =
> 			  >"Not an article", "watchnochange" =
> 			  >"None of your watched items were edited in the time period displayed.",
> 			  "watchdetails" =
> 			  >"<ul><li>You are watching <b>$1</b> articles, not counting their Talk pages (<a class=\"internal\" href=\"$4\">list</a>)</li>\n<li>The Talk pages for your watches are included in the details below</li>\n<li><b>$2</b> edits have been made in the selected time period</li>\n<li><em>$3</em>...</li></ul>",
> 			  "watchmethod-recent" =
> 			  >"checking recent edits for watched pages",
> 			  "watchmethod-list" =
> 			  >"checking watched pages for recent edits",
> 			  "removechecked" =
> 			  >"REMOVE CHECKED ITEMS", "watchlistcontains" =
> 			  >"Your watchlist contains $1 pages.",
> 			  "watcheditlist" =
> 			  >"Here's an alphabetical list of your watched pages. Check the boxes of pages you want to remove from your watchlist and click the 'remove checked' button at the bottom of the screen.",
> 			  "removingchecked" =
> 			  >"Removing requested items from watchlist...",
> 			  "couldntremove" =
> 			  >"Couldn't remove item '$1'...", "iteminvalidname" =
> 			  >"Problem with item '$1', invalid name...",
> 			  "wlnote" =
> 			  >"Below are the last $1 changes in the last <b>$2</b> hours.",
> 			  "wlshowlast" = >"Show last $1 hours $2 days $3",
746,763c554,582
< //
< 					 "deletepage" = >"Delete page",
< 					 "confirm" = >"Confirm",
< 					 "excontent" = >"content was:",
< 					 "exbeforeblank" = >"content before blanking was:", "exblank" = >"page was empty", "confirmdelete" = >"Confirm delete", "deletesub" = >"(Deleting \"$1\")", "historywarning" = >"Warning: The page you are about to delete has a history: ", "confirmdeletetext" = >"You are about to permanently delete a page
< or image along with all of its history from the database.
< Please confirm that you intend to do this, that you understand the
< consequences, and that you are doing this in accordance with
< [[$wgMetaNamespace:Policy]].", "confirmcheck" = >"Yes, I really want to delete this.", "actioncomplete" = >"Action complete", "deletedtext" = >"\"$1\" has been deleted.
< See $2 for a record of recent deletions.", "deletedarticle" = >"deleted \"$1\"", "dellogpage" = >"Deletion_log", "dellogpagetext" = >"Below is a list of the most recent deletions.
< All times shown are server time (UTC).
< <ul>
< </ul>
< ", "deletionlog" = >"deletion log", "reverted" = >"Reverted to earlier revision", "deletecomment" = >"Reason for deletion", "imagereverted" =
< 					 >"Revert to earlier version was successful.", "rollback" = >"Roll back edits", "rollbacklink" = >"rollback", "rollbackfailed" = >"Rollback failed", "cantrollback" = >"Cannot revert edit; last contributor is only author of this article.", "alreadyrolled" = >"Cannot rollback last edit of [[$1]]
< by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the article already. 
< 
< Last edit was by [[User:$3|$3]] ([[User talk:$3|Talk]]). ",
---
> 			  "deletepage" = >"Delete page",
> 			  "confirm" = >"Confirm",
> 			  "excontent" = >"content was:",
> 			  "exbeforeblank" = >"content before blanking was:",
> 			  "exblank" = >"page was empty",
> 			  "confirmdelete" = >"Confirm delete",
> 			  "deletesub" = >"(Deleting \"$1\")",
> 			  "historywarning" =
> 			  >"Warning: The page you are about to delete has a history: ",
> 			  "confirmdeletetext" =
> 			  >"You are about to permanently delete a page or image along with all of its history from the database. Please confirm that you intend to do this, that you understand the consequences, and that you are doing this in accordance with [[$wgMetaNamespace:Policy]].",
> 			  "confirmcheck" =
> 			  >"Yes, I really want to delete this.",
> 			  "actioncomplete" =
> 			  >"Action complete", "deletedtext" =
> 			  >"\"$1\" has been deleted. See $2 for a record of recent deletions.",
> 			  "deletedarticle" = >"deleted \"$1\"", "dellogpage" =
> 			  >"Deletion_log", "dellogpagetext" =
> 			  >"Below is a list of the most recent deletions. All times shown are server time (UTC).",
> 			  "deletionlog" = >"deletion log", "reverted" =
> 			  >"Reverted to earlier revision", "deletecomment" =
> 			  >"Reason for deletion", "imagereverted" =
> 			  >"Revert to earlier version was successful.",
> 			  "rollback" = >"Roll back edits", "rollbacklink" =
> 			  >"rollback", "rollbackfailed" =
> 			  >"Rollback failed", "cantrollback" =
> 			  >"Cannot revert edit; last contributor is only author of this article.",
> 			  "alreadyrolled" =
> 			  >"Cannot rollback last edit of [[$1]] by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the article already.  Last edit was by [[User:$3|$3]] ([[User talk:$3|Talk]]). ",
765,767c584,592
< 					 "editcomment" = >"The edit comment was: \"<i>$1</i>\".", "revertpage" = >"Reverted to last edit by $1", "protectlogpage" = >"Protection_log", "protectlogtext" = >"Below is a list of page locks/unlocks.
< See [[$wgMetaNamespace:Protected page]] for more information.",
< 					 "protectedarticle" = >"protected [[$1]]", "unprotectedarticle" = >"unprotected [[$1]]",
---
> 			  "editcomment" =
> 			  >"The edit comment was: \"<i>$1</i>\".",
> 			  "revertpage" =
> 			  >"Reverted to last edit by $1", "protectlogpage" =
> 			  >"Protection_log", "protectlogtext" =
> 			  >"Below is a list of page locks/unlocks. See [[$wgMetaNamespace:Protected page]] for more information.",
> 			  "protectedarticle" =
> 			  >"protected [[$1]]", "unprotectedarticle" =
> 			  >"unprotected [[$1]]",
769,776c594,606
< 					 "undelete" = >"Restore deleted page",
< 					 "undeletepage" = >"View and restore deleted pages", "undeletepagetext" = >"The following pages have been deleted but are still in the archive and
< can be restored. The archive may be periodically cleaned out.", "undeletearticle" = >"Restore deleted article",
< 					 "undeleterevisions" = >"$1 revisions archived", "undeletehistory" = >"If you restore the page, all revisions will be restored to the history.
< If a new page with the same name has been created since the deletion, the restored
< revisions will appear in the prior history, and the current revision of the live page
< will not be automatically replaced.", "undeleterevision" = >"Deleted revision as of $1", "undeletebtn" = >"Restore!", "undeletedarticle" = >"restored \"$1\"", "undeletedtext" = >"The article [[$1]] has been successfully restored.
< See [[$wgMetaNamespace:Deletion_log]] for a record of recent deletions and restorations.",
---
> 			  "undelete" = >"Restore deleted page",
> 			  "undeletepage" = >"View and restore deleted pages",
> 			  "undeletepagetext" =
> 			  >"The following pages have been deleted but are still in the archive and can be restored. The archive may be periodically cleaned out.",
> 			  "undeletearticle" =
> 			  >"Restore deleted article", "undeleterevisions" =
> 			  >"$1 revisions archived", "undeletehistory" =
> 			  >"If you restore the page, all revisions will be restored to the history. If a new page with the same name has been created since the deletion, the restored revisions will appear in the prior history, and the current revision of the live page will not be automatically replaced.",
> 			  "undeleterevision" =
> 			  >"Deleted revision as of $1", "undeletebtn" =
> 			  >"RESTORE NOW", "undeletedarticle" =
> 			  >"restored \"$1\"", "undeletedtext" =
> 			  >"The article [[$1]] has been successfully restored. See [[$wgMetaNamespace:Deletion_log]] for a record of recent deletions and restorations.",
778,788c608,617
< //
< 					 "contributions" =
< 					 >"User contributions", "mycontris" =
< 					 >"My contributions", "contribsub" =
< 					 >"For $1", "nocontribs" =
< 					 >"No changes were found matching these criteria.",
< 					 "ucnote" =
< 					 >"Below are this user's last <b>$1</b> changes in the last <b>$2</b> days.",
< 					 "uclinks" =
< 					 >"View the last $1 changes; view the last $2 days.",
< 					 "uctop" = >" (top)",
---
> 			  "contributions" = >"User contributions",
> 			  "mycontris" = >"My contributions",
> 			  "contribsub" = >"For $1",
> 			  "nocontribs" =
> 			  >"No changes were found matching these criteria.",
> 			  "ucnote" =
> 			  >"Below are this user's last <b>$1</b> changes in the last <b>$2</b> days.",
> 			  "uclinks" =
> 			  >"View the last $1 changes; view the last $2 days.",
> 			  "uctop" = >" (top)",
790,795c619,627
< //
< 					 "whatlinkshere" = >"What links here",
< 					 "notargettitle" = >"No target",
< 					 "notargettext" = >"You have not specified a target page or user
< to perform this function on.", "linklistsub" = >"(List of links)", "linkshere" = >"The following pages link to here:",
< 					 "nolinkshere" = >"No pages link to here.", "isredirect" = >"redirect page",
---
> 			  "whatlinkshere" = >"What links here",
> 			  "notargettitle" = >"No target",
> 			  "notargettext" =
> 			  >"You have not specified a target page or user to perform this function on.",
> 			  "linklistsub" = >"(List of links)", "linkshere" =
> 			  >"The following pages link to here:",
> 			  "nolinkshere" =
> 			  >"No pages link to here.", "isredirect" =
> 			  >"redirect page",
797,810c629,655
< //
< 					 "blockip" = >"Block user",
< 					 "blockiptext" = >"Use the form below to block write access
< from a specific IP address or username.
< This should be done only only to prevent vandalism, and in
< accordance with [[$wgMetaNamespace:Policy|policy]].
< Fill in a specific reason below (for example, citing particular
< pages that were vandalized).", "ipaddress" = >"IP Address/username", "ipbreason" = >"Reason",
< 					 "ipbsubmit" = >"Block this user", "badipaddress" = >"No user exists by that name", "noblockreason" = >"You must supply a reason for the block.", "blockipsuccesssub" = >"Block succeeded", "blockipsuccesstext" = >"\"$1\" has been blocked.
< <br>See [[Special:Ipblocklist|IP block list]] to review blocks.", "unblockip" = >"Unblock user", "unblockiptext" = >"Use the form below to restore write access
< to a previously blocked IP address or username.", "ipusubmit" = >"Unblock this address", "ipusuccess" = >"\"$1\" unblocked", "ipblocklist" = >"List of blocked IP addresses and usernames", "blocklistline" = >"$1, $2 blocked $3", "blocklink" = >"block", "unblocklink" = >"unblock", "contribslink" = >"contribs", "autoblocker" = >"Autoblocked because you share an IP address with \"$1\". Reason \"$2\".", "blocklogpage" = >"Block_log", "blocklogentry" = >'blocked "$1"',
< 					 "blocklogtext" = >"This is a log of user blocking and unblocking actions. Automatically 
< blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for
< the list of currently operational bans and blocks.", "unblocklogentry" = >'unblocked "$1"',
---
> 			  "blockip" = >"Block user",
> 			  "blockiptext" =
> 			  >"Use the form below to block write access from a specific IP address or username. This should be done only only to prevent vandalism, and in accordance with [[$wgMetaNamespace:Policy|policy]]. Fill in a specific reason below (for example, citing particular pages that were vandalized).",
> 			  "ipaddress" = >"IP Address/username", "ipbreason" =
> 			  >"Reason", "ipbsubmit" =
> 			  >"BLOCK THIS USER", "badipaddress" =
> 			  >"No user exists by that name", "noblockreason" =
> 			  >"You must supply a reason for the block.",
> 			  "blockipsuccesssub" =
> 			  >"Block succeeded", "blockipsuccesstext" =
> 			  >"\"$1\" has been blocked. <br>See [[Special:Ipblocklist|IP block list]] to review blocks.",
> 			  "unblockip" = >"Unblock user", "unblockiptext" =
> 			  >"Use the form below to restore write access to a previously blocked IP address or username.",
> 			  "ipusubmit" =
> 			  >"UNBLOCK THIS ADDRESS", "ipusuccess" =
> 			  >"\"$1\" unblocked", "ipblocklist" =
> 			  >"List of blocked IP addresses and usernames",
> 			  "blocklistline" =
> 			  >"$1, $2 blocked $3", "blocklink" =
> 			  >"block", "unblocklink" =
> 			  >"unblock", "contribslink" =
> 			  >"contribs", "autoblocker" =
> 			  >"Autoblocked because you share an IP address with \"$1\". Reason \"$2\".",
> 			  "blocklogpage" = >"Block_log", "blocklogentry" =
> 			  >'blocked "$1"', "blocklogtext" =
> 			  >"This is a log of user blocking and unblocking actions. Automatically blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for the list of currently operational bans and blocks.",
> 			  "unblocklogentry" = >'unblocked "$1"',
812,824c657,675
< //
< 					 "lockdb" = >"Lock database",
< 					 "unlockdb" = >"Unlock database",
< 					 "lockdbtext" = >"Locking the database will suspend the ability of all
< users to edit pages, change their preferences, edit their watchlists, and
< other things requiring changes in the database.
< Please confirm that this is what you intend to do, and that you will
< unlock the database when your maintenance is done.", "unlockdbtext" = >"Unlocking the database will restore the ability of all
< users to edit pages, change their preferences, edit their watchlists, and
< other things requiring changes in the database.
< Please confirm that this is what you intend to do.", "lockconfirm" = >"Yes, I really want to lock the database.",
< 					 "unlockconfirm" = >"Yes, I really want to unlock the database.", "lockbtn" = >"Lock database", "unlockbtn" = >"Unlock database", "locknoconfirm" = >"You did not check the confirmation box.", "lockdbsuccesssub" = >"Database lock succeeded", "unlockdbsuccesssub" = >"Database lock removed", "lockdbsuccesstext" = >"The database has been locked.
< <br>Remember to remove the lock after your maintenance is complete.", "unlockdbsuccesstext" = >"The database has been unlocked.",
---
> 			  "lockdb" = >"Lock Database",
> 			  "unlockdb" = >"Unlock Database",
> 			  "lockdbtext" =
> 			  >"Locking the database will suspend the ability of all users to edit pages, change their preferences, edit their watchlists, and other things requiring changes in the database. Please confirm that this is what you intend to do, and that you will unlock the database when your maintenance is done.",
> 			  "unlockdbtext" =
> 			  >"Unlocking the database will restore the ability of all users to edit pages, change their preferences, edit their watchlists, and other things requiring changes in the database. Please confirm that this is what you intend to do.",
> 			  "lockconfirm" =
> 			  >"Yes, I really want to lock the database.",
> 			  "unlockconfirm" =
> 			  >"Yes, I really want to unlock the database.",
> 			  "lockbtn" = >"LOCK DATABASE", "unlockbtn" =
> 			  >"UNLOCK DATABASE", "locknoconfirm" =
> 			  >"You did not check the confirmation box.",
> 			  "lockdbsuccesssub" =
> 			  >"Database lock succeeded", "unlockdbsuccesssub" =
> 			  >"Database lock removed", "lockdbsuccesstext" =
> 			  >"The database has been locked. <br>Remember to remove the lock after your maintenance is complete.",
> 			  "unlockdbsuccesstext" =
> 			  >"The database has been unlocked.",
826,833c677,685
< //
< 					 "asksql" = >"SQL query",
< 					 "asksqltext" = >"Use the form below to make a direct query of the
< database.
< Use single quotes ('like this') to delimit string literals.
< This can often add considerable load to the server, so please use
< this function sparingly.", "sqlislogged" = >"Please note that all queries are logged.",
< 					 "sqlquery" = >"Enter query", "querybtn" = >"Submit query", "selectonly" = >"Only read-only queries are allowed.", "querysuccessful" = >"Query successful",
---
> 			  "asksql" = >"SQL query",
> 			  "asksqltext" =
> 			  >"Use the form below to make a direct query of the database. Use single quotes ('like this') to delimit string literals. This can often add considerable load to the server, so please use this function sparingly.",
> 			  "sqlislogged" =
> 			  >"Please note that all queries are logged.",
> 			  "sqlquery" = >"Enter query", "querybtn" =
> 			  >"SUBMIT QUERY", "selectonly" =
> 			  >"Only read-only queries are allowed.",
> 			  "querysuccessful" = >"Query successful",
835,854c687,692
< //
< 					 "movepage" = >"Move page",
< 					 "movepagetext" = >"Using the form below will rename a page, moving all
< of its history to the new name.
< The old title will become a redirect page to the new title.
< Links to the old page title will not be changed; be sure to
< [[Special:Maintenance|check]] for double or broken redirects.
< You are responsible for making sure that links continue to
< point where they are supposed to go.
< 
< Note that the page will '''not''' be moved if there is already
< a page at the new title, unless it is empty or a redirect and has no
< past edit history. This means that you can rename a page back to where
< it was just renamed from if you make a mistake, and you cannot overwrite
< an existing page.
< 
< <b>WARNING!</b>
< This can be a drastic and unexpected change for a popular page;
< please be sure you understand the consequences of this before
< proceeding.", "movepagetalktext" = >"The associated talk page, if any, will be automatically moved along with it '''unless:'''
---
> 			  "movepage" = >"Move Page",
> 			  "movepagetext" = >"Using the form below will rename a page, moving all of its history to the new name. The old title will become a redirect page to the new title. Links to the old page title will not be changed; be sure to [[Special:Maintenance|check]] for double or broken redirects. You are responsible for making sure that links continue to point where they are supposed to go.  
> 
> Note that the page will '''not''' be moved if there is already a page at the new title, unless it is empty or a redirect and has no past edit history. This means that you can rename a page back to where it was just renamed from if you make a mistake, and you cannot overwrite an existing page.
> 
> <b>WARNING!</b> This can be a drastic and unexpected change for a popular page; please be sure you understand the consequences of this before proceeding.", "movepagetalktext" = >"The associated talk page, if any, will be automatically moved along with it '''unless:'''
860,1233c698,703
< 					 "movearticle" = >"Move page", "movenologin" = >"Not logged in", "movenologintext" = >"You must be a registered user and <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a>
< to move a page.", "newtitle" = >"To new title", "movepagebtn" = >"Move page", "pagemovedsub" = >"Move succeeded", "pagemovedtext" = >"Page \"[[$1]]\" moved to \"[[$2]]\".", "articleexists" = >"A page of that name already exists, or the
< name you have chosen is not valid.
< Please choose another name.", "talkexists" = >"The page itself was moved successfully, but the
< talk page could not be moved because one already exists at the new
< title. Please merge them manually.", "movedto" = >"moved to", "movetalk" = >"Move \"talk\" page as well, if applicable.", "talkpagemoved" = >"The corresponding talk page was also moved.", "talkpagenotmoved" = >"The corresponding talk page was <strong>not</strong> moved.", "export" = >"Export pages", "exporttext" = >"You can export the text and editing history of a particular
< page or set of pages wrapped in some XML; this can then be imported into another
< wiki running MediaWiki software, transformed, or just kept for your private
< amusement.", "exportcuronly" = >"Include only the current revision, not the full history",
< // Namespace 8 related
< 					 "allmessages" = >"All_messages",
< 					 "allmessagestext" =
< 					 >"This is a list of all messages available in the MediaWiki: namespace");
< 
< //--------------------------------------------------------------------------
< // Internationalisation code
< //--------------------------------------------------------------------------
< 
< class Language
< {
< 
<   function getDefaultUserOptions ()
<   {
<     global $wgDefaultUserOptionsEn;
<       return $wgDefaultUserOptionsEn;
<   }
< 
<   function getBookstoreList ()
<   {
<     global $wgBookstoreListEn;
<     return $wgBookstoreListEn;
<   }
< 
<   function getNamespaces ()
<   {
<     global $wgNamespaceNamesEn;
<     return $wgNamespaceNamesEn;
<   }
< 
<   function getNsText ($index)
<   {
<     global $wgNamespaceNamesEn;
<     return $wgNamespaceNamesEn[$index];
<   }
< 
<   function getNsIndex ($text)
<   {
<     global $wgNamespaceNamesEn;
< 
<     foreach ($wgNamespaceNamesEn as $i = >$n)
<     {
<       if (0 == strcasecmp ($n, $text))
< 	{
< 	  return $i;
< 	}
<     }
<     return false;
<   }
< 
<   function specialPage ($name)
<   {
<     return $this->getNsText (Namespace::getSpecial ()).":".$name;
<   }
< 
<   function getQuickbarSettings ()
<   {
<     global $wgQuickbarSettingsEn;
<     return $wgQuickbarSettingsEn;
<   }
< 
<   function getSkinNames ()
<   {
<     global $wgSkinNamesEn;
<     return $wgSkinNamesEn;
<   }
< 
<   function getMathNames ()
<   {
<     global $wgMathNamesEn;
<     return $wgMathNamesEn;
<   }
< 
<   function getDateFormats ()
<   {
<     global $wgDateFormatsEn;
<     return $wgDateFormatsEn;
<   }
< 
<   function getUserToggles ()
<   {
<     global $wgUserTogglesEn;
<     return $wgUserTogglesEn;
<   }
< 
<   function getLanguageNames ()
<   {
<     global $wgLanguageNamesEn;
<     return $wgLanguageNamesEn;
<   }
< 
<   function getLanguageName ($code)
<   {
<     global $wgLanguageNamesEn;
<     if (!array_key_exists ($code, $wgLanguageNamesEn))
<       {
< 	return "";
<       }
<     return $wgLanguageNamesEn[$code];
<   }
< 
<   function getMonthName ($key)
<   {
<     global $wgMonthNamesEn;
<     return $wgMonthNamesEn[$key - 1];
<   }
< 
<   /* by default we just return base form */
<   function getMonthNameGen ($key)
<   {
<     global $wgMonthNamesEn;
<     return $wgMonthNamesEn[$key - 1];
<   }
< 
<   function getMonthAbbreviation ($key)
<   {
<     global $wgMonthAbbreviationsEn;
<     return $wgMonthAbbreviationsEn[$key - 1];
<   }
< 
<   function getWeekdayName ($key)
<   {
<     global $wgWeekdayNamesEn;
<     return $wgWeekdayNamesEn[$key - 1];
<   }
< 
<   function userAdjust ($ts)
<   {
<     global $wgUser, $wgLocalTZoffset;
< 
<     $diff = $wgUser->getOption ("timecorrection");
<     if (!is_numeric ($diff))
<       {
< 	$diff = isset ($wgLocalTZoffset) ? $wgLocalTZoffset : 0;
<       }
<     if (0 == $diff)
<       {
< 	return $ts;
<       }
< 
<     $t = mktime (((int) substr ($ts, 8, 2)) + $diff,
< 		 (int) substr ($ts, 10, 2), (int) substr ($ts, 12, 2),
< 		 (int) substr ($ts, 4, 2), (int) substr ($ts, 6, 2),
< 		 (int) substr ($ts, 0, 4));
<     return date ("YmdHis", $t);
<   }
< 
<   function date ($ts, $adj = false)
<   {
<     global $wgAmericanDates, $wgUser, $wgUseDynamicDates;
< 
<     if ($adj)
<       {
< 	$ts = $this->userAdjust ($ts);
<       }
< 
<     if ($wgUseDynamicDates)
<       {
< 	$datePreference = $wgUser->getOption ('date');
< 	if ($datePreference == 0)
< 	  {
< 	    $datePreference = $wgAmericanDates ? 1 : 2;
< 	  }
<       }
<     else
<       {
< 	$datePreference = $wgAmericanDates ? 1 : 2;
<       }
< 
<     if ($datePreference == 1)
<       {
< 	// MDY
< 	$d = $this->getMonthAbbreviation (substr ($ts, 4, 2)).
< 	  " ".(0 + substr ($ts, 6, 2)).", ".substr ($ts, 0, 4);
<       }
<     else if ($datePreference == 2)
<       {
< 	//DMY
< 	$d = (0 + substr ($ts, 6, 2))." ".
< 	  $this->getMonthAbbreviation (substr ($ts, 4, 2))." ".
< 	  substr ($ts, 0, 4);
<       }
<     else
<       {
< 	//YMD
< 	$d =
< 	  substr ($ts, 0,
< 		  4)." ".$this->getMonthAbbreviation (substr ($ts, 4,
< 							      2))." ".(0 +
< 								       substr
< 								       ($ts,
< 									6,
< 									2));
<       }
< 
<     return $d;
<   }
< 
<   function time ($ts, $adj = false)
<   {
<     if ($adj)
<       {
< 	$ts = $this->userAdjust ($ts);
<       }
< 
<     $t = substr ($ts, 8, 2).":".substr ($ts, 10, 2);
<     return $t;
<   }
< 
<   function timeanddate ($ts, $adj = false)
<   {
<     return $this->time ($ts, $adj).", ".$this->date ($ts, $adj);
<   }
< 
<   function rfc1123 ($ts)
<   {
<     return date ("D, d M Y H:i:s T", $ts);
<   }
< 
<   function getValidSpecialPages ()
<   {
<     global $wgValidSpecialPagesEn;
<     return $wgValidSpecialPagesEn;
<   }
< 
<   function getSysopSpecialPages ()
<   {
<     global $wgSysopSpecialPagesEn;
<     return $wgSysopSpecialPagesEn;
<   }
< 
<   function getDeveloperSpecialPages ()
<   {
<     global $wgDeveloperSpecialPagesEn;
<     return $wgDeveloperSpecialPagesEn;
<   }
< 
<   function getMessage ($key)
<   {
<     global $wgAllMessagesEn;
<     return $wgAllMessagesEn[$key];
<   }
< 
<   function getAllMessages ()
<   {
<     global $wgAllMessagesEn;
<     return $wgAllMessagesEn;
<   }
< 
<   function iconv ($in, $out, $string)
<   {
<     // For most languages, this is a wrapper for iconv
<     return iconv ($in, $out, $string);
<   }
< 
<   function ucfirst ($string)
<   {
<     // For most languages, this is a wrapper for ucfirst()
<     return ucfirst ($string);
<   }
< 
<   function checkTitleEncoding ($s)
<   {
<     global $wgInputEncoding;
< 
<     // Check for UTF-8 URLs; Internet Explorer produces these if you
<     // type non-ASCII chars in the URL bar or follow unescaped links.
<     $ishigh = preg_match ('/[\x80-\xff]/', $s);
<     $isutf = ($ishigh ? preg_match ('/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|'.
< 				    '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/',
< 				    $s) : true);
< 
<     if (($wgInputEncoding != "utf-8") and $ishigh and $isutf)
<       return iconv ("UTF-8", $wgInputEncoding, $s);
< 
<     if (($wgInputEncoding == "utf-8") and $ishigh and ! $isutf)
<       return utf8_encode ($s);
< 
<     // Other languages can safely leave this function, or replace
<     // it with one to detect and convert another legacy encoding.
<     return $s;
<   }
< 
<   function stripForSearch ($in)
<   {
<     // Some languages have special punctuation to strip out
<     // or characters which need to be converted for MySQL's
<     // indexing to grok it correctly. Make such changes here.
<     return $in;
<   }
< 
< 
<   function setAltEncoding ()
<   {
<     // Some languages may have an alternate char encoding option
<     // (Esperanto X-coding, Japanese furigana conversion, etc)
<     // If 'altencoding' is checked in user prefs, this gives a
<     // chance to swap out the default encoding settings.
<     //global $wgInputEncoding, $wgOutputEncoding, $wgEditEncoding;
<   }
< 
<   function recodeForEdit ($s)
<   {
<     // For some languages we'll want to explicitly specify
<     // which characters make it into the edit box raw
<     // or are converted in some way or another.
<     // Note that if wgOutputEncoding is different from
<     // wgInputEncoding, this text will be further converted
<     // to wgOutputEncoding.
<     global $wgInputEncoding, $wgEditEncoding;
<     if ($wgEditEncoding == "" or $wgEditEncoding == $wgInputEncoding)
<       {
< 	return $s;
<       }
<     else
<       {
< 	return $this->iconv ($wgInputEncoding, $wgEditEncoding, $s);
<       }
<   }
< 
<   function recodeInput ($s)
<   {
<     // Take the previous into account.
<     global $wgInputEncoding, $wgOutputEncoding, $wgEditEncoding;
<     if ($wgEditEncoding != "")
<       {
< 	$enc = $wgEditEncoding;
<       }
<     else
<       {
< 	$enc = $wgOutputEncoding;
<       }
<     if ($enc == $wgInputEncoding)
<       {
< 	return $s;
<       }
<     else
<       {
< 	return $this->iconv ($enc, $wgInputEncoding, $s);
<       }
<   }
< 
<   // For right-to-left language support
<   function isRTL ()
<   {
<     return false;
<   }
< 
<   function getMagicWords ()
<   {
<     global $wgMagicWordsEn;
<     return $wgMagicWordsEn;
<   }
< 
<   // Fill a MagicWord object with data from here
<   function getMagic (&$mw)
<   {
<     $raw = $this->getMagicWords ();	// don't worry, it's reference counted not deep copy
<     $rawEntry = $raw[$mw->mId];
<     $mw->mCaseSensitive = $rawEntry[0];
<     $mw->mSynonyms = array_slice ($rawEntry, 1);
<   }
< }
< 
< @include_once ("Language".ucfirst ($wgLanguageCode).".php");
---
> 			  "movearticle" = >"Move page", "movenologin" = >"Not logged in", "movenologintext" = >"You must be a registered user and <a href=\"".wfLocalUrl ("Special:Userlogin")."\">logged in</a> to move a page.", "newtitle" = >"To new title", "movepagebtn" = >"MOVE PAGE", "pagemovedsub" = >"Move succeeded", "pagemovedtext" = >"Page \"[[$1]]\" moved to \"[[$2]]\".", "articleexists" = >"A page of that name already exists, or the name you have chosen is not valid. Please choose another name.", "talkexists" = >"The page itself was moved successfully, but the talk page could not be moved because one already exists at the new title. Please merge them manually.", "movedto" = >"moved to", "movetalk" = >"Move \"talk\" page as well, if applicable.", "talkpagemoved" = >"The corresponding talk page was also moved.", "talkpagenotmoved" = >"The corresponding talk page was <strong>not</strong> moved.", "export" = >"Export pages", "exporttext" = >"Export the text most recent edit information for a particular page or set of pages wrapped in $wgSitename XML.  XML can be imported into another wiki or other application, or transformed into other documents.",
> 			  "exportcuronly" = >"Include only the current revision, not the full history",
> // Namespace "8" 
> 			  "allmessages" = >"All_messages",
> 			  "allmessagestext" =
> 			  >"This is a list of all messages available in the Wikinfo: namespace");
1234a705
> include_once ("LanguageFunctions.php");

LanguageEn.php[edit]

diff mediawiki-fm\LanguageEn.php getwiki-fm\LanguageEn.php
2c2,8
< // See language.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // this file does nothing, except produce errors if you delete it
> // or try to comment out what calls it. Jeesh!
Only in getwiki-fm: LanguageFunctions.php

LinkCache.php[edit]

diff mediawiki-fm\LinkCache.php getwiki-fm\LinkCache.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
12c17
<   /* private */ var $mClassVer = 1;
---
>   var $mClassVer = 1;
14,16c19,21
<   /* private */ var $mGoodLinks, $mBadLinks, $mActive;
<   /* private */ var $mImageLinks;
<   /* private */ var $mPreFilled, $mOldGoodLinks, $mOldBadLinks;
---
>   var $mGoodLinks, $mBadLinks, $mActive;
>   var $mImageLinks;
>   var $mPreFilled, $mOldGoodLinks, $mOldBadLinks;
18c23
<   /* private */ function getKey ($title)
---
>   function getKey ($title)
163c168,169
< 	$sql = "SELECT cur_id FROM cur WHERE cur_namespace=".
---
> 	$sql =
> 	  "SELECT cur_id FROM cur WHERE cur_namespace=".
168,170c174
< 	  {
< 	    $id = 0;
< 	  }
---
> 	  $id = 0;
216,218c220,221
<     $sql = "SELECT cur_id,cur_namespace,cur_title
< 			FROM cur,links
< 			WHERE cur_id=l_to AND l_from='{$dbkeyfrom}'";
---
>     $sql =
>       "SELECT cur_id,cur_namespace,cur_title FROM cur,links WHERE cur_id=l_to AND l_from='{$dbkeyfrom}'";
231,233c234
<     $sql = "SELECT bl_to
< 			FROM brokenlinks
< 			WHERE bl_from='{$id}'";
---
>     $sql = "SELECT bl_to FROM brokenlinks WHERE bl_from='{$id}'";
236,238c237
<       {
< 	$this->addBadLink ($s->bl_to);
<       }
---
>       $this->addBadLink ($s->bl_to);
248,250c247
< 	  {
< 	    $ser = wfStrencode (gzcompress (serialize ($this), 3));
< 	  }
---
> 	  $ser = wfStrencode (gzcompress (serialize ($this), 3));
252,254c249,250
< 	  {
< 	    $ser = wfStrencode (serialize ($this));
< 	  }
---
> 	  $ser = wfStrencode (serialize ($this));
> 
260d255
< 
302c297
<   //     Parameters: $which is one of the LINKCACHE_xxx constants, $del and $add are 
---
>   // Parameters: $which is one of the LINKCACHE_xxx constants, $del and $add are 
309,311c304
<       {
< 	return false;
<       }
---
>       return false;
358,360c351,352
<       {
< 	$cacheobj = $row->lcc_cacheobj;
<       }
---
>       $cacheobj = $row->lcc_cacheobj;
> 
363,365c355
<       {
< 	return $cc;
<       }
---
>       return $cc;
367,369c357
<       {
< 	return FALSE;
<       }
---
>       return FALSE;

LinksUpdate.php[edit]

diff mediawiki-fm\LinksUpdate.php getwiki-fm\LinksUpdate.php
2c2,6
< // See deferred.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
6c10
<   /* private */ var $mId, $mTitle;
---
>   var $mId, $mTitle;
42,44d45
<     //------------------------------------------------------------------------------
<     // Good links
< 
74d74
< 
80d79
< 
89d87
<     //------------------------------------------------------------------------------
136d133
<     //------------------------------------------------------------------------------
Only in getwiki-fm: LocalSettings.php

LogPage.php[edit]

diff mediawiki-fm\LogPage.php getwiki-fm\Logpage.php
2c2,7
< // Class to simplify the use of log pages
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // class to simplify the use of log pages
5c10
<   /* private */ var $mTitle, $mContent, $mContentLoaded, $mId, $mComment;
---
>   var $mTitle, $mContent, $mContentLoaded, $mId, $mComment;
21,23c26,29
<     $sql = "SELECT cur_id,cur_text,cur_timestamp FROM cur ".
<       "WHERE cur_namespace=".Namespace::getWikipedia ()." AND ".
<       "cur_title='".wfStrencode ($this->mTitle)."'";
---
>     $sql =
>       "SELECT cur_id,cur_text,cur_timestamp FROM cur WHERE cur_namespace=".
>       Namespace::getWikipedia ()." AND cur_title='".wfStrencode ($this->
> 								 mTitle)."'";
69,72c75,79
< 	$sql = "INSERT INTO cur (cur_timestamp,cur_user,cur_user_text,
< 				cur_namespace,cur_title,cur_text,cur_comment,cur_restrictions,
< 				inverse_timestamp,cur_touched)
< 				VALUES ('{$now}', {$uid}, '{$ut}', ".Namespace::getWikipedia ().", '".wfStrencode ($this->mTitle)."', '".wfStrencode ($this->mContent)."', '".wfStrencode ($this->mComment)."', 'sysop', '{$won}','{$now}')";
---
> 	$sql =
> 	  "INSERT INTO cur (cur_timestamp,cur_user,cur_user_text,cur_namespace,cur_title,cur_text,cur_comment,cur_restrictions,inverse_timestamp,cur_touched) VALUES ('{$now}', {$uid}, '{$ut}', ".
> 	  Namespace::getWikipedia ().", '".wfStrencode ($this->mTitle)."', '".
> 	  wfStrencode ($this->mContent)."', '".wfStrencode ($this->mComment).
> 	  "', 'sysop', '{$won}','{$now}')";
78,83c85,89
< 	$sql = "UPDATE cur SET cur_timestamp='{$now}', ".
< 	  "cur_user={$uid}, cur_user_text='{$ut}', ".
< 	  "cur_text='".wfStrencode ($this->mContent)."', ".
< 	  "cur_comment='".wfStrencode ($this->mComment)."', ".
< 	  "cur_restrictions='sysop', inverse_timestamp='{$won}', cur_touched='{$now}' ".
< 	  "WHERE cur_id={$this->mId}";
---
> 	$sql =
> 	  "UPDATE cur SET cur_timestamp='{$now}',cur_user={$uid}, cur_user_text='{$ut}',cur_text='".
> 	  wfStrencode ($this->mContent)."',cur_comment='".wfStrencode ($this->
> 								       mComment).
> 	  "',cur_restrictions='sysop', inverse_timestamp='{$won}', cur_touched='{$now}' WHERE cur_id={$this->mId}";
90,92c96,99
< 	$sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time,
<         	        rc_user,rc_user_text,rc_namespace,rc_title,rc_comment,
<                 	rc_cur_id) VALUES ('{$now}','{$now}',{$uid},'{$ut}',4,'".wfStrencode ($this->mTitle)."','".wfStrencode ($this->mComment)."',{$this->mId})";
---
> 	$sql =
> 	  "INSERT INTO recentchanges (rc_timestamp,rc_cur_time,rc_user,rc_user_text,rc_namespace,rc_title,rc_comment,rc_cur_id) VALUES ('{$now}','{$now}',{$uid},'{$ut}',4,'".
> 	  wfStrencode ($this->mTitle)."','".wfStrencode ($this->mComment).
> 	  "',{$this->mId})";
110,111c117,118
< 	$ul = "[[".
< 	  $wgLang->getNsText (Namespace::getUser ()).":{$ut}|{$ut}]]";
---
> 	$ul =
> 	  "[[".$wgLang->getNsText (Namespace::getUser ()).":{$ut}|{$ut}]]";
137c144
<       "{$m[1]}<ul><li>{$d} {$ul} {$action}{$inline}</li>\n{$m[2]}";
---
>       "{$m[1]}<ul><li>{$d} {$ul} {$action}{$inline}</li></ul>\n{$m[2]}";

MagicWord.php[edit]

diff mediawiki-fm\MagicWord.php getwiki-fm\MagicWord.php
2,12c2,70
< // This class encapsulates "magic words" such as //redirect, __NOTOC__, etc.
< // Usage:
< //     if (MagicWord::get( MAG_REDIRECT )->match( $text ) )
< // 
< // Possible future improvements: 
< //   * Simultaneous searching for a number of magic words
< //   * $wgMagicWords in shared memory
< //
< // Please avoid reading the data out of one of these objects and then writing 
< // special case code. If possible, add another match()-like function here.
< /*private*/ $wgMagicFound = false;
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> /*
>  This class encapsulates "magic words" such as //redirect, __NOTOC__, etc.
>  Usage:
>      if (MagicWord::get( MAG_REDIRECT )->match( $text ) )
>  
>  Possible future improvements: 
>    * Simultaneous searching for a number of magic words
>    * $wgMagicWords in shared memory
> 
>  Please avoid reading the data out of one of these objects and then writing 
>  special case code. If possible, add another match()-like function here.
> */
> // Magic words - moved from Language.php - proteus
>   define ("MAG_REDIRECT", 0);
> define ("MAG_NOTOC", 1);
> define ("MAG_START", 2);
> define ("MAG_CURRENTMONTH", 3);
> define ("MAG_CURRENTMONTHNAME", 4);
> define ("MAG_CURRENTDAY", 5);
> define ("MAG_CURRENTDAYNAME", 6);
> define ("MAG_CURRENTYEAR", 7);
> define ("MAG_CURRENTTIME", 8);
> define ("MAG_NUMBEROFARTICLES", 9);
> define ("MAG_CURRENTMONTHNAMEGEN", 10);
> define ("MAG_MSG", 11);
> define ("MAG_SUBST", 12);
> define ("MAG_MSGNW", 13);
> define ("MAG_NOEDITSECTION", 14);
> define ("MAG_END", 15);
> define ("MAG_IMG_THUMBNAIL", 16);
> define ("MAG_IMG_LEFT", 17);
> define ("MAG_IMG_RIGHT", 18);
> define ("MAG_IMG_NONE", 19);
> define ("MAG_IMG_SCALE", 20);
> 
> // moved from Language.php - proteus
> $wgMagicWordsEn = array (
> 			  //   ID                                 CASE  SYNONYMS
> 			  MAG_REDIRECT = >array (0, "//redirect"),
> 			  MAG_NOTOC = >array (0, "__NOTOC__"),
> 			  MAG_NOEDITSECTION = >array (0, "__NOEDITSECTION__"),
> 			  MAG_START = >array (0, "__START__"),
> 			  MAG_CURRENTMONTH = >array (1, "{{CURRENTMONTH}}"),
> 			  MAG_CURRENTMONTHNAME =
> 			  >array (1, "{{CURRENTMONTHNAME}}"), MAG_CURRENTDAY =
> 			  >array (1, "{{CURRENTDAY}}"), MAG_CURRENTDAYNAME =
> 			  >array (1, "{{CURRENTDAYNAME}}"), MAG_CURRENTYEAR =
> 			  >array (1, "{{CURRENTYEAR}}"), MAG_CURRENTTIME =
> 			  >array (1, "{{CURRENTTIME}}"),
> 			  MAG_NUMBEROFARTICLES =
> 			  >array (1, "{{NUMBEROFARTICLES}}"),
> 			  MAG_CURRENTMONTHNAMEGEN =
> 			  >array (1, "{{CURRENTMONTHNAMEGEN}}"), MAG_MSG =
> 			  >array (0, "{{MSG:$1}}"), MAG_SUBST =
> 			  >array (0, "{{SUBST:$1}}"), MAG_MSGNW =
> 			  >array (0, "{{MSGNW:$1}}"), MAG_END =
> 			  >array (0, "__END__"), MAG_IMG_THUMBNAIL =
> 			  >array (0, "thumb"), MAG_IMG_LEFT =
> 			  >array (0, "left"), MAG_IMG_RIGHT =
> 			  >array (0, "right"), MAG_IMG_NONE =
> 			  >array (0, "none"), MAG_IMG_SCALE =
> 			  >array (0, "scale:$1"));
> 
> $wgMagicFound = false;
16,17c74,75
<   /*private */ var $mId, $mSynonyms, $mCaseSensitive, $mRegex;
<   /*private */ var $mRegexStart, $mBaseRegex, $mVariableRegex;
---
>   var $mId, $mSynonyms, $mCaseSensitive, $mRegex;
>   var $mRegexStart, $mBaseRegex, $mVariableRegex;
26a85,86
>     $this->mVariableStartToEndRegex = "";
>     $this->mModified = false;
29c89
<   /*static */ function & get ($id)
---
>   function & get ($id)
50c110
<   /* private */ function initRegex ()
---
>   function initRegex ()
58a119,121
>     $this->mVariableStartToEndRegex =
>       str_replace ("\\$1", "([A-Za-z0-9_\-]*)",
> 		   "/^{$this->mBaseRegex}$/{$case}");
107a171,195
>   // Returns NULL if there's no match, the value of $1 otherwise
>   // The return code is the matched string, if there's no variable
>   // part in the regex and the matched variable part ($1) if there  is one.
> 
>   function matchVariableStartToEnd ($text)
>   {
>     $matchcount =
>       preg_match ($this->getVariableStartToEndRegex (), $text, $matches);
>     if ($matchcount == 0)
>       {
> 	return NULL;
>       }
>     elseif (count ($matches) == 1)
>     {
>       return $matches[0];
>     }
>     else
>     {
>       return $matches[1];
>     }
>   }
> 
>   // Returns true if the text matches the word, and alters the
>   // input string, removing all instances of the word
> 
128a217,226
>   // Matches the entire string, where $1 is a wildcard
>   function getVariableStartToEndRegex ()
>   {
>     if ($this->mVariableStartToEndRegex == "")
>       {
> 	$this->initRegex ();
>       }
>     return $this->mVariableStartToEndRegex;
>   }
> 
135c233
< /*private*/ function
---
> function

Math.php[edit]

diff mediawiki-fm\Math.php getwiki-fm\Math.php
1c1,7
< < ? function linkToMathImage ($tex, $outputhash)
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function linkToMathImage ($tex, $outputhash)
17a24,32
> 
> //*****************************************
> // BLOCK - this blocks PNG support and makes nice HTML, remove if fixed - proteus
>   if ($math == (0 || 1 || 4 || ""))
>     {
>       return (nl2br (stripcslashes (wfEscapeHTML ($tex))));
>     }
> 
> //*****************************************
19c34,36
<     return ('$ '.wfEscapeHTML ($tex).' $');
---
>     {
>       return ('$ '.wfEscapeHTML ($tex).' $');
>     }
23,26c40,46
<   if ($math == 0)
<     $sql =
<       "SELECT math_outputhash FROM math WHERE math_inputhash = '".$md5_sql.
<       "'";
---
> 
>   if (!$math)
>     {
>       $sql =
> 	"SELECT math_outputhash FROM math WHERE math_inputhash = '".$md5_sql.
> 	"'";
>     }
28,30c48,52
<     $sql =
<       "SELECT math_outputhash,math_html_conservativeness,math_html FROM math WHERE math_inputhash = '".
<       $md5_sql."'";
---
>     {
>       $sql =
> 	"SELECT math_outputhash,math_html_conservativeness,math_html FROM math WHERE math_inputhash = '".
> 	$md5_sql."'";
>     }
33a56,61
>   $cmd =
>     "./exec/texvc ".escapeshellarg ($wgTmpDirectory)." ".
>     escapeshellarg ($wgMathDirectory)." ".escapeshellarg ($tex)." ".
>     escapeshellarg ($wgInputEncoding);
>   $contents = `$cmd `;
> 
44c72,74
< 	    return linkToMathImage ($tex, $outputhash);
---
> 	    {
> 	      return linkToMathImage ($tex, $outputhash);
> 	    }
46c76,82
< 	    return $rpage->math_html;
---
> 	    {
> 	      return $rpage->math_html;
> 	    }
> 	}
>       else
> 	{
> 	  $outputhash = "blahblah";
50,54d85
<   $cmd = "./math/texvc ".escapeshellarg ($wgTmpDirectory)." ".
<     escapeshellarg ($wgMathDirectory)." ".escapeshellarg ($tex)." ".
<     escapeshellarg ($wgInputEncoding);
<   $contents = `$cmd `;
< 
56c87,90
<     return "<b>".$mf." (".$munk."): ".wfEscapeHTML ($tex)."</b>";
---
>     {
>       return "<b>".$mf." (".$munk."): ".wfEscapeHTML ($tex)."</b>";
>     }
> 
57a92
> 
61,62c96,100
< 	$conservativeness = 2;
<       else if ($retval == "M")
---
> 	{
> 	  $conservativeness = 2;
> 	}
>       elseif ($retval == "M")
>       {
63a102
>       }
64a104
>       {
66c106
<       $outdata = substr ($contents, 33);
---
> 	$outdata = substr ($contents, 33);
68c108
<       $i = strpos ($outdata, "\000");
---
> 	$i = strpos ($outdata, "\000");
70,71c110,111
<       $outhtml = substr ($outdata, 0, $i);
<       $mathml = substr ($outdata, $i + 1);
---
> 	$outhtml = substr ($outdata, 0, $i);
> 	$mathml = substr ($outdata, $i + 1);
73,74c113,115
<       $sql_html = "'".mysql_escape_string ($outhtml)."'";
<       $sql_mathml = "'".mysql_escape_string ($mathml)."'";
---
> 	$sql_html = "'".mysql_escape_string ($outhtml)."'";
> 	$sql_mathml = "'".mysql_escape_string ($mathml)."'";
>       }
76,79c117,122
<   else if (($retval == "c") || ($retval == "m") || ($retval == "l"))
<     {
<       $outhtml = substr ($contents, 33);
<       if ($retval == "c")
---
> 
>   elseif (($retval == "c") || ($retval == "m") || ($retval == "l"))
>   {
>     $outhtml = substr ($contents, 33);
>     if ($retval == "c")
>       {
81,89c124,125
<       else if ($retval == "m")
< 	$conservativeness = 1;
<       else
< 	$conservativeness = 0;
<       $sql_html = "'".mysql_escape_string ($outhtml)."'";
<       $mathml = '';
<       $sql_mathml = 'NULL';
<     }
<   else if ($retval == "X")
---
>       }
>     elseif ($retval == "m")
91,95c127
<       $outhtml = '';
<       $mathml = substr ($contents, 33);
<       $sql_html = 'NULL';
<       $sql_mathml = "'".mysql_escape_string ($mathml)."'";
<       $conservativeness = 0;
---
>       $conservativeness = 1;
97c129
<   else if ($retval == "+")
---
>     else
99c131,132
<       $outhtml = '';
---
>       $conservativeness = 0;
>       $sql_html = "'".mysql_escape_string ($outhtml)."'";
101d133
<       $sql_html = 'NULL';
103d134
<       $conservativeness = 0;
104a136,152
>   }
>   elseif ($retval == "X")
>   {
>     $outhtml = '';
>     $mathml = substr ($contents, 33);
>     $sql_html = 'NULL';
>     $sql_mathml = "'".mysql_escape_string ($mathml)."'";
>     $conservativeness = 0;
>   }
>   elseif ($retval == "+")
>   {
>     $outhtml = '';
>     $mathml = '';
>     $sql_html = 'NULL';
>     $sql_mathml = 'NULL';
>     $conservativeness = 0;
>   }
105a154,159
>   {
>     if ($retval == "E")
>       $errmsg = wfMsg ("math_lexing_error");
>     elseif ($retval == "S") $errmsg = wfMsg ("math_syntax_error");
>     elseif ($retval == "F") $errmsg = wfMsg ("math_unknown_function");
>     else
107,114c161
<       if ($retval == "E")
< 	$errmsg = wfMsg ("math_lexing_error");
<       else if ($retval == "S")
< 	$errmsg = wfMsg ("math_syntax_error");
<       else if ($retval == "F")
< 	$errmsg = wfMsg ("math_unknown_function");
<       else
< 	$errmsg = $munk;
---
>       $errmsg = $munk;
118a166
>   }
125d172
< 
130,132d176
<   $res = wfQuery ($sql, DB_READ, $fname);
<   // we don't really care if it fails
< 
137c181,183
<     return linkToMathImage ($tex, $outmd5);
---
>     {
>       return linkToMathImage ($tex, $outmd5);
>     }

MemCachedClient.in[edit]

diff mediawiki-fm\MemCachedClient.inc.php getwiki-fm\MemCachedClient.inc.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
3,17c8,21
<  * MemCached PHP client
<  * Copyright (c) 2003
<  * Ryan Gilfether <hotrodder@rocketmail.com>
<  * http://www.gilfether.com
<  *
<  * Originally translated from Brad Fitzpatrick's <brad@danga.com> MemCached Perl client
<  * See the memcached website:
<  * http://www.danga.com/memcached/
<  *
<  * This module is Copyright (c) 2003 Ryan Gilfether.
<  * All rights reserved.
<  * You may distribute under the terms of the GNU General Public License
<  * This is free software. IT COMES WITHOUT WARRANTY OF ANY KIND.
<  *
<  */
---
>  MemCached PHP client
>  Copyright (c) 2003
>  Ryan Gilfether <hotrodder@rocketmail.com>
>  http://www.gilfether.com
> 
>  Originally translated from Brad Fitzpatrick's <brad@danga.com> MemCached Perl client
>  See the memcached website:
>  http://www.danga.com/memcached/
> 
>  This module is Copyright (c) 2003 Ryan Gilfether.
>  All rights reserved.
>  You may distribute under the terms of the GNU General Public License
>  This is free software. IT COMES WITHOUT WARRANTY OF ANY KIND.
> */
590,592c594
<       {
< 	$this->comp_active = 1;
<       }
---
>       $this->comp_active = 1;
594,596c596
<       {
< 	$this->comp_active = 0;
<       }
---
>       $this->comp_active = 0;
598,599d597
< 
< 

MemcachedSessions.php[edit]

diff mediawiki-fm\MemcachedSessions.php getwiki-fm\MemcachedSessions.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */

Namespace.php[edit]

diff mediawiki-fm\Namespace.php getwiki-fm\Namespace.php
2,5c2,12
< // This is a utility class with only static functions
< // for dealing with namespaces that encodes all the
< // "magic" behaviors of them based on index.  The textual
< // names of the namespaces are handled by Language.php.
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> /*
>  This is a utility class with only static functions
>  for dealing with namespaces that encodes all the
>  "magic" behaviors of them based on index.  The textual
>  names of the namespaces are handled by Language.php.
> */
67d73
<   //

OutputPage.php[edit]

diff mediawiki-fm\OutputPage.php getwiki-fm\OutputPage.php
2c2,6
< // See design.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
4c8
<   include_once ("Math.php");
---
>   require ("Math.php");
191,193c195
<   // First pass--just handle <nowiki> sections, pass the rest off
<   // to doWikiPass2() which does all the real work.
<   //
---
>   // First pass--just handle <nowiki> sections, pass the rest off to doWikiPass2() which does all the real work.
281,284c283,286
< 	$text = preg_replace ("/{$unique3}{$i}s/", str_replace ($specialChars,
< 								$escapedChars,
< 								$prelist[$i]),
< 			      $text);
---
> 	$text =
> 	  preg_replace ("/{$unique3}{$i}s/",
> 			str_replace ($specialChars, $escapedChars,
> 				     $prelist[$i]), $text);
289,292c291,294
< 	$text = preg_replace ("/{$unique2}{$i}s/", str_replace ($specialChars,
< 								$escapedChars,
< 								$mathlist
< 								[$i]), $text);
---
> 	$text =
> 	  preg_replace ("/{$unique2}{$i}s/",
> 			str_replace ($specialChars, $escapedChars,
> 				     $mathlist[$i]), $text);
297,300c299,302
< 	$text = preg_replace ("/{$unique}{$i}s/", str_replace ($specialChars,
< 							       $escapedChars,
< 							       $nwlist[$i]),
< 			      $text);
---
> 	$text =
> 	  preg_replace ("/{$unique}{$i}s/",
> 			str_replace ($specialChars, $escapedChars,
> 				     $nwlist[$i]), $text);
331,333c333,334
<   // Finally, all the text has been munged and accumulated into
<   // the object, let's actually output it:
<   //
---
>   // all the text has been munged and accumulated into the object, let's actually output it
> 
336c337
<     global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
---
>     global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration, $wgServer;
346,347c347,348
<     header ("Content-type: text/html; charset={$wgOutputEncoding}");
<     header ("Content-language: {$wgLanguageCode}");
---
>     //header( "content-type: application/xhtml+xml; charset={$wgOutputEncoding}" );         // screws up our xml declaration
>     //header( "content-language: {$wgLanguageCode}" );                              //
355,359c356,370
<     $exp = time () + $wgCookieExpiration;
<     foreach ($this->mCookies as $name = >$val)
<     {
<       setcookie ($name, $val, $exp, "/");
<     }
---
>     if (!$HTTP_COOKIE_VARS || !session_is_registered ("wsUserPassword"))
>       {
> 	$exp = time () + $wgCookieExpiration;
> 	foreach ($this->mCookies as $name = >$val)
> 	{
> 	  setcookie ($name, $val, $exp, "/");
> 	}
>       }
>     else
>       {
> 	session_register ("wsUserID");
> 	session_register ("wsUserName");
> 	session_register ("wsUserPassword");
> 	session_register ("wsUploadFiles");
>       }
401,429d411
< 
<     /*
<        // This code is unused anyway!
<        // Commenting out. --bv 2003-11-15
< 
<        $a = explode( ",", $_SERVER['HTTP_ACCEPT_CHARSET'] );
<        $best = 0.0;
<        $bestset = "*";
< 
<        foreach ( $a as $s ) {
<        if ( preg_match( "/(.*);q=(.*)/", $s, $m ) ) {
<        $set = $m[1];
<        $q = (float)($m[2]);
<        } else {
<        $set = $s;
<        $q = 1.0;
<        }
<        if ( $q > $best ) {
<        $bestset = $set;
<        $best = $q;
<        }
<        }
<        //if ( "*" == $bestset ) { $bestset = "iso-8859-1"; }
<        if ( "*" == $bestset ) { $bestset = $wgOutputEncoding; }
<        $wgOutputEncoding = strtolower( $bestset );
< 
<        // Disable for now
<        //
<      */
458,460c440,442
< 	$log = sprintf ("%s\t%04.3f\t%s\n",
< 			gmdate ("YmdHis"), $elapsed,
< 			urldecode ($_SERVER['REQUEST_URI'].$forward));
---
> 	$log =
> 	  sprintf ("%s\t%04.3f\t%s\n", gmdate ("YmdHis"), $elapsed,
> 		   urldecode ($_SERVER['REQUEST_URI'].$forward));
468d449
<   //
480c461
<     $this->addHTML ("<p>".wfMsg ($msg)."\n");
---
>     $this->addHTML ("<br /><br />".wfMsg ($msg)."\n");
637,638c618,619
< 	$wgOut->addMeta ("http:Refresh", "10;url=".
< 			 wfLocalUrlE (wfUrlencode ($returnto)));
---
> 	$wgOut->addMeta ("http:Refresh",
> 			 "10;url=".wfLocalUrlE (wfUrlencode ($returnto)));
640c621
<     $wgOut->addHTML ("\n<p>$r\n");
---
>     $wgOut->addHTML ("\n<br /><br />$r\n");
655c636
<     $r = "<br break=all>\n";
---
>     $r = "<br />\n";
701d681
< 
708,709c688
< 			 "title", "align", "lang", "dir", "width", "height", "bgcolor", "clear", /* BR */ "noshade",	/* HR */
< 			 "cite", /* BLOCKQUOTE, Q */ "size", "face", "color",
---
> 			 "title", "align", "lang", "dir", "width", "height", "bgcolor", "cite", /* BLOCKQUOTE, Q */ "size", "face", "color",	// removed clear and noshade - proteus
721,728c700,705
<       return "";		// Saves runtime ;-)
<     $htmlattrs = $this->getHTMLattrs ();
< 
< // Strip non-approved attributes from the tag
<     $t = preg_replace ("/(\\w+)(\\s*=\\s*([^\\s\">]+|\"[^\">]*\"))?/e",
< 		       "(in_array(strtolower(\"\$1\"),\$htmlattrs)?(\"\$1\".((\"x\$3\" != \"x\")?\"=\$3\":'')):'')",
< 		       $t);
< 
---
>       return "";		// Saves runtime ;-) $htmlattrs = $this->getHTMLattrs() ;
>     // Strip non-approved attributes from the tag
>     $t =
>       preg_replace ("/(\\w+)(\\s*=\\s*([^\\s\">]+|\"[^\">]*\"))?/e",
> 		    "(in_array(strtolower(\"\$1\"),\$htmlattrs)?(\"\$1\".((\"x\$3\" != \"x\")?\"=\$3\":'')):'')",
> 		    $t);
765,769d741
< /*      else if ( "|_" == substr ( $x , 0 , 2 ) ) // Caption
<         { 
<         $z = trim ( substr ( $x , 2 ) ) ;
<         $t[$k] = "<caption>{$z}</caption>\n" ;
<         }*/
788c760
<       else if ("|" == $fc || "!" == $fc || "|+" == substr ($x, 0, 2))	// Caption
---
>       else if ("|" == $fc || "!" == $fc || "|+" == substr ($x, 0, 2))	//Caption
832c804
< // Closing open td, tr && table
---
>     // Closing open td, tr && table
843c815
< //              $t = $this->removeHTMLtags( $t );
---
>     //$t = $this->removeHTMLtags( $t );
847,850c819
<   // Well, OK, it's actually about 14 passes.  But since all the
<   // hard lifting is done inside PHP's regex code, it probably
<   // wouldn't speed things up much to add a real parser.
<   //
---
>   // about 14 passes.  hard lifting done inside PHP's regex code, it probably wouldn't speed things up much to add a real parser
860,861c829,835
<     $text = preg_replace ("/(^|\n)-----*/", "\\1<hr>", $text);
<     $text = str_replace ("<HR>", "<hr>", $text);
---
>     $text = preg_replace ("/(^|\n)-----*/", "\\1<hr />", $text);
>     $text = str_replace ("<HR>", "<hr />", $text);
>     $text = str_replace ("<hr>", "<hr />", $text);
>     $text = str_replace ("<hr >", "<hr />", $text);
>     $text = str_replace ("<BR>", "<br />", $text);
>     $text = str_replace ("<br>", "<br />", $text);
>     $text = str_replace ("<br >", "<br />", $text);
890c864
<   /* private */ function doAllQuotes ($text)
---
>   function doAllQuotes ($text)
901c875
<   /* private */ function doQuotes ($pre, $text, $mode)
---
>   function doQuotes ($pre, $text, $mode)
992c966
<   /* private */ function doHeadings ($text)
---
>   function doHeadings ($text)
1003,1007c977,978
<   // Note: we have to do external links before the internal ones,
<   // and otherwise take great care in the order of things here, so
<   // that we don't end up interpreting some URLs twice.
< 
<   /* private */ function replaceExternalLinks ($text)
---
>   // do external links before the internal ones, and take great care in the order of things, so we don't end up interpreting some URLs twice.
>   function replaceExternalLinks ($text)
1021c992
<   /* private */ function subReplaceExternalLinks ($s, $protocol, $autonumber)
---
>   function subReplaceExternalLinks ($s, $protocol, $autonumber)
1030,1033c1001,1002
<     // this is  the list of separators that should be ignored if they 
<     // are the last character of an URL but that should be included
<     // if they occur within the URL, e.g. "go to www.foo.com, where .."
<     // in this case, the last comma should not become part of the URL,
---
>     // this is  the list of separators that should be ignored if they  are the last character of an URL but that should be included
>     // if they occur within the URL, e.g. "go to www.foo.com, where .." in this case, the last comma should not become part of the URL,
1039,1040c1008
<     // PLEASE NOTE: The curly braces { } are not part of the regex,
<     // they are interpreted as part of the string (used to tell PHP
---
>     // PLEASE NOTE: The curly braces { } are not part of the regex, they are interpreted as part of the string (used to tell PHP
1042c1010,1011
<     $e1 = "/(^|[^\\[])({$protocol}:)([{$uc}{$sep}]+)\\/([{$fnc}]+)\\.".
---
>     $e1 =
>       "/(^|[^\\[])({$protocol}:)([{$uc}{$sep}]+)\\/([{$fnc}]+)\\.".
1052,1060c1021,1032
< 	$s = preg_replace ($e1, "\\1".$sk->makeImage ("{$unique}:\\3".
< 						      "/\\4.\\5",
< 						      "\\4.\\5")."\\6", $s);
<       }
<     $s = preg_replace ($e2, "\\1"."<a href=\"{$unique}:\\3\"".
< 		       $sk->getExternalLinkAttributes ("{$unique}:\\3",
< 						       wfEscapeHTML
< 						       ("{$unique}:\\3")).">".
< 		       wfEscapeHTML ("{$unique}:\\3")."</a>\\5", $s);
---
> 	$s =
> 	  preg_replace ($e1,
> 			"\\1".$sk->makeImage ("{$unique}:\\3"."/\\4.\\5",
> 					      "\\4.\\5")."\\6", $s);
>       }
>     $s =
>       preg_replace ($e2,
> 		    "\\1"."<a href=\"{$unique}:\\3\"".$sk->
> 		    getExternalLinkAttributes ("{$unique}:\\3",
> 					       wfEscapeHTML
> 					       ("{$unique}:\\3")).">".
> 		    wfEscapeHTML ("{$unique}:\\3")."</a>\\5", $s);
1107c1079
<   /* private */ function replaceInternalLinks ($s)
---
>   function replaceInternalLinks ($s)
1202,1227c1174
< /* CHECK MERGE @@@
< 				} else if ( "media" == $pre ) {
< 					$nt = Title::newFromText( $suf );
< 					$name = $nt->getDBkey();
< 					if ( "" == $text ) { $text = $nt->GetText(); }
< 
< 					$wgLinkCache->addImageLink( $name );
< 					$s .= $sk->makeMediaLink( $name,
< 					  wfImageUrl( $name ), $text );
< 					$s .= $trail;
< 				} else if ( isset($wgUseCategoryMagic) && $wgUseCategoryMagic && $pre == wfMsg ( "category" ) ) {
< 					$l = $sk->makeLink ( $pre.":".ucfirst( $m[2] ), ucfirst ( $m[2] ) ) ;
< 					array_push ( $this->mCategoryLinks , $l ) ;
< 					$s .= $trail ;
< 				} else {
< 					$l = $wgLang->getLanguageName( $pre );
< 					if ( "" == $l or !$wgInterwikiMagic or Namespace::isTalk( $wgTitle->getNamespace() ) ) {
< 						if ( "" == $text ) { 
< 							$text = $link; 
< 						}
< 						$s .= $sk->makeLink( $link, $text, "", $trail );
< 					} else if ( $pre != $wgLanguageCode ) {
< 						array_push( $this->mLanguageLinks, "$pre:$suf" );
< 						$s .= $trail;
< 					}
< */
---
> 
1236,1244d1182
< /* CHECK MERGE @@@
< //			} else if ( 0 == strcmp( "////", substr( $link, 0, 2 ) ) ) {
< //				$link = substr( $link, 2 );
< //				$s .= "<a name=\"{$link}\">{$text}</a>{$trail}";
< 			} else {
< 				if ( "" == $text ) { $text = $link; }
< 				// Hotspot: 
< 				$s .= $sk->makeLink( $link, $text, "", $trail );
< */
1264,1265c1202
<   //
<   /* private */ function closeParagraph ()
---
>   function closeParagraph ()
1268,1269c1205,1206
<     if (0 != strcmp ("p", $this->mLastSection) &&
< 	0 != strcmp ("", $this->mLastSection))
---
>     if (0 != strcmp ("p", $this->mLastSection)
> 	&& 0 != strcmp ("", $this->mLastSection))
1271a1209
> 	//$result = "<" . $this->mLastSection  . ">";
1273a1212
>     //$this->mLastSection = "/p";
1276,1279c1215,1216
<   // getCommon() returns the length of the longest common substring
<   // of both arguments, starting at the beginning of both.
<   //
<   /* private */ function getCommon ($st1, $st2)
---
>   // getCommon() returns the length of the longest common substring of both arguments, starting at the beginning of both
>   function getCommon ($st1, $st2)
1303,1306c1240,1241
<   // These next three functions open, continue, and close the list
<   // element appropriate to the prefix character passed into them.
<   //
<   /* private */ function openList ($char)
---
>   // These next three functions open, continue, and close the list element appropriate to the prefix character passed into them
>   function openList ($char)
1335c1270
<   /* private */ function nextItem ($char)
---
>   function nextItem ($char)
1362c1297
<   /* private */ function closeList ($char)
---
>   function closeList ($char)
1387c1322
<   /* private */ function doBlockLevels ($text, $linestart)
---
>   function doBlockLevels ($text, $linestart)
1391,1392c1326
<     // Parsing through the text line by line.  The main thing
<     // happening here is handling of block-level elements p, pre,
---
>     // parses through the text line by line.  The main thing happening here is handling of block-level elements p, pre,
1394d1327
<     //
1490c1423
< 		  $newSection = "p";
---
> 		  //$newSection = "p"; 
1492d1424
< 
1496,1504c1428
< 		  $text. = "<".$newSection.">";
< 		}
< 	      else if (0 != strcmp ($this->mLastSection, $newSection))
< 		{
< 		  $text. = $this->closeParagraph ();
< 		  if (0 != strcmp ("p", $newSection))
< 		    {
< 		      $text. = "<".$newSection.">";
< 		    }
---
> 		  $text. = "</p><p>";
1505a1430,1437
> 	      elseif (0 != strcmp ($this->mLastSection, $newSection))
> 	      {
> 		$text. = $this->closeParagraph ();
> 		if (0 != strcmp ("p", $newSection))
> 		  {
> 		    $text. = "</p>";
> 		  }
> 	      }
1508c1440,1441
< 	  if ($inBlockElem &&
---
> 	  if ($inBlockElem
> 	      &&
1538c1471
<   /* private */ function replaceVariables ($text)
---
>   function replaceVariables ($text)
1545,1549c1478,1479
<     // Basic variables
<     // See Language.php for the definition of each magic word
< 
<     // As with sigs, this uses the server's local time -- ensure 
<     // this is appropriate for your audience!
---
>     // Basic variables, See Language.php for the definition of each magic word
>     // As with sigs, this uses the server's local time -- ensure this is appropriate for your audience!
1585,1586c1515
<     // "Variables" with an additional parameter e.g. {{MSG:wikipedia}}
<     // The callbacks are at the bottom of this file
---
>     // "Variables" with an additional parameter e.g. {{MSG:wikipedia}} The callbacks are at the bottom of this file
1597,1598c1526,1527
<   // Cleans up HTML, removes dangerous tags and attributes
<   /* private */ function removeHTMLtags ($text)
---
>   // cleans up HTML, removes dangerous tags and attributes
>   function removeHTMLtags ($text)
1602,1609c1531,1541
<     $htmlpairs = array (	// Tags that must be closed
< 			 "b", "i", "u", "font", "big", "small", "sub", "sup",
< 			 "h1", "h2", "h3", "h4", "h5", "h6", "cite", "code",
< 			 "em", "s", "strike", "strong", "tt", "var", "div",
< 			 "center", "blockquote", "ol", "ul", "dl", "table",
< 			 "caption", "pre", "ruby", "rt", "rb", "rp");
<     $htmlsingle = array ("br", "p", "hr", "li", "dt", "dd");
<     $htmlnest = array (		// Tags that can be nested--??
---
>     $htmlpairs = array (
> 			 // Tags that must be closed
> 			 "p", "b", "i", "u", "font", "big", "small", "sub",
> 			 "sup", "h1", "h2", "h3", "h4", "h5", "h6", "cite",
> 			 "code", "em", "s", "strike", "strong", "tt", "var",
> 			 "div", "center", "span", "blockquote", "ol", "ul",
> 			 "li", "dl", "table", "pre", "ruby", "rt", "rb", "rp",
> 			 "dt", "dd");
>     $htmlsingle = array ("br", "hr");
>     $htmlnest = array (
> 			// Tags that can be nested--??
1612,1613c1544,1546
<     $tabletags = array (	// Can only appear inside table
< 			 "td", "th", "tr");
---
>     $tabletags = array (
> 			 // Can only appear inside table
> 			 "td", "th", "tr", "caption");
1617d1549
< 
1692c1624
<     // Close off any remaining tags
---
>     // closes off any remaining tags
1705d1636
< 
1707,1718c1638,1645
<  * 
<  * This function accomplishes several tasks:
<  * 1) Auto-number headings if that option is enabled
<  * 2) Add an [edit] link to sections for logged in users who have enabled the option
<  * 3) Add a Table of contents on the top for users who have enabled the option
<  * 4) Auto-anchor headings
<  *
<  * It loops through all headlines, collects the necessary data, then splits up the
<  * string and re-inserts the newly formatted headlines.
<  *
<  * */
<   /* private */ function formatHeadings ($text)
---
>  This function accomplishes several tasks:
>  1) Auto-number headings if that option is enabled
>  2) Add an [edit] link to sections for logged in users who have enabled the option
>  3) Add a Table of contents on the top for users who have enabled the option
>  4) Auto-anchor headings
>  It loops through all headlines, collects the necessary data, then splits up the string and re-inserts the newly formatted headlines.
> */
>   function formatHeadings ($text)
1740,1742c1667
< 	  {
< 	    $es = 0;
< 	  }
---
> 	  $es = 0;
1744,1745c1669,1670
<     // if the string __NOTOC__ (not case-sensitive) occurs in the HTML, 
<     // do not add TOC
---
> 
>     // if the string __NOTOC__ (not case-sensitive) occurs in the HTML, do not add TOC
1752,1753c1677
<     // never add the TOC to the Main Page. This is an entry page that should not
<     // be more than 1-2 screens large anyway
---
>     // never add the TOC to the Main Page. This is an entry page that should not be more than 1-2 screens large anyway
1759c1683
<     // We need this to perform operations on the HTML
---
>     // perform operations on the HTML
1762,1763c1686
<     // Get all headlines for numbering them and adding funky stuff like [edit]
<     // links
---
>     // Get all headlines for numbering them and adding funky stuff like [edit] links
1769,1770c1692
<     // Ugh .. the TOC should have neat indentation levels which can be
<     // passed to the skin functions. These are determined here
---
>     // TOC should have neat indentation levels which can be passed to the skin functions. These are determined here
1780d1701
< 
1784d1704
< 
1791d1710
< 
1823d1741
< 
1836d1753
< 
1852d1768
< 
1854,1855c1770,1771
< 	"<h".$level.$matches[2][$c]."<a name=\"".$anchor."\">".$headline.
< 	"</a>"."</h".$level.">";
---
> 	"<h".$level.$matches[2][$c]."<a class=\"section\" name=\"".$anchor.
> 	"\">".$headline."</a>"."</h".$level.">";
1858d1773
< 
1877d1791
< 
1893c1807
< 	  $full = "<a name=\"top\"></a>".$full.$toc;
---
> 	  $full = "<a class=\"section\" name=\"top\"></a>".$full.$toc;
1903c1817
<   /* private */ function magicISBN ($text)
---
>   function magicISBN ($text)
1953c1867
<   /* private */ function magicRFC ($text)
---
>   function magicRFC ($text)
1958c1872
<   /* private */ function headElement ()
---
>   function headElement ()
1961c1875
<       $wgLang;
---
>       $wgLang, $wgSitename;
1963c1877,1879
<     $ret = "<!DOCTYPE HTML PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
---
>     $ret =
>       "<"."?"."xml version=\"1.0\" encoding=\"{$wgOutputEncoding}\""."?".
>       ">\n<!-- GetWiki 1.0 | Adapted from Mediawiki 1.1.0 //-->\n<!DOCTYPE HTML PUBLIC \"$wgDocType\" \"$wgDTD\">\n";
1971c1887,1888
<       "<html lang=\"$wgLanguageCode\"$rtl><head><title>{$this->mHTMLtitle}</title>\n";
---
>       "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"{$wgLanguageCode}\" lang=\"{$wgLanguageCode}\">\n\n<head>\n<title>{$wgSitename} | {$this->mPagetitle}</title>\n";
>     //$ret .= "<html lang=\"$wgLanguageCode\"$rtl>\n<head>\n<title>{$wgSitename} | {$this->mPagetitle}</title>\n";
1973,1974c1890,1891
< 		array ("http:Content-type",
< 		       "text/html; charset={$wgOutputEncoding}"));
---
> 		array ("http:content-type",
> 		       "application/xhtml+xml; charset={$wgOutputEncoding}"));
1988,1993c1905,1907
<     $p = $this->mRobotpolicy;
<     if ("" == $p)
<       {
< 	$p = "index,follow";
<       }
<     $ret. = "<meta name=\"robots\" content=\"$p\">\n";
---
>     //$p = $this->mRobotpolicy;
>     //if ( "" == $p ) { $p = "index,follow"; }
>     //$ret .= "<meta name=\"robots\" content=\"$p\">\n";
1997,1998c1911,1914
< 	$ret. = "<meta name=\"keywords\" content=\"".
< 	  implode (",", $this->mKeywords)."\">\n";
---
> 	$ret. =
> 	  "<meta name=\"keywords\" content=\"".implode (",",
> 							$this->mKeywords).
> 	  "\">\n";
2013a1930
>     $ret. = $sk->getUserStyles ();	// shouldn't put CSS in (X)HTML - moved to separate files, and this calls them - proteus
2015d1931
<     $ret. = $sk->getUserStyles ();
2023d1938
< 
2025,2026c1940
< // Necessary because replaceVariables is called after removeHTMLtags, 
< // and message text can come from any user
---
> // Necessary because replaceVariables is called after removeHTMLtags, and message text can come from any user

Profiling.php[edit]

diff mediawiki-fm\Profiling.php getwiki-fm\Profiling.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
145,147c150
< 	{
< 	  $elapsed -= $overhead * $calls;
< 	}
---
> 	$elapsed -= $overhead * $calls;
150,151c153,155
<       $prof. = sprintf ($format, $fname, $calls, (float) ($elapsed * 1000),
< 			(float) ($elapsed * 1000) / $calls, $percent);
---
>       $prof. =
> 	sprintf ($format, $fname, $calls, (float) ($elapsed * 1000),
> 		 (float) ($elapsed * 1000) / $calls, $percent);
155,157c159
< 	{
< 	  Profiler::logToDB ($fname, (float) ($elapsed * 1000), $calls);
< 	}
---
> 	Profiler::logToDB ($fname, (float) ($elapsed * 1000), $calls);
165c167
<   /* static */ function logToDB ($name, $timeSum, $eventCount)
---
>   function logToDB ($name, $timeSum, $eventCount)
168,170c170,171
<     $sql = "UPDATE profiling ".
<       "SET pf_count=pf_count+{$eventCount}, ".
<       "pf_time=pf_time + {$timeSum} "."WHERE pf_name='{$name}'";
---
>     $sql =
>       "UPDATE profiling SET pf_count=pf_count+{$eventCount},pf_time=pf_time + {$timeSum} WHERE pf_name='{$name}'";
176,177c177,178
< 	$sql = "INSERT IGNORE INTO profiling (pf_name,pf_count,pf_time) ".
< 	  "VALUES ('{$name}', {$eventCount}, {$timeSum}) ";
---
> 	$sql =
> 	  "INSERT IGNORE INTO profiling (pf_name,pf_count,pf_time) VALUES ('{$name}', {$eventCount}, {$timeSum}) ";
189d189
< 

QueryPage.php[edit]

diff mediawiki-fm\QueryPage.php getwiki-fm\QueryPage.php
1c1,7
< < ? include_once ("LogPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("LogPage.php");
9,12c15,17
< 
<   // Subclasses return their name here. Make sure the name is also
<   // specified in Language.php, both in the $wgValidSpecialPagesEn
<   // variable, and as a language message param.
---
> // Subclasses return their name here. Make sure the name is also
> // specified in Language.php, both in the $wgValidSpecialPagesEn
> // variable, and as a language message param.
26,28c31,33
<   // Is this query expensive (for some definition of expensive)? Then we
<   // don't let it run in miser mode. The default is 0. Expensive
<   // subqueries should override this.
---
> // Is this query expensive (for some definition of expensive)? Then we
> // don't let it run in miser mode. The default is 0. Expensive
> // subqueries should override this.
35,37c40,42
<   // Formats the results of the query for display. The skin is the current
<   // skin; you can use it for making links. The result is a single row of
<   // result data. You should be able to grab SQL results off of it.
---
> // Formats the results of the query for display. The skin is the current
> // skin; you can use it for making links. The result is a single row of
> // result data. You should be able to grab SQL results off of it.
44,45c49,50
<   // This is the actual workhorse. It does everything needed to make a
<   // real, honest-to-gosh query page.
---
> // This is the actual workhorse. It does everything needed to make a
> // real, honest-to-gosh query page.
49d53
< 
57d60
< 
70d72
< 
72d73
< 
74d74
< 
92c92
<     // Saving cache
---
>     //Saving cache
107d106
< 
113d111
< 
Only in getwiki-fm: README

redirect.phtml[edit]

diff mediawiki-fm\redirect.phtml getwiki-fm\redirect.phtml
1a2,7
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> 

SearchEngine.php[edit]

diff mediawiki-fm\SearchEngine.php getwiki-fm\SearchEngine.php
2c2,6
< // See search.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5,7c9,10
<   /* private */ var $mUsertext, $mSearchterms;
<   /* private */ var $mTitlecond, $mTextcond;
< 
---
>   var $mUsertext, $mSearchterms;
>   var $mTitlecond, $mTextcond;
16d18
<     //
43c45
<   /* private */ function initNamespaceCheckbox ($i)
---
>   function initNamespaceCheckbox ($i)
60,61c62
<   // Display the "power search" footer. Does not actually perform the search, 
<   // that is done by showResults()
---
>   // Display the "power search" footer. Does not actually perform the search, that is done by showResults()
84,87c85
< 	{
< 	  continue;
< 	}
< 
---
> 	continue;
90,91c88
<       // Initialise checkboxValues, either from defaults or from 
<       // a previous invocation
---
>       // Initialise checkboxValues, either from defaults or from a previous invocation
118,119c115,116
<       $tempText. = "<input type=checkbox value=\"1\" name=\"".
< 	"ns{$i}\"{$checked}>{$name}\n";
---
>       $tempText. =
> 	"<input type=\"checkbox\" class=\"fill\" value=\"1\" name=\"ns{$i}\"{$checked} />{$name}<br />\n";
131c128,129
<     $tempText = "<input type=checkbox value=1 name=\"redirs\"{$checked}>\n";
---
>     $tempText =
>       "<input type=\"checkbox\" value=\"1\" class=\"fill\" name=\"redirs\"{$checked} />\n";
136,137c134,136
<     $tempText = "<input type=text name=\"search\" value=\"".
<       htmlspecialchars ($search)."\" width=80>\n";
---
>     $tempText =
>       "<input type=\"text\" name=\"search\" value=\"".
>       htmlspecialchars ($search)."\" width=\"80\" />\n";
142,143c141,143
<     $tempText = "<input type=submit name=\"searchx\" value=\"".
<       wfMsg ("powersearch")."\">\n";
---
>     $tempText =
>       "<input type=\"submit\" name=\"searchx\" value=\"".
>       wfMsg ("powersearch")."\" />\n";
146,147c146,149
<     $ret = "<br><br>\n<form id=\"powersearch\" method=\"get\" ".
<       "action=\"".wfLocalUrl ("")."\">\n{$ret}\n</form>\n";
---
>     //$ret = "<br /><br />\n<form id=\"powersearch\" method=\"get\" action=\"" . wfLocalUrl( "" ) . "\">\n{$ret}\n</form>\n";
>     $ret =
>       "<div id=\"powersearch\" class=\"small\">\n<form method=\"get\" action=\"".
>       wfLocalUrl ("")."\">\n{$ret}\n</form>\n</div>\n";
168c170,172
<     $powersearch = $this->powersearch ();	/* Need side-effects here? */
---
>     // For powersearch
>     $powersearch = $this->powersearch ();
>     $wgOut->addHTML ($powersearch);	// moved way up and floated with CSS for better layout - proteus
186,187c190,191
< 	$wgOut->addHTML ("<h2>".wfMsg ("badquery")."</h2>\n".
< 			 "<p>".wfMsg ("badquerytext"));
---
> 	$wgOut->addHTML ("<h2>".wfMsg ("badquery")."</h2>\n"."<p>".
> 			 wfMsg ("badquerytext")."</p>");
204,207c208,209
< 	$sql = "SELECT cur_id,cur_namespace,cur_title,".
< 	  "cur_text FROM cur,searchindex ".
< 	  "WHERE cur_id=si_page AND {$this->mTitlecond} ".
< 	  "{$searchnamespaces} {$redircond}"."LIMIT {$offset}, {$limit}";
---
> 	$sql =
> 	  "SELECT cur_id,cur_namespace,cur_title,cur_text FROM cur,searchindex WHERE cur_id=si_page AND {$this->mTitlecond} {$searchnamespaces} {$redircond} LIMIT {$offset}, {$limit}";
211a214
> 	//$text = wfMsg( "searchresulttext", $sk->makeKnownLink(wfMsg( "searchhelppage" ), wfMsg( "searchingwikipedia" ) ) );
216c219
< 	$wgOut->addHTML ($text);
---
> 	//$wgOut->addHTML( $text );
221,222c224,225
< 	    $wgOut->addHTML ("<h2>".wfMsg ("badquery")."</h2>\n".
< 			     "<p>".wfMsg ("badquerytext"));
---
> 	    $wgOut->addHTML ("<h2>".wfMsg ("badquery")."</h2>\n"."<p>".
> 			     wfMsg ("badquerytext")."</p>");
226a230
> 
230,233c234,235
< 	$sql = "SELECT cur_id,cur_namespace,cur_title,".
< 	  "cur_text FROM cur,searchindex ".
< 	  "WHERE cur_id=si_page AND {$this->mTitlecond} ".
< 	  "{$searchnamespaces} {$redircond}"."LIMIT {$offset}, {$limit}";
---
> 	$sql =
> 	  "SELECT cur_id,cur_namespace,cur_title,cur_text FROM cur,searchindex WHERE cur_id=si_page AND {$this->mTitlecond} {$searchnamespaces} {$redircond} LIMIT {$offset}, {$limit}";
237,240c239,240
< 	$sql = "SELECT cur_id,cur_namespace,cur_title,".
< 	  "cur_text FROM cur,searchindex ".
< 	  "WHERE cur_id=si_page AND {$this->mTextcond} ".
< 	  "{$searchnamespaces} {$redircond} "."LIMIT {$offset}, {$limit}";
---
> 	$sql =
> 	  "SELECT cur_id,cur_namespace,cur_title,cur_text FROM cur,searchindex WHERE cur_id=si_page AND {$this->mTextcond} {$searchnamespaces} {$redircond} LIMIT {$offset}, {$limit}";
252d251
< 	$wgOut->addHTML ("<p>{$top}\n");
254c253
< 	// For powersearch
---
> 	$wgOut->addHTML ("\n<p>({$top})</p>\n");
263,265c262,265
< 	$sl = wfViewPrevNext ($offset, $limit, "",
< 			      "search=".wfUrlencode ($this->mUsertext).$a2l);
< 	$wgOut->addHTML ("<br>{$sl}\n");
---
> 	$sl =
> 	  wfViewPrevNext ($offset, $limit, "",
> 			  "search=".wfUrlencode ($this->mUsertext).$a2l);
> 	$wgOut->addHTML ("<p>{$sl}</p>\n");
307c307
< 	    $wgOut->addHTML ("<p>".wfMsg ("nonefound")."\n");
---
> 	    $wgOut->addHTML ("<p>".wfMsg ("nonefound")."</p>\n");
309,310c309,310
< 	$wgOut->addHTML ("<p>{$sl}\n");
< 	$wgOut->addHTML ($powersearch);
---
> 	$wgOut->addHTML ("<p>{$sl}</p>\n");
> 	//$wgOut->addHTML( $powersearch );
339,340c339,340
<       if ("and" == $word || "or" == $word || "not" == $word
< 	  || "(" == $word || ")" == $word)
---
>       if ("and" == $word || "or" == $word || "not" == $word || "(" == $word
> 	  || ")" == $word)
359,360c359,360
< 	  $cond. = " (MATCH (////field////) AGAINST ('".
< 	    wfStrencode ($word)."'))";
---
> 	  $cond. =
> 	    " (MATCH (////field////) AGAINST ('".wfStrencode ($word)."'))";
370,371c370,371
<     $this->mTitlecond = "(".str_replace ("////field////",
< 					 "si_title", $cond)." )";
---
>     $this->mTitlecond =
>       "(".str_replace ("////field////", "si_title", $cond)." )";
373,375c373,375
<     $this->mTextcond = "(".str_replace ("////field////",
< 					"si_text",
< 					$cond)." AND (cur_is_redirect=0) )";
---
>     $this->mTextcond =
>       "(".str_replace ("////field////", "si_text",
> 		       $cond)." AND (cur_is_redirect=0) )";
380,381d379
<     // FIXME: not ready yet! Do not use.
< 
384,386c382
<     //$q = preg_replace( "/([+-]?)([$lc]+)/e",
<     //      "\"$1\" . \$wgLang->stripForSearch(\"$2\")",
<     //      $this->mUsertext );
---
>     //$q = preg_replace( "/([+-]?)([$lc]+)/e","\"$1\" . \$wgLang->stripForSearch(\"$2\")",$this->mUsertext );
474c470
<       $line = preg_replace ($pat2, "<font color='red'>\\1</font>", $line);
---
>       $line = preg_replace ($pat2, "<span class=\"error\">\\1</span>", $line);
476c472
<       $wgOut->addHTML ("<br><small>{$lineno}: {$line}</small>\n");
---
>       $wgOut->addHTML ("<br /><small>{$lineno}: {$line}</small>\n");
489d484
<     //
506d500
<     //
515d508
<     //
524d516
<     //
533d524
<     //
538,539c529
< 	  "SELECT cur_id,cur_title,cur_namespace,si_page FROM cur,searchindex ".
< 	  "WHERE cur_id=si_page AND {$this->mTitlecond} ORDER BY cur_namespace LIMIT 1";
---
> 	  "SELECT cur_id,cur_title,cur_namespace,si_page FROM cur,searchindex WHERE cur_id=si_page AND {$this->mTitlecond} ORDER BY cur_namespace LIMIT 1";
554,557c544,549
<     $wgOut->addHTML (wfMsg ("nogomatch",
< 			    htmlspecialchars (wfLocalUrl
< 					      (ucfirst ($this->mUsertext),
< 					       "action=edit")))."\n<p>");
---
>     $wgOut->
>       addHTML (wfMsg
> 	       ("nogomatch",
> 		htmlspecialchars (wfLocalUrl
> 				  (ucfirst ($this->mUsertext),
> 				   "action=edit")))."\n<p>");

SearchUpdate.php[edit]

diff mediawiki-fm\SearchUpdate.php getwiki-fm\SearchUpdate.php
2c2,6
< // See deferred.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5,7c9,10
< 
<   /* private */ var $mId = 0, $mNamespace, $mTitle, $mText;
<   /* private */ var $mTitleWords;
---
>   var $mId = 0, $mNamespace, $mTitle, $mText;
>   var $mTitleWords;
40c43,44
< 	$sql = "UPDATE LOW_PRIORITY searchindex SET si_title='".
---
> 	$sql =
> 	  "UPDATE LOW_PRIORITY searchindex SET si_title='".

Setup.php[edit]

diff mediawiki-fm\Setup.php getwiki-fm\Setup.php
2,6c2,8
< // The main wiki script and things like database
< // conversion and maintenance scripts all share a
< // common setup of including lots of classes and
< // setting up a few globals.
< //
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // main wiki script, database conversion and maintenance scripts all share a
> // common setup of including lots of classes and setting up a few globals.
11,13c13
<   {
<     include_once ("Profiling.php");
<   }
---
>   include_once ("Profiling.php");
35,36c35
< // Only files which are used on every invocation should be included here
< // Otherwise, include them conditionally [TS]
---
> // Only files used on every invocation should be included here, otherwise include them conditionally
53c52
< global $wgUser, $wgLang, $wgOut, $wgTitle;
---
> global $wgSitename, $wgCookieExpiration, $wgUser, $wgLang, $wgOut, $wgTitle;
71,72c70
<     // Test it to see if it's working
<     // This is necessary because otherwise wfMsg would be extremely inefficient
---
>     // Test it to see if it's working, necessary because otherwise wfMsg would be extremely inefficient
87a86
> // so sick of this bugware.  even with an english only installation, all of this extra bloat it needed
93a93
> 
95a96
> 
109,110c110,114
<     session_set_cookie_params (0, $wgCookiePath, $wgCookieDomain);
<     session_cache_limiter ("private, must-revalidate");
---
> 
>     //session_set_cookie_params( 0, $wgCookiePath, $wgCookieDomain );
>     //session_cache_limiter( "private, must-revalidate" );
> 
>     session_cache_limiter ('no-cache');

SiteStatsUpdate.php[edit]

diff mediawiki-fm\SiteStatsUpdate.php getwiki-fm\SiteStatsUpdate.php
2c2,6
< // See deferred.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5d8
< 
55,56c58,60
<     $sql = "UPDATE LOW_PRIORITY site_stats SET ".implode (",", $a).
<       " WHERE ss_row_id=1";
---
>     $sql =
>       "UPDATE LOW_PRIORITY site_stats SET ".implode (",",
> 						     $a)." WHERE ss_row_id=1";

Skin.php[edit]

diff mediawiki-fm\Skin.php getwiki-fm\Skin.php
2,9c2,8
< // See skin.doc
< // These are the INTERNAL names, which get mapped
< // directly to class names.  For display purposes, the
< // Language class has internationalized names
< //
< /* private */ $wgValidSkinNames = array (
< 					  "Standard", "Nostalgia", "CologneBlue"	//, "Smarty", "Montparnasse"
<   );
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // creates most of the XHTML output
>   $wgValidSkinNames = array ("Standard", "Nostalgia", "CologneBlue");
11d9
< // For some odd PHP bug, this function can't be part of a class
24c22
<   $s. = "\n<br>\n";
---
>   $s. = "<br />\n";
35d32
< 
43c40
< };
---
> }
47,49c44
< 
<   /* private */ var $lastdate, $lastline;
< 
---
>   var $lastdate, $lastline;
114c109
<       $out->out (" $name='$val'");
---
>       $out->out (" $name=\"$val\"");
130c125
<     $out->out ("\n</body></html>");
---
>     $out->out ("\n\n</body>\n</html>");
143,145c138
<     $s = "<style type='text/css'><!--\n";
<     $s. = $this->doGetUserStyles ();
<     $s. = "//--></style>\n";
---
>     $s = $this->doGetUserStyles ();
151c144
<     global $wgUser;
---
>     global $wgUser, $wgStyleSheetPath;
153c146
<     $s = "";
---
>     //$s = "";
155,167c148,150
<       {
< 	// Don't override browser settings
<       }
<     else
<       {
< 	// CHECK MERGE @@@
< 	// Force no underline
< 	$s. = "a.stub, a.new, a.internal, a.external { ".
< 	  "text-decoration: none; }\n";
<       }
<     if (1 == $wgUser->getOption ("highlightbroken"))
<       {
< 	$s. = "a.new, //quickbar a.new { color: //CC2200; }\n";
---
>       {				// add an underline CSS
> 	$s. =
> 	  "<link rel=\"stylesheet\" href=\"{$wgStyleSheetPath}/wikiunder.css\">\n";
171c154,155
< 	$s. = "//article { text-align: justify; }\n";
---
> 	$s. =
> 	  "<link rel=\"stylesheet\" href=\"{$wgStyleSheetPath}/wikijust.css\">\n";
178,179c162,163
<     global $wgUser, $wgTitle, $wgNamespaceBackgrounds, $wgOut, $oldid,
<       $redirect, $diff, $action;
---
>     global $wgUser, $wgTitle, $wgNamespaceBackgrounds, $wgNamespaceNamesEn,
>       $wgOut, $oldid, $redirect, $diff, $action;
181c165
<     if (0 != $wgTitle->getNamespace ())
---
>     if ($wgTitle->getNamespace () != 0)	// change bgcolor for namespaces
183c167,192
< 	$a = array ("bgcolor" = >"//ffffec");
---
> 	if (($wgTitle->getNamespace () == 8)
> 	    || ($wgTitle->getNamespace () == 4))
> 	  {			// metanamespace pages
> 	    $a = array ("class" = >"meta");
> 	  }
> 	elseif (($wgTitle->getNamespace () == 2))
> 	{			//  user (home)pages
> 	  $a = array ("class" = >"user");
> 	}
> 	elseif (($wgTitle->getNamespace () == 10))
> 	{			//  alternate articles pages (we are not using these, but they may be useful)
> 	  $a = array ("class" = >"alternate");
> 	}
> 	elseif (($wgTitle->getNamespace () == 1)
> 		|| ($wgTitle->getNamespace () == 3)
> 		|| ($wgTitle->getNamespace () == 5)
> 		|| ($wgTitle->getNamespace () == 7)
> 		|| ($wgTitle->getNamespace () == 9)
> 		|| ($wgTitle->getNamespace () == 11))
> 	{			// ALL talk pages
> 	  $a = array ("class" = >"talk");
> 	}
> 	else
> 	{			// special pages
> 	  $a = array ("class" = >"system");
> 	}
184a194
>     // article pages
186c196,197
<       $a = array ("bgcolor" = >"//FFFFFF");
---
>       $a = array ("class" = >"articles");
> 
204d214
< 
210,212c220
< 	  {
< 	    $a['onload']. = ";$foc";
< 	  }
---
> 	  $a['onload']. = ";$foc";
214,216c222
< 	  {
< 	    $a['onload'] = $foc;
< 	  }
---
> 	  $a['onload'] = $foc;
232c238
< 	$r = " class='printable'";
---
> 	$r = " class=\"printable\"";
236c242
< 	$r = " class='external'";
---
> 	$r = " class=\"external\"";
255,257c261
<       {
< 	$r = " class='printable'";
<       }
---
>       $r = " class=\"printable\"";
259,261c263
<       {
< 	$r = " class='stub'";
<       }
---
>       $r = " class=\"stub\"";
263,265c265
<       {
< 	$r = " class='new'";
<       }
---
>       $r = " class=\"new\"";
267,269c267
<       {
< 	$r = " class='internal'";
<       }
---
>       $r = " class=\"internal\"";
272,274c270
<       {
< 	$r. = " title=\"{$link}\"";
<       }
---
>       $r. = " title=\"{$link}\"";
283,285c279
<       {
< 	$r = " class='printable'";
<       }
---
>       $r = " class=\"printable\"";
287,289c281
<       {
< 	$r = " class='stub'";
<       }
---
>       $r = " class=\"stub\"";
291,293c283
<       {
< 	$r = " class='new'";
<       }
---
>       $r = " class=\"new\"";
295,297c285
<       {
< 	$r = " class='internal'";
<       }
---
>       $r = " class=\"internal\"";
300,302c288
<       {
< 	$r. = ' title ="'.$nt->getEscapedText ().'"';
<       }
---
>       $r. = ' title ="'.$nt->getEscapedText ().'"';
312,314d297
<   // This will be called immediately after the <body> tag.  Split into
<   // two functions to make it easier to subclass.
<   //
322c305
< 	$s. = "\n<div class='bodytext'>";
---
> 	$s. = "\n<div class=\"printable\">";
337,350c320
<     if ($langlinks = $this->otherLanguages ())
<       {
< 	$rows = 2;
< 	$borderhack = "";
<       }
<     else
<       {
< 	$rows = 1;
< 	$langlinks = false;
< 	$borderhack = "class='top'";
<       }
< 
<     $s. = "\n<div id='content'>\n<div id='topbar'>".
<       "<table width='98%' border=0 cellspacing=0><tr>";
---
>     $s. = "\n<div id=\"content\">\n\n<div id=\"topbar\">\n";
359,360c329
< 	$s. = "<td class='top' align=left valign=top rowspan='{$rows}'>".
< 	  $this->logoText ()."</td>";
---
> 	$s. = "\n".$this->logoText ();
362,367d330
<     elseif ($left)
<     {
<       $s. = $this->getQuickbarCompensator ($rows);
<     }
<     $l = $wgLang->isRTL ()? "right" : "left";
<     $s. = "<td {$borderhack} align='$l' valign='top'>";
369,380c332,334
<     $s. = $this->topLinks ();
<     $s. = "<p class='subtitle'>".$this->pageTitleLinks ();
< 
<     $r = $wgLang->isRTL ()? "left" : "right";
<     $s. = "</td>\n<td {$borderhack} valign='top' align='$r' nowrap>";
<     $s. = $this->nameAndLogin ();
<     $s. = "\n<br>".$this->searchForm ()."</td>";
< 
<     if ($langlinks)
<       {
< 	$s. = "</tr>\n<tr><td class='top' colspan=\"2\">$langlinks</td>";
<       }
---
>     $l = $wgLang->isRTL ()? "right" : "left";
>     $s. = "<div id=\"toplinks\">".$this->topLinks ();
>     $s. = $this->pageTitleLinks ();
382,387c336,338
<     if ($shove && !$left)
<       {				// Right
< 	$s. = $this->getQuickbarCompensator ($rows);
<       }
<     $s. = "</tr></table>\n</div>\n";
<     $s. = "\n<div id='article'>";
---
>     $s. = "</div>\n<div id=\"userlinks\">".$this->nameAndLogin ();
>     $s. =
>       "<br />\n".$this->searchForm ()."\n</div>\n\n".$this->otherLanguages ();
388a340
>     $s. = "</div>\n\n<div id=\"article\">";
391c343
<     $s. = getCategories ();	// For some odd reason, zhis can't be a function of the object
---
>     $s. = getCategories ();
397,403d348
<   function getQuickbarCompensator ($rows = 1)
<   {
<     return "<td width='152' rowspan='{$rows}'> </td>";
<   }
< 
<   // This gets called immediately before the </body> tag.
<   //
406c351
<     global $wgUser, $wgOut, $wgServer;
---
>     global $wgUser, $wgOut, $wgServer, $wgScript;
413c358,359
< 	$u = htmlspecialchars ($wgServer.$wgTitle->getFullURL ());
---
> 	$u = htmlspecialchars ($wgScript.$wgTitle->getFullURL ());
> 	$un = str_replace ("?", "", $u);
415a362
> 	$cr = wfMsg ("gnunote");
417c364
< 	if ($wgOut->isArticle ())
---
> 	if (!$wgOut->isArticle ())
419c366
< 	    $lm = "<br>".$this->lastModified ();
---
> 	    $s. = "<br /><br />\n<em>{$rf}<br />{$cr}</em>\n";
421c368
< 	else
---
> 	else			// enhanced for XML imports...
423c370,371
< 	    $lm = "";
---
> 	    $lm = "<br />\n".$this->lastModified ();
> 	    $s. = "<br /><br />\n<em>{$rf}{$lm}<br />{$cr}</em>\n";
426,427d373
< 	$cr = wfMsg ("gnunote");
< 	$s. = "<p><em>{$rf}{$lm} {$cr}</em>\n";
440,442c386,387
<     $s = "\n</div><br clear=all>\n";
<     $s. = "\n<div id='footer'>";
<     $s. = "<table width='98%' border=0 cellspacing=0><tr>";
---
>     $s = "</p>\n</div>\n";
>     $s. = "\n<div id=\"footer\">\n";
453,456d397
<     if ($shove && $left)
<       {				// Left
< 	$s. = $this->getQuickbarCompensator ();
<       }
460d400
<     $s. = "<td class='bottom' align='$l' valign='top'>";
464,465c404,405
<       "\n<br>".$this->mainPageLink ()." | ".$this->aboutLink ()." | ".$this->
<       specialLink ("recentchanges")." | ".$this->searchForm ()."<br>".$this->
---
>       "<br />".$this->mainPageLink ()." | ".$this->aboutLink ()." | ".$this->
>       specialLink ("recentchanges")."<br />".$this->searchForm ().$this->
467,473c407
< 
<     $s. = "</td>";
<     if ($shove && !$left)
<       {				// Right
< 	$s. = $this->getQuickbarCompensator ();
<       }
<     $s. = "</tr></table>\n</div>\n</div>\n";
---
>     $s. = "\n</div>\n\n</div>\n";
516,517c450,452
< 	$s. = " | ".$this->makeKnownLink ($wgTitle->getPrefixedText (),
< 					  wfMsg ("currentrev"));
---
> 	$s. =
> 	  " | ".$this->makeKnownLink ($wgTitle->getPrefixedText (),
> 				      wfMsg ("currentrev"));
522,523c457
< 	// do not show "You have new messages" text when we are viewing our 
< 	// own talk page 
---
> 	// do not show "You have new messages" text when we are viewing our  own talk page 
525,527c459,462
< 	if (!(strcmp ($wgTitle->getText (), $wgUser->getName ()) == 0 &&
< 	      $wgTitle->getNamespace () ==
< 	      Namespace::getTalk (Namespace::getUser ())))
---
> 	if (!
> 	    (strcmp ($wgTitle->getText (), $wgUser->getName ()) == 0
> 	     && $wgTitle->getNamespace () ==
> 	     Namespace::getTalk (Namespace::getUser ())))
539,549c474,485
<     if ($wgUser->isSysop () &&
< 	(($wgTitle->getArticleId () == 0) || ($action == "history")) &&
< 	($n = $wgTitle->isDeleted ()))
<       {
< 	$s. = " | ".wfMsg ("thisisdeleted",
< 			   $this->makeKnownLink ($wgLang->
< 						 SpecialPage ("Undelete/".
< 							      $wgTitle->
< 							      getPrefixedDBkey
< 							      ()),
< 						 wfMsg ("restorelink", $n)));
---
>     if ($wgUser->isSysop ()
> 	&& (($wgTitle->getArticleId () == 0) || ($action == "history"))
> 	&& ($n = $wgTitle->isDeleted ()))
>       {
> 	$s. =
> 	  " | ".wfMsg ("thisisdeleted",
> 		       $this->makeKnownLink ($wgLang->
> 					     SpecialPage ("Undelete/".
> 							  $wgTitle->
> 							  getPrefixedDBkey
> 							  ()),
> 					     wfMsg ("restorelink", $n)));
567,569c503,505
<     $s = $this->makeKnownLink ($wgTitle->getPrefixedText (),
< 			       WfMsg ("printableversion"),
< 			       "{$q}printable=yes");
---
>     $s =
>       $this->makeKnownLink ($wgTitle->getPrefixedText (),
> 			    WfMsg ("printableversion"), "{$q}printable=yes");
577c513
<     $s = "<h1 class='pagetitle'>".$wgOut->getPageTitle ()."</h1>";
---
>     $s = "<h1 class=\"pagetitle\">".$wgOut->getPageTitle ()."</h1>\n";
602c538
< 	    $sub. = "</p><p class='subpages'>";
---
> 	    $sub. = "</p><p class=\"subpages\">";
613c549
< 		  if (preg_match ("/class='new'/i", $getlink))
---
> 		  if (preg_match ("/class=\"new\"/i", $getlink))
618,620c554
< 		    {
< 		      $sub. = " | ";
< 		    }
---
> 		    $sub. = " | ";
622,624c556
< 		    {
< 		      $sub. = "< ";
< 		    }
---
> 		    $sub. = "< ";
628d559
< 
632c563
<     $s = "<p class='subtitle'>{$sub}\n";
---
>     $s = "<span class=\"subtitle\">{$sub}</span>\n";
657,658c588
< 
< 	    $s. = $n." (".$tl.")";
---
> 	    $s. = $n." (".$tl.")<br />\n";
661,663c591
< 	  {
< 	    $s. = wfMsg ("notloggedin");
< 	  }
---
> 	  $s. = wfMsg ("notloggedin");
667,669c595
< 	  {
< 	    $q = "";
< 	  }
---
> 	  $q = "";
671,673c597
< 	  {
< 	    $q = "returnto={$rt}";
< 	  }
---
> 	  $q = "returnto={$rt}";
675c599
< 	$s. = "\n<br>".$this->makeKnownLink ($li, wfMsg ("login"), $q);
---
> 	$s. = $this->makeKnownLink ($li, wfMsg ("login"), $q);
687d610
< 
689d611
< 
693,696c615,618
< 				$n)."{$tl}<br>".$this->makeKnownLink ($lo,
< 								      wfMsg
< 								      ("logout"),
< 								      "returnto={$rt}").
---
> 				$n)."{$tl}<br />\n".$this->makeKnownLink ($lo,
> 									  wfMsg
> 									  ("logout"),
> 									  "returnto={$rt}").
709,714c631,637
<       "<form name='search' class='inline' method=get action=\"".
<       wfLocalUrl ("")."\">".
<       "<input type=text name=\"search\" size=19 value=\"".
<       htmlspecialchars (substr ($search, 0, 256))."\">\n".
<       "<input type=submit name=\"go\" value=\"".wfMsg ("go")."\"> ".
<       "<input type=submit value=\"".wfMsg ("search")."\"></form>";
---
>       "\n<form name=\"search\" class=\"inline\" method=\"get\" action=\"".
>       wfLocalUrl ("")."\">\n".
>       "<input type=\"text\" name=\"search\" size=\"19\" value=\"".
>       htmlspecialchars (substr ($search, 0, 256))."\" />\n".
>       "<input type=\"submit\" name=\"go\" value=\"".wfMsg ("go").
>       "\" /> \n"."<input type=\"submit\" value=\"".wfMsg ("search").
>       "\" />\n</form>\n";
722c645
<     $sep = " |\n";
---
>     $sep = " | ";
728c651,657
< 	$s. = $sep.$this->editThisPage ().$sep.$this->historyLink ();
---
> 	$s. =
> 	  $sep."<span class=\"strong\">".$this->editThisPage ()."</span>".
> 	  $sep.$this->historyLink ()."<br />\n";
>       }
>     else
>       {
> 	$s. = "<br />\n";
730d658
<     // Many people don't like this dropdown box
732d659
< 
744c671
< 	$s. = "<strong>".$this->editThisPage ()."</strong>";
---
> 	$s. = "<span class=\"strong\">".$this->editThisPage ()."</span>";
756d682
< 
763c689
< 		$s. = $sep.$this->userContribsLink ();
---
> 		$s. = "<br />\n".$this->userContribsLink ();
775c701
< 	    $s. = "\n<br>".$this->deleteThisPage ().
---
> 	    $s. = "<br />\n".$this->deleteThisPage ().
778c704
< 	$s. = "<br>\n".$this->otherLanguages ();
---
> 	$s. = "<br />\n".$this->otherLanguages ();
787a714,717
>     $getwiki =
>       "\n<div id=\"getwiki\"><a class=\"image\" href=\"http://www.wikinfo.org/wiki.phtml?title=GetWiki\"><img src=\"./upload/getwiki-pb.gif\" width=\"88\" height=\"31\" alt=\"Powered by GetWiki\" /></a></div>\n";
>     $gnu = wfMsg ("gnunote");
> 
789,794c719,720
<       {
< 	return "";
<       }
<     if (isset ($oldid) || isset ($diff))
<       {
< 	return "";
---
>       {				// changed to put a GNU footer, mostly for the XML imports - proteus
> 	return "<hr />\n<div id=\"pagestats\">{$getwiki}{$gnu}</div>";
795a722
>     //if ( isset( $oldid ) || isset( $diff ) ) { return ""; }
797,798c724,725
<       {
< 	return "";
---
>       {				// changed to put a GNU footer, mostly for the XML imports - proteus
> 	return "<hr />\n<div id=\"pagestats\">{$getwiki}{$gnu}</div>";
800d726
< 
802,804c728
<       {
< 	$s = "";
<       }
---
>       $pv = "";
808c732
< 	$s = wfMsg ("viewcount", $count);
---
> 	$pv = wfMsg ("viewcount", $count);
810,812c734,738
<     $s. = $this->lastModified ();
<     $s. = " ".wfMsg ("gnunote");
<     return "<span id='pagestats'>{$s}</span>";
---
>     $lm = $this->lastModified ();
>     //$s .= " " . wfMsg( "gnunote" );
>     $gnu = wfMsg ("gnunote");
>     return
>       "<hr />\n<div id=\"pagestats\">{$getwiki}{$gnu}<hr />{$pv} | {$lm}</div>";
826,835c752
<     if ("" != $align)
<       {
< 	$a = " align='{$align}'";
<       }
<     else
<       {
< 	$a = "";
<       }
< 
<     $mp = wfMsg ("mainpage");
---
>     $mp = wfMsg ("mainpage");	// changed to below - proteus
837,839c754,756
<       "<a href=\"".wfLocalUrlE (urlencode ($mp)).
<       "\"><img{$a} border=0 src=\"".$this->getLogo ()."\" alt=\"".
<       "[{$mp}]\"></a>";
---
>       "<div id=\"wilogo\"><a class=\"image\" href=\"".
>       wfLocalUrlE (urlencode ($mp))."\"><img src=\"".$this->getLogo ().
>       "\" alt=\"".wfMsg ("mainlogoalt")."\" /></a></div>\n";
852,855c769,771
<     $s = "\n<div id='quickbar'>";
<     $s. = "\n".$this->logoText ()."\n<hr class='sep'>";
< 
<     $sep = "\n<br>";
---
>     $sep = "<br />\n";
>     $s = "\n<div id=\"quickbar\">\n";
>     $s. = $this->logoText ()."\n<hr />\n";
858a775
> 
867d783
< 
872c788
<     $s. = "\n<br><hr class='sep'>";
---
>     $s. = "\n<hr />\n";
879c795
< 	    $s. = "<strong>".$this->editThisPage ()."</strong>";
---
> 	    $s. = "<span class=\"strong\">".$this->editThisPage ()."</span>";
925,927c841,842
< 	      // we just throw in a "New page" text to tell the user that he's in edit mode,
< 	      // and to avoid messing with the separator that is prepended to the next item
< 	      $s. = "<strong>".wfMsg ("newpage")."</strong>";
---
> 	      // we just throw in a "New page" text to tell the user that he's in edit mode, and to avoid messing with the separator that is prepended to the next item
> 	      $s. = "<span class=\"strong\">".wfMsg ("newpage")."</span>";
932d846
< 
936,938c850,852
< 	      "<br>".$this->makeKnownLink ($wgTitle->getPrefixedText (),
< 					   wfMsg ("postcomment"),
< 					   "action=edit&section=new");
---
> 	      "<br />\n".$this->makeKnownLink ($wgTitle->getPrefixedText (),
> 					       wfMsg ("postcomment"),
> 					       "action=edit&section=new");
941,946c855
< 	/*
< 	   watching could cause problems in edit mode:
< 	   if user edits article, then loads "watch this article" in background and then saves
< 	   article with "Watch this article" checkbox disabled, the article is transparently
< 	   unwatched. Therefore we do not show the "Watch this page" link in edit mode
< 	 */
---
> 	//watching could cause problems in edit mode, so remove "Watch this page" link in edit mode
949,950c858,859
< 	    if ($action != "edit" && $action != "history" &&
< 		$action != "submit")
---
> 	    if ($action != "edit" && $action != "history"
> 		&& $action != "submit")
978d886
< 
983,985c891
< 	      {
< 		$s. = $sep.$this->userContribsLink ();
< 	      }
---
> 	      $s. = $sep.$this->userContribsLink ();
994c900
< 	$s. = "\n<br><hr class='sep'>";
---
> 	$s. = "\n<hr />\n";
996a903,905
>     // added announcements link - proteus
>     $s. = $this->announceLink ();
> 
998,1000c907
<       {
< 	$s. = $this->specialLink ("upload").$sep;
<       }
---
>       $s. = $this->specialLink ("upload").$sep;
1006,1007c913,915
< 	$s. = "\n<br><a href=\"".htmlspecialchars ($wgSiteSupportPage).
< 	  "\">".wfMsg ("sitesupport")."</a>";
---
> 	$s. =
> 	  "<br />\n<a href=\"".htmlspecialchars ($wgSiteSupportPage)."\">".
> 	  wfMsg ("sitesupport")."</a>";
1010c918
<     $s. = "\n<br></div>\n";
---
>     $s. = "<br />\n</div>\n";
1017c925
<     global $wgUser, $wgOut, $wgLang, $wgServer, $wgRedirectScript;
---
>     global $wgUser, $wgOut, $wgLang, $wgServer, $wgRedirectScript, $wgScript;
1060,1062c968,970
<     $s = "<form id=\"specialpages\" method=\"get\" class=\"inline\" ".
<       "action=\"{$wgServer}{$wgRedirectScript}\">\n";
<     $s. = "<select name=\"wpDropdown\">\n";
---
>     $s =
>       "<form id=\"specialpages\" method=\"get\" class=\"inline\" action=\"{$wgScript}?\">\n";
>     $s. = "<select name=\"title\">\n";
1071c979
<     $s. = "<input type=submit value=\"{$go}\" name=redirect>\n";
---
>     $s. = "<input type=\"submit\" value=\"{$go}\" name=\"redirect\" />\n";
1085,1086c993,995
<     $s = $this->makeKnownLink (wfMsg ("copyrightpage"),
< 			       wfMsg ("copyrightpagename"));
---
>     $s =
>       $this->makeKnownLink (wfMsg ("copyrightpage"),
> 			    wfMsg ("copyrightpagename"));
1101,1103c1010
<       {
< 	$s = wfMsg ("protectedpage");
<       }
---
>       $s = wfMsg ("protectedpage");
1115,1117c1022
< 	  {
< 	    $oid = "&oldid={$oldid}";
< 	  }
---
> 	  $oid = "&oldid={$oldid}";
1121,1123c1026
<       {
< 	$s = wfMsg ("protectedpage");
<       }
---
>       $s = wfMsg ("protectedpage");
1135d1037
< 
1139,1141c1041
<       {
< 	$s = "";
<       }
---
>       $s = "";
1166,1168c1066
<       {
< 	$s = "";
<       }
---
>       $s = "";
1193,1195c1091
<       {
< 	$s = wfMsg ("notanarticle");
<       }
---
>       $s = wfMsg ("notanarticle");
1205,1207c1101,1104
< 	$s = $this->makeKnownLink ($wgLang->specialPage ("Movepage"),
< 				   wfMsg ("movethispage"),
< 				   "target=".$wgTitle->getPrefixedURL ());
---
> 	$s =
> 	  $this->makeKnownLink ($wgLang->specialPage ("Movepage"),
> 				wfMsg ("movethispage"),
> 				"target=".$wgTitle->getPrefixedURL ());
1216,1217c1113,1115
<     $s = $this->makeKnownLink ($wgTitle->getPrefixedText (),
< 			       wfMsg ("history"), "action=history");
---
>     $s =
>       $this->makeKnownLink ($wgTitle->getPrefixedText (), wfMsg ("history"),
> 			    "action=history");
1225,1227c1123,1126
<     $s = $this->makeKnownLink ($wgLang->specialPage ("Whatlinkshere"),
< 			       wfMsg ("whatlinkshere"),
< 			       "target=".$wgTitle->getPrefixedURL ());
---
>     $s =
>       $this->makeKnownLink ($wgLang->specialPage ("Whatlinkshere"),
> 			    wfMsg ("whatlinkshere"),
> 			    "target=".$wgTitle->getPrefixedURL ());
1235,1237c1134,1137
<     $s = $this->makeKnownLink ($wgLang->specialPage ("Contributions"),
< 			       wfMsg ("contributions"),
< 			       "target=".$wgTitle->getURL ());
---
>     $s =
>       $this->makeKnownLink ($wgLang->specialPage ("Contributions"),
> 			    wfMsg ("contributions"),
> 			    "target=".$wgTitle->getURL ());
1245,1247c1145,1148
<     $s = $this->makeKnownLink ($wgLang->specialPage ("Emailuser"),
< 			       wfMsg ("emailuser"),
< 			       "target=".$wgTitle->getURL ());
---
>     $s =
>       $this->makeKnownLink ($wgLang->specialPage ("Emailuser"),
> 			    wfMsg ("emailuser"),
> 			    "target=".$wgTitle->getURL ());
1256,1258c1157
<       {
< 	$s = "(".wfMsg ("notanarticle").")";
<       }
---
>       $s = "(".wfMsg ("notanarticle").")";
1274d1172
<     // TEST THIS @@@
1278c1176
< 	  return "";
---
> 	  return "Other languages: <i>none</i>";
1289,1291c1187
<       {
< 	$s = wfMsg ("otherlanguages").": ";
<       }
---
>       $s = wfMsg ("otherlanguages").": ";
1297,1298c1193,1195
< 	$s = $this->makeKnownLink ($wgLang->specialPage ("Intl"),
< 				   wfMsg ("otherlanguages"), $x).": ";
---
> 	$s =
> 	  $this->makeKnownLink ($wgLang->specialPage ("Intl"),
> 				wfMsg ("otherlanguages"), $x).": ";
1304c1201
<       $s. = "<span dir='LTR'>";
---
>       $s. = "<span dir=\"ltr\">";
1331,1332c1228,1237
<     $s = $this->makeKnownLink (wfMsg ("bugreportspage"),
< 			       wfMsg ("bugreports"));
---
>     $s =
>       $this->makeKnownLink (wfMsg ("bugreportspage"), wfMsg ("bugreports"));
>     return $s;
>   }
> 
>   function announceLink ()	// added by proteus
>   {
>     $s =
>       $this->makeKnownLink (wfMsg ("announcelink"),
> 			    wfMsg ("announcetext"))."<br />\n";
1347,1349c1252
<       {
< 	$s = $this->makeBrokenLink ($t1->getText ());
<       }
---
>       $s = $this->makeBrokenLink ($t1->getText ());
1351,1353c1254
<       {
< 	$s = $this->makeKnownLink ($t1->getText ());
<       }
---
>       $s = $this->makeKnownLink ($t1->getText ());
1361,1363c1262
<       {
< 	$s. = $this->makeBrokenLink ($t2->getText ());
<       }
---
>       $s. = $this->makeBrokenLink ($t2->getText ());
1365,1367c1264
<       {
< 	$s. = $this->makeKnownLink ($t2->getText ());
<       }
---
>       $s. = $this->makeKnownLink ($t2->getText ());
1406d1302
< 
1409a1306
> 
1455,1457c1352
<   // After all the page content is transformed into HTML, it makes
<   // a final pass through here for things like table backgrounds.
<   //
---
>   // final pass through here for things like table backgrounds.
1463,1465c1358
<   // Note: This function MUST call getArticleID() on the link,
<   // otherwise the cache won't get updated properly.  See LINKCACHE.DOC.
<   //
---
>   // Note: This function MUST call getArticleID() on the link, otherwise the cache won't get updated properly
1471,1475c1364,1366
<       {
< 	$result =
< 	  $this->makeLinkObj (Title::newFromText ($title), $text, $query,
< 			      $trail);
<       }
---
>       $result =
> 	$this->makeLinkObj (Title::newFromText ($title), $text, $query,
> 			    $trail);
1490,1493c1381,1382
<       {
< 	return $this->makeKnownLinkObj (Title::newFromText ($title), $text,
< 					$query, $trail);
<       }
---
>       return $this->makeKnownLinkObj (Title::newFromText ($title), $text,
> 				      $query, $trail);
1506,1509c1395,1396
<       {
< 	return $this->makeBrokenLinkObj (Title::newFromText ($title), $text,
< 					 $query, $trail);
<       }
---
>       return $this->makeBrokenLinkObj (Title::newFromText ($title), $text,
> 				       $query, $trail);
1522,1525c1409,1410
<       {
< 	return $this->makeStubLinkObj (Title::newFromText ($title), $text,
< 				       $query, $trail);
<       }
---
>       return $this->makeStubLinkObj (Title::newFromText ($title), $text,
> 				     $query, $trail);
1537a1423
> 
1558,1566c1444,1449
<     elseif (0 == $nt->getNamespace () && "" == $nt->getText ())
<     {
<       $retVal = $this->makeKnownLinkObj ($nt, $text, $query, $trail);
<     }
<     elseif ((-1 == $nt->getNamespace ()) ||
< 	    (Namespace::getImage () == $nt->getNamespace ()))
<     {
<       $retVal = $this->makeKnownLinkObj ($nt, $text, $query, $trail);
<     }
---
>     elseif (0 == $nt->getNamespace ()
> 	    && "" == $nt->getText ())$retVal =
>       $this->makeKnownLinkObj ($nt, $text, $query, $trail);
>     elseif ((-1 == $nt->getNamespace ())
> 	    || (Namespace::getImage () == $nt->getNamespace ()))$retVal =
>       $this->makeKnownLinkObj ($nt, $text, $query, $trail);
1589,1591c1472
< 		    {
< 		      $size = $threshold * 2;	// Really big
< 		    }
---
> 		    $size = $threshold * 2;	// Really big
1595,1597c1476
< 		{
< 		  $size = $threshold * 2;	// Really big
< 		}
---
> 		$size = $threshold * 2;	// Really big
1600,1602c1479,1480
< 	    {
< 	      $size = 1;
< 	    }
---
> 	    $size = 1;
> 
1604,1606c1482
< 	    {
< 	      $retVal = $this->makeStubLinkObj ($nt, $text, $query, $trail);
< 	    }
---
> 	    $retVal = $this->makeStubLinkObj ($nt, $text, $query, $trail);
1608,1610c1484
< 	    {
< 	      $retVal = $this->makeKnownLinkObj ($nt, $text, $query, $trail);
< 	    }
---
> 	    $retVal = $this->makeKnownLinkObj ($nt, $text, $query, $trail);
1635,1637c1509,1510
<       {
< 	$u = wfLocalUrlE ($link, $query);
<       }
---
>       $u = wfLocalUrlE ($link, $query);
> 
1639,1641c1512
<       {
< 	$u. = "//".wfEscapeHTML ($nt->getFragment ());
<       }
---
>       $u. = "//".wfEscapeHTML ($nt->getFragment ());
1671a1543,1549
>     // removed "action=edit" below because of our "getwiki" XML import - proteus
>     /*
>        if ( "" == $query ) { $q = "action=edit"; }
>        else { $q = "action=edit&{$query}"; }
>        $u = wfLocalUrlE( $link, $q );
>      */
> 
1674c1552
< 	$q = "action=edit";
---
> 	$q = "";
1678c1556
< 	$q = "action=edit&{$query}";
---
> 	$q = "{$query}";
1697,1701c1575,1577
<     if ($wgOut->isPrintable () ||
< 	(1 == $wgUser->getOption ("highlightbroken")))
<       {
< 	$s = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>{$trail}";
<       }
---
>     if ($wgOut->isPrintable ()
> 	|| (1 == $wgUser->getOption ("highlightbroken")))
>       $s = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>{$trail}";
1703,1706c1579,1580
<       {
< 	$s = "{$text}{$inside}<a href=\"{$u}\"{$style}>?</a>{$trail}";
<       }
< 
---
>       $s =
> 	"{$text}{$inside}<a href=\"{$u}\"{$style}><span class=\"newmark\">?</span></a>{$trail}";
1735,1739c1609,1611
<     if ($wgOut->isPrintable () ||
< 	(1 == $wgUser->getOption ("highlightbroken")))
<       {
< 	$s = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>{$trail}";
<       }
---
>     if ($wgOut->isPrintable ()
> 	|| (1 == $wgUser->getOption ("highlightbroken")))
>       $s = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>{$trail}";
1741,1743c1613
<       {
< 	$s = "{$text}{$inside}<a href=\"{$u}\"{$style}>!</a>{$trail}";
<       }
---
>       $s = "{$text}{$inside}<a href=\"{$u}\"{$style}>!</a>{$trail}";
1769c1639
<     $s = "<img src=\"{$url}\" alt=\"{$alt}\">";
---
>     $s = "<img src=\"{$url}\" alt=\"{$alt}\" />";
1780a1651,1652
>     global $wgServer;
>     global $wgLang, $wgUseImageResize;
1784c1656,1659
<     if (empty ($alt))
---
> 
>     $float = "";
> 
>     if ($wgUseImageResize)
1786c1661,1724
< 	$alt = preg_replace ('/\.(.+?)^/', '', $name);
---
> 	// Check if the alt text is of the form "options|alt text"
> 	// Options are:
> 	//  * thumb             = show a thumbnail view with enlarge-icon and caption
> 	//  * left              = left float
> 	//  * right             = right float
> 	//  * none              = no float
> 	//  * xx(%)             = scale to percentage given (just number), default 20%
> 
> 	$part = explode ("|", $alt);
> 
> 	if (count ($part) > 1)
> 	  {
> 	    $mwThumb = &MagicWord::get (MAG_IMG_THUMBNAIL);
> 	    $mwLeft = &MagicWord::get (MAG_IMG_LEFT);
> 	    $mwRight = &MagicWord::get (MAG_IMG_RIGHT);
> 	    $mwNone = &MagicWord::get (MAG_IMG_NONE);
> 	    $mwScale = &MagicWord::get (MAG_IMG_SCALE);
> 	    $alt = $part[count ($part) - 1];
> 
> 	    $thumb = false;
> 
> 	    foreach ($part as $key = >$val)
> 	    {
> 	      if (!is_null ($mwThumb->matchVariableStartToEnd ($val)))
> 		$thumb = true;
> 	      elseif (!is_null ($mwRight->matchVariableStartToEnd ($val)))
> 		$float = "right";
> 	      elseif (!is_null ($mwLeft->matchVariableStartToEnd ($val)))
> 		$float = "left";
> 	      elseif (!is_null ($mwNone->matchVariableStartToEnd ($val)))
> 		$float = "none";
> 	      elseif (!is_null
> 		      ($scale = $mwScale->matchVariableStartToEnd ($val)))
> 	      {
> 		// scale the image
> 		$width = intval ($scale);
> 		$height = intval ($scale);
> 	      }
> 	      else
> 	      {
> 		$altxt = $val;
> 	      }
> 	    }
> 	  }
> 
> 	if ($thumb)
> 	  {
> 	    // Create a scaled view of actual image, float set by user
> 	    // if scale has not been provided, set to 20%
> 	    if ((!isset ($width)) || (!isset ($height)))
> 	      {
> 		$width = 20;
> 		$height = 20;
> 	      }
> 	    return $this->makeThumbLinkObj ($nt, $altxt, $float, $width,
> 					    $height);
> 	  }
> 
> 	/*elseif (isset($width) && isset($height)) 
> 	   {
> 	   // create thumbnail view
> 	   $url = $this->createThumb( $name, $width, $height );
> 	   }
> 	   } // endif $wgUseImageResize */
1788d1725
<     $alt = htmlspecialchars ($alt);
1789a1727
>     $alt = htmlspecialchars ($alt);
1791,1792c1729,1796
<     $s = "<a href=\"{$u}\" class='image' title=\"{$alt}\">".
<       "<img border=\"0\" src=\"{$url}\" alt=\"{$alt}\"></a>";
---
> 
>     $localurl = rawurldecode (str_replace ("$wgServer", ".", $url));
>     $localdisplay = rawurldecode (str_replace ("$wgServer", "", $url));
>     $link = rawurldecode ($link);
>     ini_set ("allow_url_fopen", TRUE);
>     if (!(fopen ($localurl, "r")))
>       {
> 	$s =
> 	  "<div class=\"imgmissing\">\n<span class=\"small\"><b>Missing Image</b>!<br />\"<a href=\"{$u}\" class=\"image\" title=\"{$alt}\">{$link}</a>\"<br />\n({$localdisplay})</span>\n</div>";
>       }
>     else
>       {
> 	$s =
> 	  "<a href=\"{$u}\" class=\"image\" title=\"{$alt}\"><img border=\"0\" src=\"{$url}\" alt=\"{$alt}\" /></a>";
>       }
>     fclose ($localurl);
> 
>     return $s;
>   }
> 
>   function makeThumbLinkObj ($nt, $altxt, $float, $width, $height)
>   {
>     global $wgUploadPath, $wgScript, $wgScriptPath, $wgServer;
> 
>     $name = $nt->getDBKey ();
>     $image = Title::makeTitle (Namespace::getImage (), $name);
>     $link = $wgScript."?title=".$image->getPrefixedURL ();	// heavy-handed, but works - proteus
>     $url = wfImageUrl ($name);
>     $path = wfImagePath ($name);
> 
>     list ($iwidth, $iheight) = getimagesize ($path);
> 
>     $twidth = intval (($iwidth * $width) / 100);
>     $theight = intval (($iheight * $height) / 100);
> 
>     //$thumbUrl = $this->createThumb( $name, $cwidth );
> 
>     $u = wfLocalUrlE ($image);
>     $vfs = "view image";
> 
>     if (empty ($altxt))
>       {
> 	$altxt = preg_replace ('/\.(.+?)^/', '', $name);
>       }
> 
>     ini_set ("allow_url_fopen", TRUE);
>     $localurl = rawurldecode (str_replace ("$wgServer", ".", $url));
>     if (!(fopen ($localurl, "r")))
>       {
> 	$s =
> 	  "<div class=\"imgmissing\">\n<span class=\"small\"><b>Missing Image</b>!<br />\"<a href=\"{$link}\" class=\"image\" title=\"{$altxt}\">Image:{$name}</a>\"<br />\n({$url})</span>\n</div>";
>       }
>     else
>       {
> 	$imgs =
> 	  "<a href=\"{$link}\" class=\"image\" title=\"{$altxt}\"><img id=\"thumb\" src=\"{$url}\" width=\"{$twidth}\" height=\"{$theight}\" alt=\"{$altxt}\" /></a><br />\n<a href=\"{$url}\" class=\"image\"><img id=\"thumbmag\" src=\"{$wgUploadPath}/magnify.gif\" width=\"75\" height=\"20\" alt=\"{$vfs}\" /></a>";
> 
> 	if ("" != $float)
> 	  {
> 	    $s = "\n<div id=\"thumb{$float}\">\n{$imgs}\n</div>\n";
> 	  }
> 	else
> 	  {
> 	    $s = "\n<div id=\"thumbnone\">\n{$imgs}\n</div>\n";
> 	  }
>       }
> 
>     fclose ($localurl);
1807,1809c1811
<       {
< 	$alt = preg_replace ('/\.(.+?)^/', '', $name);
<       }
---
>       $alt = preg_replace ('/\.(.+?)^/', '', $name);
1812c1814
<     $s = "<a href=\"{$u}\" class='internal' title=\"{$alt}\">{$alt}</a>";
---
>     $s = "<a href=\"{$u}\" class=\"internal\" title=\"{$alt}\">{$alt}</a>";
1829,1830d1830
<   //
< 
1842c1842
<     $s = "\n<p>".wfMsg ("histlegend")."\n<ul>";
---
>     $s = "\n".wfMsg ("histlegend")."\n<ul>";
1848,1849c1848,1850
<     $s = "\n<h2>".wfMsg ("imghistory")."</h2>\n".
<       "<p>".wfMsg ("imghistlegend")."\n<ul>";
---
>     $s =
>       "\n<h2>".wfMsg ("imghistory")."</h2>\n".wfMsg ("imghistlegend").
>       "\n<ul>";
1893,1895c1894,1895
<       {
< 	$ret = "";
<       }
---
>       $ret = "";
> 
1914,1918c1914,1916
<       {
< 	$ul =
< 	  $this->makeLink ($wgLang->getNsText (Namespace::getUser ()).
< 			   ":{$ut}", $ut);
<       }
---
>       $ul =
> 	$this->makeLink ($wgLang->getNsText (Namespace::getUser ()).":{$ut}",
> 			 $ut);
1922,1925c1920
<       {
< 	$curlink = $this->makeKnownLink ($artname, $cur,
< 					 "diff=0&oldid={$oid}");
<       }
---
>       $curlink = $this->makeKnownLink ($artname, $cur, "diff=0&oldid={$oid}");
1927,1929c1922,1923
<       {
< 	$curlink = $cur;
<       }
---
>       $curlink = $cur;
> 
1956c1950,1951
<     $r. = "<img src='{$wgUploadPath}/Arr_.png' width=12 height=12 border=0>";
---
>     $r. =
>       "<img src=\"{$wgUploadPath}/Arr_.png\" width=\"12\" height=\"12\" border=\"0\" alt=\"\" />";
1983c1978
<     $r. = "<br>\n";
---
>     $r. = "<br />\n";
2018c2013
<     $users = " <font size='-1'>[".implode ("; ", $users)."]</font>";
---
>     $users = " <span class=\"small\">[".implode ("; ", $users)."]</span>";
2028c2023
<       "<a href='javascript:toggleVisibility(\"{$rci}\",\"{$rcm}\",\"{$rcl}\")'>";
---
>       "<a href=\"javascript:toggleVisibility(\"{$rci}\",\"{$rcm}\",\"{$rcl}\")\">";
2030c2025
<       "<span id='{$rcm}'><img src='{$wgUploadPath}/Arr_r.png' width=12 height=12 border=0></span>";
---
>       "<span id=\"{$rcm}\"><img src=\"{$wgUploadPath}/Arr_r.png\" width=\"12\" height=\"12\" border=\"0\" alt=\"\" /></span>";
2032c2027
<       "<span id='{$rcl}' style='display:none'><img src='{$wgUploadPath}/Arr_d.png' width=12 height=12 border=0></span>";
---
>       "<span id=\"{$rcl}\"><img src=\"{$wgUploadPath}/Arr_d.png\" width=\"12\" height=\"12\" border=\"0\" alt=\"\" /></span>";
2068c2063
<     $r. = "<br>\n";
---
>     $r. = "<br />\n";
2071c2066
<     $r. = "<div id='{$rci}' style='display:none'>";
---
>     $r. = "<div id=\"{$rci}\">";
2075c2070
< 	"<img src='{$wgUploadPath}/Arr_.png' width=12 height=12 border=0>";
---
> 	"<img src=\"{$wgUploadPath}/Arr_.png\" width=\"12\" height=\"12\" border=\"0\" alt=\"\" />";
2106c2101
<       $r. = "<br>\n";
---
>       $r. = "<br />\n";
2175,2177c2170,2171
<       {
< 	$clink = "<strong>{$clink}</strong>";
<       }
---
>       $clink = "<strong>{$clink}</strong>";
> 
2180,2182c2174
<       {
< 	$dlink = wfMsg ("diff");
<       }
---
>       $dlink = wfMsg ("diff");
2184,2186c2176,2177
<       {
< 	$dlink = $this->makeKnownLink ($t, wfMsg ("diff"), "diff={$oldid}&oldid={$diffid}");	// Finagle's law
<       }
---
>       $dlink = $this->makeKnownLink ($t, wfMsg ("diff"), "diff={$oldid}&oldid={$diffid}");	// Finagle's law
> 
2188,2197c2179,2185
<       {
< 	$ul = $this->makeKnownLink ($wgLang->specialPage ("Contributions"),
< 				    $ut, "target=".$ut);
<       }
<     else
<       {
< 	$ul =
< 	  $this->makeLink ($wgLang->getNsText (Namespace::getUser ()).
< 			   ":{$ut}", $ut);
<       }
---
>       $ul =
> 	$this->makeKnownLink ($wgLang->specialPage ("Contributions"), $ut,
> 			      "target=".$ut);
>     else
>       $ul =
> 	$this->makeLink ($wgLang->getNsText (Namespace::getUser ()).":{$ut}",
> 			 $ut);
2202,2204c2190
<       {
< 	$utl = "";
<       }
---
>       $utl = "";
2228,2231c2214,2216
<       {
< 	$blink =
< 	  $this->makeKnownLink ($wgLang->specialPage ("Blockip"),
< 				wfMsg ("blocklink"), "ip={$ut}");
---
>       $blink =
> 	$this->makeKnownLink ($wgLang->specialPage ("Blockip"),
> 			      wfMsg ("blocklink"), "ip={$ut}");
2233d2217
<       }
2244,2246c2228
<       {
< 	$s. = " <em>(".wfEscapeHTML ($c).")</em>";
<       }
---
>       $s. = " <em>(".wfEscapeHTML ($c).")</em>";
2259d2240
< 
2292,2294c2273
<       {
< 	$dlink = wfMsg ("cur");
<       }
---
>       $dlink = wfMsg ("cur");
2296,2299c2275,2276
<       {
< 	$dlink = $this->makeKnownLink ($t, wfMsg ("cur"),
< 				       "diff=0&oldid={$oldid}");
<       }
---
>       $dlink =
> 	$this->makeKnownLink ($t, wfMsg ("cur"), "diff=0&oldid={$oldid}");
2302,2304c2279
<       {
< 	$plink = wfMsg ("last");
<       }
---
>       $plink = wfMsg ("last");
2306,2309c2281,2283
<       {
< 	$plink = $this->makeKnownLink ($t, wfMsg ("last"),
< 				       "diff={$oldid}&oldid={$diffid}");
<       }
---
>       $plink =
> 	$this->makeKnownLink ($t, wfMsg ("last"),
> 			      "diff={$oldid}&oldid={$diffid}");
2312,2321c2286,2292
<       {
< 	$ul = $this->makeKnownLink ($wgLang->specialPage ("Contributions"),
< 				    $ut, "target=".$ut);
<       }
<     else
<       {
< 	$ul =
< 	  $this->makeLink ($wgLang->getNsText (Namespace::getUser ()).
< 			   ":{$ut}", $ut);
<       }
---
>       $ul =
> 	$this->makeKnownLink ($wgLang->specialPage ("Contributions"), $ut,
> 			      "target=".$ut);
>     else
>       $ul =
> 	$this->makeLink ($wgLang->getNsText (Namespace::getUser ()).":{$ut}",
> 			 $ut);
2356d2326
< 
2375d2344
< 
2379,2381c2348
< 	  {
< 	    $dlink = $del;
< 	  }
---
> 	  $dlink = $del;
2388,2391c2355,2359
< 	    $rlink = $this->makeKnownLink ($wgTitle->getPrefixedText (),
< 					   wfMsg ("revertimg"),
< 					   "action=revert&oldimage=".
< 					   urlencode ($img));
---
> 	    $rlink =
> 	      $this->makeKnownLink ($wgTitle->getPrefixedText (),
> 				    wfMsg ("revertimg"),
> 				    "action=revert&oldimage=".
> 				    urlencode ($img));
2399,2401c2367
< 	    // Having live active links for non-logged in users
< 	    // means that bots and spiders crawling our site can
< 	    // inadvertently change content. Baaaad idea.
---
> 	    // Having live active links for non-logged in users means that bots and spiders crawling our site can inadvertently change content
2425,2427c2391
<       {
< 	$s. = " <em>(".wfEscapeHTML ($c).")</em>";
<       }
---
>       $s. = " <em>(".wfEscapeHTML ($c).")</em>";
2432c2396
<   function tocIndent ($level)
---
>   function tocIndent ($level)	// moved to stylesheets - proteus
2434,2438c2398,2399
< 
<     while ($level-- > 0)
<       $rv. = "<div style=\"margin-left:2em;\">\n";
<     return $rv;
< 
---
>     //while($level-->0) $rv.="<div style=\"margin-left:2em;\">\n";
>     //return $rv;
2443,2445c2404,2405
<     while ($level-- > 0)
<       $rv. = "</div>\n";
<     return $rv;
---
>     //while($level-->0) $rv.="</div>\n";
>     //return $rv;
2451d2410
< 
2453,2457c2412,2413
<       {
< 
< 	return "<A CLASS=\"internal\" HREF=\"//".$anchor."\">".$tocline.
< 	  "</A><BR>\n";
<       }
---
>       return "<div class=\"tocindent\"><a class=\"internal\" href=\"//".
> 	$anchor."\">".$tocline."</a></div>\n";
2459,2465c2415,2416
<       {
< 
< 	return "<div style=\"margin-bottom:0px;\">\n".
< 	  "<A CLASS=\"internal\" HREF=\"//".$anchor."\">".$tocline.
< 	  "</A><BR>\n"."</div>\n";
<       }
< 
---
>       return "<div class=\"tocbullet\"><a class=\"internal\" href=\"//".
> 	$anchor."\">".$tocline."</a></div>\n";
2470c2421
<     // note to CSS fanatics: putting this in a div does not work -- div won't auto-expand
---
>     // for once, a table is necessary and accurately used - proteus
2476c2427
< 	  " <script type='text/javascript'>showTocToggle(\"".
---
> 	  " <script type=\"text/javascript\">showTocToggle(\"".
2479,2480c2430
<     return
<       "<p><table border=\"0\" id=\"toc\"><tr><td align=\"center\">\n".
---
>     return "<table border=\"0\" id=\"toc\"><tr><td align=\"center\">\n".
2483,2484c2433,2434
<       "</td></tr><tr id='tocinside'><td align=\"left\">\n".
<       $toc."</td></tr></table><P>\n";
---
>       "</td></tr><tr id=\"tocinside\"><td align=\"left\">\n".
>       $toc."</td></tr></table>\n";
2490d2439
< 
2497,2498c2446,2447
<     return "<span onContextMenu='document.location=\"".$url.
<       "\";return false;'>{$head}</span>";
---
>     return "<span onContextMenu=\"document.location=\"".$url.
>       "\";return false;\">{$head}</span>";
2503d2451
< 
2514,2516c2462
<     return "<div style=\"float:right;margin-left:5px;\"><small>[".$url.
<       "]</small></div>";
< 
---
>     return "<div class=\"sectioned\">[".$url."]</div>";
2523,2524d2468
< 
< //include_once( "SkinSmarty.php" );

SkinCologneBlue.php[edit]

diff mediawiki-fm\SkinCologneBlue.php getwiki-fm\SkinCologneBlue.php
2c2,6
< // See skin.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
9d12
< 
20,43c23,34
<     $s. = "\n<div id='content'>\n<div id='topbar'>".
<       "<table width='100%' border=0 cellspacing=0 cellpadding=8><tr>";
< 
<     $s. = "<td class='top' align=left valign=middle nowrap>";
<     $s. = "<a href=\"".wfLocalUrlE (wfMsg ("mainpage"))."\">";
<     $s. = "<span id='sitetitle'>".wfMsg ("sitetitle")."</span></a>";
< 
<     $s. = "</td><td class='top' align=right valign=bottom width='100%'>";
<     $s. = $this->sysLinks ();
<     $s. = "</td></tr><tr><td valign=top>";
< 
<     $s. = "<font size='-1'><span id='sitesub'>";
<     $s. = wfMsg ("sitesubtitle")."</span></font>";
<     $s. = "</td><td align=right>";
< 
<     $s. = "<font size='-1'><span id='langlinks'>";
<     $s. = str_replace ("<br>", "", $this->otherLanguages ());
<     $s. = "<br>".$this->pageTitleLinks ();
<     $s. = "</span></font>";
< 
<     $s. = "</td></tr></table>\n";
< 
<     $s. = "\n</div>\n<div id='article'>";
< 
---
>     $s. = "\n<div id=\"cbcontent\">\n\n<div id=\"topbar\">\n";
>     $s. =
>       "<a href=\"".wfLocalUrlE (wfMsg ("mainpage")).
>       "\"><span id=\"sitetitle\">".wfMsg ("sitetitle").
>       "</span></a><span id=\"sitesub\">".wfMsg ("sitesubtitle")."</span>\n";
>     $s. = "<div id=\"toplinks\">".$this->sysLinks ()."</div>\n</div>\n\n";
>     $s. =
>       "<div id=\"langlinks\">".str_replace ("<br />", "",
> 					    $this->otherLanguages ()).
>       "<br />\n".$this->pageTitleLinks ()."<br />\n";
>     $s. = str_replace ("<br />", " ", $this->nameAndLogin ())."</div>\n\n";
>     $s. = "<div id=\"cbarticle\">";
53,56c44
<     $s = "\n</div><br clear=all>\n";
< 
<     $s. = "\n<div id='footer'>";
<     $s. = "<table width='98%' border=0 cellspacing=0><tr>";
---
>     $s. = "</p>\n\n<div id=\"footer\">";
59,63d46
<     if (1 == $qb || 3 == $qb)
<       {				// Left
< 	$s. = $this->getQuickbarCompensator ();
<       }
<     $s. = "<td class='bottom' align=center valign=top>";
66,68c49,52
<     $s. = "\n<br>".$this->makeKnownLink (wfMsg ("mainpage"),
< 					 wfMsg ("mainpage"))." | ".$this->
<       aboutLink ()." | ".$this->searchForm (wfMsg ("qbfind"));
---
>     $s. = "\n<br />".$this->makeKnownLink (wfMsg ("mainpage"),
> 					   wfMsg ("mainpage"))." | ".$this->
>       aboutLink ()." | ".$this->specialLink ("recentchanges")."<br />".$this->
>       searchForm ();
70,77c54,55
<     $s. = "\n<br>".$this->pageStats ();
< 
<     $s. = "</td>";
<     if (2 == $qb)
<       {				// Right
< 	$s. = $this->getQuickbarCompensator ();
<       }
<     $s. = "</tr></table>\n</div>\n</div>\n";
---
>     $s. = "\n<br />".$this->pageStats ();
>     $s. = "\n</div>\n\n</div>\n</div>\n";
89c67
<     $s = parent::doGetUserStyles ();
---
>     $s = "";
93,95c71,73
<       {				// Right
< 	$s. = "//quickbar { position: absolute; right: 4px; }\n".
< 	  "//article { margin-left: 4px; margin-right: 148px; }\n";
---
>       {				// quickbar fixed right
> 	$s. =
> 	  "<link rel=\"stylesheet\" href=\"{$wgStyleSheetPath}/wikibar-r.css\" />\n";
97c75
<     else if (1 == $qb || 3 == $qb)
---
>     else if (1 == $qb || 3 == $qb)	// 3 is deprecated, doesn't work - proteus
99,100c77,78
< 	$s. = "//quickbar { position: absolute; left: 4px; }\n".
< 	  "//article { margin-left: 148px; margin-right: 4px; }\n";
---
> 	$s. =
> 	  "<link rel=\"stylesheet\" href=\"{$wgStyleSheetPath}/wikibar-l.css\" />\n";
101a80,81
> 
>     $s. = parent::doGetUserStyles ();
103a84
> 
112,114c93
<       {
< 	$q = "";
<       }
---
>       $q = "";
116,118c95
<       {
< 	$q = "returnto={$rt}";
<       }
---
>       $q = "returnto={$rt}";
120c97
<     $s. = "\n<br>".$this->makeKnownLink ($li, wfMsg ("login"), $q);
---
>     $s. = "<br />\n".$this->makeKnownLink ($li, wfMsg ("login"), $q);
147c124
<     $s = "\n<div id='quickbar'>";
---
>     $s = "\n<div id=\"quickbar\">\n";
149c126
<     $sep = "<br>";
---
>     $sep = "<br />";
271c248,249
<     $s = "<form id=\"search\" method=\"get\" class=\"inline\" action=\"".
---
>     $s =
>       "<form id=\"search\" method=\"get\" class=\"inline\" action=\"".
279,282c257,261
<       "<input type=text name=\"search\" size=14 value=\"".
<       htmlspecialchars (substr ($search, 0, 256))."\">".
<       "<br><input type=submit name=\"go\" value=\"".wfMsg ("go").
<       "\"> <input type=submit value=\"".wfMsg ("search")."\"></form>";
---
>       "\n<input type=text name=\"search\" size=\"14\" value=\"".
>       htmlspecialchars (substr ($search, 0, 256))."\" />".
>       "\n<input type=\"submit\" name=\"go\" value=\"".wfMsg ("go").
>       "\" />\n<input type=\"submit\" value=\"".wfMsg ("search").
>       "\" />\n</form>";
Only in mediawiki-fm: SkinFramed.php

SkinNostalgia.php[edit]

diff mediawiki-fm\SkinNostalgia.php getwiki-fm\SkinNostalgia.php
2c2,6
< // See skin.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
17c21
<     $s = "\n<div id='content'>\n<div id='topbar'>";
---
>     $s = "\n<div id=\"content\">\n<div id=\"topbar\">";
19d22
< 
21,31c24,30
<     $s. = $this->pageSubtitle ()."\n<p>";
< 
<     $s. = $this->topLinks ()."\n<br>";
<     $s. = $this->pageTitleLinks ();
< 
<     $ol = $this->otherLanguages ();
<     if ($ol)
<       $s. = "<br>".$ol;
< 
<     $s. = "<br clear=all><hr>\n</div>\n";
<     $s. = "\n<div id='article'>";
---
>     $s. = $this->pageSubtitle ()."<br /><br />\n";
>     $s. = $this->topLinks ()."<br />\n";
>     $s. = $this->nameAndLogin ()."<br />\n";
>     $s. = $this->otherLanguages ()."<br />\n";
>     $s. = $this->specialPagesList ();
>     $s. = "<hr />\n</div>\n";
>     $s. = "\n<div id=\"article\">\n<p>";
39c38
<     $sep = " |\n";
---
>     $sep = " | ";
47,55c46
<     if (0 == $wgUser->getID ())
<       {
< 	$s. = $sep.$this->specialLink ("userlogin");
<       }
<     else
<       {
< 	$s. = $sep.$this->specialLink ("userlogout");
<       }
<     $s. = $sep.$this->specialPagesList ();
---
>     //$s .= $sep . $this->specialPagesList();
64c55
<     $s = "\n</div><br clear=all>\n";
---
>     $s = "</p>\n</div>\n";
66c57
<     $s. = "\n<div id='footer'><hr>";
---
>     $s. = "\n<div id=\"footer\">\n<hr />";
68,69c59
<     $s. = $this->bottomLinks ();
<     $s. = "\n<br>".$this->pageStats ();
---
>     $s. = "\n".$this->bottomLinks ();
71,72c61,63
<       "\n<br>".$this->mainPageLink ()." | ".$this->aboutLink ()." | ".$this->
<       searchForm ();
---
>       "<br />\n".$this->mainPageLink ()." | ".$this->aboutLink ()." | ".
>       $this->specialLink ("recentchanges")."<br />".$this->searchForm ();
>     $s. = $this->pageStats ();
74c65
<     $s. = "\n</div>\n</div>\n";
---
>     $s. = "\n</div>\n\n</div>\n";
Only in mediawiki-fm: SkinSmarty.php

SkinStandard.php[edit]

diff mediawiki-fm\SkinStandard.php getwiki-fm\SkinStandard.php
2c2,6
< // See skin.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
6c10
<   function getHeadScripts ()
---
>   function getHeadScripts ()	// deprecated, doesn't work very well - proteus
13,14c17,19
< 	$s. = "<script language='javascript' type='text/javascript' ".
< 	  "src='{$wgStyleSheetPath}/sticky.js'></script>\n";
---
> 	$s. =
> 	  "<script language=\"javascript\" type=\"text/javascript\" ".
> 	  "src=\"{$wgStyleSheetPath}/sticky.js\"></script>\n";
26c31,32
< 	$s. = "<style type='text/css'>\n".
---
> 	$s. =
> 	  "<style type=\"text/css\">\n".
36c42
<     $s = parent::doGetUserStyles ();
---
>     $s = "";
40,43c46,48
<       {				// Right
< 	$s. = "//quickbar { position: absolute; top: 4px; right: 4px; ".
< 	  "border-left: 2px solid //000000; }\n".
< 	  "//article { margin-left: 4px; margin-right: 152px; }\n";
---
>       {				// quickbar fixed right
> 	$s. =
> 	  "<link rel=\"stylesheet\" href=\"{$wgStyleSheetPath}/wikibar-r.css\" />\n";
45c50
<     else if (1 == $qb || 3 == $qb)
---
>     else if (1 == $qb || 3 == $qb)	// 3 is deprecated, doesn't work - proteus
47,49c52,53
< 	$s. = "//quickbar { position: absolute; top: 4px; left: 4px; ".
< 	  "border-right: 1px solid gray; }\n".
< 	  "//article { margin-left: 152px; margin-right: 4px; }\n";
---
> 	$s. =
> 	  "<link rel=\"stylesheet\" href=\"{$wgStyleSheetPath}/wikibar-l.css\" />\n";
50a55,56
> 
>     $s. = parent::doGetUserStyles ();
62,64c68
< 	  {
< 	    $a["onload"]. = ";$qb";
< 	  }
---
> 	  $a["onload"]. = ";$qb";
66,68c70
< 	  {
< 	    $a["onload"] = $qb;
< 	  }
---
> 	  $a["onload"] = $qb;

SpecialAllpages.php[edit]

diff mediawiki-fm\SpecialAllpages.php getwiki-fm\SpecialAllpages.php
1c1,7
< < ? function wfSpecialAllpages ($par = NULL)
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialAllpages ($par = NULL)
7,13c13,14
<     {
<       indexShowChunk ($par);
<     }
<   elseif (isset ($from))
<   {
<     indexShowChunk ($from);
<   }
---
>     indexShowChunk ($par);
>   elseif (isset ($from)) indexShowChunk ($from);
15,17c16
<   {
<     indexShowToplevel ();
<   }
---
>   indexShowToplevel ();
38,39c37
< 
< //      $fromwhere = "FROM cur WHERE cur_namespace=0 AND cur_is_redirect=0";
---
>   //$fromwhere = "FROM cur WHERE cur_namespace=0 AND cur_is_redirect=0";
110,114c108,110
<   $sql = "SELECT cur_title
< FROM cur
< WHERE cur_namespace=0 AND cur_title >= '".wfStrencode ($from)."'
< ORDER BY cur_title
< LIMIT {$indexMaxperpage}";
---
>   $sql =
>     "SELECT cur_title FROM cur WHERE cur_namespace=0 AND cur_title >= '".
>     wfStrencode ($from)."' ORDER BY cur_title LIMIT {$indexMaxperpage}";
117,118c113,114
< // FIXME: Dynamic column widths, backlink to main list,
< // side links to next and previous
---
>   // FIXME: Dynamic column widths, backlink to main list,
>   // side links to next and previous
144c140
< //return $out;
---
>   //return $out;

SpecialAncientpages.php[edit]

diff mediawiki-fm\SpecialAncientpages.php getwiki-fm\SpecialAncientpages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
18,21c24,25
<     return "SELECT cur_title, cur_timestamp ".
<       "FROM cur USE INDEX (cur_timestamp) ".
<       "WHERE cur_namespace=0 AND cur_is_redirect=0 ".
<       " ORDER BY cur_timestamp LIMIT {$offset}, {$limit}";
---
>     return
>       "SELECT cur_title, cur_timestamp FROM cur USE INDEX (cur_timestamp) WHERE cur_namespace=0 AND cur_is_redirect=0 ORDER BY cur_timestamp LIMIT {$offset}, {$limit}";

SpecialAsksql.php[edit]

diff mediawiki-fm\SpecialAsksql.php getwiki-fm\SpecialAsksql.php
1c1,7
< < ? function wfSpecialAsksql ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialAsksql ()
41,42c47,48
< 	$wgOut->addHTML ("<p><font color='red' size='+1'>".
< 			 htmlspecialchars ($err)."</font>\n");
---
> 	$wgOut->addHTML ("<p class=\"error\"><span class=\"big\">".
> 			 htmlspecialchars ($err)."</span></p>\n");
52c58
<     $wgOut->addHTML ("<p>
---
>     $wgOut->addHTML ("
54,63c60,62
< <table border=0><tr>
< <td align=right>{$q}:</td>
< <td align=left>
< <textarea name=\"wpSqlQuery\" cols=80 rows=4 wrap=\"virtual\">".htmlspecialchars ($wpSqlQuery)."
< </textarea>
< </td>
< </tr><tr>
< <td> </td><td align=\"left\">
< <input type=submit name=\"wpQueryBtn\" value=\"{$qb}\">
< </td></tr></table>
---
> <label for=\"wpSqlQuery\">{$q}:</label><br />
> <textarea name=\"wpSqlQuery\" cols=\"80\" rows=\"4\" wrap=\"virtual\">".htmlspecialchars ($wpSqlQuery)."</textarea><br />
> <input type=\"submit\" name=\"wpQueryBtn\" value=\"{$qb}\" />
116c115
< 	      $o = "<a href=\"".wfLocalUrlE ($o)."\" class='internal'>".
---
> 	      $o = "<a href=\"".wfLocalUrlE ($o)."\" class=\"internal\">".
135,139c134,137
< 
< 	    $r = "<table border=1 bordercolor=black cellspacing=0 ".
< 	      "cellpadding=2><tr>\n";
< 	    foreach ($k as $x) $r. = "<th>".htmlspecialchars ($x)."</th>";
< 	    $r. = "</tr>\n";
---
> 	    $r =
> 	      "<table border=\"1\" bordercolor=\"black\" cellspacing=\"0\" cellpadding=\"2\">\n<tr>\n";
> 	    foreach ($k as $x) $r. = "\n<th>".htmlspecialchars ($x)."</th>";
> 	    $r. = "\n</tr>\n";
159c157,158
< 		    $o = "<a href=\"".wfLocalUrlE ($o)."\" class='internal'>".
---
> 		    $o =
> 		      "<a href=\"".wfLocalUrlE ($o)."\" class='internal'>".
166c165
< 		$r. = "<td>".$o."</td>\n";
---
> 		$r. = "\n<td>".$o."</td>\n";
168c167
< 	      $r. = "</tr>\n";
---
> 	      $r. = "\n</tr>\n";

SpecialBlockip.php[edit]

diff mediawiki-fm\SpecialBlockip.php getwiki-fm\SpecialBlockip.php
1c1,7
< < ? function wfSpecialBlockip ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialBlockip ()
51c57,59
< 	$wgOut->addHTML ("<p><font color='red' size='+1'>{$err}</font>\n");
---
> 	$wgOut->
> 	  addHTML
> 	  ("<p class=\"error\"><span class=\"big\">{$err}</span></p>\n");
53c61
<     $wgOut->addHTML ("<p>
---
>     $wgOut->addHTML ("
55,66c63,67
< <table border=0><tr>
< <td align=\"right\">{$ipa}:</td>
< <td align=\"left\">
< <input tabindex=1 type=text size=20 name=\"wpBlockAddress\" value=\"{$wpBlockAddress}\">
< </td></tr><tr>
< <td align=\"right\">{$reason}:</td>
< <td align=\"left\">
< <input tabindex=2 type=text size=40 name=\"wpBlockReason\" value=\"{$wpBlockReason}\">
< </td></tr><tr>
< <td> </td><td align=\"left\">
< <input tabindex=3 type=submit name=\"wpBlock\" value=\"{$ipbs}\">
< </td></tr></table>
---
> <label for=\"wpBlockAddress\">{$ipa}:</label><br />
> <input tabindex=\"1\" type=\"text\" size=\"20\" name=\"wpBlockAddress\" value=\"{$wpBlockAddress}\" /><br />
> <label for=\"wpBlockReason\">{$reason}:</label><br />
> <input tabindex=\"2\" type=\"text\" size=\"40\" name=\"wpBlockReason\" value=\"{$wpBlockReason}\" /><br />
> <input tabindex=\"3\" type=\"submit\" name=\"wpBlock\" value=\"{$ipbs}\" />
79,80c80,81
<     if (!preg_match ("/^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$/",
< 		     $wpBlockAddress))
---
>     if (!preg_match
> 	("/^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$/", $wpBlockAddress))
115,116c116,118
<     $success = wfLocalUrl ($wgLang->specialPage ("Blockip"),
< 			   "action=success&ip={$wpBlockAddress}");
---
>     $success =
>       wfLocalUrl ($wgLang->specialPage ("Blockip"),
> 		  "action=success&ip={$wpBlockAddress}");

SpecialBooksources.php[edit]

diff mediawiki-fm\SpecialBooksources.php getwiki-fm\SpecialBooksources.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
34,35c39,40
< 	$sql = "SELECT cur_text FROM cur ".
< 	  "WHERE cur_namespace=4 and cur_title='".
---
> 	$sql =
> 	  "SELECT cur_text FROM cur WHERE cur_namespace=4 and cur_title='".

SpecialCategories.php[edit]

diff mediawiki-fm\SpecialCategories.php getwiki-fm\SpecialCategories.php
1c1,7
< < ? function wfSpecialCategories ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialCategories ()
8c14
<   $r. = "<OL>\n";
---
>   $r. = "<ol>\n";
21c27
<   $r. = "</OL>\n";
---
>   $r. = "</ol>\n";
23c29
<   $r. = "<hr>\n";
---
>   $r. = "<hr />\n";
27c33
<   $r. = "<OL>\n";
---
>   $r. = "<ol>\n";
37c43
<   $r. = "</OL>\n";
---
>   $r. = "</ol>\n";

SpecialContributions.php[edit]

diff mediawiki-fm\SpecialContributions.php getwiki-fm\SpecialContributions.php
1c1,7
< < ? function wfSpecialContributions ($par = "")
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialContributions ($par = "")
28,30c34
<     {
<       $ul = $nt->getText ();
<     }
---
>     $ul = $nt->getText ();
32,34c36,37
<     {
<       $ul = $sk->makeKnownLink ($nt->getPrefixedText (), $nt->getText ());
<     }
---
>     $ul = $sk->makeKnownLink ($nt->getPrefixedText (), $nt->getText ());
> 
48,52c51,55
<       $mlink = $sk->makeKnownLink ($wgLang->specialPage ("Contributions"),
< 				   WfMsg ("show"),
< 				   "target=".wfEscapeHTML ($nt->
< 							   getPrefixedURL ()).
< 				   "&offset={$offset}&limit={$limit}&hideminor=0");
---
>       $mlink =
> 	$sk->makeKnownLink ($wgLang->specialPage ("Contributions"),
> 			    WfMsg ("show"),
> 			    "target=".wfEscapeHTML ($nt->getPrefixedURL ()).
> 			    "&offset={$offset}&limit={$limit}&hideminor=0");
57,61c60,64
<       $mlink = $sk->makeKnownLink ($wgLang->specialPage ("Contributions"),
< 				   WfMsg ("hide"),
< 				   "target=".wfEscapeHTML ($nt->
< 							   getPrefixedURL ()).
< 				   "&offset={$offset}&limit={$limit}&hideminor=1");
---
>       $mlink =
> 	$sk->makeKnownLink ($wgLang->specialPage ("Contributions"),
> 			    WfMsg ("hide"),
> 			    "target=".wfEscapeHTML ($nt->getPrefixedURL ()).
> 			    "&offset={$offset}&limit={$limit}&hideminor=1");
65c68
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
67,70c70,72
<   $sl = wfViewPrevNext ($offset, $limit,
< 			$wgLang->specialpage ("Contributions"),
< 			"hideminor={$hideminor}&target=".
< 			wfUrlEncode ($target));
---
>   $sl =
>     wfViewPrevNext ($offset, $limit, $wgLang->specialpage ("Contributions"),
> 		    "hideminor={$hideminor}&target=".wfUrlEncode ($target));
73c75
<   $wgOut->addHTML ("<br>{$sl} ($shm) \n");
---
>   $wgOut->addHTML ("<br />{$sl} ($shm) \n");
78,80c80,82
< 	"SELECT cur_namespace,cur_title,cur_timestamp,cur_comment,cur_minor_edit FROM cur ".
< 	"WHERE cur_user_text='".wfStrencode ($nt->getText ())."' {$cmq} ".
< 	"ORDER BY inverse_timestamp LIMIT {$offlimit}";
---
> 	"SELECT cur_namespace,cur_title,cur_timestamp,cur_comment,cur_minor_edit FROM cur WHERE cur_user_text='".
> 	wfStrencode ($nt->getText ()).
> 	"' {$cmq} ORDER BY inverse_timestamp LIMIT {$offlimit}";
84,86c86,88
< 	"SELECT old_namespace,old_title,old_timestamp,old_comment,old_minor_edit FROM old ".
< 	"WHERE old_user_text='".wfStrencode ($nt->getText ())."' {$omq} ".
< 	"ORDER BY inverse_timestamp LIMIT {$offlimit}";
---
> 	"SELECT old_namespace,old_title,old_timestamp,old_comment,old_minor_edit FROM old WHERE old_user_text='".
> 	wfStrencode ($nt->getText ()).
> 	"' {$omq} ORDER BY inverse_timestamp LIMIT {$offlimit}";
92,93c94
< 	"SELECT cur_namespace,cur_title,cur_timestamp,cur_comment,cur_minor_edit FROM cur ".
< 	"WHERE cur_user={$id} {$cmq} ORDER BY inverse_timestamp LIMIT {$offlimit}";
---
> 	"SELECT cur_namespace,cur_title,cur_timestamp,cur_comment,cur_minor_edit FROM cur WHERE cur_user={$id} {$cmq} ORDER BY inverse_timestamp LIMIT {$offlimit}";
97,98c98
< 	"SELECT old_namespace,old_title,old_timestamp,old_comment,old_minor_edit FROM old ".
< 	"WHERE old_user={$id} {$omq} ORDER BY inverse_timestamp LIMIT {$offlimit}";
---
> 	"SELECT old_namespace,old_title,old_timestamp,old_comment,old_minor_edit FROM old WHERE old_user={$id} {$omq} ORDER BY inverse_timestamp LIMIT {$offlimit}";
168,171c168,171
<       $topmarktext. = " [".$sk->makeKnownLink ($page,
< 					       wfMsg ("rollbacklink"),
< 					       "action=rollback&from=".
< 					       urlencode ($target))."]";
---
>       $topmarktext. =
> 	" [".$sk->makeKnownLink ($page, wfMsg ("rollbacklink"),
> 				 "action=rollback&from=".urlencode ($target)).
> 	"]";
174,178c174
<     {
< 
<       $comment = "<em>(".htmlspecialchars ($comment).")</em> ";
< 
<     }
---
>     $comment = "<em>(".htmlspecialchars ($comment).")</em> ";
180d175
< 
182,185c177
<     {
<       $mflag = "<strong>".wfMsg ("minoreditletter")."</strong> ";
<     }
< 
---
>     $mflag = "<strong>".wfMsg ("minoreditletter")."</strong> ";
196,198c188,190
<   $s = $sk->makeKnownLink ($wgLang->specialPage ("Contributions"),
< 			   "{$lim}",
< 			   "target={$target}&days={$d}&limit={$lim}");
---
>   $s =
>     $sk->makeKnownLink ($wgLang->specialPage ("Contributions"), "{$lim}",
> 			"target={$target}&days={$d}&limit={$lim}");
208,209c200,202
<   $s = $sk->makeKnownLink ($wgLang->specialPage ("Contributions"),
< 			   "{$d}", "target={$target}&days={$d}&limit={$lim}");
---
>   $s =
>     $sk->makeKnownLink ($wgLang->specialPage ("Contributions"), "{$d}",
> 			"target={$target}&days={$d}&limit={$lim}");

SpecialDeadendpages.php[edit]

diff mediawiki-fm\SpecialDeadendpages.php getwiki-fm\SpecialDeadendpages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
20,24c26,27
<     return "SELECT cur_title ".
<       "FROM cur LEFT JOIN links ON cur_title = l_from ".
<       "WHERE l_from IS NULL ".
<       "AND cur_namespace = 0 ".
<       "ORDER BY cur_title "."LIMIT {$offset}, {$limit}";
---
>     return
>       "SELECT cur_title FROM cur LEFT JOIN links ON cur_title = l_from WHERE l_from IS NULL AND cur_namespace = 0 ORDER BY cur_title LIMIT {$offset}, {$limit}";
31d33
< 
33d34
< 
35d35
< 

SpecialDebug.php[edit]

diff mediawiki-fm\SpecialDebug.php getwiki-fm\SpecialDebug.php
1c1,7
< < ? function wfSpecialDebug ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialDebug ()
11a18,19
> 
> ? >

SpecialEmailuser.php[edit]

diff mediawiki-fm\SpecialEmailuser.php getwiki-fm\SpecialEmailuser.php
1c1,7
< < ? function wfSpecialEmailuser ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialEmailuser ()
5,6c11,12
<   if (0 == $wgUser->getID () ||
<       (false == = strpos ($wgUser->getEmail (), "@")))
---
>   if (0 == $wgUser->getID ()
>       || (false == = strpos ($wgUser->getEmail (), "@")))
29,30c35,36
<   if ((false == = strpos ($address, "@")) ||
<       (1 == $nu->getOption ("disablemail")))
---
>   if ((false == = strpos ($address, "@"))
>       || (1 == $nu->getOption ("disablemail")))
56d61
< 
66c71
<     global $wgOut, $wgUser, $wgLang;
---
>     global $wgOut, $wgUser, $wgLang, $wgSitename;
74c79
< 	$wpSubject = "Wikipedia e-mail";
---
> 	$wpSubject = $wgSitename." Email";
85,86c90,92
<     $action = wfLocalUrlE ($wgLang->specialPage ("Emailuser"),
< 			   "target={$target}&action=submit");
---
>     $action =
>       wfLocalUrlE ($wgLang->specialPage ("Emailuser"),
> 		   "target={$target}&action=submit");
91c97,99
< 	$wgOut->addHTML ("<p><font color='red' size='+1'>{$err}</font>\n");
---
> 	$wgOut->
> 	  addHTML
> 	  ("<p class=\"error\"><span class=\"big\">{$err}</span></p>\n");
93c101
<     $wgOut->addHTML ("<p>
---
>     $wgOut->addHTML ("
95,115c103,108
< <table border=0><tr>
< <td align=right>{$emf}:</td>
< <td align=left><strong>{$sender}</strong></td>
< </tr><tr>
< <td align=right>{$emt}:</td>
< <td align=left><strong>{$rcpt}</strong></td>
< </tr><tr>
< <td align=right>{$emr}:</td>
< <td align=left>
< <input type=text name=\"wpSubject\" value=\"{$wpSubject}\">
< </td>
< </tr><tr>
< <td align=right>{$emm}:</td>
< <td align=left>
< <textarea name=\"wpText\" rows=10 cols=60 wrap=virtual>
< {$wpText}
< </textarea>
< </td></tr><tr>
< <td> </td><td align=left>
< <input type=submit name=\"wpSend\" value=\"{$ems}\">
< </td></tr></table>
---
> {$emf}: <span class=\"strong\">{$sender}</span>, {$emt}: <span class=\"strong\">{$rcpt}</span><br />
> {$emr}:<br />
> <input type=\"text\" name=\"wpSubject\" value=\"{$wpSubject}\" /><br /><br />
> {$emm}: <br />
> <textarea name=\"wpText\" rows=\"10\" cols=\"50\" wrap=\"virtual\">{$wpText}</textarea><br />
> <input type=\"submit\" name=\"wpSend\" value=\"{$ems}\" />
133,135c126,128
<       "From: {$from}\r\n".
<       "Reply-To: {$from}\r\n".
<       "To: {$to}\r\n"."X-Mailer: MediaWiki interuser e-mailer";
---
>       "From: {$from}\r\n"."Reply-To: {$from}\r\n".
>       //"To: {$to}\r\n" .             // sends to "to"s - proteus
>       "X-Mailer: GetWiki 1.0";
138,140c131,133
< 
<     $success = wfLocalUrl ($wgLang->specialPage ("Emailuser"),
< 			   "target={$target}&action=success");
---
>     $success =
>       wfLocalUrl ($wgLang->specialPage ("Emailuser"),
> 		  "target={$target}&action=success");

SpecialExport.php[edit]

diff mediawiki-fm\SpecialExport.php getwiki-fm\SpecialExport.php
1c1,7
< < ? function wfSpecialExport ($page = "")
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialExport ($page = "")
17c23
<       header ("Content-type: application/xml; charset=utf-8");
---
>       header ("content-type: application/xml; charset=utf-8");
26,32c32,36
<   $wgOut->addHTML ("
< <form method='post' action=\"$action\">
< <input type='hidden' name='action' value='submit' />
< <textarea name='pages' cols='40' rows='10'></textarea><br />
< <label><input type='checkbox' name='curonly' value='true' checked />
< ".wfMsg ("exportcuronly")."</label><br />
< <input type='submit' />
---
>   $wgOut->addHTML ("<form method=\"post\" action=\"$action\">
> <input type=\"hidden\" name=\"action\" value=\"submit\" />
> <textarea name=\"pages\" cols=\"40\" rows=\"10\"></textarea><br />
> <label for=\"curonly\"><input type=\"checkbox\" class=\"fill\" name=\"curonly\" value=\"true\" checked />".wfMsg ("exportcuronly")."</label><br />
> <input type=\"submit\" value=\"SUBMIT QUERY\" />
41,42c45,48
<   $xml = "<"."?xml version=\"1.0\" encoding=\"UTF-8\" ?".">\n".
<     "<mediawiki version=\"0.1\" xml:lang=\"$wgLanguageCode\">\n";
---
>   $xml =
>     "<"."?xml version=\"1.0\" encoding=\"UTF-8\" ?".
>     ">\n<getwiki version=\"1.0\" xml:lang=\"$wgLanguageCode\">\n";
> 
47c53,55
<   $xml. = "</mediawiki>\n";
---
> 
>   $xml. = "</getwiki>\n";
> 
57a66
> 
59c68,72
<     return "";
---
>     {
>       $xml = "<page>no article</page>";
>       return $xml;
>     }
> 
63,65c76
<     "SELECT cur_id as id,cur_timestamp as timestamp,cur_user as user,cur_user_text as user_text,".
<     "cur_restrictions as restrictions,cur_comment as comment,cur_text as text FROM cur ".
<     "WHERE cur_namespace=$ns AND cur_title='$t'";
---
>     "SELECT cur_id as id,cur_timestamp as timestamp,cur_user as user,cur_user_text as user_text,cur_restrictions as restrictions,cur_comment as comment,cur_text as text FROM cur WHERE cur_namespace=$ns AND cur_title='$t'";
66a78
> 
83,85c95
< 	    "SELECT old_id as id,old_timestamp as timestamp, old_user as user, old_user_text as user_text,".
< 	    "old_comment as comment, old_text as text FROM old ".
< 	    "WHERE old_namespace=$ns AND old_title='$t' ORDER BY old_timestamp";
---
> 	    "SELECT old_id as id,old_timestamp as timestamp, old_user as user, old_user_text as user_text,old_comment as comment, old_text as text FROM old WHERE old_namespace=$ns AND old_title='$t' ORDER BY old_timestamp";
99c109,110
<       return "";
---
>       $xml = "<page>no article</page>";
>       return $xml;
120a132
> 
121a134
> 
130a144
> 

SpecialImagelist.php[edit]

diff mediawiki-fm\SpecialImagelist.php getwiki-fm\SpecialImagelist.php
1c1,7
< < ? function wfSpecialImagelist ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialImagelist ()
9,10c15,16
<   $sql = "SELECT img_size,img_name,img_user,img_user_text,".
<     "img_description,img_timestamp FROM image";
---
>   $sql =
>     "SELECT img_size,img_name,img_user,img_user_text,img_description,img_timestamp FROM image";
41,43c47
<     {
<       $lt = wfMsg ("all");
<     }
---
>     $lt = wfMsg ("all");
49c53
<   $wgOut->addHTML ("<p>".wfMsg ("imglegend")."\n");
---
>   $wgOut->addHTML (wfMsg ("imglegend")."</p>\n");
51,53c55,58
<   $text = wfMsg ("imagelisttext",
< 		 "<strong>{$lt}</strong>", "<strong>{$st}</strong>");
<   $wgOut->addHTML ("<p>{$text}\n<p>");
---
>   $text =
>     wfMsg ("imagelisttext", "<span class=\"strong\">{$lt}</span>",
> 	   "<span class=\"strong\">{$st}</span>");
>   $wgOut->addHTML ("<p>{$text}\n</p>");
61,64c66,68
<   $wgOut->addHTML ("<form id=\"imagesearch\" method=\"post\" action=\"".
< 		   "{$action}\">".
< 		   "{$cap}: <input type=text size=8 name=\"wpIlMatch\" value=\"\"> ".
< 		   "<input type=submit name=\"wpIlSubmit\" value=\"{$sub}\"></form>");
---
>   $wgOut->
>     addHTML
>     ("<form id=\"imagesearch\" method=\"post\" action=\" {$action}\">{$cap}: \n<input type=\"text\" size=\"20\" name=\"wpIlMatch\" value=\"\" />\n<input type=\"submit\" name=\"wpIlSubmit\" value=\"{$sub}\" />\n</form>");
82c86
<   $wgOut->addHTML ("{$text}<br>\n");
---
>   $wgOut->addHTML ("{$text}<br />\n");
97c101
<   $wgOut->addHTML ("{$text}<br>\n<p>");
---
>   $wgOut->addHTML ("{$text}<br />\n<p>");
118,121c122,125
<       $l = "(".
< 	$sk->makeKnownLink ($wgLang->getNsText (Namespace::getImage ()).
< 			    ":{$name}",
< 			    wfMsg ("imgdesc")).
---
>       $l =
> 	"(".$sk->makeKnownLink ($wgLang->getNsText (Namespace::getImage ()).
> 				":{$name}",
> 				wfMsg ("imgdesc")).
130c134
<       $wgOut->addHTML ("{$l}<br>\n");
---
>       $wgOut->addHTML ("{$l}<br />\n");

SpecialIpblocklist.php[edit]

diff mediawiki-fm\SpecialIpblocklist.php getwiki-fm\SpecialIpblocklist.php
1c1,7
< < ? function wfSpecialIpblocklist ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialIpblocklist ()
24,26c30
<     {
<       $ipu->showForm ("");
<     }
---
>     $ipu->showForm ("");
28,30c32
<     {
<       $ipu->showList ("");
<     }
---
>     $ipu->showList ("");
51,52c53,54
<     $action = wfLocalUrlE ($wgLang->specialPage ("Ipblocklist"),
< 			   "action=submit");
---
>     $action =
>       wfLocalUrlE ($wgLang->specialPage ("Ipblocklist"), "action=submit");
57c59,61
< 	$wgOut->addHTML ("<p><font color='red' size='+1'>{$err}</font>\n");
---
> 	$wgOut->
> 	  addHTML
> 	  ("<p class=\"error\"><span class=\"big\">{$err}</span></p>\n");
59c63
<     $wgOut->addHTML ("<p>
---
>     $wgOut->addHTML ("
61,72c65,69
< <table border=0><tr>
< <td align=right>{$ipa}:</td>
< <td align=left>
< <input tabindex=1 type=text size=20 name=\"wpUnblockAddress\" value=\"{$wpUnblockAddress}\">
< </td></tr><tr>
< <td align=right>{$ipr}:</td>
< <td align=left>
< <input tabindex=1 type=text size=40 name=\"wpUnblockReason\" value=\"{$wpUnblockReason}\">
< </td></tr><tr>
< <td> </td><td align=left>
< <input tabindex=2 type=submit name=\"wpBlock\" value=\"{$ipus}\">
< </td></tr></table>
---
> <label for=\"wpUnblockAddress\">{$ipa}:</label><br />
> <input tabindex=\"1\" type=\"text\" size=\"20\" name=\"wpUnblockAddress\" value=\"{$wpUnblockAddress}\" /><br />
> <label for=\"wpUnblockReason\">{$ipr}:</label><br />
> <input tabindex=\"1\" type=\"text\" size=\"40\" name=\"wpUnblockReason\" value=\"{$wpUnblockReason}\" /><br />
> <input tabindex=\"2\" type=\"submit\" name=\"wpBlock\" value=\"{$ipus}\" />
89,91c86
<       {
< 	$block->mId = substr ($wpUnblockAddress, 1);
<       }
---
>       $block->mId = substr ($wpUnblockAddress, 1);
93,95c88
<       {
< 	$block->mAddress = $wpUnblockAddress;
<       }
---
>       $block->mAddress = $wpUnblockAddress;
107,109c100,102
<     $success = wfLocalUrl ($wgLang->specialPage ("Ipblocklist"),
< 			   "action=success&ip=".
< 			   urlencode ($wpUnblockAddress));
---
>     $success =
>       wfLocalUrl ($wgLang->specialPage ("Ipblocklist"),
> 		  "action=success&ip=".urlencode ($wpUnblockAddress));
172d164
< 

SpecialListusers.php[edit]

diff mediawiki-fm\SpecialListusers.php getwiki-fm\SpecialListusers.php
1c1,7
< < ? function wfSpecialListusers ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialListusers ()
8c14
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("{$top}\n");
11c17
<   $wgOut->addHTML ("<br>{$sl}\n<ol start=".($offset + 1).">");
---
>   $wgOut->addHTML ("<br />{$sl}\n<ol start=\"".($offset + 1)."\">");
13,14c19,20
<   $sql = "SELECT user_name,user_rights FROM user ORDER BY ".
<     "user_name LIMIT {$offset}, {$limit}";
---
>   $sql =
>     "SELECT user_name,user_rights FROM user ORDER BY user_name LIMIT {$offset}, {$limit}";
35c41
<   $wgOut->addHTML ("</ol><p>{$sl}\n");
---
>   $wgOut->addHTML ("</ol><p>{$sl}</p>\n");

SpecialLockdb.php[edit]

diff mediawiki-fm\SpecialLockdb.php getwiki-fm\SpecialLockdb.php
1c1,7
< < ? function wfSpecialLockdb ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialLockdb ()
43c49,51
< 	$wgOut->addHTML ("<p><font color='red' size='+1'>{$err}</font>\n");
---
> 	$wgOut->
> 	  addHTML
> 	  ("<p class=\"error\"><span class=\"big\">{$err}</span></p>\n");
50c58
<     $wgOut->addHTML ("<p>
---
>     $wgOut->addHTML ("
52,63c60,63
< {$elr}:
< <textarea name=\"wpLockReason\" rows=10 cols=60 wrap=virtual>
< </textarea>
< <table border=0><tr>
< <td align=right>
< <input type=checkbox name=\"wpLockConfirm\">
< </td>
< <td align=left>{$lc}<td>
< </tr><tr>
< <td> </td><td align=left>
< <input type=submit name=\"wpLock\" value=\"{$lb}\">
< </td></tr></table>
---
> <label for=\"wpLockReason\">{$elr}:</label><br />
> <textarea name=\"wpLockReason\" rows=\"10\" cols=\"60\" wrap=\"virtual\"></textarea>
> <input type=\"checkbox\" class=\"fill\" name=\"wpLockConfirm\" /><label for=\"wpLockConfirm\">{$lc}</label><br />
> <input type=\"submit\" name=\"wpLock\" value=\"{$lb}\" />
86,87c86,88
<     fwrite ($fp, "\n<p>(by ".$wgUser->getName ()." at ".
< 	    $wgLang->timeanddate (wfTimestampNow ()).")\n");
---
>     fwrite ($fp,
> 	    "\n<p>(by ".$wgUser->getName ()." at ".$wgLang->
> 	    timeanddate (wfTimestampNow ()).")\n");

SpecialLonelypages.php[edit]

diff mediawiki-fm\SpecialLonelypages.php getwiki-fm\SpecialLonelypages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
18,21c24,25
< 
<     return "SELECT cur_title FROM cur LEFT JOIN links ON ".
<       "cur_id=l_to WHERE l_to IS NULL AND cur_namespace=0 AND ".
<       "cur_is_redirect=0 ORDER BY cur_title LIMIT {$offset}, {$limit}";
---
>     return
>       "SELECT cur_title FROM cur LEFT JOIN links ON cur_id=l_to WHERE l_to IS NULL AND cur_namespace=0 AND cur_is_redirect=0 ORDER BY cur_title LIMIT {$offset}, {$limit}";
29d32
< 
31d33
< 

SpecialLongpages.php[edit]

diff mediawiki-fm\SpecialLongpages.php getwiki-fm\SpecialLongpages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
18,20c24,25
<     return "SELECT cur_title, LENGTH(cur_text) AS len FROM cur ".
<       "WHERE cur_namespace=0 AND cur_is_redirect=0 ORDER BY ".
<       "LENGTH(cur_text) DESC LIMIT {$offset}, {$limit}";
---
>     return
>       "SELECT cur_title, LENGTH(cur_text) AS len FROM cur WHERE cur_namespace=0 AND cur_is_redirect=0 ORDER BY LENGTH(cur_text) DESC LIMIT {$offset}, {$limit}";
35d39
< 
37d40
< 

SpecialMaintenance.php[edit]

diff mediawiki-fm\SpecialMaintenance.php getwiki-fm\SpecialMaintenance.php
1c1,7
< < ? function sns ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function sns ()
43c49
<   $r. = "<UL>\n";
---
>   $r. = "<ul>\n";
53c59
<   $l = str_replace ("<a ", "<FORM method=post ", $l);
---
>   $l = str_replace ("<a ", "<form method=\"post\" ", $l);
57c63
<   $r. = "<input type=submit name='submitmll' value='";
---
>   $r. = "<input type=\"submit\" name=\"submitmll\" value=\"";
59,60c65,66
<   $r. = "'>\n";
<   $r. = "<select name=thelang>\n";
---
>   $r. = "\" />\n";
>   $r. = "<select name=\"thelang\">\n";
69c75
<   $r. = "</FORM>\n</li>";
---
>   $r. = "</form>\n</li>";
71c77
<   $r. = "</UL>\n";
---
>   $r. = "</ul>\n";
90,91c96,98
<   $r = $sk->makeKnownLink ($ns[-1].":Maintenance",
< 			   wfMsg ("maintenancebacklink"));
---
>   $r =
>     $sk->makeKnownLink ($ns[-1].":Maintenance",
> 			wfMsg ("maintenancebacklink"));
94,96c101,102
<   $s = "<table width=100% border=0><tr><td>";
<   $s. = "<h2>{$t}</h2></td><td align=right>";
<   $s. = "{$r}</td></tr></table>\n";
---
>   $s = "<h2>{$t}</h2><br />\n";
>   $s. = "{$r}\n";
129c135
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
135c141
<   $wgOut->addHTML ("<br>{$sl}\n");
---
>   $wgOut->addHTML ("<br />{$sl}\n");
150c156
<   $wgOut->addHTML ("<p>{$sl}\n");
---
>   $wgOut->addHTML ("<p>{$sl}</p>\n");
169c175
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
175c181
<   $wgOut->addHTML ("<br>{$sl}\n");
---
>   $wgOut->addHTML ("<br />{$sl}\n");
193c199
<   $wgOut->addHTML ("<p>{$sl}\n");
---
>   $wgOut->addHTML ("<p>{$sl}</p>\n");
210c216
<   $top. = "<p>".wfMsg ("brokenredirectstext")."</p><br>\n";
---
>   $top. = "<p>".wfMsg ("brokenredirectstext")."</p>\n";
212c218
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
218c224
<   $wgOut->addHTML ("<br>{$sl}\n");
---
>   $wgOut->addHTML ("<br />{$sl}\n");
234c240
<   $wgOut->addHTML ("<p>{$sl}\n");
---
>   $wgOut->addHTML ("<p>{$sl}</p>\n");
251c257
<   $top. = "<p>".wfMsg ("selflinkstext")."</p><br>\n";
---
>   $top. = "<p>".wfMsg ("selflinkstext")."</p>\n";
253c259
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
259c265
<   $wgOut->addHTML ("<br>{$sl}\n");
---
>   $wgOut->addHTML ("<br />{$sl}\n");
268c274
<   $wgOut->addHTML ("<p>{$sl}\n");
---
>   $wgOut->addHTML ("<p>{$sl}</p>\n");
319c325
< 		    $b[] = "<H3>{$y}</H3>\n<OL start=".($cnt + 1).">\n";
---
> 		    $b[] = "<h3>{$y}</h3>\n<ol start=\"".($cnt + 1)."\">\n";
323,326c329,331
< 		  $sk->makeKnownLink ($obj->cur_title).
< 		  " (".
< 		  $sk->makeBrokenLink ($obj->cur_title, wfMsg ("qbedit")).
< 		  ")</li>\n";
---
> 		  $sk->makeKnownLink ($obj->cur_title)." (".$sk->
> 		  makeBrokenLink ($obj->cur_title,
> 				  wfMsg ("qbedit")).")</li>\n";
333c338
<   $top. = "<p>".wfMsg ("mispeelingstext", $msl)."</p><br>\n";
---
>   $top. = "<p>".wfMsg ("mispeelingstext", $msl)."</p>\n";
335c340
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
341c346
<   $wgOut->addHTML ("<br>{$sl}\n");
---
>   $wgOut->addHTML ("<br />{$sl}\n");
347c352
<   $wgOut->addHTML ("<p>{$sl}\n");
---
>   $wgOut->addHTML ("<p>{$sl}</p>\n");
372c377
<   $top. = "<p>$mll</p><br>";
---
>   $top. = "<p>$mll</p>";
374c379
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
382c387
<   $wgOut->addHTML ("<br>{$sl}\n");
---
>   $wgOut->addHTML ("<br />{$sl}\n");
385c390
<   $s = "<ol start=".($offset + 1).">";
---
>   $s = "<ol start=\"".($offset + 1)."\">";
391c396
<   $wgOut->addHTML ("<p>{$sl}\n");
---
>   $wgOut->addHTML ("<p>{$sl}</p>\n");
Only in getwiki-fm: SpecialMissingimages.php

SpecialMovepage.php[edit]

diff mediawiki-fm\SpecialMovepage.php getwiki-fm\SpecialMovepage.php
1c1,7
< < ? include_once ("LinksUpdate.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("LinksUpdate.php");
39d44
< 
77,78c82,83
<     $action = wfLocalUrlE ($wgLang->specialPage ("Movepage"),
< 			   "action=submit");
---
>     $action =
>       wfLocalUrlE ($wgLang->specialPage ("Movepage"), "action=submit");
83c88,90
< 	$wgOut->addHTML ("<p><font color='red' size='+1'>{$err}</font>\n");
---
> 	$wgOut->
> 	  addHTML
> 	  ("<p class=\"error\"><span class=\"big\">{$err}</span></p>\n");
85c92
<     $wgOut->addHTML ("<p>
---
>     $wgOut->addHTML ("
87,96c94,97
< <table border=0><tr>
< <td align=right>{$ma}:</td>
< <td align=left><strong>{$ott}</strong></td>
< </tr><tr>
< <td align=right>{$newt}:</td>
< <td align=left>
< <input type=text size=40 name=\"wpNewTitle\" value=\"{$wpNewTitle}\">
< <input type=hidden name=\"wpOldTitle\" value=\"{$wpOldTitle}\">
< </td>
< </tr>");
---
> {$ma}: <span class=\"strong\">{$ott}</span><br />
> {$newt}:<br />
> <input type=\"text\" size=\"40\" name=\"wpNewTitle\" value=\"{$wpNewTitle}\" /><br />
> <input type=\"hidden\" name=\"wpOldTitle\" value=\"{$wpOldTitle}\" />");
100,109c101,105
< 	$wgOut->addHTML ("<tr>
< <td align=right>
< <input type=checkbox name=\"wpMovetalk\" checked value=\"1\">
< </td><td>{$movetalk}</td>
< </tr>");
<       }
<     $wgOut->addHTML ("<tr>
< <td> </td><td align=left>
< <input type=submit name=\"wpMove\" value=\"{$mpb}\">
< </td></tr></table>
---
> 	$wgOut->addHTML ("
> <input type=\"checkbox\" name=\"wpMovetalk\" checked=\"checked\" value=\"1\" /> {$movetalk}<br />");
>       }
>     $wgOut->addHTML ("
> <input type=\"submit\" name=\"wpMove\" value=\"{$mpb}\" />
145,152c141,145
<     if ((!Namespace::isMovable ($this->ons)) ||
< 	("" == $this->odt) ||
< 	("" != $this->ot->getInterwiki ()) ||
< 	(!$this->ot->userCanEdit ()) ||
< 	(!$this->oldid) ||
< 	(!Namespace::isMovable ($nns)) ||
< 	("" == $this->ndt) ||
< 	("" != $this->nt->getInterwiki ()) || (!$this->nt->userCanEdit ()))
---
>     if ((!Namespace::isMovable ($this->ons)) || ("" == $this->odt)
> 	|| ("" != $this->ot->getInterwiki ()) || (!$this->ot->userCanEdit ())
> 	|| (!$this->oldid) || (!Namespace::isMovable ($nns))
> 	|| ("" == $this->ndt) || ("" != $this->nt->getInterwiki ())
> 	|| (!$this->nt->userCanEdit ()))
186,187c179,180
<     if ((1 == $wpMovetalk) &&
< 	(!Namespace::isTalk ($this->ons)) && ($this->ons == $this->nns))
---
>     if ((1 == $wpMovetalk) && (!Namespace::isTalk ($this->ons))
> 	&& ($this->ons == $this->nns))
189d181
< 
233,238c225,229
<     $success = wfLocalUrl ($wgLang->specialPage ("Movepage"),
< 			   "action=success&oldtitle=".wfUrlencode ($this->
< 								   ofx).
< 			   "&newtitle=".wfUrlencode ($this->nfx).
< 			   "&talkmoved={$this->talkmoved}");
< 
---
>     $success =
>       wfLocalUrl ($wgLang->specialPage ("Movepage"),
> 		  "action=success&oldtitle=".wfUrlencode ($this->ofx).
> 		  "&newtitle=".wfUrlencode ($this->nfx).
> 		  "&talkmoved={$this->talkmoved}");
257,263c248,251
<       {
< 	$wgOut->addHTML ("\n<p>".wfMsg ("talkpagemoved"));
<       }
<     elseif ('invalid' == $talkmoved)
<     {
<       $wgOut->addHTML ("\n<p><strong>".wfMsg ("talkexists")."</strong>");
<     }
---
>       $wgOut->addHTML ("\n<p>".wfMsg ("talkpagemoved")."</p>");
>     elseif ('invalid' ==
> 	    $talkmoved) $wgOut->addHTML ("\n<p><strong>".wfMsg ("talkexists").
> 					 "</strong></p>");
269c257
< 	  $wgOut->addHTML ("\n<p>".wfMsg ("talkpagenotmoved"));
---
> 	  $wgOut->addHTML ("\n<p>".wfMsg ("talkpagenotmoved")."</p>");
275d262
< 
280,281c267,268
<     $sql = "SELECT cur_is_redirect,cur_text FROM cur ".
<       "WHERE cur_id={$this->newid}";
---
>     $sql =
>       "SELECT cur_is_redirect,cur_text FROM cur WHERE cur_id={$this->newid}";
298,299c285,286
<     $sql = "SELECT old_id FROM old WHERE old_namespace={$this->nns} ".
<       "AND old_title='{$this->ndt}'";
---
>     $sql =
>       "SELECT old_id FROM old WHERE old_namespace={$this->nns} AND old_title='{$this->ndt}'";
320,321c307,308
<     $sql = "UPDATE cur SET cur_touched='{$now}',".
<       "cur_namespace={$this->nns},cur_title='{$this->ndt}' ".
---
>     $sql =
>       "UPDATE cur SET cur_touched='{$now}',cur_namespace={$this->nns},cur_title='{$this->ndt}' ".
328,329c315,316
<     $sql = "UPDATE cur SET cur_touched='{$now}',cur_timestamp='{$now}',".
<       "cur_namespace={$this->ons},cur_title='{$this->odt}',".
---
>     $sql =
>       "UPDATE cur SET cur_touched='{$now}',cur_timestamp='{$now}',cur_namespace={$this->ons},cur_title='{$this->odt}',".
340,342c327,328
<     $sql = "UPDATE old SET ".
<       "old_namespace={$this->nns},old_title='{$this->ndt}' WHERE ".
<       "old_namespace={$this->ons} AND old_title='{$this->odt}'";
---
>     $sql =
>       "UPDATE old SET old_namespace={$this->nns},old_title='{$this->ndt}' WHERE old_namespace={$this->ons} AND old_title='{$this->odt}'";
345,347c331,332
<     $sql = "UPDATE recentchanges SET ".
<       "rc_namespace={$this->nns}, rc_title='{$this->ndt}' WHERE ".
<       "rc_cur_id={$this->oldid}";
---
>     $sql =
>       "UPDATE recentchanges SET rc_namespace={$this->nns}, rc_title='{$this->ndt}' WHERE rc_cur_id={$this->oldid}";
352,355c337,341
<     $sql = "INSERT INTO recentchanges (rc_namespace,rc_title,
< 			rc_comment,rc_user,rc_user_text,rc_timestamp,
< 			rc_cur_time,rc_cur_id,rc_new)
< 			VALUES ({$this->ons},'{$this->odt}',"."'{$mt} \\\"{$this->nft}\\\"','".$wgUser->getID ()."','".wfStrencode ($wgUser->getName ())."','{$now}','{$now}',{$this->newid},1)";
---
>     $sql =
>       "INSERT INTO recentchanges (rc_namespace,rc_title,rc_comment,rc_user,rc_user_text,rc_timestamp,rc_cur_time,rc_cur_id,rc_new) VALUES ({$this->ons},'{$this->odt}',".
>       "'{$mt} \\\"{$this->nft}\\\"','".$wgUser->getID ()."','".
>       wfStrencode ($wgUser->getName ()).
>       "','{$now}','{$now}',{$this->newid},1)";
400,402c386,387
<     $sql = "UPDATE cur SET cur_touched='{$now}',".
<       "cur_namespace={$this->nns},cur_title='{$this->ndt}' ".
<       "WHERE cur_id={$this->oldid}";
---
>     $sql =
>       "UPDATE cur SET cur_touched='{$now}',cur_namespace={$this->nns},cur_title='{$this->ndt}' WHERE cur_id={$this->oldid}";
406,407c391,392
<     $common = "{$this->ons},'{$this->odt}',".
<       "'{$mt} \\\"{$this->nft}\\\"','".
---
>     $common =
>       "{$this->ons},'{$this->odt}',"."'{$mt} \\\"{$this->nft}\\\"','".
409,412c394,395
<     $sql = "INSERT INTO cur (cur_namespace,cur_title,".
<       "cur_comment,cur_user,cur_user_text,cur_timestamp,inverse_timestamp,".
<       "cur_touched,cur_text,cur_is_redirect,cur_is_new) ".
<       "VALUES ({$common},'{$won}','{$now}','//REDIRECT [[{$this->nft}]]\n',1,1)";
---
>     $sql =
>       "INSERT INTO cur (cur_namespace,cur_title,cur_comment,cur_user,cur_user_text,cur_timestamp,inverse_timestamp,cur_touched,cur_text,cur_is_redirect,cur_is_new) VALUES ({$common},'{$won}','{$now}','//REDIRECT [[{$this->nft}]]\n',1,1)";
417,419c400,401
<     $sql = "UPDATE old SET ".
<       "old_namespace={$this->nns},old_title='{$this->ndt}' WHERE ".
<       "old_namespace={$this->ons} AND old_title='{$this->odt}'";
---
>     $sql =
>       "UPDATE old SET old_namespace={$this->nns},old_title='{$this->ndt}' WHERE old_namespace={$this->ons} AND old_title='{$this->odt}'";
422,424c404,405
<     $sql = "UPDATE recentchanges SET ".
<       "rc_namespace={$this->nns}, rc_title='{$this->ndt}' WHERE ".
<       "rc_namespace={$this->ons} AND rc_title='{$this->odt}'";
---
>     $sql =
>       "UPDATE recentchanges SET rc_namespace={$this->nns}, rc_title='{$this->ndt}' WHERE rc_namespace={$this->ons} AND rc_title='{$this->odt}'";
427,430c408,409
<     $sql = "INSERT INTO recentchanges (rc_namespace,rc_title,
< 			rc_comment,rc_user,rc_user_text,rc_timestamp,
< 			rc_cur_time,rc_cur_id,rc_new)
< 			VALUES ({$common},'{$now}',{$this->newid},1)";
---
>     $sql =
>       "INSERT INTO recentchanges (rc_namespace,rc_title,rc_comment,rc_user,rc_user_text,rc_timestamp,rc_cur_time,rc_cur_id,rc_new) VALUES ({$common},'{$now}',{$this->newid},1)";
438,439c417,419
< 	wfQuery ("DELETE linkscc FROM linkscc,brokenlinks ".
< 		 "WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'", DB_WRITE);
---
> 	wfQuery
> 	  ("DELETE linkscc FROM linkscc,brokenlinks WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'",
> 	   DB_WRITE);
472d451
< 

SpecialNeglectedpages.php[edit]

diff mediawiki-fm\SpecialNeglectedpages.php getwiki-fm\SpecialNeglectedpages.php
2,4c2,7
< // Suggestion from mailing list: lists pages in order
< // least recently reviewed.
< //
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // Suggestion from mailing list: lists pages in order least recently reviewed.
9c12,16
<   $wgOut->addHTML ("<p>(TODO: neglected pages)");
---
>   $wgOut->addHTML ("
> <ul>
> 	<li>A page listing those articles gone longest since editing</li>
> 	<li><a class=\"internal\" href=\"?title=Wikinfo:Village_pump\">Talk at the pump</a>
> </ul>");

SpecialNewpages.php[edit]

diff mediawiki-fm\SpecialNewpages.php getwiki-fm\SpecialNewpages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
19,22c25
<       "SELECT rc_title AS cur_title,rc_user AS cur_user,rc_user_text AS cur_user_text,rc_comment as cur_comment,".
<       "rc_timestamp AS cur_timestamp,length(cur_text) as cur_length FROM recentchanges,cur ".
<       "WHERE rc_cur_id=cur_id AND rc_new=1 AND rc_namespace=0 AND cur_is_redirect=0 ".
<       "ORDER BY rc_timestamp DESC LIMIT {$offset}, {$limit}";
---
>       "SELECT rc_title AS cur_title,rc_user AS cur_user,rc_user_text AS cur_user_text,rc_comment as cur_comment,rc_timestamp AS cur_timestamp,length(cur_text) as cur_length FROM recentchanges,cur WHERE rc_cur_id=cur_id AND rc_new=1 AND rc_namespace=0 AND cur_is_redirect=0 ORDER BY rc_timestamp DESC LIMIT {$offset}, {$limit}";
53d55
< 
62d63
< 
64d64
< 

SpecialPopularpages.php[edit]

diff mediawiki-fm\SpecialPopularpages.php getwiki-fm\SpecialPopularpages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
18,20c24,25
<     return "SELECT DISTINCT cur_title, cur_counter FROM cur ".
<       "WHERE cur_namespace=0 AND cur_is_redirect=0 ORDER BY ".
<       "cur_counter DESC LIMIT {$offset}, {$limit}";
---
>     return
>       "SELECT DISTINCT cur_title, cur_counter FROM cur WHERE cur_namespace=0 AND cur_is_redirect=0 ORDER BY cur_counter DESC LIMIT {$offset}, {$limit}";
35d39
< 
37d40
< 

SpecialPreferences.php[edit]

diff mediawiki-fm\SpecialPreferences.php getwiki-fm\SpecialPreferences.php
1c1,7
< < ? function wfSpecialPreferences ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialPreferences ()
6,7c12,13
<   $fields = array ("wpOldpass", "wpNewpass", "wpRetypePass",
< 		   "wpUserEmail", "wpNick");
---
>   $fields =
>     array ("wpOldpass", "wpNewpass", "wpRetypePass", "wpUserEmail", "wpNick");
36c42
< /* private */ function
---
> function
45c51
< /* private */ function
---
> function
50,52c56
<     {
<       return $val;
<     }
---
>     return $val;
54,56c58
<     {
<       return validateInt ($val, $min, $max);
<     }
---
>     return validateInt ($val, $min, $max);
59,60c61
< 
< /* private */ function
---
> function
64,66c65
<     {
<       return 1;
<     }
---
>     return 1;
68,70c67
<     {
<       return 0;
<     }
---
>     return 0;
73,75c70
< 
< 
< /* private */ function
---
> function
101a97,99
>       session_unregister ("wsUserPassword");
>       $wsUserPassword = $wpNewpass;
>       session_register ("wsUserPassword");
146c144
<   $wgUser->setCookies ();
---
>   //$wgUser->setCookies();
152c150
< /* private */ function
---
> function
194c192
< /* private */ function
---
> function
211c209
< 	    $checked = " checked";
---
> 	    $checked = " checked=\"checked\"";
220,224c218,221
< 	  {
< 	    $r1. = " ";
< 	  }
< 	$r1. = "<label><input type=checkbox value=\"1\" name=\"".
< 	  "wpNs$i\"{$checked}>{$name}</label>\n";
---
> 	  $r1. = " ";
> 
> 	$r1. =
> 	  "<label><input type=\"checkbox\" class=\"fill\" value=\"1\" name=\"wpNs$i\"{$checked} />{$name}</label><br>\n";
227d223
< 
231,234c227
< 
< 
< 
< /* private */ function
---
> function
237c230
<   global $wgUser, $wgOut, $wgLang, $wgUseDynamicDates;
---
>   global $wgUser, $wgOut, $wgLang, $wgUseDynamicDates, $wgSitename;
250c243,251
<       $wgOut->addHTML ("<font size='+1' color='red'>$err</font>\n<p>");
---
>       $wgOut->
> 	addHTML
> 	("<ul>\n\t<li><span class=\"error\"><b>$err</b></span>\n</li>\n");
>     }
>   else
>     {
>       $wgOut->
> 	addHTML
> 	("<ul>\n\t<li><b>Welcome</b> to <a href=\"?title=Wikinfo:About\">$wgSitename</a> (<a href=\"?title=Wikinfo:About\">Internet Encyclopedia</a>)</li>\n");
263,264c264,265
<   $action = wfLocalUrlE ($wgLang->specialPage ("Preferences"),
< 			 "action=submit");
---
>   $action =
>     wfLocalUrlE ($wgLang->specialPage ("Preferences"), "action=submit");
283c284
<   $yem = wfMsg ("youremail");
---
>   $yem = wfMsg ("youremail2");
293a295,323
>   $wgOut->addHTML ("</ul>");	// inserting this to complete the user list coming from Language.php, and mainPrefsForm() above
> 
>   $wgOut->
>     addHTML
>     ("<form id=\"preferences\" name=\"preferences\" action=\"$action\" method=\"post\">
> <table border=\"0\" cellspacing=\"5\" cellpadding=\"0\" summary=\"table shows all user preferences for the site\">
> 	<tr>");
> 
>   $wgOut->addHTML ("\n\t<td class=\"prefs\" valign=\"top\" nowrap>");
> 
> // Nickname
> 
>   $wpNick = wfEscapeHTML ($wpNick);
>   $wgOut->
>     addHTML
>     ("<b>$ynn</b><br><label><input type=\"text\" name=\"wpNick\" value=\"{$wpNick}\" size=\"15\" /></label><br><br>");
> 
> // Email settings
> 
>   $wpUserEmail = wfEscapeHTML ($wpUserEmail);
>   if ($wpEmailFlag)
>     {
>       $emfc = "checked";
>     }
>   else
>     {
>       $emfc = "";
>     }
> 
295,296c325,331
<     addHTML ("<form id=\"preferences\" name=\"preferences\" action=\"$action\"
< method=\"post\"><table border=\"1\"><tr><td valign=top nowrap><b>$qb:</b><br>\n");
---
>     addHTML
>     ("<b>$yem</b><br><label><input type=\"text\" name=\"wpUserEmail\" value=\"{$wpUserEmail}\" size=\"30\" /></label><br>
> <label><input type=\"checkbox\" class=\"fill\" $emfc value=\"1\" name=\"wpEmailFlag\"> $emf </label><br>");
> 
>   $wgOut->addHTML ("</td>\n\t<td class=\"prefs\" valign=\"top\" nowrap>");
> 
> // Quickbar setting
298,299c333
<   // Quickbar setting
<   //
---
>   $wgOut->addHTML ("<b>$qb</b>**<br>");
304c338
< 	  $checked = " checked";
---
> 	  $checked = " checked=\"checked\"";
310,311c344,346
<       $wgOut->addHTML ("<label><input type=radio name=\"wpQuickbar\"
< value=\"$i\"$checked> {$qbs[$i]}</label><br>\n");
---
>       $wgOut->
> 	addHTML
> 	("\n\t<label><input type=\"radio\" class=\"fill\" name=\"wpQuickbar\" value=\"$i\" $checked /> {$qbs[$i]}</label><br>");
314,318c349,351
<   // Fields for changing password
<   //
<   $wpOldpass = wfEscapeHTML ($wpOldpass);
<   $wpNewpass = wfEscapeHTML ($wpNewpass);
<   $wpRetypePass = wfEscapeHTML ($wpRetypePass);
---
>   $wgOut->
>     addHTML
>     ("</td>\n\t</tr><tr>\n\t<td class=\"prefs\" valign=\"top\" nowrap>");
320,328c353,355
<   $wgOut->addHTML ("</td><td vaign=top nowrap><b>$cp:</b><br>
< <label>$opw: <input type=password name=\"wpOldpass\" value=\"$wpOldpass\" size=20></label><br>
< <label>$npw: <input type=password name=\"wpNewpass\" value=\"$wpNewpass\" size=20></label><br>
< <label>$rpw: <input type=password name=\"wpRetypePass\" value=\"$wpRetypePass\" size=20></label><br>
< </td></tr>\n");
< 
<   // Skin setting
<   //
<   $wgOut->addHTML ("<tr><td valign=top nowrap><b>$sk:</b><br>\n");
---
> // Skin setting
> 
>   $wgOut->addHTML ("<b>$sk</b><br>\n");
336c363
< 	  $checked = " checked";
---
> 	  $checked = " checked=\"checked\"";
342,343c369,371
<       $wgOut->addHTML ("<label><input type=radio name=\"wpSkin\"
< value=\"$i\"$checked> {$skins[$i]}</label><br>\n");
---
>       $wgOut->
> 	addHTML
> 	("<label><input type=\"radio\" class=\"fill\" name=\"wpSkin\" value=\"$i\" $checked /> {$skins[$i]}</label><br>\n");
346,352c374,379
<   // Various checkbox options
<   //
<   if ($wgUseDynamicDates)
<     {
<       $wgOut->addHTML ("</td><td rowspan=3 valign=top nowrap>\n");
<     }
<   else
---
> // Math setting
> 
>   $wgOut->
>     addHTML
>     ("<br><b>$math</b><br>NOTE: PNG rendering <i>currently</i> disabled<br>\n");
>   for ($i = 0; $i < count ($mathopts); ++$i)
354c381,391
<       $wgOut->addHTML ("</td><td rowspan=2 valign=top nowrap>\n");
---
>       if ($i == $wpMath)
> 	{
> 	  $checked = " checked=\"checked\"";
> 	}
>       else
> 	{
> 	  $checked = "";
> 	}
>       $wgOut->
> 	addHTML
> 	("<label><input type=\"radio\" class=\"fill\" name=\"wpMath\" value=\"$i\" $checked /> {$mathopts[$i]}</label><br>\n");
356c393,418
<   $wgOut->addHTML ("<table border=0>");
---
> 
> // Textbox rows, cols
> 
>   $wgOut->addHTML ("<br><b>$tbs</b><br>
> <label><input type=\"text\" name=\"wpCols\" value=\"{$wpCols}\" size=\"4\" /></label> Width ($tbc) <br>
> <label><input type=\"text\" name=\"wpRows\" value=\"{$wpRows}\" size=\"4\" /> Height ($tbr) </label><br><br>
> 
> <b>Special Pages Settings</b><br>
> <label><input type=\"text\" name=\"wpRecent\" value=\"$wpRecent\" size=\"4\" /> $rcc </label><br>
> <label><input type=\"text\" name=\"wpStubs\" value=\"$wpStubs\" size=\"4\" /> $stt </label><br><br>");
> 
> // Search settings
> 
>   $wgOut->addHTML ("<strong>{$srh}</strong><br>
> <label><input type=\"text\" name=\"wpSearch\" value=\"$wpSearch\" size=\"4\" /> $rpp </label><br>
> <label><input type=\"text\" name=\"wpSearchLines\" value=\"$wpSearchLines\" size=\"4\" /> $scl </label><br>
> <label><input type=\"text\" name=\"wpSearchChars\" value=\"$wpSearchChars\" size=\"4\" /> $scc </label><br>");
> 
>   $wgOut->addHTML ("</td>\n\t<td class=\"prefs\" valign=\"top\" nowrap>");
> 
> // Interactive setting checkboxes
> 
>   $ift = wfMsg ("interactivefeatures");
>   $wgOut->
>     addHTML
>     ("<b>{$ift}</b><br /><table border=\"0\" class\"flag\" cellspacing=\"0\" cellpadding=\"0\">\n");
361c423
< 	$checked = " checked";
---
> 	$checked = " checked=\"checked\"";
368,369c430,431
<       addHTML ("<tr valign=\"top\"><td><input type=checkbox value=\"1\" ".
< 	       "id=\"$tname\" name=\"wpOp$tname\"$checked></td><td><label for=\"$tname\">$ttext</label></td></tr>\n");
---
>       addHTML
>       ("<tr valign=\"top\"><td><input type=\"checkbox\" class=\"fill\" value=\"1\" id=\"$tname\" name=\"wpOp$tname\" $checked /></td><td><label for=\"$tname\">$ttext</label></td></tr>\n");
373,389c435
<   // Math setting
<   //
<   $wgOut->addHTML ("<tr><td valign=top nowrap><b>$math:</b><br>\n");
<   for ($i = 0; $i < count ($mathopts); ++$i)
<     {
<       if ($i == $wpMath)
< 	{
< 	  $checked = " checked";
< 	}
<       else
< 	{
< 	  $checked = "";
< 	}
<       $wgOut->addHTML ("<label><input type=radio name=\"wpMath\"
< value=\"$i\"$checked> {$mathopts[$i]}</label><br>\n");
<     }
<   $wgOut->addHTML ("</td></tr>");
---
>   $wgOut->addHTML ("</tr><tr>\n\t<td class=\"prefs\" valign=\"top\" nowrap>");
391,412c437,444
<   // Date format
<   //
<   if ($wgUseDynamicDates)
<     {
<       $wgOut->addHTML ("<tr><td valign=top nowrap><b>$dateFormat:</b><br>");
<       for ($i = 0; $i < count ($dateopts); ++$i)
< 	{
< 	  if ($i == $wpDate)
< 	    {
< 	      $checked = " checked";
< 	    }
< 	  else
< 	    {
< 	      $checked = "";
< 	    }
< 	  $wgOut->addHTML ("<label><input type=radio name=\"wpDate\" ".
< 			   "value=\"$i\"$checked> {$dateopts[$i]}</label><br>\n");
< 	}
<       $wgOut->addHTML ("</td></tr>");
<     }
<   // Textbox rows, cols
<   //
---
> // Namespace list
> 
>   $ps = namespacesCheckboxes ();
>   $wgOut->addHTML ("<b>$dsn</b><br>$ps");
> 
>   $wgOut->addHTML ("</td>\n\t<td class=\"prefs\" valign=\"top\" nowrap>");
> 
> // Time settings
415,422c447,451
<   $wgOut->addHTML ("<td valign=top nowrap><b>$tbs:</b><br>
< <label>$tbr: <input type=text name=\"wpRows\" value=\"{$wpRows}\" size=6></label><br>
< <label>$tbc: <input type=text name=\"wpCols\" value=\"{$wpCols}\" size=6></label><br><br>
< <b>$tzServerTime:</b> $nowserver<br />
< <b>$ltz:</b> $nowlocal<br />
< <label>$tzo*: <input type=text name=\"wpHourDiff\" value=\"{$wpHourDiff}\" size=6></label><br />
< <input type=\"button\" value=\"$tzGuess\" onClick=\"javascript:guessTimezone()\" />
< </td>");
---
>   $wgOut->
>     addHTML
>     ("<span class=\"big\">$nowserver</span> | <b>$tzServerTime:</b><br>
> <span class=\"big\">$nowlocal</span> | <b>$ltz:</b><br>
> <label><b>$tzo</b></label><br> <input type=\"text\" name=\"wpHourDiff\" value=\"{$wpHourDiff}\" size=\"3\" /> <input type=\"button\" value=\"$tzGuess\" onClick=\"javascript:guessTimezone()\" /> *<br><br>");
424,435c453
<   // Email, etc.
<   //
<   $wpUserEmail = wfEscapeHTML ($wpUserEmail);
<   $wpNick = wfEscapeHTML ($wpNick);
<   if ($wpEmailFlag)
<     {
<       $emfc = "checked";
<     }
<   else
<     {
<       $emfc = "";
<     }
---
> // Password settings
437c455,477
<   $ps = namespacesCheckboxes ();
---
>   $wpOldpass = wfEscapeHTML ($wpOldpass);
>   $wpNewpass = wfEscapeHTML ($wpNewpass);
>   $wpRetypePass = wfEscapeHTML ($wpRetypePass);
> 
>   $wgOut->addHTML ("<b>$cp</b><br>
> <label><input type=\"password\" name=\"wpOldpass\" value=\"$wpOldpass\" size=\"20\" /> $opw </label><br>
> <label><input type=\"password\" name=\"wpNewpass\" value=\"$wpNewpass\" size=\"20\" /> $npw </label><br>
> <label><input type=\"password\" name=\"wpRetypePass\" value=\"$wpRetypePass\" size=\"20\" /> $rpw </label><br><br>
> 
> <hr class=\"sep\">
> 
> *  <span class=\"small\">these features require JavaScript</span><br />
> ** <span class=\"small\">this feature uses CSS positioning</span>");
> 
>   $wgOut->addHTML ("</td>\n\t</tr>\n</table>");
> 
>   $wgOut->
>     addHTML
>     ("<table border=\"0\" class\"flag\" cellspacing=\"5\" cellpadding=\"0\">
> 	<tr>
> 	<td valign=\"top\" nowrap><input type=\"submit\" name=\"wpSaveprefs\" value=\"$svp\" /> <input type=\"submit\" name=\"wpReset\" value=\"$rsp\" /></td>
> 	</tr>
> </table></form>");
439,457d478
<   $wgOut->addHTML ("<td valign=top nowrap>
< <label>$yem: <input type=text name=\"wpUserEmail\" value=\"{$wpUserEmail}\" size=20></label><br>
< <label><input type=checkbox $emfc value=\"1\" name=\"wpEmailFlag\"> $emf</label><br>
< <label>$ynn: <input type=text name=\"wpNick\" value=\"{$wpNick}\" size=12></label><br>
< <label>$rcc: <input type=text name=\"wpRecent\" value=\"$wpRecent\" size=6></label><br>
< <label>$stt: <input type=text name=\"wpStubs\" value=\"$wpStubs\" size=6></label><br>
< <strong>{$srh}:</strong><br>
< <label>$rpp: <input type=text name=\"wpSearch\" value=\"$wpSearch\" size=6></label><br>
< <label>$scl: <input type=text name=\"wpSearchLines\" value=\"$wpSearchLines\" size=6></label><br>
< <label>$scc: <input type=text name=\"wpSearchChars\" value=\"$wpSearchChars\" size=6></label></td>
< </tr><tr>
< <td colspan=2>
< <b>$dsn</b><br>
< $ps
< </td>
< </tr><tr>
< <td align=center><input type=submit name=\"wpSaveprefs\" value=\"$svp\"></td>
< <td align=center><input type=submit name=\"wpReset\" value=\"$rsp\"></td>
< </tr></table>* {$tzt} </form>\n");

SpecialRandompage.php[edit]

diff mediawiki-fm\SpecialRandompage.php getwiki-fm\SpecialRandompage.php
1c1,7
< < ? function wfSpecialRandompage ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialRandompage ()
7a14
> 

SpecialRecentchanges.php[edit]

diff mediawiki-fm\SpecialRecentchanges.php getwiki-fm\SpecialRecentchanges.php
1c1,7
< < ? function wfSpecialRecentchanges ($par)
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialRecentchanges ($par)
88,89c94,96
<   $mlink = $sk->makeKnownLink ($wgLang->specialPage ("Recentchanges"),
< 			       $mltitle, $mlparams);
---
>   $mlink =
>     $sk->makeKnownLink ($wgLang->specialPage ("Recentchanges"), $mltitle,
> 			$mlparams);
101,102c108,109
<   $sql2 = "SELECT rc_cur_id,rc_namespace,rc_title,rc_user,rc_new,".
<     "rc_comment,rc_user_text,rc_timestamp,rc_minor,rc_this_oldid,rc_last_oldid,rc_bot".
---
>   $sql2 =
>     "SELECT rc_cur_id,rc_namespace,rc_title,rc_user,rc_new,rc_comment,rc_user_text,rc_timestamp,rc_minor,rc_this_oldid,rc_last_oldid,rc_bot".
107,108c114
<     "WHERE rc_timestamp > '{$cutoff}' {$hidem} ".
<     "ORDER BY rc_timestamp DESC LIMIT {$limit}";
---
>     "WHERE rc_timestamp > '{$cutoff}' {$hidem} ORDER BY rc_timestamp DESC LIMIT {$limit}";
113,114c119,120
<       $note = wfMsg ("rcnotefrom", $limit,
< 		     $wgLang->timeanddate ($from, true));
---
>       $note =
> 	wfMsg ("rcnotefrom", $limit, $wgLang->timeanddate ($from, true));
126,131c132,137
<   $note. = "<br>\n".wfMsg ("rclistfrom",
< 			   $sk->makeKnownLink ($wgLang->
< 					       specialPage ("Recentchanges"),
< 					       $wgLang->timeanddate ($now,
< 								     true),
< 					       "hideminor={$hideminor}&from=$now"));
---
>   $note. =
>     "<br />\n".wfMsg ("rclistfrom",
> 		      $sk->makeKnownLink ($wgLang->
> 					  specialPage ("Recentchanges"),
> 					  $wgLang->timeanddate ($now, true),
> 					  "hideminor={$hideminor}&from=$now"));
162,164c168,170
< 	  $s. = $sk->recentChangesLine ($ts, $u, $ut, $ns, $ttl,
< 					$com, $me, $new, $watched, $oldid,
< 					$diffid);
---
> 	  $s. =
> 	    $sk->recentChangesLine ($ts, $u, $ut, $ns, $ttl, $com, $me, $new,
> 				    $watched, $oldid, $diffid);
179,181c185,188
<   $s = $sk->makeKnownLink ($wgLang->specialPage ($page),
< 			   ($lim ? "{$lim}" : wfMsg ("all")), "{$more}".
< 			   ($d ? "days={$d}&" : "")."limit={$lim}");
---
>   $s =
>     $sk->makeKnownLink ($wgLang->specialPage ($page),
> 			($lim ? "{$lim}" : wfMsg ("all")),
> 			"{$more}".($d ? "days={$d}&" : "")."limit={$lim}");
190,192c197,200
<   $s = $sk->makeKnownLink ($wgLang->specialPage ($page),
< 			   ($d ? "{$d}" : wfMsg ("all")), "{$more}days={$d}".
< 			   ($lim ? "&limit={$lim}" : ""));
---
>   $s =
>     $sk->makeKnownLink ($wgLang->specialPage ($page),
> 			($d ? "{$d}" : wfMsg ("all")),
> 			"{$more}days={$d}".($lim ? "&limit={$lim}" : ""));

SpecialRecentchangeslinked.php[edit]

diff mediawiki-fm\SpecialRecentchangeslinked.php getwiki-fm\SpecialRecentchangeslinked.php
1c1,7
< < ? include_once ("SpecialRecentchanges.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("SpecialRecentchanges.php");
14,16c20,21
<     {
<       $target = $par;
<     }
---
>     $target = $par;
> 
59,61c64
<     {
<       $cmq = "";
<     }
---
>     $cmq = "";
63,67c66,69
<   $sql = "SELECT cur_id,cur_namespace,cur_title,cur_user,cur_comment,".
<     "cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new FROM links, cur ".
<     "WHERE cur_timestamp > '{$cutoff}' {$cmq} AND l_to=cur_id AND l_from='".
<     wfStrencode ($nt->getPrefixedDBkey ())."' GROUP BY cur_id ".
<     "ORDER BY inverse_timestamp LIMIT {$limit}";
---
>   $sql =
>     "SELECT cur_id,cur_namespace,cur_title,cur_user,cur_comment,cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new FROM links, cur WHERE cur_timestamp > '{$cutoff}' {$cmq} AND l_to=cur_id AND l_from='".
>     wfStrencode ($nt->getPrefixedDBkey ()).
>     "' GROUP BY cur_id ORDER BY inverse_timestamp LIMIT {$limit}";
71c73
<   $wgOut->addHTML ("<hr>\n{$note}\n<br>");
---
>   $wgOut->addHTML ("<hr />\n{$note}\n<br />");
73,75c75,78
<   $note = rcDayLimitlinks ($days, $limit, "Recentchangeslinked",
< 			   "target=".$nt->getPrefixedURL ().
< 			   "&hideminor={$hideminor}", false, $mlink);
---
>   $note =
>     rcDayLimitlinks ($days, $limit, "Recentchangeslinked",
> 		     "target=".$nt->getPrefixedURL ().
> 		     "&hideminor={$hideminor}", false, $mlink);

SpecialShortpages.php[edit]

diff mediawiki-fm\SpecialShortpages.php getwiki-fm\SpecialShortpages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
18,20c24,25
<     return "SELECT cur_title, LENGTH(cur_text) AS len FROM cur ".
<       "WHERE cur_namespace=0 AND cur_is_redirect=0 ORDER BY ".
<       "LENGTH(cur_text) LIMIT {$offset}, {$limit}";
---
>     return
>       "SELECT cur_title, LENGTH(cur_text) AS len FROM cur WHERE cur_namespace=0 AND cur_is_redirect=0 ORDER BY LENGTH(cur_text) LIMIT {$offset}, {$limit}";
35d39
< 
37d40
< 

SpecialSpecialpages.php[edit]

diff mediawiki-fm\SpecialSpecialpages.php getwiki-fm\SpecialSpecialpages.php
1c1,7
< < ? function wfSpecialSpecialpages ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialSpecialpages ()

SpecialStatistics.php[edit]

diff mediawiki-fm\SpecialStatistics.php getwiki-fm\SpecialStatistics.php
1c1,7
< < ? function wfSpecialStatistics ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialStatistics ()
21,24c27,33
<   $text = wfMsg ("sitestatstext",
< 		 $total, $good, $views, $edits,
< 		 sprintf ("%.2f", $total ? $edits / $total : 0),
< 		 sprintf ("%.2f", $edits ? $views / $edits : 0));
---
>   $text =
>     wfMsg ("sitestatstext", $total, $good, $views, $edits,
> 	   sprintf ("%.2f", $total ? $edits / $total : 0), sprintf ("%.2f",
> 								    $edits ?
> 								    $views /
> 								    $edits :
> 								    0));
34,35c43,44
<   $sql = "SELECT COUNT(user_id) AS total FROM user ".
<     "WHERE user_rights LIKE '%sysop%'";
---
>   $sql =
>     "SELECT COUNT(user_id) AS total FROM user WHERE user_rights LIKE '%sysop%'";

SpecialUndelete.php[edit]

diff mediawiki-fm\SpecialUndelete.php getwiki-fm\SpecialUndelete.php
1c1,7
< < ? function wfSpecialUndelete ($par)
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialUndelete ($par)
42c48,49
< 					   $n, "target=".urlencode ($n))." ".
---
> 					   $n,
> 					   "target=".urlencode ($n))."</li>".
46d52
< 
50c56
< /* private */ function
---
> function
69d74
< 
73c78
< /* private */ function
---
> function
81,83c86,87
<   $sql = "SELECT ar_minor_edit,ar_timestamp,ar_user,ar_user_text,ar_comment
<       FROM archive WHERE ar_namespace={$namespace} AND ar_title=\"{$title}\"
<       ORDER BY ar_timestamp DESC";
---
>   $sql =
>     "SELECT ar_minor_edit,ar_timestamp,ar_user,ar_user_text,ar_comment FROM archive WHERE ar_namespace={$namespace} AND ar_title=\"{$title}\" ORDER BY ar_timestamp DESC";
92c96
<   $wgOut->addWikiText (wfMsg ("undeletehistory")."\n<hr>\n".$row->ar_text);
---
>   $wgOut->addWikiText (wfMsg ("undeletehistory")."\n<hr />\n".$row->ar_text);
95,98c99,102
<   $wgOut->addHTML ("<p>
< <form id=\"undelete\" method=\"post\" action=\"{$action}\">
< <input type=hidden name=\"target\" value=\"{$target}\">
< <input type=submit name=\"restore\" value=\"".wfMsg ("undeletebtn")."\">
---
>   $wgOut->addHTML ("<form id=\"undelete\" method=\"post\" action=\"{$action}\">
> <input type=\"hidden\" name=\"target\" value=\"{$target}\" />
> <input type=\"submit\" name=\"restore\" value=\"".wfMsg ("undeletebtn").
> 		   "\" />
123,125c127,129
< 		       " ".". . {$row->ar_user_text}"." <i>(".
< 		       htmlspecialchars ($row->ar_comment)."</i>)\n");
< 
---
> 		       " . {$row->ar_user_text} <i>(".htmlspecialchars ($row->
> 									ar_comment).
> 		       "</i>)</li>\n");
128d131
< 
132c135
< /* private */ function
---
> function
159,163c162
< 	"INSERT INTO cur (cur_namespace,cur_title,cur_text,".
< 	"cur_comment,cur_user,cur_user_text,cur_timestamp,inverse_timestamp,cur_minor_edit,cur_random,cur_touched)".
< 	"SELECT ar_namespace,ar_title,ar_text,ar_comment,".
< 	"ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,RAND(),'{$now}' FROM archive ".
< 	"WHERE ar_namespace={$namespace} AND ar_title='{$t}' AND ar_timestamp={$max}";
---
> 	"INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_comment,cur_user,cur_user_text,cur_timestamp,inverse_timestamp,cur_minor_edit,cur_random,cur_touched) SELECT ar_namespace,ar_title,ar_text,ar_comment,ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,RAND(),'{$now}' FROM archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' AND ar_timestamp={$max}";
175,179c174,175
<   $sql = "INSERT INTO old (old_namespace,old_title,old_text,".
<     "old_comment,old_user,old_user_text,old_timestamp,inverse_timestamp,old_minor_edit,".
<     "old_flags) SELECT ar_namespace,ar_title,ar_text,ar_comment,".
<     "ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,ar_flags ".
<     "FROM archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' {$oldones}";
---
>   $sql =
>     "INSERT INTO old (old_namespace,old_title,old_text,old_comment,old_user,old_user_text,old_timestamp,inverse_timestamp,old_minor_edit,old_flags) SELECT ar_namespace,ar_title,ar_text,ar_comment,ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,ar_flags FROM archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' {$oldones}";
182c178
<   // Finally, clean up the link tables 
---
>   // clean up the link tables 
185,187c181,182
<       // Create a dummy OutputPage to update the outgoing links
<       // This works at the moment due to good luck. It may stop working in the 
<       // future. Damn globals.
---
>       // Create a dummy OutputPage to update the outgoing links This works at the moment due to
>       // good luck. It may stop working in the future. Damn globals. (bad programming, actually)
190,191c185,188
<       $res = wfQuery ("SELECT cur_text FROM cur WHERE cur_id={$newid} ".
< 		      "AND cur_namespace={$namespace}", DB_READ, $fname);
---
>       $res =
> 	wfQuery
> 	("SELECT cur_text FROM cur WHERE cur_id={$newid} AND cur_namespace={$namespace}",
> 	 DB_READ, $fname);
205,207c202,204
< 	  wfQuery ("DELETE linkscc FROM linkscc,brokenlinks ".
< 		   "WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'",
< 		   DB_WRITE);
---
> 	  wfQuery
> 	    ("DELETE linkscc FROM linkscc,brokenlinks WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'",
> 	     DB_WRITE);
209d205
<       //TODO: SearchUpdate, etc.
213,214c209,210
<   $sql = "DELETE FROM archive WHERE ar_namespace={$namespace} AND ".
<     "ar_title='{$t}'";
---
>   $sql =
>     "DELETE FROM archive WHERE ar_namespace={$namespace} AND ar_title='{$t}'";

SpecialUnlockdb.php[edit]

diff mediawiki-fm\SpecialUnlockdb.php getwiki-fm\SpecialUnlockdb.php
1c1,7
< < ? function wfSpecialUnlockdb ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialUnlockdb ()
40c46,48
< 	$wgOut->addHTML ("<p><font color='red' size='+1'>{$err}</font>\n");
---
> 	$wgOut->
> 	  addHTML
> 	  ("<p class=\"error\"><span class=\"big\">{$err}</span></p>\n");
44,45c52,53
<     $action = wfLocalUrlE ($wgLang->specialPage ("Unlockdb"),
< 			   "action=submit");
---
>     $action =
>       wfLocalUrlE ($wgLang->specialPage ("Unlockdb"), "action=submit");
47c55
<     $wgOut->addHTML ("<p>
---
>     $wgOut->addHTML ("
49,57c57,58
< <table border=0><tr>
< <td align=right>
< <input type=checkbox name=\"wpLockConfirm\">
< </td>
< <td align=\"left\">{$lc}<td>
< </tr><tr>
< <td> </td><td align=left>
< <input type=submit name=\"wpLock\" value=\"{$lb}\">
< </td></tr></table>
---
> <input type=\"checkbox\" class=\"fill\" name=\"wpLockConfirm\" /> {$lc}<br />
> <input type=\"submit\" name=\"wpLock\" value=\"{$lb}\" />
77,78c78,79
<     $success = wfLocalUrl ($wgLang->specialPage ("Unlockdb"),
< 			   "action=success");
---
>     $success =
>       wfLocalUrl ($wgLang->specialPage ("Unlockdb"), "action=success");

SpecialUnusedimages.php[edit]

diff mediawiki-fm\SpecialUnusedimages.php getwiki-fm\SpecialUnusedimages.php
1c1,7
< < ? function wfSpecialUnusedimages ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialUnusedimages ()
10,12c16
<     "SELECT img_name,img_user,img_user_text,img_timestamp,img_description ".
<     "FROM image LEFT JOIN imagelinks ON img_name=il_to WHERE il_to IS NULL ".
<     "ORDER BY img_timestamp LIMIT {$offset}, {$limit}";
---
>     "SELECT img_name,img_user,img_user_text,img_timestamp,img_description FROM image LEFT JOIN imagelinks ON img_name=il_to WHERE il_to IS NULL ORDER BY img_timestamp LIMIT {$offset}, {$limit}";
19c23
<   $wgOut->addHTML ("<p>{$top}\n");
---
>   $wgOut->addHTML ("<p>{$top}</p>\n");
23c27
<   $wgOut->addHTML ("<br>{$sl}\n");
---
>   $wgOut->addHTML ("<br />{$sl}\n");
26c30
<   $s = "<ol start=".($offset + 1).">";
---
>   $s = "<ol start=\"".($offset + 1)."\">";
58c62
<   $wgOut->addHTML ("<p>{$sl}\n");
---
>   $wgOut->addHTML ("<p>{$sl}</p>\n");

SpecialUpload.php[edit]

diff mediawiki-fm\SpecialUpload.php getwiki-fm\SpecialUpload.php
1c1,7
< < ? function wfSpecialUpload ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialUpload ()
114,115c120,121
<       if ((!$wpIgnoreWarning) &&
< 	  (0 != strcmp (ucfirst ($basename), $wpUploadSaveName)))
---
>       if ((!$wpIgnoreWarning)
> 	  && (0 != strcmp (ucfirst ($basename), $wpUploadSaveName)))
119c125,127
<       $extensions = array ("png", "jpg", "jpeg", "ogg");
---
>       // we disabled sounds and other files, to keep our DB demands down - proteus
>       //$extensions = array( "png", "gif", "jpg", "jpeg", "ogg", "mid", "wav", "mp3", "avi", "mpg"); 
>       $extensions = array ("png", "gif", "jpg", "jpeg");
124c132
<       if ((!$wpIgnoreWarning) && ($wpUploadSize > 150000))
---
>       if ((!$wpIgnoreWarning) && ($wpUploadSize > 200000))
133,134c141,142
<   wfRecordUpload ($wpUploadSaveName, $wgUploadOldVersion,
< 		  $wpUploadSize, $wpUploadDescription);
---
>   wfRecordUpload ($wpUploadSaveName, $wgUploadOldVersion, $wpUploadSize,
> 		  $wpUploadDescription);
144c152
<   $wgOut->addHTML ("<p>{$text}\n");
---
>   $wgOut->addHTML ("<p>{$text}</p>\n");
228c236
<   $wgOut->addHTML ("<h4><font color=red>{$warning}</font></h4>\n");
---
>   $wgOut->addHTML ("<h4><span class=\"error\">{$warning}</span></h4>\n");
230,262c238,268
<   $save = wfMsg ("savefile");
<   $reupload = wfMsg ("reupload");
<   $iw = wfMsg ("ignorewarning");
<   $reup = wfMsg ("reuploaddesc");
<   $action = wfLocalUrlE ($wgLang->specialPage ("Upload"), "action=submit");
< 
<   if ($wgUseCopyrightUpload)
<     {
<       $copyright = "
< <input type=hidden name=\"wpUploadCopyStatus\" value=\"".htmlspecialchars ($wpUploadCopyStatus)."\">
< <input type=hidden name=\"wpUploadSource\" value=\"".htmlspecialchars ($wpUploadSource)."\">
< ";
<     }
< 
<   $wgOut->addHTML ("
< <form id=\"uploadwarning\" method=\"post\" enctype=\"multipart/form-data\"
< action=\"{$action}\">
< <input type=hidden name=\"wpUploadAffirm\" value=\"1\">
< <input type=hidden name=\"wpIgnoreWarning\" value=\"1\">
< <input type=hidden name=\"wpUploadDescription\" value=\"".htmlspecialchars ($wpUploadDescription)."\">
< {$copyright}
< <input type=hidden name=\"wpUploadSaveName\" value=\"".htmlspecialchars ($wpUploadSaveName)."\">
< <input type=hidden name=\"wpUploadTempName\" value=\"".htmlspecialchars ($wpUploadTempName)."\">
< <input type=hidden name=\"wpUploadSize\" value=\"".htmlspecialchars ($wpUploadSize)."\">
< <input type=hidden name=\"wpSessionKey\" value=\"".htmlspecialchars ($wpSessionKey)."\">
< <input type=hidden name=\"wpUploadOldVersion\" value=\"".htmlspecialchars ($wgUploadOldVersion)."\">
< <table border=0><tr>
< <tr><td align=right>
< <input tabindex=2 type=submit name=\"wpUpload\" value=\"{$save}\">
< </td><td align=left>{$iw}</td></tr>
< <tr><td align=right>
< <input tabindex=2 type=submit name=\"wpReUpload\" value=\"{$reupload}\">
< </td><td align=left>{$reup}</td></tr></table></form>\n");
---
>   // we disabled the "re-save" form, so non-approved files and larger files than 150k are not allowed - proteus
>   /*
>      $save = wfMsg( "savefile" );
>      $reupload = wfMsg( "reupload" );
>      $iw = wfMsg( "ignorewarning" );
>      $reup = wfMsg( "reuploaddesc" );
>      $action = wfLocalUrlE( $wgLang->specialPage( "Upload" ), "action=submit" );
> 
>      if ( $wgUseCopyrightUpload )
>      {
>      $copyright =  "<input type=\"hidden\" name=\"wpUploadCopyStatus\" value=\"" . htmlspecialchars( $wpUploadCopyStatus ) . "\" />
>      <input type=\"hidden\" name=\"wpUploadSource\" value=\"" . htmlspecialchars( $wpUploadSource ) . "\" />
>      ";
>      }
> 
>      $wgOut->addHTML( "<form id=\"uploadwarning\" method=\"post\" enctype=\"multipart/form-data\" action=\"{$action}\">
>      <input type=\"hidden\" name=\"wpUploadAffirm\" value=\"1\" />
>      <input type=\"hidden\" name=\"wpIgnoreWarning\" value=\"1\" />
>      <input type=\"hidden\" name=\"wpUploadDescription\" value=\"" . htmlspecialchars( $wpUploadDescription ) . "\" />
>      {$copyright}
>      <input type=\"hidden\" name=\"wpUploadSaveName\" value=\"" . htmlspecialchars( $wpUploadSaveName ) . "\" />
>      <input type=\"hidden\" name=\"wpUploadTempName\" value=\"" . htmlspecialchars( $wpUploadTempName ) . "\" />
>      <input type=\"hidden\" name=\"wpUploadSize\" value=\"" . htmlspecialchars( $wpUploadSize ) . "\" />
>      <input type=\"hidden\" name=\"wpSessionKey\" value=\"" . htmlspecialchars( $wpSessionKey ) . "\" />
>      <input type=\"hidden\" name=\"wpUploadOldVersion\" value=\"" . htmlspecialchars( $wgUploadOldVersion) . "\" />
>      <input tabindex=\"2\" type=\"submit\" name=\"wpUpload\" value=\"{$save}\" /><br/>
>      {$iw}<br />
>      <input tabindex=\"2\" type=\"submit\" name=\"wpReUpload\" value=\"{$reupload}\" /><br />
>      {$reup}
>      </form>\n" );
>    */
276,277c282,284
<       $wgOut->addHTML ("<h2>{$sub}</h2>\n".
< 		       "<h4><font color=red>{$msg}</font></h4>\n");
---
>       $wgOut->
> 	addHTML
> 	("<h2>{$sub}</h2>\n<span class=\"error\"><b>{$msg}</b></span>\n");
282c289,290
<       $wgOut->addHTML ("<h2>{$sub}</h2>\n");
---
>       $msg = wfMsg ("uploadexplain");
>       $wgOut->addHTML ("<h2>{$sub}</h2>\n{$msg}\n");
284d291
<   $wgOut->addHTML ("<p>".wfMsg ("uploadtext"));
291,292c298,299
<   $clink = $sk->makeKnownLink (wfMsg ("copyrightpage"),
< 			       wfMsg ("copyrightpagename"));
---
>   $clink =
>     $sk->makeKnownLink (wfMsg ("copyrightpage"), wfMsg ("copyrightpagename"));
298,302c305,306
<   $source = "
< <td align=right>
< <input tabindex=3 type=checkbox name=\"wpUploadAffirm\" value=\"1\" id=\"wpUploadAffirm\">
< </td><td align=left><label for=\"wpUploadAffirm\">{$ca}</label></td>
< ";
---
>   $source =
>     "<input tabindex=\"3\" type=\"checkbox\" class=\"fill\" name=\"wpUploadAffirm\" value=\"1\" id=\"wpUploadAffirm\" /> <label for=\"wpUploadAffirm\">{$ca}</label><br />";
305,311c309,315
<       $source = "
< <td align=right nowrap>".wfMsg ("filestatus").":</td>
< <td><input tabindex=3 type=text name=\"wpUploadCopyStatus\" value=\"".htmlspecialchars ($wpUploadCopyStatus)."\" size=40></td>
< </tr><tr>
< <td align=right>".wfMsg ("filesource").":</td>
< <td><input tabindex=4 type=text name=\"wpUploadSource\" value=\"".htmlspecialchars ($wpUploadSource)."\" size=40></td>
< ";
---
>       $source =
> 	"".wfMsg ("filestatus").
> 	"<input tabindex=\"3\" type=\"text\" name=\"wpUploadCopyStatus\" value=\"".
> 	htmlspecialchars ($wpUploadCopyStatus)."\" size=\"40\" />".
> 	wfMsg ("filesource").
> 	":<input tabindex=\"4\" type=\"text\" name=\"wpUploadSource\" value=\"".
> 	htmlspecialchars ($wpUploadSource)."\" size=\"40\" />";
315,323c319,323
< <form id=\"upload\" method=\"post\" enctype=\"multipart/form-data\"
< action=\"{$action}\">
< <table border=0><tr>
< <td align=right>{$fn}:</td><td align=left>
< <input tabindex=1 type=file name=\"wpUploadFile\" value=\"".htmlspecialchars ($wpUploadFile)."\" size=40>
< </td></tr><tr>
< <td align=right>{$fd}:</td><td align=left>
< <input tabindex=2 type=text name=\"wpUploadDescription\" value=\"".htmlspecialchars ($wpUploadDescription)."\" size=40>
< </td></tr><tr>
---
> <form id=\"upload\" method=\"post\" enctype=\"multipart/form-data\" action=\"{$action}\">
> <br /><br />{$fn}:<br />
> <input tabindex=\"1\" type=\"file\" name=\"wpUploadFile\" value=\"".htmlspecialchars ($wpUploadFile)."\" size=\"40\" /><br />
> {$fd}:<br />
> <input tabindex=\"2\" type=\"text\" name=\"wpUploadDescription\" value=\"".htmlspecialchars ($wpUploadDescription)."\" size=\"40\" /><br />
325,328c325,328
< </tr>
< <tr><td> </td><td align=left>
< <input tabindex=5 type=submit name=\"wpUpload\" value=\"{$ulb}\">
< </td></tr></table></form>\n");
---
> <input tabindex=\"5\" type=\"submit\" name=\"wpUpload\" value=\"{$ulb}\" />
> </form>\n");
> 
>   $wgOut->addHTML ("<p>".wfMsg ("uploadtext")."</p>");

SpecialUserlogin.php[edit]

diff mediawiki-fm\SpecialUserlogin.php getwiki-fm\SpecialUserlogin.php
1c1,10
< < ? function wfSpecialUserlogin ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("Setup.php");	// recall to fix login problems - proteus
> 
> function
> wfSpecialUserlogin ()
7,8c16,18
<   $fields = array ("wpName", "wpPassword", "wpName",
< 		   "wpPassword", "wpRetype", "wpEmail");
---
>   $fields =
>     array ("wpName", "wpPassword", "wpName", "wpPassword", "wpRetype",
> 	   "wpEmail");
19,21c29
<     {
<       onCookieRedirectCheck ($wpCookieCheck);
<     }
---
>     onCookieRedirectCheck ($wpCookieCheck);
23,25c31
<     {
<       addNewAccount ();
<     }
---
>     addNewAccount ();
27,29c33
<     {
<       addNewAccountMailPassword ();
<     }
---
>     addNewAccountMailPassword ();
31,33c35
<     {
<       mailPassword ();
<     }
---
>     mailPassword ();
35,37c37
<     {
<       processLogin ();
<     }
---
>     processLogin ();
39,41c39
<     {
<       mainLoginForm ("");
<     }
---
>     mainLoginForm ("");
44,45c42
< 
< /* private */ function
---
> function
59,61c56
<     {
<       return;
<     }
---
>     return;
65,67c60
<     {
<       return;
<     }
---
>     return;
80,81c73
< 
< /* private */ function
---
> function
90,92c82
<     {
<       return;
<     }
---
>     return;
101,103c91
<     {
<       return successfulLogin (wfMsg ("welcomecreation", $wgUser->getName ()));
<     }
---
>     return successfulLogin (wfMsg ("welcomecreation", $wgUser->getName ()));
105,107c93
<     {
<       return cookieRedirectCheck ("new");
<     }
---
>     return cookieRedirectCheck ("new");
110,111c96
< 
< /* private */ function
---
> function
129,131c114,116
<   if (("" == $wpName) ||
<       preg_match ("/\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}/", $wpName) ||
<       (strpos ($wpName, "/") !== false))
---
>   if (("" == $wpName)
>       || preg_match ("/\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}/", $wpName)
>       || (strpos ($wpName, "/") !== false))
164,167c149
< 
< 
< 
< /* private */ function
---
> function
199d180
<   //
206,208c187,188
<     {
<       $r = 0;
<     }
---
>     $r = 0;
> 
218,220c198
<     {
<       return successfulLogin (wfMsg ("loginsuccess", $wgUser->getName ()));
<     }
---
>     return successfulLogin (wfMsg ("loginsuccess", $wgUser->getName ()));
222,224c200
<     {
<       return cookieRedirectCheck ("login");
<     }
---
>     return cookieRedirectCheck ("login");
227c203
< /* private */ function
---
> function
249,251c225
<     {
<       return;
<     }
---
>     return;
256,257c230
< 
< /* private */ function
---
> function
273,274d245
<   $u->saveSettings ();
< 
285,286c256,257
< 	"Content-type: text/plain; charset={$wgOutputEncoding}\r\n".
< 	"Content-transfer-encoding: 8bit\r\n"."From: $wgPasswordSender");
---
> 	"content-type: text/plain; charset={$wgOutputEncoding}\r\n".
> 	"content-transfer-encoding: 8bit\r\n"."From: $wgPasswordSender");
291,295c262
< 
< 
< 
< 
< /* private */ function
---
> function
305c272
<   $wgOut->addHTML ($msg."\n<p>");
---
>   $wgOut->addHTML ($msg."\n");
323c290
< /* private */ function
---
> function
336c303
<   $li = wfMsg ("login");
---
>   $li = wfMsg ("loginbutton");
364c331,332
<       $wgOut->addHTML ("<h2>$li:</h2>\n<p>$lp</p>");
---
>       //$wgOut->addHTML( "<h2>$li:</h2>\n<p>$lp</p>" );
>       $wgOut->addHTML ("$lp");
368,369c336,338
<       $wgOut->addHTML ("<h2>$le:</h2>\n<font size='+1' 
< color='red'>$err</font>\n");
---
>       $wgOut->
> 	addHTML
> 	("<ul><li><b>$le:</b></li><li><span class=\"error\"><b>$err</b></span></li></ul>\n");
394c363
< 	"<input tabindex=6 type=submit name=\"wpCreateaccountMail\" value=\"{$cam}\">";
---
> 	"<input tabindex=\"6\" type=\"submit\" name=\"wpCreateaccountMail\" value=\"{$cam}\" />";
399,416c368,372
< <table border=0><tr>
< <td align=right>$yn:</td>
< <td align=left>
< <input tabindex=1 type=text name=\"wpName\" value=\"{$name}\" size=20>
< </td>
< <td align=left>
< <input tabindex=3 type=submit name=\"wpLoginattempt\" value=\"{$li}\">
< </td>
< </tr>
< <tr>
< <td align=right>$yp:</td>
< <td align=left>
< <input tabindex=2 type=password name=\"wpPassword\" value=\"{$pwd}\" size=20>
< </td>
< <td align=left>
< <input tabindex=7 type=checkbox name=\"wpRemember\" value=\"1\" id=\"wpRemember\"$checked><label for=\"wpRemember\">$rmp</label>
< </td>			   
< </tr>");
---
> $yn:<br />
> <input tabindex=\"1\" type=\"text\" name=\"wpName\" value=\"{$name}\" size=\"30\" /><br />
> $yp:<br />
> <input tabindex=\"2\" type=\"password\" name=\"wpPassword\" value=\"{$pwd}\" size=\"30\" /><br />
> <input tabindex=\"3\" type=\"submit\" name=\"wpLoginattempt\" value=\"{$li}\" />  <input tabindex=\"7\" type=\"checkbox\" class=\"fill\" name=\"wpRemember\" value=\"1\" id=\"wpRemember\"$checked /> <label for=\"wpRemember\">$rmp</label><br /><br />");
420,434c376,382
< 
<       $wgOut->addHTML ("<tr><td colspan=3> </td></tr><tr>
< <td align=right>$ypa:</td>
< <td align=left>
< <input tabindex=4 type=password name=\"wpRetype\" value=\"{$wpRetype}\" 
< size=20>
< </td><td>$nuo</td></tr>
< <tr>
< <td align=right>$ye:</td>
< <td align=left>
< <input tabindex=5 type=text name=\"wpEmail\" value=\"{$wpEmail}\" size=20>
< </td><td align=left>
< <input tabindex=6 type=submit name=\"wpCreateaccount\" value=\"{$ca}\">
< $cambutton
< </td></tr>");
---
>       $wgOut->addHTML ("<hr /><h1 class=\"pagetitle\">$nuo</h1>
> $ypa:<br />
> <input tabindex=\"4\" type=\"password\" name=\"wpRetype\" value=\"{$wpRetype}\" size=\"30\" /><br />
> $ye:<br />
> <input tabindex=\"5\" type=\"text\" name=\"wpEmail\" value=\"{$wpEmail}\" size=\"30\" /><br />
> <input tabindex=\"6\" type=\"submit\" name=\"wpCreateaccount\" value=\"{$ca}\" />  $cambutton<br /><br />
> <em class=\"small\">$efl</em>");
437,442c385,386
<   $wgOut->addHTML ("
< <tr><td colspan=3> </td></tr><tr>
< <td colspan=3 align=left>
< <p>$efl<br>
< <input tabindex=8 type=submit name=\"wpMailmypassword\" value=\"{$mmp}\">
< </td></tr></table>
---
>   $wgOut->addHTML ("<hr><h1 class=\"pagetitle\">For emergencies..</h1>
> <input tabindex=\"8\" type=\"submit\" name=\"wpMailmypassword\" value=\"{$mmp}\" /><br />
445,446d388
< 
< 
449c391
< /* private */ function
---
> function
456c398
< /* private */ function
---
> function
460,463c402,403
< 
<   $check = wfLocalUrl ($wgLang->specialPage ("Userlogin"),
< 		       "wpCookieCheck=$type");
< 
---
>   $check =
>     wfLocalUrl ($wgLang->specialPage ("Userlogin"), "wpCookieCheck=$type");
467c407
< /* private */ function
---
> function
475,477c415
< 	{
< 	  return mainLoginForm (wfMsg ("nocookiesnew"));
< 	}
---
> 	return mainLoginForm (wfMsg ("nocookiesnew"));
479,481c417
< 	{
< 	  return mainLoginForm (wfMsg ("nocookieslogin"));
< 	}
---
> 	return mainLoginForm (wfMsg ("nocookieslogin"));

SpecialUserlogout.php[edit]

diff mediawiki-fm\SpecialUserlogout.php getwiki-fm\SpecialUserlogout.php
1c1,7
< < ? function wfSpecialUserlogout ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialUserlogout ()
8c14
<   $wgOut->addHTML (wfMsg ("logouttext")."\n<p>");
---
>   $wgOut->addHTML (wfMsg ("logouttext")."\n");

SpecialVote.php[edit]

diff mediawiki-fm\SpecialVote.php getwiki-fm\SpecialVote.php
1c1,7
< < ? function wfSpecialVote ()
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialVote ()
5c11,15
<   $wgOut->addHTML ("<p>(TODO: Vote)");
---
>   $wgOut->addHTML ("
> <ul>
> 	<li>A page where we can all vote on things, or conduct polls</li>
> 	<li><a class=\"internal\" href=\"?title=Wikinfo:Village_pump\">Talk at the pump</a>
> </ul>");

SpecialWantedpages.php[edit]

diff mediawiki-fm\SpecialWantedpages.php getwiki-fm\SpecialWantedpages.php
1c1,7
< < ? include_once ("QueryPage.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("QueryPage.php");
18,20c24,25
<     return "SELECT bl_to, COUNT( DISTINCT bl_from ) as nlinks ".
<       "FROM brokenlinks GROUP BY bl_to HAVING nlinks > 1 ".
<       "ORDER BY nlinks DESC LIMIT {$offset}, {$limit}";
---
>     return
>       "SELECT bl_to, COUNT( DISTINCT bl_from ) as nlinks FROM brokenlinks GROUP BY bl_to HAVING nlinks > 1 ORDER BY nlinks DESC LIMIT {$offset}, {$limit}";
43d47
< 
45d48
< 

SpecialWatchlist.php[edit]

diff mediawiki-fm\SpecialWatchlist.php getwiki-fm\SpecialWatchlist.php
1c1,7
< < ? include_once ("SpecialRecentchanges.php");
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   include_once ("SpecialRecentchanges.php");
51c57
<       $wgOut->addHTML ("done.\n<p>");
---
>       $wgOut->addHTML ("done.\n");
91,92c97,101
<       $docutoff = "AND cur_timestamp > '".
< 	($cutoff = wfUnix2Timestamp (time () - intval ($days * 86400)))."'";
---
>       $docutoff = "AND cur_timestamp > '".($cutoff =
> 					   wfUnix2Timestamp (time () -
> 							     intval ($days *
> 								     86400))).
> 	"'";
101,102c110,111
<       $wgOut->addHTML (wfMsg ("watchlistcontains", $nitems).
< 		       "<p>".wfMsg ("watcheditlist")."</p>\n");
---
>       $wgOut->addHTML (wfMsg ("watchlistcontains", $nitems)."<p>".
> 		       wfMsg ("watcheditlist")."</p>\n");
106,107c115
< 				   "action=submit")."' method='post'>\n".
< 		       "<ul>\n");
---
> 				   "action=submit")."' method='post'>\n");
116,119c124,129
< 	  $wgOut->addHTML ("<li><input type='checkbox' name='id[]' value=\"".
< 			   htmlspecialchars ($t)."\">".$sk->makeKnownLink ($t,
< 									   $t).
< 			   "</li>\n");
---
> 	  $wgOut->
> 	    addHTML
> 	    ("<input type=\"checkbox\" class=\"fill\" name=\"id[]\" value=\"".
> 	     htmlspecialchars ($t)."\" /> ".$sk->makeKnownLink ($t,
> 								$t).
> 	     "<br />\n");
121,124c131,133
<       $wgOut->addHTML ("</ul>\n".
< 		       "<input type='submit' name='remove' value='".
< 		       wfMsg ("removechecked")."'>\n"."</form>\n");
< 
---
>       $wgOut->
> 	addHTML ("</ul>\n<input type=\"submit\" name=\"remove\" value=\"".
> 		 wfMsg ("removechecked")."\" />\n</form>\n");
148,163c157,160
<   $wgOut->addHTML ("<i>".wfMsg ("watchdetails", $nitems, $npages, $y,
< 				wfLocalUrl ($wgLang->
< 					    specialPage ("Watchlist"),
< 					    "magic=yes"))."</i><br>\n");
< 
< 
<   $sql = "SELECT
<   cur_namespace,cur_title,cur_comment,
<   cur_user,cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new
<   FROM watchlist,cur USE INDEX ($x)
<   WHERE wl_user=$uid
<   AND $z
<   AND wl_title=cur_title
<   $docutoff
<   ORDER BY cur_timestamp DESC";
< 
---
>   $wgOut->addHTML ("<p>".
> 		   wfMsg ("watchdetails", $nitems, $npages, $y,
> 			  wfLocalUrl ($wgLang->specialPage ("Watchlist"),
> 				      "magic=yes"))."</p>\n");
164a162,163
>   $sql =
>     "SELECT cur_namespace,cur_title,cur_comment,cur_user,cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new FROM watchlist,cur USE INDEX ($x) WHERE wl_user=$uid AND $z  AND wl_title=cur_title $docutoff ORDER BY cur_timestamp DESC";
172c171,172
<   $wgOut->addHTML ("\n<hr>\n{$note}\n<br>");
---
> 
>   $wgOut->addHTML ("\n<hr />\n{$note}\n<br />");
213,214c213,215
<   $s = $sk->makeKnownLink ($wgLang->specialPage ($page),
< 			   $h, "days=".($h / 24.0));
---
>   $s =
>     $sk->makeKnownLink ($wgLang->specialPage ($page), $h,
> 			"days=".($h / 24.0));
218d218
< 
224,225c224,226
<   $s = $sk->makeKnownLink ($wgLang->specialPage ($page),
< 			   ($d ? $d : wfMsg ("all")), "days=$d");
---
>   $s =
>     $sk->makeKnownLink ($wgLang->specialPage ($page),
> 			($d ? $d : wfMsg ("all")), "days=$d");

SpecialWhatlinkshere.php[edit]

diff mediawiki-fm\SpecialWhatlinkshere.php getwiki-fm\SpecialWhatlinkshere.php
1c1,7
< < ? function wfSpecialWhatlinkshere ($par = NULL)
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   function wfSpecialWhatlinkshere ($par = NULL)
7,9c13
<     {
<       $target = $par;
<     }
---
>     $target = $par;
11,13c15,16
<     {
<       $target = wfCleanQueryVar ($_REQUEST['target']);
<     }
---
>     $target = wfCleanQueryVar ($_REQUEST['target']);
> 
34c37,38
<       $sql = "SELECT DISTINCT bl_from FROM brokenlinks WHERE bl_to='".
---
>       $sql =
> 	"SELECT DISTINCT bl_from FROM brokenlinks WHERE bl_to='".
39,41c43
< 	{
< 	  $wgOut->addHTML (wfMsg ("nolinkshere"));
< 	}
---
> 	$wgOut->addHTML (wfMsg ("nolinkshere"));
50,51c52,53
< 	      $sql = "SELECT cur_namespace,cur_title,cur_is_redirect ".
< 		"FROM cur WHERE cur_id={$lid}";
---
> 	      $sql =
> 		"SELECT cur_namespace,cur_title,cur_is_redirect FROM cur WHERE cur_id={$lid}";
114,117c116,117
<       // FIXME: this should be in a join above, or cached in the links table
< 
<       $sql = "SELECT cur_id,cur_is_redirect FROM cur ".
< 	"WHERE cur_namespace={$ns} AND cur_title='{$t}'";
---
>       $sql =
> 	"SELECT cur_id,cur_is_redirect FROM cur WHERE cur_namespace={$ns} AND cur_title='{$t}'";

Title.php[edit]

diff mediawiki-fm\Title.php getwiki-fm\Title.php
2,3c2,7
< // See title.doc
< /* private static */ $title_html_translation_table =
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   $title_html_translation_table =
5c9
< /* private static */ $title_interwiki_cache = array ();
---
> $title_interwiki_cache = array ();
9,12c13,16
<   /* private */ var $mTextform, $mUrlform, $mDbkeyform;
<   /* private */ var $mNamespace, $mInterwiki, $mFragment;
<   /* private */ var $mArticleID, $mRestrictions, $mRestrictionsLoaded;
<   /* private */ var $mPrefixedText;
---
>   var $mTextform, $mUrlform, $mDbkeyform;
>   var $mNamespace, $mInterwiki, $mFragment;
>   var $mArticleID, $mRestrictions, $mRestrictionsLoaded;
>   var $mPrefixedText;
14c18
<   /* private */ function Title ()
---
>   function Title ()
25d28
<   //
42,43c45
<     // Note - mixing latin1 named entities and unicode numbered
<     // ones will result in a bad link.
---
>     // Note - mixing latin1 named entities and unicode numbered ones will result in a bad link.
56,58c58
<       {
< 	return $t;
<       }
---
>       return $t;
60,62c60
<       {
< 	return NULL;
<       }
---
>       return NULL;
70,73c68
<     $s = urldecode ($url);	// This is technically wrong, as anything
<     // we've gotten is already decoded by PHP.
<     // Kept for backwards compatibility with
<     // buggy URLs we had for a while...
---
>     $s = urldecode ($url);	// Kept for backwards compatibility with buggy URLs we had for a while...
75,76c70
<     // For links that came from outside, check for alternate/legacy
<     // character encoding.
---
>     // For links that came from outside, check for alternate/legacy character encoding.
79,80c73,74
<     if (empty ($_SERVER["HTTP_REFERER"]) ||
< 	strncmp ($wgServer, $_SERVER["HTTP_REFERER"], strlen ($wgServer)))
---
>     if (empty ($_SERVER["HTTP_REFERER"])
> 	|| strncmp ($wgServer, $_SERVER["HTTP_REFERER"], strlen ($wgServer)))
85,87c79
<       {
< 	return $t;
<       }
---
>       return $t;
89,91c81
<       {
< 	return NULL;
<       }
---
>       return NULL;
96c86
<     $sql = "SELECT cur_namespace,cur_title FROM cur WHERE "."cur_id={$id}";
---
>     $sql = "SELECT cur_namespace,cur_title FROM cur WHERE cur_id={$id}";
188c178
<   /* static */ function indexTitle ($ns, $title)
---
>   function indexTitle ($ns, $title)
215c205
<   /* static */ function makeName ($ns, $title)
---
>   function makeName ($ns, $title)
230c220
<   /* static */ function makeTitle ($ns, $title)
---
>   function makeTitle ($ns, $title)
235,237c225
<       {
< 	return $t;
<       }
---
>       return $t;
239,241c227
<       {
< 	return NULL;
<       }
---
>       return NULL;
253d238
<     // TEST THIS @@@
346,347c331,332
<     if ((0 == strcmp (wfMsg ("uploadlogpage"), $this->mDbkeyform)) ||
< 	(0 == strcmp (wfMsg ("dellogpage"), $this->mDbkeyform)))
---
>     if ((0 == strcmp (wfMsg ("uploadlogpage"), $this->mDbkeyform))
> 	|| (0 == strcmp (wfMsg ("dellogpage"), $this->mDbkeyform)))
465c450
<   /* private */ function prefix ($name)
---
>   function prefix ($name)
481,487c466,468
<   // Assumes that mDbkeyform has been set, and is urldecoded
<   // and uses undersocres, but not otherwise munged.  This function
<   // removes illegal characters, splits off the winterwiki and
<   // namespace prefixes, sets the other forms, and canonicalizes
<   // everything.      
<   //
<   /* private */ function secureAndSplit ()
---
>   // Assumes that mDbkeyform has been set, and is urldecoded and uses undersocres, but not otherwise munged.  This function
>   // removes illegal characters, splits off the winterwiki and namespace prefixes, sets the other forms, and canonicalizes everything.    
>   function secureAndSplit ()
503d483
< 
562,566d541
< 		{
< 		  $done = true;
< 		}
< 	      elseif ($this->mInterwiki != $wgLocalInterwiki)
< 	      {
568c543
< 	      }
---
> 	      elseif ($this->mInterwiki != $wgLocalInterwiki) $done = true;
574,576c549,550
<       {
< 	$this->mInterwiki = "";
<       }
---
>       $this->mInterwiki = "";
> 
578d551
<     //
580,582c553,554
<       {
< 	$this->mArticleID = 0;
<       }
---
>       $this->mArticleID = 0;
> 
590d561
<     //

UpdateClasses.php[edit]

diff mediawiki-fm\UpdateClasses.php getwiki-fm\UpdateClasses.php
2c2,6
< // See deferred.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */

User.php[edit]

diff mediawiki-fm\User.php getwiki-fm\User.php
2c2,6
< // See user.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
7,13c11,17
<   /* private */ var $mId, $mName, $mPassword, $mEmail, $mNewtalk;
<   /* private */ var $mRights, $mOptions;
<   /* private */ var $mDataLoaded, $mNewpassword;
<   /* private */ var $mSkin;
<   /* private */ var $mBlockedby, $mBlockreason;
<   /* private */ var $mTouched;
<   /* private */ var $mCookiePassword;
---
>   var $mId, $mName, $mPassword, $mEmail, $mNewtalk;
>   var $mRights, $mOptions;
>   var $mDataLoaded, $mNewpassword;
>   var $mSkin;
>   var $mBlockedby, $mBlockreason;
>   var $mTouched;
>   var $mCookiePassword;
21d24
<   //
33c36
<   /* static */ function whoIs ($id)
---
>   function whoIs ($id)
38c41
<   /* static */ function idFromName ($name)
---
>   function idFromName ($name)
41,42c44,47
<     $sql = "SELECT user_id FROM user WHERE user_name='".
<       wfStrencode ($nt->getText ())."'";
---
>     $sql =
>       "SELECT user_id FROM user WHERE user_name='".wfStrencode ($nt->
> 								getText ()).
>       "'";
57c62
<   /* static */ function isIP ($name)
---
>   function isIP ($name)
60d64
< 
63c67
<   /* static */ function randomPassword ()
---
>   function randomPassword ()
116c120
<   /* private */ function getBlockedStatus ()
---
>   function getBlockedStatus ()
129,131c133,135
<     if ((!is_array ($wgBadUserAgents) ||
< 	 array_key_exists (getenv ("HTTP_USER_AGENT"), $wgBadUserAgents)) &&
< 	is_array ($wgBadRanges))
---
>     if ((!is_array ($wgBadUserAgents)
> 	 || array_key_exists (getenv ("HTTP_USER_AGENT"), $wgBadUserAgents))
> 	&& is_array ($wgBadRanges))
189c193
<   /* static */ function loadFromSession ()
---
>   function loadFromSession ()
294d297
< 	// TEST THIS @@@
320,322c323,324
<     $sql = "SELECT user_name,user_password,user_newpassword,user_email,".
<       "user_options,user_rights,user_touched FROM user WHERE user_id=".
<       "{$this->mId}";
---
>     $sql =
>       "SELECT user_name,user_password,user_newpassword,user_email,user_options,user_rights,user_touched FROM user WHERE user_id={$this->mId}";
380,381c382
<     // Don't forget to save the options after this or
<     // it won't take effect!
---
>     // Don't forget to save the options after this or it won't take effect!
456,458c457
<       {
< 	return "";
<       }
---
>       return "";
557c556
<   /* private */ function encodeOptions ()
---
>   function encodeOptions ()
568c567
<   /* private */ function decodeOptions ($str)
---
>   function decodeOptions ($str)
599,602c598,599
<       {
< 	setcookie ("{$wgDBname}Password", $this->mCookiePassword, $exp,
< 		   $wgCookiePath, $wgCookieDomain);
<       }
---
>       setcookie ("{$wgDBname}Password", $this->mCookiePassword, $exp,
> 		 $wgCookiePath, $wgCookieDomain);
604,606c601
<       {
< 	setcookie ("{$wgDBname}Password", "", time () - 3600);
<       }
---
>       setcookie ("{$wgDBname}Password", "", time () - 3600);
659d653
<   //
699,700c693
<     // If the (non-anonymous) user is blocked, this function will block any IP address
<     // that they successfully log on from.
---
>     // If the (non-anonymous) user is blocked, this function will block any IP address that they successfully log on from.
705,707c698
<       {
< 	return;
<       }
---
>       return;
711,713c702
<       {
< 	return;
<       }
---
>       return;
737d725
< 
758,760d745
< 
< 
< 

UserTalkUpdate.php[edit]

diff mediawiki-fm\UserTalkUpdate.php getwiki-fm\UserTalkUpdate.php
2c2,6
< // See deferred.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5,6c9
< 
<   /* private */ var $mAction, $mNamespace, $mTitle;
---
>   var $mAction, $mNamespace, $mTitle;
17d19
< 
24,28c26,28
<       {
< 	return;
<       }
<     // If the user talk page is our own, clear the flag
<     // whether we are reading it or writing it.
---
>       return;
> 
>     // If the user talk page is our own, clear the flag whether we are reading it or writing it.
53,55c53
< 		  {		//real anon (user:xxx.xxx.xxx.xxx)
< 		    $sql =
< 		      "INSERT INTO user_newtalk (user_id,user_ip) values (0,\"{$this->mTitle}\")";
---
> 		  {		//real anon (user:xxx.xxx.xxx.xxx) $sql = "INSERT INTO user_newtalk (user_id,user_ip) values (0,\"{$this->mTitle}\")";

UserUpdate.php[edit]

diff mediawiki-fm\UserUpdate.php getwiki-fm\UserUpdate.php
2c2,6
< // See deferred.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5d8
< 

Utf8Case.php[edit]

diff mediawiki-fm\Utf8Case.php getwiki-fm\Utf8case.php
1a2,6
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */

Version.php[edit]

diff mediawiki-fm\Version.php getwiki-fm\Version.php
2,11c2,9
< // This file is copied to the install directory so that
< // later update scripts will be able to use it to determine
< // what they need to update. The version number here must
< // be updated any time you make a change that requires
< // the update to do anything other than copy the new files
< // over, such as changing the database layout. If you
< // change this version number, you should also update the
< // update.php script.
< //
<   $wgSoftwareRevision = 1002;
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
> // This file is unused, but may be in future
> // it was a mediawiki file
>   $wgSoftwareRevision = "1.0";

ViewCountUpdate.php[edit]

diff mediawiki-fm\ViewCountUpdate.php getwiki-fm\ViewCountUpdate.php
2c2,6
< // See deferred.doc
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5d8
< 
21,22c24,25
<     $sql = "UPDATE LOW_PRIORITY cur SET cur_counter=(1+cur_counter),".
<       "cur_timestamp=cur_timestamp WHERE cur_id={$this->mPageID}";
---
>     $sql =
>       "UPDATE LOW_PRIORITY cur SET cur_counter=(1+cur_counter),cur_timestamp=cur_timestamp WHERE cur_id={$this->mPageID}";

WatchedItem.php[edit]

diff mediawiki-fm\WatchedItem.php getwiki-fm\WatchedItem.php
1c1,7
< < ? class WatchedItem
---
> < ?
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
>   class WatchedItem
3,4c9
< 
<   /* static */ function & fromUserTitle (&$user, &$title)
---
>   function & fromUserTitle (&$user, &$title)
42,43c47
<     // REPLACE instead of INSERT because occasionally someone
<     // accidentally reloads a watch-add operation.
---
>     // REPLACE instead of INSERT because occasionally someone accidentally reloads a watch-add operation.
68c72
<   /* static */ function duplicateEntries ($ot, $nt)
---
>   function duplicateEntries ($ot, $nt)
78,79c82,83
<     $sql = "SELECT wl_user FROM watchlist
< 			WHERE wl_namespace={$oldnamespace} AND wl_title='{$eoldtitle}'";
---
>     $sql =
>       "SELECT wl_user FROM watchlist WHERE wl_namespace={$oldnamespace} AND wl_title='{$eoldtitle}'";
83,84c87,88
< 	$sql = "REPLACE INTO watchlist (wl_user,wl_namespace,wl_title)
< 				VALUES ({$s->wl_user},{$newnamespace},'{$enewtitle}')";
---
> 	$sql =
> 	  "REPLACE INTO watchlist (wl_user,wl_namespace,wl_title) VALUES ({$s->wl_user},{$newnamespace},'{$enewtitle}')";
101,102d104
< 
< 

wiki.phtml[edit]

diff mediawiki-fm\wiki.phtml getwiki-fm\wiki.phtml
2,4c2,6
< # Main wiki script; see design.doc
< #
< $wgRequestTime = microtime();
---
> /* 
> 	GetWiki 1.0 | Adapted from Mediawiki 1.1.0
> 	See README for details
> 	PHP released under terms of GPL
> */
5a8
> $wgRequestTime = microtime();
7c10,11
< ini_set( "allow_url_fopen", 0 ); # For security...
---
> ini_set( "allow_url_fopen", 0 );
> 
10c14
< # Windows requires ';' as separator, ':' for Unix
---
> // Windows requires ';' as separator, ':' for Unix
17c21
< OutputPage::setEncodings(); # Not really used yet
---
> OutputPage::setEncodings();
19c23
< # Useful debug output
---
> // useful debug output
23c27,29
< foreach ($headers as $name => $value) {
---
> 
> foreach ($headers as $name => $value) 
> 	{
25c31
< }
---
> 	}
28,29c34
< # Query string fields
< #
---
> // global query string variables
34,35d38
< if ( "" == $action ) { $action = "view"; }
< if ( "yes" == $printable ) { $wgOut->setPrintable(); }
37c40,49
< if ( "" == $title && "delete" != $action ) {
---
> if ( "" == $action ) 
> 	{ 
> 	$action = "view"; 
> 	}
> if ( "yes" == $printable ) 
> 	{ 
> 	$wgOut->setPrintable(); 
> 	}
> if ( "" == $title && "delete" != $action ) 
> 	{
39c51,53
< } else {
---
> 	} 
> else 
> 	{
41,42c55,56
< #	if( $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" or strncmp($wgTitle->getDBkey(),"_",1) == 0 ) {
< 	if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) {
---
> 	if( !$wgTitle or $wgTitle->getInterwiki() != "" or $wgTitle->getDBkey() == "" ) 
> 		{
46a61
> 		}
48c63
< }
---
> 
51c66,67
< if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {
---
> if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) 
> 	{
53,54c69,73
< } else if ( "" != $search ) {
< 	if($go) {
---
> 	} 
> else if ( "" != $search ) 
> 	{
> 	if($go) 
> 		{
56c75,77
< 	} else {
---
> 		} 
> 	else 
> 		{
58,60c79,84
< 	}
< } else {
< 	if ( Namespace::getMedia() == $wgTitle->getNamespace() ) {
---
> 		}
> 	} 
> else 
> 	{
> 	if ( Namespace::getMedia() == $wgTitle->getNamespace() ) 
> 		{
62,65c86,89
< 	}	
< 	
< 	switch( $wgTitle->getNamespace() ) {
< 	case 6:
---
> 		}	
> 	switch( $wgTitle->getNamespace() ) 
> 		{
> 		case 6:
69c93
< 	default:
---
> 		default:
71,73c95,97
< 	}
< 
< 	switch( $action ) {
---
> 		}
> 	switch( $action ) 
> 		{
95a120
> 		}
97d121
< }
100d123
< foreach ( $wgDeferredUpdateList as $up ) { $up->doUpdate(); }
101a125,128
> foreach ( $wgDeferredUpdateList as $up ) 
> 	{ 
> 	$up->doUpdate(); 
> 	}</nowiki>