Tell regexp parser to use extra analysis on external link regexp;
[lhc/web/wiklou.git] / includes / EditPage.php
index 0018b5a..cf64b00 100644 (file)
@@ -1,10 +1,18 @@
 <?php
-# $Id$
-
-# 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.
+/**
+ * Contain the EditPage class
+ * @package MediaWiki
+ * @version $Id$
+ */
+
+/**
+ * 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.
+ *
+ * @package MediaWiki
+ */
 
 class EditPage {
        var $mArticle;
@@ -13,20 +21,24 @@ class EditPage {
        # Form values
        var $save = false, $preview = false;
        var $minoredit = false, $watchthis = false;
-       var $textbox1 = "", $textbox2 = "", $summary = "";
-       var $edittime = "", $section = "";
+       var $textbox1 = '', $textbox2 = '', $summary = '';
+       var $edittime = '', $section = '';
        var $oldid = 0;
        
+       /**
+        * @todo document
+        * @param $article
+        */
        function EditPage( $article ) {
                $this->mArticle =& $article;
                global $wgTitle;
                $this->mTitle =& $wgTitle;
        }
 
-       # This is the function that gets called for "action=edit".
-
-       function edit()
-       {
+       /**
+        * This is the function that gets called for "action=edit".
+        */
+       function edit() {
                global $wgOut, $wgUser, $wgWhitelistEdit, $wgRequest;
                // this is not an article
                $wgOut->setArticleFlag(false);
@@ -47,31 +59,34 @@ class EditPage {
                }
                if ( wfReadOnly() ) {
                        if( $this->save || $this->preview ) {
-                               $this->editForm( "preview" );
+                               $this->editForm( 'preview' );
                        } else {
                                $wgOut->readOnlyPage( $this->mArticle->getContent( true ) );
                        }
                        return;
                }
                if ( $this->save ) {
-                       $this->editForm( "save" );
-               } else if ( $this->preview ) {
-                       $this->editForm( "preview" );
+                       $this->editForm( 'save' );
+               } else if ( $this->preview or $wgUser->getOption('previewonfirst')) {
+                       $this->editForm( 'preview' );
                } else { # First time through
-                       $this->editForm( "initial" );
+                       $this->editForm( 'initial' );
                }
        }
 
+       /**
+        * @todo document
+        */
        function importFormData( &$request ) {
                # These fields need to be checked for encoding.
                # Also remove trailing whitespace, but don't remove _initial_
                # whitespace from the text boxes. This may be significant formatting.
-               $this->textbox1 = rtrim( $request->getText( "wpTextbox1" ) );
-               $this->textbox2 = rtrim( $request->getText( "wpTextbox2" ) );
-               $this->summary = trim( $request->getText( "wpSummary" ) );
+               $this->textbox1 = rtrim( $request->getText( 'wpTextbox1' ) );
+               $this->textbox2 = rtrim( $request->getText( 'wpTextbox2' ) );
+               $this->summary = trim( $request->getText( 'wpSummary' ) );
 
                $this->edittime = $request->getVal( 'wpEdittime' );
-               if( !preg_match( '/^\d{14}$/', $this->edittime )) $this->edittime = "";
+               if( !preg_match( '/^\d{14}$/', $this->edittime )) $this->edittime = '';
 
                $this->preview = $request->getCheck( 'wpPreview' );
                $this->save = $request->wasPosted() && !$this->preview;
@@ -84,32 +99,35 @@ class EditPage {
                $this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) );
        }
 
-       # 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.
-
-       function submit()
-       {
+       /**
+        * 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.
+        */
+       function submit() {
                if( !$this->preview ) $this->save = true;
 
                $this->edit();
        }
 
-       # 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.
-
-       function editForm( $formtype )
-       {
+       /**
+        * 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.
+        *
+        * @param string $formtype Type of form either : save, initial or preview
+        */
+       function editForm( $formtype ) {
                global $wgOut, $wgUser;
-               global $wgLang, $wgParser, $wgTitle;
+               global $wgLang, $wgContLang, $wgParser, $wgTitle;
                global $wgAllowAnonymousMinor;
                global $wgWhitelistEdit;
                global $wgSpamRegex, $wgFilterCallback;
+               global $wgUseLatin1;
 
                $sk = $wgUser->getSkin();
                $isConflict = false;
@@ -117,11 +135,11 @@ class EditPage {
                $isCssJsSubpage = (Namespace::getUser() == $wgTitle->getNamespace() and preg_match("/\\.(css|js)$/", $wgTitle->getText() ));
 
                if(!$this->mTitle->getArticleID()) { # new article
-                       $wgOut->addWikiText(wfmsg("newarticletext"));
+                       $wgOut->addWikiText(wfmsg('newarticletext'));
                }
 
                if( Namespace::isTalk( $this->mTitle->getNamespace() ) ) {
-                       $wgOut->addWikiText(wfmsg("talkpagetext"));
+                       $wgOut->addWikiText(wfmsg('talkpagetext'));
                }
 
                # Attempt submission here.  This will check for edit conflicts,
@@ -129,7 +147,7 @@ class EditPage {
                # that edit() already checked just in case someone tries to sneak
                # in the back door with a hand-edited submission URL.
 
-               if ( "save" == $formtype ) {
+               if ( 'save' == $formtype ) {
                        # Check for spam
                        if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) {
                                $this->spamPage ( $matches );
@@ -156,8 +174,8 @@ class EditPage {
                        $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
                        if ( 0 == $aid ) {
                                # Don't save a new article if it's blank.
-                               if ( ( "" == $this->textbox1 ) ||
-                                 ( wfMsg( "newarticletext" ) == $this->textbox1 ) ) {
+                               if ( ( '' == $this->textbox1 ) ||
+                                 ( wfMsg( 'newarticletext' ) == $this->textbox1 ) ) {
                                        $wgOut->redirect( $this->mTitle->getFullURL() );
                                        return;
                                }
@@ -170,14 +188,20 @@ class EditPage {
                        $this->mArticle->clear(); # Force reload of dates, etc.
                        $this->mArticle->forUpdate( true ); # Lock the article
 
-                       if( ( $this->section != "new" ) &&
+                       if( ( $this->section != 'new' ) &&
                                ($this->mArticle->getTimestamp() != $this->edittime ) ) {
                                $isConflict = true;
                        }
                        $userid = $wgUser->getID();
 
-                       $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
-                               $this->section, $this->textbox1, $this->summary);
+                       if ( $isConflict) {
+                               $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
+                                       $this->section, $this->textbox1, $this->summary, $this->edittime);
+                       }
+                       else {
+                               $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
+                                       $this->section, $this->textbox1, $this->summary);
+                       }
                        # Suppress edit conflict with self
 
                        if ( ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
@@ -190,7 +214,7 @@ class EditPage {
                                                // Successful merge! Maybe we should tell the user the good news?
                                                $isConflict = false;
                                        } else {
-                                               $this->section = "";
+                                               $this->section = '';
                                                $this->textbox1 = $text;
                                        }
                                }
@@ -198,7 +222,11 @@ class EditPage {
                        if ( ! $isConflict ) {
                                # All's well
                                $sectionanchor = '';
-                               if( $this->section != '' ) {
+                               if( $this->section == 'new' ) {
+                                       if( $this->summary != '' ) {
+                                               $sectionanchor = $this->sectionAnchor( $this->summary );
+                                       }
+                               } elseif( $this->section != '' ) {
                                        # Try to get a section anchor from the section source, redirect to edited section if header found
                                        # XXX: might be better to integrate this into Article::getTextOfLastEditWithSectionReplacedOrAdded
                                        # for duplicate heading checking and maybe parsing
@@ -207,17 +235,7 @@ class EditPage {
                                        # headline would need to be parsed to improve this
                                        #if($hasmatch and strlen($matches[2]) > 0 and !preg_match( "/[\\['{<>]/", $matches[2])) {
                                        if($hasmatch and strlen($matches[2]) > 0) {
-                                               global $wgInputEncoding;
-                                               $headline = do_html_entity_decode( $matches[2], ENT_COMPAT, $wgInputEncoding );
-                                               # strip out HTML 
-                                               $headline = preg_replace( "/<.*?" . ">/","",$headline );
-                                               $headline = trim( $headline );
-                                               $sectionanchor = '#'.urlencode( str_replace(' ', '_', $headline ) );
-                                               $replacearray = array(
-                                                       '%3A' => ':',
-                                                       '%' => '.'
-                                               );
-                                               $sectionanchor = str_replace(array_keys($replacearray),array_values($replacearray),$sectionanchor);
+                                               $sectionanchor = $this->sectionAnchor( $matches[2] );
                                        }
                                }
        
@@ -231,33 +249,32 @@ class EditPage {
                # First time through: get contents, set time for conflict
                # checking, etc.
 
-               if ( "initial" == $formtype ) {
+               if ( 'initial' == $formtype ) {
                        $this->edittime = $this->mArticle->getTimestamp();
                        $this->textbox1 = $this->mArticle->getContent( true );
-                       $this->summary = "";
+                       $this->summary = '';
                        $this->proxyCheck();
                }
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                # Enabled article-related sidebar, toplinks, etc.
                $wgOut->setArticleRelated( true );
 
                if ( $isConflict ) {
-                       $s = wfMsg( "editconflict", $this->mTitle->getPrefixedText() );
+                       $s = wfMsg( 'editconflict', $this->mTitle->getPrefixedText() );
                        $wgOut->setPageTitle( $s );
-                       $wgOut->addHTML( wfMsg( "explainconflict" ) );
+                       $wgOut->addHTML( wfMsg( 'explainconflict' ) );
 
                        $this->textbox2 = $this->textbox1;
                        $this->textbox1 = $this->mArticle->getContent( true );
                        $this->edittime = $this->mArticle->getTimestamp();
                } else {
-                       $s = wfMsg( "editing", $this->mTitle->getPrefixedText() );
 
-                       if( $this->section != "" ) {
-                               if( $this->section == "new" ) {
-                                       $s.=wfMsg("commentedit");
+                       if( $this->section != '' ) {
+                               if( $this->section == 'new' ) {
+                                       $s = wfMsg('editingcomment', $this->mTitle->getPrefixedText() );
                                } else {
-                                       $s.=wfMsg("sectionedit");
+                                       $s = wfMsg('editingsection', $this->mTitle->getPrefixedText() );
                                }
                                if(!$this->preview) {
                                        $sectitle=preg_match("/^=+(.*?)=+/mi",
@@ -267,53 +284,59 @@ class EditPage {
                                                $this->summary = "/* ". trim($matches[1])." */ ";
                                        }
                                }
+                       } else {
+                               $s = wfMsg( 'editing', $this->mTitle->getPrefixedText() );
                        }
                        $wgOut->setPageTitle( $s );
+                       if ( !$wgUseLatin1 && !$this->checkUnicodeCompliantBrowser() ) {
+                               $this->mArticle->setOldSubtitle();
+                               $wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
+                       }
                        if ( $this->oldid ) {
                                $this->mArticle->setOldSubtitle();
-                               $wgOut->addHTML( wfMsg( "editingold" ) );
+                               $wgOut->addHTML( wfMsg( 'editingold' ) );
                        }
                }
 
                if( wfReadOnly() ) {
-                       $wgOut->addHTML( "<strong>" .
-                       wfMsg( "readonlywarning" ) .
+                       $wgOut->addHTML( '<strong>' .
+                       wfMsg( 'readonlywarning' ) .
                        "</strong>" );
-               } else if ( $isCssJsSubpage and "preview" != $formtype) {
-                       $wgOut->addHTML( wfMsg( "usercssjsyoucanpreview" ));
+               } else if ( $isCssJsSubpage and 'preview' != $formtype) {
+                       $wgOut->addHTML( wfMsg( 'usercssjsyoucanpreview' ));
                }
-               if( $this->mTitle->isProtected() ) {
-                       $wgOut->addHTML( "<strong>" . wfMsg( "protectedpagewarning" ) .
+               if( $this->mTitle->isProtected('edit') ) {
+                       $wgOut->addHTML( '<strong>' . wfMsg( 'protectedpagewarning' ) .
                          "</strong><br />\n" );
                }
 
                $kblength = (int)(strlen( $this->textbox1 ) / 1024);
                if( $kblength > 29 ) {
-                       $wgOut->addHTML( "<strong>" .
-                               wfMsg( "longpagewarning", $kblength )
-                               . "</strong>" );
+                       $wgOut->addHTML( '<strong>' .
+                               wfMsg( 'longpagewarning', $wgLang->formatNum( $kblength ) )
+                               . '</strong>' );
                }
 
-               $rows = $wgUser->getOption( "rows" );
-               $cols = $wgUser->getOption( "cols" );
+               $rows = $wgUser->getOption( 'rows' );
+               $cols = $wgUser->getOption( 'cols' );
 
-               $ew = $wgUser->getOption( "editwidth" );
+               $ew = $wgUser->getOption( 'editwidth' );
                if ( $ew ) $ew = " style=\"width:100%\"";
-               else $ew = "" ;
+               else $ew = '';
 
-               $q = "action=submit";
+               $q = 'action=submit';
                #if ( "no" == $redirect ) { $q .= "&redirect=no"; }
                $action = $this->mTitle->escapeLocalURL( $q );
 
-               $summary = wfMsg( "summary" );
-               $subject = wfMsg("subject");
-               $minor = wfMsg( "minoredit" );
-               $watchthis = wfMsg ("watchthis");
-               $save = wfMsg( "savearticle" );
-               $prev = wfMsg( "showpreview" );
+               $summary = wfMsg('summary');
+               $subject = wfMsg('subject');
+               $minor   = wfMsg('minoredit');
+               $watchthis = wfMsg ('watchthis');
+               $save = wfMsg('savearticle');
+               $prev = wfMsg('showpreview');
 
                $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
-                               wfMsg( "cancel" ) );
+                               wfMsg('cancel') );
                $edithelpurl = $sk->makeUrl( wfMsg( 'edithelppage' ));
                $edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'.
                        htmlspecialchars( wfMsg( 'edithelp' ) ).'</a> '.
@@ -321,21 +344,21 @@ class EditPage {
 
                global $wgRightsText;
                $copywarn = "<div id=\"editpage-copywarn\">\n" .
-                       wfMsg( $wgRightsText ? "copyrightwarning" : "copyrightwarning2",
-                               "[[" . wfMsg( "copyrightpage" ) . "]]",
+                       wfMsg( $wgRightsText ? 'copyrightwarning' : 'copyrightwarning2',
+                               '[[' . wfMsg( 'copyrightpage' ) . ']]',
                                $wgRightsText ) . "\n</div>";
 
-               if( $wgUser->getOption("showtoolbar") and !$isCssJsSubpage ) {
+               if( $wgUser->getOption('showtoolbar') and !$isCssJsSubpage ) {
                        # prepare toolbar for edit buttons
-                       $toolbar = $sk->getEditToolbar();
+                       $toolbar = $this->getEditToolbar();
                } else {
-                       $toolbar = "";
+                       $toolbar = '';
                }
 
                // activate checkboxes if user wants them to be always active
                if( !$this->preview ) {
-                       if( $wgUser->getOption( "watchdefault" ) ) $this->watchthis = true;
-                       if( $wgUser->getOption( "minordefault" ) ) $this->minoredit = true;
+                       if( $wgUser->getOption( 'watchdefault' ) ) $this->watchthis = true;
+                       if( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true;
 
                        // activate checkbox also if user is already watching the page,
                        // require wpWatchthis to be unset so that second condition is not
@@ -343,7 +366,7 @@ class EditPage {
                        if( !$this->watchthis && $this->mTitle->userIsWatching() ) $this->watchthis = true;
                }
 
-               $minoredithtml = "";
+               $minoredithtml = '';
 
                if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
                        $minoredithtml =
@@ -352,7 +375,7 @@ class EditPage {
                                "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>";
                }
 
-               $watchhtml = "";
+               $watchhtml = '';
 
                if ( 0 != $wgUser->getID() ) {
                        $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked='checked'":"").
@@ -360,18 +383,17 @@ class EditPage {
                                "<label for='wpWatchthis' title='".wfMsg('tooltip-watch')."'>{$watchthis}</label>";
                }
 
-               $checkboxhtml = $minoredithtml . $watchhtml . "<br />";
+               $checkboxhtml = $minoredithtml . $watchhtml . '<br />';
 
-               if ( "preview" == $formtype) {
-                       $previewhead="<h2>" . wfMsg( "preview" ) . "</h2>\n<p><center><font color=\"#cc0000\">" .
-                               wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></p>\n";
+               if ( 'preview' == $formtype) {
+                       $previewhead='<h2>' . wfMsg( 'preview' ) . "</h2>\n<p><center><font color=\"#cc0000\">" .
+                               wfMsg( 'note' ) . wfMsg( 'previewnote' ) . "</font></center></p>\n";
                        if ( $isConflict ) {
-                               $previewhead.="<h2>" . wfMsg( "previewconflict" ) .
+                               $previewhead.='<h2>' . wfMsg( 'previewconflict' ) .
                                        "</h2>\n";
                        }
 
                        $parserOptions = ParserOptions::newFromUser( $wgUser );
-                       $parserOptions->setUseCategoryMagic( false );
                        $parserOptions->setEditSection( false );
                        $parserOptions->setEditSectionOnRightClick( false );
 
@@ -387,11 +409,17 @@ class EditPage {
                                $parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions );
                                $wgOut->addHTML( $parserOutput->mText );
                        } else {
+                               # if user want to see preview when he edit an article
+                               if( $wgUser->getOption('previewonfirst') and ($this->textbox1 == '')) {
+                                       $this->textbox1 = $this->mArticle->getContent(true);
+                               }
+
                                $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $this->textbox1 ) ."\n\n",
-                                               $wgTitle, $parserOptions );
+                                               $wgTitle, $parserOptions );             
+                               
                                $previewHTML = $parserOutput->mText;
 
-                               if($wgUser->getOption("previewontop")) {
+                               if($wgUser->getOption('previewontop')) {
                                        $wgOut->addHTML($previewhead);
                                        $wgOut->addHTML($previewHTML);
                                }
@@ -403,18 +431,18 @@ class EditPage {
 
                # 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
-               $summarytext = htmlspecialchars( $wgLang->recodeForEdit( $this->summary ) ); # FIXME
-                       if( $this->section == "new" ) {
+               $summarytext = htmlspecialchars( $wgContLang->recodeForEdit( $this->summary ) ); # FIXME
+                       if( $this->section == 'new' ) {
                                $commentsubject="{$subject}: <input tabindex='1' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
-                               $editsummary = "";
+                               $editsummary = '';
                        } else {
-                               $commentsubject = "";
+                               $commentsubject = '';
                                $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
                        }
 
                if( !$this->preview ) {
                # Don't select the edit box on preview; this interferes with seeing what's going on.
-                       $wgOut->setOnloadHandler( "document.editform.wpTextbox1.focus()" );
+                       $wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
                }
                # Prepare a list of templates used by this page
                $db =& wfGetDB( DB_SLAVE );
@@ -434,16 +462,16 @@ class EditPage {
                        }
                        $templates .= '</ul>';
                } else {        
-                       $templates = "";
+                       $templates = '';
                }
                $wgOut->addHTML( "
 {$toolbar}
 <form id=\"editform\" name=\"editform\" method=\"post\" action=\"$action\"
-enctype=\"application/x-www-form-urlencoded\">
+enctype=\"multipart/form-data\">
 {$commentsubject}
 <textarea tabindex='1' accesskey=\",\" name=\"wpTextbox1\" rows='{$rows}'
 cols='{$cols}'{$ew}>" .
-htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
+htmlspecialchars( $wgContLang->recodeForEdit( $this->textbox1 ) ) .
 "
 </textarea>
 <br />{$editsummary}
@@ -466,7 +494,7 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 
                        $wgOut->addHTML( "<h2>" . wfMsg( "yourtext" ) . "</h2>
 <textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
-. htmlspecialchars( $wgLang->recodeForEdit( $this->textbox2 ) ) .
+. htmlspecialchars( $wgContLang->recodeForEdit( $this->textbox2 ) ) .
 "
 </textarea>" );
                }
@@ -477,12 +505,14 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                }
        }
 
-       function blockedIPpage()
-       {
-               global $wgOut, $wgUser, $wgLang, $wgIP;
+       /**
+        * @todo document
+        */
+       function blockedIPpage() {
+               global $wgOut, $wgUser, $wgContLang, $wgIP;
 
-               $wgOut->setPageTitle( wfMsg( "blockedtitle" ) );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+               $wgOut->setPageTitle( wfMsg( 'blockedtitle' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
 
                $id = $wgUser->blockedBy();
@@ -494,32 +524,35 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                } else {
                        $name = $id;
                }
-               $link = "[[" . $wgLang->getNsText( Namespace::getUser() ) .
+               $link = '[[' . $wgContLang->getNsText( Namespace::getUser() ) .
                  ":{$name}|{$name}]]";
 
-               $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip, $name ) );
+               $wgOut->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) );
                $wgOut->returnToMain( false );
        }
 
+       /**
+        * @todo document
+        */
+       function userNotLoggedInPage() {
+               global $wgOut, $wgUser;
 
-
-       function userNotLoggedInPage()
-       {
-               global $wgOut, $wgUser, $wgLang;
-
-               $wgOut->setPageTitle( wfMsg( "whitelistedittitle" ) );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+               $wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
 
-               $wgOut->addWikiText( wfMsg( "whitelistedittext" ) );
+               $wgOut->addWikiText( wfMsg( 'whitelistedittext' ) );
                $wgOut->returnToMain( false );
        }
 
+       /**
+        * @todo document
+        */
        function spamPage ( $matches = array() )
        {
                global $wgOut;
-               $wgOut->setPageTitle( wfMsg( "spamprotectiontitle" ) );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+               $wgOut->setPageTitle( wfMsg( 'spamprotectiontitle' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
 
                $wgOut->addWikiText( wfMsg( 'spamprotectiontext' ) );
@@ -529,10 +562,11 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                $wgOut->returnToMain( false );
        }
 
-       # Forks processes to scan the originating IP for an open proxy server
-       # MemCached can be used to skip IPs that have already been scanned
-       function proxyCheck()
-       {
+       /**
+        * Forks processes to scan the originating IP for an open proxy server
+        * MemCached can be used to skip IPs that have already been scanned
+        */
+       function proxyCheck() {
                global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
                global $wgIP, $wgUseMemCached, $wgMemc, $wgDBname, $wgProxyMemcExpiry;
                
@@ -543,7 +577,7 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                # Get MemCached key
                $skip = false;
                if ( $wgUseMemCached ) {
-                       $mcKey = "$wgDBname:proxy:ip:$wgIP";
+                       $mcKey = $wgDBname.':proxy:ip:'.$wgIP;
                        $mcValue = $wgMemc->get( $mcKey );
                        if ( $mcValue ) {
                                $skip = true;
@@ -552,12 +586,12 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 
                # Fork the processes
                if ( !$skip ) {
-                       $title = Title::makeTitle( NS_SPECIAL, "Blockme" );
+                       $title = Title::makeTitle( NS_SPECIAL, 'Blockme' );
                        $iphash = md5( $wgIP . $wgProxyKey );
-                       $url = $title->getFullURL( "ip=$iphash" );
+                       $url = $title->getFullURL( 'ip='.$iphash );
 
                        foreach ( $wgProxyPorts as $port ) {
-                               $params = implode( " ", array(
+                               $params = implode( ' ', array(
                                                        escapeshellarg( $wgProxyScriptPath ),
                                                        escapeshellarg( $wgIP ),
                                                        escapeshellarg( $port ),
@@ -572,17 +606,21 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                }
        }
 
-       /* private */ function mergeChangesInto( &$text ){
+       /**
+        * @access private
+        * @todo document
+        */
+       function mergeChangesInto( &$text ){
                $fname = 'EditPage::mergeChangesInto';
                $oldDate = $this->edittime;
                $dbw =& wfGetDB( DB_MASTER );
-               $obj = $dbw->getArray( 'cur', array( 'cur_text' ), array( 'cur_id' => $this->mTitle->getArticleID() ), 
+               $obj = $dbw->selectRow( 'cur', array( 'cur_text' ), array( 'cur_id' => $this->mTitle->getArticleID() ), 
                        $fname, 'FOR UPDATE' );
 
                $yourtext = $obj->cur_text;
                $ns = $this->mTitle->getNamespace();
                $title = $this->mTitle->getDBkey();
-               $obj = $dbw->getArray( 'old', 
+               $obj = $dbw->selectRow( 'old', 
                        array( 'old_text','old_flags'), 
                        array( 'old_namespace' => $ns, 'old_title' => $title, 
                                'old_timestamp' => $dbw->timestamp($oldDate)),
@@ -596,6 +634,168 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                        return false;
                }
        }
+
+
+       function checkUnicodeCompliantBrowser() {
+               global $wgBrowserBlackList;
+               $currentbrowser = $_SERVER["HTTP_USER_AGENT"];
+               foreach ( $wgBrowserBlackList as $browser ) {
+                       if ( preg_match($browser, $currentbrowser) ) {
+                               return false;
+                       }
+               }
+               return true;
+       }
+
+       /**
+        * Format an anchor fragment as it would appear for a given section name
+        * @param string $text
+        * @return string
+        * @access private
+        */
+       function sectionAnchor( $text ) {
+               global $wgInputEncoding;
+               $headline = do_html_entity_decode( $text, ENT_COMPAT, $wgInputEncoding );
+               # strip out HTML 
+               $headline = preg_replace( '/<.*?' . '>/', '', $headline );
+               $headline = trim( $headline );
+               $sectionanchor = '#' . urlencode( str_replace( ' ', '_', $headline ) );
+               $replacearray = array(
+                       '%3A' => ':',
+                       '%' => '.'
+               );
+               return str_replace(
+                       array_keys( $replacearray ),
+                       array_values( $replacearray ),
+                       $sectionanchor );
+       }
+
+       /**
+        * Shows a bulletin board style toolbar for common editing functions.
+        * It can be disabled in the user preferences.
+        * The necessary JavaScript code can be found in style/wikibits.js.
+        */
+       function getEditToolbar() {
+               global $wgStylePath, $wgLang, $wgMimeType;
+
+               /**
+                * toolarray an array of arrays which each include the filename of
+                * the button image (without path), the opening tag, the closing tag,
+                * and optionally a sample text that is inserted between the two when no
+                * selection is highlighted.
+                * The tip text is shown when the user moves the mouse over the button.
+                *
+                * Already here are accesskeys (key), which are not used yet until someone
+                * can figure out a way to make them work in IE. However, we should make
+                * sure these keys are not defined on the edit page.
+                */
+               $toolarray=array(
+                       array(  'image'=>'button_bold.png',
+                                       'open'  =>      "\'\'\'",
+                                       'close' =>      "\'\'\'",
+                                       'sample'=>      wfMsg('bold_sample'),
+                                       'tip'   =>      wfMsg('bold_tip'),
+                                       'key'   =>      'B'
+                               ),
+                       array(  'image'=>'button_italic.png',
+                                       'open'  =>      "\'\'",
+                                       'close' =>      "\'\'",
+                                       'sample'=>      wfMsg('italic_sample'),
+                                       'tip'   =>      wfMsg('italic_tip'),
+                                       'key'   =>      'I'
+                               ),
+                       array(  'image'=>'button_link.png',
+                                       'open'  =>      '[[',
+                                       'close' =>      ']]',
+                                       'sample'=>      wfMsg('link_sample'),
+                                       'tip'   =>      wfMsg('link_tip'),
+                                       'key'   =>      'L'
+                               ),
+                       array(  'image'=>'button_extlink.png',
+                                       'open'  =>      '[',
+                                       'close' =>      ']',
+                                       'sample'=>      wfMsg('extlink_sample'),
+                                       'tip'   =>      wfMsg('extlink_tip'),
+                                       'key'   =>      'X'
+                               ),
+                       array(  'image'=>'button_headline.png',
+                                       'open'  =>      "\\n== ",
+                                       'close' =>      " ==\\n",
+                                       'sample'=>      wfMsg('headline_sample'),
+                                       'tip'   =>      wfMsg('headline_tip'),
+                                       'key'   =>      'H'
+                               ),
+                       array(  'image'=>'button_image.png',
+                                       'open'  =>      '[['.$wgLang->getNsText(NS_IMAGE).":",
+                                       'close' =>      ']]',
+                                       'sample'=>      wfMsg('image_sample'),
+                                       'tip'   =>      wfMsg('image_tip'),
+                                       'key'   =>      'D'
+                               ),
+                       array(  'image' =>      'button_media.png',
+                                       'open'  =>      '[['.$wgLang->getNsText(NS_MEDIA).':',
+                                       'close' =>      ']]',
+                                       'sample'=>      wfMsg('media_sample'),
+                                       'tip'   =>      wfMsg('media_tip'),
+                                       'key'   =>      'M'
+                               ),
+                       array(  'image' =>      'button_math.png',
+                                       'open'  =>      "\\<math\\>",
+                                       'close' =>      "\\</math\\>",
+                                       'sample'=>      wfMsg('math_sample'),
+                                       'tip'   =>      wfMsg('math_tip'),
+                                       'key'   =>      'C'
+                               ),
+                       array(  'image' =>      'button_nowiki.png',
+                                       'open'  =>      "\\<nowiki\\>",
+                                       'close' =>      "\\</nowiki\\>",
+                                       'sample'=>      wfMsg('nowiki_sample'),
+                                       'tip'   =>      wfMsg('nowiki_tip'),
+                                       'key'   =>      'N'
+                               ),
+                       array(  'image' =>      'button_sig.png',
+                                       'open'  =>      '--~~~~',
+                                       'close' =>      '',
+                                       'sample'=>      '',
+                                       'tip'   =>      wfMsg('sig_tip'),
+                                       'key'   =>      'Y'
+                               ),
+                       array(  'image' =>      'button_hr.png',
+                                       'open'  =>      "\\n----\\n",
+                                       'close' =>      '',
+                                       'sample'=>      '',
+                                       'tip'   =>      wfMsg('hr_tip'),
+                                       'key'   =>      'R'
+                               )
+               );
+               $toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
+
+               $toolbar.="document.writeln(\"<div id='toolbar'>\");\n";
+               foreach($toolarray as $tool) {
+
+                       $image=$wgStylePath.'/common/images/'.$tool['image'];
+                       $open=$tool['open'];
+                       $close=$tool['close'];
+                       $sample = addslashes( $tool['sample'] );
+
+                       // Note that we use the tip both for the ALT tag and the TITLE tag of the image.
+                       // Older browsers show a "speedtip" type message only for ALT.
+                       // Ideally these should be different, realistically they
+                       // probably don't need to be.
+                       $tip = addslashes( $tool['tip'] );
+
+                       #$key = $tool["key"];
+
+                       $toolbar.="addButton('$image','$tip','$open','$close','$sample');\n";
+               }
+
+               $toolbar.="addInfobox('" . addslashes( wfMsg( "infobox" ) ) . "','" . addslashes(wfMsg("infobox_alert")) . "');\n";
+               $toolbar.="document.writeln(\"</div>\");\n";
+
+               $toolbar.="/*]]>*/\n</script>";
+               return $toolbar;
+       }
+
 }
 
 ?>