-<?
+<?php
# Splitting edit page/HTML interface from Article...
# The actual database and text munging is still in Article,
var $mArticle;
var $mTitle;
+ # Form values
+ var $save = false, $preview = false;
+ var $minoredit = false, $watchthis = false;
+ var $textbox1 = "", $textbox2 = "", $summary = "";
+ var $edittime = "", $section = "";
+ var $oldid = 0;
+
function EditPage( $article ) {
$this->mArticle =& $article;
global $wgTitle;
function edit()
{
- global $wgOut, $wgUser, $wgWhitelistEdit;
- global $wpTextbox1, $wpSummary, $wpSave, $wpPreview;
- global $wpMinoredit, $wpEdittime, $wpTextbox2;
+ global $wgOut, $wgUser, $wgWhitelistEdit, $wgRequest;
+ // this is not an article
+ $wgOut->setArticleFlag(false);
- $fields = array( "wpTextbox1", "wpSummary", "wpTextbox2" );
- wfCleanFormFields( $fields );
+ $this->importFormData( $wgRequest );
if ( ! $this->mTitle->userCanEdit() ) {
- $this->mArticle->view();
+ $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
return;
}
if ( $wgUser->isBlocked() ) {
return;
}
if ( wfReadOnly() ) {
- if( isset( $wpSave ) or isset( $wpPreview ) ) {
+ if( $this->save || $this->preview ) {
$this->editForm( "preview" );
} else {
$wgOut->readOnlyPage( $this->mArticle->getContent() );
}
return;
}
- if ( $_SERVER['REQUEST_METHOD'] != "POST" ) unset( $wpSave );
- if ( isset( $wpSave ) ) {
+ if ( $this->save ) {
$this->editForm( "save" );
- } else if ( isset( $wpPreview ) ) {
+ } else if ( $this->preview ) {
$this->editForm( "preview" );
} else { # First time through
$this->editForm( "initial" );
}
}
+ 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->edittime = $request->getVal( 'wpEdittime' );
+ if( !preg_match( '/^\d{14}$/', $this->edittime ) ) $this->edittime = "";
+
+ $this->preview = $request->getCheck( 'wpPreview' );
+ $this->save = $request->wasPosted() && !$this->preview;
+ $this->minoredit = $request->getCheck( 'wpMinoredit' );
+ $this->watchthis = $request->getCheck( 'wpWatchthis' );
+
+ $this->oldid = $request->getInt( 'oldid' );
+
+ # Section edit can come from either the form or a link
+ $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
function submit()
{
- global $wpSave, $wpPreview;
- if ( ! isset( $wpPreview ) ) { $wpSave = 1; }
+ if( !$this->preview ) $this->save = true;
$this->edit();
}
function editForm( $formtype )
{
global $wgOut, $wgUser;
- global $wpTextbox1, $wpSummary, $wpWatchthis;
- global $wpSave, $wpPreview;
- global $wpMinoredit, $wpEdittime, $wpTextbox2, $wpSection;
- global $oldid, $redirect, $section;
- global $wgLang;
-
- if(isset($wpSection)) { $section=$wpSection; } else { $wpSection=$section; }
+ global $wgLang, $wgParser, $wgTitle;
+ global $wgAllowAnonymousMinor;
+ global $wgWhitelistEdit;
$sk = $wgUser->getSkin();
$isConflict = false;
- $wpTextbox1 = rtrim ( $wpTextbox1 ) ; # To avoid text getting longer on each preview
if(!$this->mTitle->getArticleID()) { # new article
-
$wgOut->addWikiText(wfmsg("newarticletext"));
+ }
+ if( Namespace::isTalk( $this->mTitle->getNamespace() ) ) {
+ $wgOut->addWikiText(wfmsg("talkpagetext"));
}
# Attempt submission here. This will check for edit conflicts,
$wgOut->readOnlyPage();
return;
}
+
# If article is new, insert it.
-
- $aid = $this->mTitle->getArticleID();
+ $aid = $this->mTitle->getArticleID();
if ( 0 == $aid ) {
- # 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) ) ) ) {
- $wgOut->redirect( wfLocalUrl(
- $this->mTitle->getPrefixedURL() ) );
+ # Don't save a new article if it's blank.
+ if ( ( "" == $this->textbox1 ) ||
+ ( wfMsg( "newarticletext" ) == $this->textbox1 ) ) {
+ $wgOut->redirect( $this->mTitle->getFullURL() );
return;
}
- $this->mArticle->insertNewArticle( $wpTextbox1, $wpSummary, $wpMinoredit, $wpWatchthis );
+ $this->mArticle->insertNewArticle( $this->textbox1, $this->summary, $this->minoredit, $this->watchthis );
return;
}
+
# Article exists. Check for edit conflict.
- # Don't check for conflict when appending a comment - this should always work
$this->mArticle->clear(); # Force reload of dates, etc.
- if ( $section!="new" && ( $this->mArticle->getTimestamp() != $wpEdittime ) ) {
- $isConflict = true;
+
+ if( ( $this->section != "new" ) &&
+ ($this->mArticle->getTimestamp() != $this->edittime ) ) {
+ $isConflict = true;
}
- $u = $wgUser->getID();
+ $userid = $wgUser->getID();
- # Supress edit conflict with self
+ $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
+ $this->section, $this->textbox1, $this->summary);
+ # Suppress edit conflict with self
- if ( ( 0 != $u ) && ( $this->mArticle->getUser() == $u ) ) {
+ if ( ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
$isConflict = false;
} else {
# switch from section editing to normal editing in edit conflict
if($isConflict) {
- $section="";$wpSection="";
+ # Attempt merge
+ if( $this->mergeChangesInto( $text ) ){
+ // Successful merge! Maybe we should tell the user the good news?
+ $isConflict = false;
+ } else {
+ $this->section = "";
+ $this->textbox1 = $text;
+ }
}
-
}
if ( ! $isConflict ) {
# All's well: update the article here
- if($this->mArticle->updateArticle( $wpTextbox1, $wpSummary, $wpMinoredit, $wpWatchthis, $wpSection ))
+ if($this->mArticle->updateArticle( $text, $this->summary, $this->minoredit, $this->watchthis ))
return;
else
$isConflict = true;
# checking, etc.
if ( "initial" == $formtype ) {
- $wpEdittime = $this->mArticle->getTimestamp();
- $wpTextbox1 = $this->mArticle->getContent(true);
- $wpSummary = "";
+ $this->edittime = $this->mArticle->getTimestamp();
+ $this->textbox1 = $this->mArticle->getContent(true);
+ $this->summary = "";
+ $this->proxyCheck();
}
$wgOut->setRobotpolicy( "noindex,nofollow" );
- $wgOut->setArticleFlag( false );
+
+ # Enabled article-related sidebar, toplinks, etc.
+ $wgOut->setArticleRelated( true );
if ( $isConflict ) {
$s = wfMsg( "editconflict", $this->mTitle->getPrefixedText() );
$wgOut->setPageTitle( $s );
$wgOut->addHTML( wfMsg( "explainconflict" ) );
- $wpTextbox2 = $wpTextbox1;
- $wpTextbox1 = $this->mArticle->getContent(true);
- $wpEdittime = $this->mArticle->getTimestamp();
+ $this->textbox2 = $this->textbox1;
+ $this->textbox1 = $this->mArticle->getContent(true);
+ $this->edittime = $this->mArticle->getTimestamp();
} else {
$s = wfMsg( "editing", $this->mTitle->getPrefixedText() );
- if($section!="") {
- if($section=="new") {
+ if( $this->section != "" ) {
+ if( $this->section == "new" ) {
$s.=wfMsg("commentedit");
} else {
$s.=wfMsg("sectionedit");
}
+ if(!$this->preview) {
+ $sectitle=preg_match("/^=+(.*?)=+/mi",
+ $this->textbox1,
+ $matches);
+ if( !empty( $matches[1] ) ) {
+ $this->summary = "/* ". trim($matches[1])." */ ";
+ }
+ }
}
$wgOut->setPageTitle( $s );
- if ( $oldid ) {
+ if ( $this->oldid ) {
$this->mArticle->setOldSubtitle();
$wgOut->addHTML( wfMsg( "editingold" ) );
}
"</strong><br />\n" );
}
- $kblength = (int)(strlen( $wpTextbox1 ) / 1024);
+ $kblength = (int)(strlen( $this->textbox1 ) / 1024);
if( $kblength > 29 ) {
- $wgOut->addHTML( "<strong>" .
+ $wgOut->addHTML( "<strong>" .
wfMsg( "longpagewarning", $kblength )
. "</strong>" );
}
-
+
$rows = $wgUser->getOption( "rows" );
$cols = $wgUser->getOption( "cols" );
else $ew = "" ;
$q = "action=submit";
- if ( "no" == $redirect ) { $q .= "&redirect=no"; }
- $action = wfEscapeHTML( wfLocalUrl( $this->mTitle->getPrefixedURL(), $q ) );
+ #if ( "no" == $redirect ) { $q .= "&redirect=no"; }
+ $action = $this->mTitle->escapeLocalURL( $q );
- $summary = wfMsg( "summary" );
+ $summary = wfMsg( "summary" );
$subject = wfMsg("subject");
$minor = wfMsg( "minoredit" );
$watchthis = wfMsg ("watchthis");
$copywarn = wfMsg( "copyrightwarning", $sk->makeKnownLink(
wfMsg( "copyrightpage" ) ) );
- $wpTextbox1 = wfEscapeHTML( $wpTextbox1 );
- $wpTextbox2 = wfEscapeHTML( $wpTextbox2 );
- $wpSummary = wfEscapeHTML( $wpSummary );
-
+ if( $wgUser->getOption("showtoolbar") ) {
+ # prepare toolbar for edit buttons
+ $toolbar = $sk->getEditToolbar();
+ } else {
+ $toolbar = "";
+ }
+
// activate checkboxes if user wants them to be always active
- if (!$wpPreview && $wgUser->getOption("watchdefault")) $wpWatchthis=1;
- if (!$wpPreview && $wgUser->getOption("minordefault")) $wpMinoredit=1;
-
- // activate checkbox also if user is already watching the page,
- // require wpWatchthis to be unset so that second condition is not
- // checked unnecessarily
- if (!$wpWatchthis && !$wpPreview && $this->mTitle->userIsWatching()) $wpWatchthis=1;
-
+ if( !$this->preview ) {
+ 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
+ // checked unnecessarily
+ if( !$this->watchthis && $this->mTitle->userIsWatching() ) $this->watchthis = true;
+ }
+
+ $minoredithtml = "";
+
+ if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
+ $minoredithtml =
+ "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
+ " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
+ "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>";
+ }
+
+ $watchhtml = "";
+
if ( 0 != $wgUser->getID() ) {
- $checkboxhtml=
- "<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>";
-
- } else {
- $checkboxhtml="";
+ $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked='checked'":"").
+ " accesskey='".wfMsg('accesskey-watch')."' id='wpWatchthis' />".
+ "<label for='wpWatchthis' title='".wfMsg('tooltip-watch')."'>{$watchthis}</label>";
}
+ $checkboxhtml = $minoredithtml . $watchhtml . "<br />";
if ( "preview" == $formtype) {
-
- $previewhead="<h2>" . wfMsg( "preview" ) . "</h2>\n<p><large><center><font color=\"#cc0000\">" .
- wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large><P>\n";
+ $previewhead="<h2>" . wfMsg( "preview" ) . "</h2>\n<p><large><center><font color=\"#cc0000\">" .
+ wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large></p>\n";
if ( $isConflict ) {
$previewhead.="<h2>" . wfMsg( "previewconflict" ) .
"</h2>\n";
}
- $previewtext = wfUnescapeHTML( $wpTextbox1 );
-
+ $previewtext = wfUnescapeHTML( $this->textbox1 );
+
+ $parserOptions = ParserOptions::newFromUser( $wgUser );
+ $parserOptions->setUseCategoryMagic( false );
+ $parserOptions->setEditSection( false );
+ $parserOptions->setEditSectionOnRightClick( false );
+ $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $previewtext ) ."\n\n",
+ $wgTitle, $parserOptions );
+ $previewHTML = $parserOutput->mText;
+
if($wgUser->getOption("previewontop")) {
$wgOut->addHTML($previewhead);
- $wgOut->addWikiText( $this->mArticle->preSaveTransform( $previewtext ) ."\n\n");
+ $wgOut->addHTML($previewHTML);
}
$wgOut->addHTML( "<br clear=\"all\" />\n" );
}
# 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($section=="new") {
-
- $commentsubject="{$subject}: <input tabindex=1 type=text value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=200 size=60><br>";
+ $summarytext = htmlspecialchars( $wgLang->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 = "";
} else {
-
- $editsummary="{$summary}: <input tabindex=3 type=text value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=200 size=60><br>";
+ $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->addHTML( "
+{$toolbar}
<form id=\"editform\" name=\"editform\" method=\"post\" action=\"$action\"
enctype=\"application/x-www-form-urlencoded\">
{$commentsubject}
-<textarea tabindex=2 name=\"wpTextbox1\" rows={$rows}
-cols={$cols}{$ew} wrap=\"virtual\">" .
-$wgLang->recodeForEdit( $wpTextbox1 ) .
+<div id=\"tawrapper\"><textarea tabindex='1' accesskey=\",\" name=\"wpTextbox1\" rows='{$rows}'
+cols='{$cols}'{$ew}>" .
+htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
"
-</textarea>
-<br>{$editsummary}
+</textarea></div>
+<br />{$editsummary}
{$checkboxhtml}
-<input tabindex=5 type=submit value=\"{$save}\" name=\"wpSave\">
-<input tabindex=6 type=submit value=\"{$prev}\" name=\"wpPreview\">
+<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
+" title=\"".wfMsg('tooltip-save')."\"/>
+<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"".wfMsg('accesskey-preview')."\"".
+" title=\"".wfMsg('tooltip-preview')."\"/>
<em>{$cancel}</em> | <em>{$edithelp}</em>
-<br><br>{$copywarn}
-<input type=hidden value=\"{$section}\" name=\"wpSection\">
-<input type=hidden value=\"{$wpEdittime}\" name=\"wpEdittime\">\n" );
+<br /><br />{$copywarn}
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n" );
if ( $isConflict ) {
$wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
- DifferenceEngine::showDiff( $wpTextbox2, $wpTextbox1,
+ DifferenceEngine::showDiff( $this->textbox2, $this->textbox1,
wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
$wgOut->addHTML( "<h2>" . wfMsg( "yourtext" ) . "</h2>
-<textarea tabindex=6 name=\"wpTextbox2\" rows={$rows} cols={$cols} wrap=virtual>"
-. $wgLang->recodeForEdit( $wpTextbox2 ) .
+<textarea tabindex=6 name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
+. htmlspecialchars( $wgLang->recodeForEdit( $this->textbox2 ) ) .
"
</textarea>" );
}
$wgOut->addHTML( "</form>\n" );
if($formtype =="preview" && !$wgUser->getOption("previewontop")) {
$wgOut->addHTML($previewhead);
- $wgOut->addWikiText( $this->mArticle->preSaveTransform( $previewtext ) );
+ $wgOut->addHTML($previewHTML);
}
}
function blockedIPpage()
{
- global $wgOut, $wgUser, $wgLang;
+ global $wgOut, $wgUser, $wgLang, $wgIP;
$wgOut->setPageTitle( wfMsg( "blockedtitle" ) );
$wgOut->setRobotpolicy( "noindex,nofollow" );
- $wgOut->setArticleFlag( false );
+ $wgOut->setArticleRelated( false );
$id = $wgUser->blockedBy();
$reason = $wgUser->blockedFor();
-
- $name = User::whoIs( $id );
+ $ip = $wgIP;
+
+ $name = User::whoIs( $id );
$link = "[[" . $wgLang->getNsText( Namespace::getUser() ) .
":{$name}|{$name}]]";
- $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason ) );
+ $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip ) );
$wgOut->returnToMain( false );
}
$wgOut->setPageTitle( wfMsg( "whitelistedittitle" ) );
$wgOut->setRobotpolicy( "noindex,nofollow" );
- $wgOut->setArticleFlag( false );
+ $wgOut->setArticleRelated( false );
$wgOut->addWikiText( wfMsg( "whitelistedittext" ) );
$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()
+ {
+ global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
+ global $wgIP, $wgUseMemCached, $wgMemc, $wgDBname, $wgProxyMemcExpiry;
+
+ if ( !$wgBlockOpenProxies ) {
+ return;
+ }
+
+ # Get MemCached key
+ $skip = false;
+ if ( $wgUseMemCached ) {
+ $mcKey = "$wgDBname:proxy:ip:$wgIP";
+ $mcValue = $wgMemc->get( $mcKey );
+ if ( $mcValue ) {
+ $skip = true;
+ }
+ }
+
+ # Fork the processes
+ if ( !$skip ) {
+ $title = Title::makeTitle( NS_SPECIAL, "Blockme" );
+ $iphash = md5( $wgIP . $wgProxyKey );
+ $url = $title->getFullURL( "ip=$iphash" );
+
+ foreach ( $wgProxyPorts as $port ) {
+ $params = implode( " ", array(
+ escapeshellarg( $wgProxyScriptPath ),
+ escapeshellarg( $wgIP ),
+ escapeshellarg( $port ),
+ escapeshellarg( $url )
+ ));
+ exec( "php $params &>/dev/null &" );
+ }
+ # Set MemCached key
+ if ( $wgUseMemCached ) {
+ $wgMemc->set( $mcKey, 1, $wgProxyMemcExpiry );
+ }
+ }
+ }
+ /* private */ function mergeChangesInto( &$text ){
+ $oldDate = $this->edittime;
+ $res = wfQuery("SELECT cur_text FROM cur WHERE cur_id=" .
+ $this->mTitle->getArticleID() . " FOR UPDATE", DB_WRITE);
+ $obj = wfFetchObject($res);
+
+ $yourtext = $obj->cur_text;
+ $ns = $this->mTitle->getNamespace();
+ $title = wfStrencode( $this->mTitle->getDBkey() );
+ $res = wfQuery("SELECT old_text FROM old WHERE old_namespace = $ns AND ".
+ "old_title = '{$title}' AND old_timestamp = '{$oldDate}'", DB_WRITE);
+ $obj = wfFetchObject($res);
+ if(wfMerge($obj->old_text, $text, $yourtext, $result)){
+ $text = $result;
+ return true;
+ } else {
+ return false;
+ }
+ }
}
?>
dépôts / lhc / web / wiklou.git / blobdiff