}
return;
}
- if( !$wgRequest->wasPosted() ) $this->save = false;
if ( $this->save ) {
$this->editForm( "save" );
} else if ( $this->preview ) {
$this->edittime = $request->getVal( 'wpEdittime' );
if( !preg_match( '/^\d{14}$/', $this->edittime ) ) $this->edittime = "";
- $this->save = $request->getCheck( 'wpSave' );
$this->preview = $request->getCheck( 'wpPreview' );
+ $this->save = $request->wasPosted() && !$this->preview;
$this->minoredit = $request->getCheck( 'wpMinoredit' );
$this->watchthis = $request->getCheck( 'wpWatchthis' );
$sectitle=preg_match("/^=+(.*?)=+/mi",
$this->textbox1,
$matches);
- if($matches[1]) { $this->summary = "/* ". trim($matches[1])." */ "; }
+ if( !empty( $matches[1] ) ) {
+ $this->summary = "/* ". trim($matches[1])." */ ";
+ }
}
}
$wgOut->setPageTitle( $s );
$copywarn = wfMsg( "copyrightwarning", $sk->makeKnownLink(
wfMsg( "copyrightpage" ) ) );
- if($wgUser->getOption("showtoolbar")) {
- // prepare toolbar for edit buttons
- $toolbar=$sk->getEditToolbar();
+ 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 ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
$minoredithtml =
- "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked":"")." id='wpMinoredit' />".
- "<label for='wpMinoredit'>{$minor}</label>";
+ "<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() ) {
- $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked":"")." id='wpWatchthis' />".
- "<label for='wpWatchthis'>{$watchthis}</label>";
+ $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";
+ wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large></p>\n";
if ( $isConflict ) {
$previewhead.="<h2>" . wfMsg( "previewconflict" ) .
"</h2>\n";
<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\">" .
+<div id=\"tawrapper\"><textarea tabindex='1' accesskey=\",\" name=\"wpTextbox1\" rows='{$rows}'
+cols='{$cols}'{$ew}>" .
htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
"
-</textarea>
+</textarea></div>
<br />{$editsummary}
{$checkboxhtml}
-<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"s\" />
-<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\" />
+<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=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
$link = "[[" . $wgLang->getNsText( Namespace::getUser() ) .
":{$name}|{$name}]]";
- $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip ) );
+ $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip, $name ) );
$wgOut->returnToMain( false );
}
if ( !$skip ) {
$title = Title::makeTitle( NS_SPECIAL, "Blockme" );
$iphash = md5( $wgIP . $wgProxyKey );
- $url = wfFullUrl( $title->getPrefixedURL(), "ip=$iphash" );
+ $url = $title->getFullURL( "ip=$iphash" );
foreach ( $wgProxyPorts as $port ) {
$params = implode( " ", array(