2008-04-05 18:11:23 +00:00
|
|
|
<?php
|
2012-05-10 15:51:44 +00:00
|
|
|
/**
|
|
|
|
|
* Generic operation result.
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
|
*
|
|
|
|
|
* @file
|
|
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Generic operation result class
|
|
|
|
|
* Has warning/error list, boolean status and arbitrary value
|
|
|
|
|
*
|
2008-04-14 07:45:50 +00:00
|
|
|
* "Good" means the operation was completed with no warnings or errors.
|
2008-04-05 18:11:23 +00:00
|
|
|
*
|
|
|
|
|
* "OK" means the operation was partially or wholly completed.
|
|
|
|
|
*
|
2008-04-14 07:45:50 +00:00
|
|
|
* An operation which is not OK should have errors so that the user can be
|
|
|
|
|
* informed as to what went wrong. Calling the fatal() function sets an error
|
2008-04-05 18:11:23 +00:00
|
|
|
* message and simultaneously switches off the OK flag.
|
|
|
|
|
*/
|
|
|
|
|
class Status {
|
|
|
|
|
var $ok = true;
|
|
|
|
|
var $value;
|
|
|
|
|
|
|
|
|
|
/** Counters for batch operations */
|
2011-02-04 20:54:11 +00:00
|
|
|
public $successCount = 0, $failCount = 0;
|
2011-05-26 18:41:06 +00:00
|
|
|
/** Array to indicate which items of the batch operations were successful */
|
2011-02-04 20:54:11 +00:00
|
|
|
public $success = array();
|
2008-04-05 18:11:23 +00:00
|
|
|
|
|
|
|
|
/*semi-private*/ var $errors = array();
|
|
|
|
|
/*semi-private*/ var $cleanCallback = false;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Factory function for fatal errors
|
2010-04-01 21:16:53 +00:00
|
|
|
*
|
|
|
|
|
* @param $message String: message name
|
2012-02-09 21:36:14 +00:00
|
|
|
* @return Status
|
2008-04-05 18:11:23 +00:00
|
|
|
*/
|
|
|
|
|
static function newFatal( $message /*, parameters...*/ ) {
|
|
|
|
|
$params = func_get_args();
|
|
|
|
|
$result = new self;
|
|
|
|
|
call_user_func_array( array( &$result, 'error' ), $params );
|
|
|
|
|
$result->ok = false;
|
|
|
|
|
return $result;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-01 21:16:53 +00:00
|
|
|
/**
|
|
|
|
|
* Factory function for good results
|
|
|
|
|
*
|
|
|
|
|
* @param $value Mixed
|
2012-02-09 21:36:14 +00:00
|
|
|
* @return Status
|
2010-04-01 21:16:53 +00:00
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
static function newGood( $value = null ) {
|
|
|
|
|
$result = new self;
|
|
|
|
|
$result->value = $value;
|
|
|
|
|
return $result;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-01 21:16:53 +00:00
|
|
|
/**
|
|
|
|
|
* Change operation result
|
|
|
|
|
*
|
2011-12-02 07:45:20 +00:00
|
|
|
* @param $ok Boolean: whether the operation completed
|
2010-04-01 21:16:53 +00:00
|
|
|
* @param $value Mixed
|
|
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
function setResult( $ok, $value = null ) {
|
|
|
|
|
$this->ok = $ok;
|
|
|
|
|
$this->value = $value;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-01 21:16:53 +00:00
|
|
|
/**
|
|
|
|
|
* Returns whether the operation completed and didn't have any error or
|
|
|
|
|
* warnings
|
|
|
|
|
*
|
|
|
|
|
* @return Boolean
|
|
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
function isGood() {
|
|
|
|
|
return $this->ok && !$this->errors;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-01 21:16:53 +00:00
|
|
|
/**
|
|
|
|
|
* Returns whether the operation completed
|
|
|
|
|
*
|
|
|
|
|
* @return Boolean
|
|
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
function isOK() {
|
|
|
|
|
return $this->ok;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-01 21:16:53 +00:00
|
|
|
/**
|
|
|
|
|
* Add a new warning
|
|
|
|
|
*
|
|
|
|
|
* @param $message String: message name
|
|
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
function warning( $message /*, parameters... */ ) {
|
2008-04-14 07:45:50 +00:00
|
|
|
$params = array_slice( func_get_args(), 1 );
|
|
|
|
|
$this->errors[] = array(
|
|
|
|
|
'type' => 'warning',
|
|
|
|
|
'message' => $message,
|
2008-04-05 18:11:23 +00:00
|
|
|
'params' => $params );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Add an error, do not set fatal flag
|
|
|
|
|
* This can be used for non-fatal errors
|
2010-04-01 21:16:53 +00:00
|
|
|
*
|
|
|
|
|
* @param $message String: message name
|
2008-04-05 18:11:23 +00:00
|
|
|
*/
|
|
|
|
|
function error( $message /*, parameters... */ ) {
|
2008-04-14 07:45:50 +00:00
|
|
|
$params = array_slice( func_get_args(), 1 );
|
|
|
|
|
$this->errors[] = array(
|
|
|
|
|
'type' => 'error',
|
|
|
|
|
'message' => $message,
|
2008-04-05 18:11:23 +00:00
|
|
|
'params' => $params );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2010-04-01 21:16:53 +00:00
|
|
|
* Add an error and set OK to false, indicating that the operation
|
|
|
|
|
* as a whole was fatal
|
|
|
|
|
*
|
|
|
|
|
* @param $message String: message name
|
2008-04-05 18:11:23 +00:00
|
|
|
*/
|
|
|
|
|
function fatal( $message /*, parameters... */ ) {
|
2008-04-14 07:45:50 +00:00
|
|
|
$params = array_slice( func_get_args(), 1 );
|
|
|
|
|
$this->errors[] = array(
|
|
|
|
|
'type' => 'error',
|
|
|
|
|
'message' => $message,
|
2008-04-05 18:11:23 +00:00
|
|
|
'params' => $params );
|
|
|
|
|
$this->ok = false;
|
|
|
|
|
}
|
|
|
|
|
|
2009-04-30 05:21:27 +00:00
|
|
|
/**
|
|
|
|
|
* Sanitize the callback parameter on wakeup, to avoid arbitrary execution.
|
|
|
|
|
*/
|
|
|
|
|
function __wakeup() {
|
|
|
|
|
$this->cleanCallback = false;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 20:06:57 +00:00
|
|
|
/**
|
|
|
|
|
* @param $params array
|
|
|
|
|
* @return array
|
|
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
protected function cleanParams( $params ) {
|
|
|
|
|
if ( !$this->cleanCallback ) {
|
|
|
|
|
return $params;
|
|
|
|
|
}
|
|
|
|
|
$cleanParams = array();
|
|
|
|
|
foreach ( $params as $i => $param ) {
|
|
|
|
|
$cleanParams[$i] = call_user_func( $this->cleanCallback, $param );
|
|
|
|
|
}
|
|
|
|
|
return $cleanParams;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 20:06:57 +00:00
|
|
|
/**
|
|
|
|
|
* @param $item
|
|
|
|
|
* @return string
|
|
|
|
|
*/
|
2008-04-05 18:11:23 +00:00
|
|
|
protected function getItemXML( $item ) {
|
|
|
|
|
$params = $this->cleanParams( $item['params'] );
|
2008-04-14 07:45:50 +00:00
|
|
|
$xml = "<{$item['type']}>\n" .
|
2008-04-05 18:11:23 +00:00
|
|
|
Xml::element( 'message', null, $item['message'] ) . "\n" .
|
2011-04-23 17:42:34 +00:00
|
|
|
Xml::element( 'text', null, wfMsg( $item['message'], $params ) ) ."\n";
|
2008-04-05 18:11:23 +00:00
|
|
|
foreach ( $params as $param ) {
|
|
|
|
|
$xml .= Xml::element( 'param', null, $param );
|
|
|
|
|
}
|
2011-04-30 22:12:51 +00:00
|
|
|
$xml .= "</{$item['type']}>\n";
|
2008-04-05 18:11:23 +00:00
|
|
|
return $xml;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Get the error list as XML
|
2011-05-21 20:06:57 +00:00
|
|
|
* @return string
|
2008-04-05 18:11:23 +00:00
|
|
|
*/
|
|
|
|
|
function getXML() {
|
|
|
|
|
$xml = "<errors>\n";
|
|
|
|
|
foreach ( $this->errors as $error ) {
|
|
|
|
|
$xml .= $this->getItemXML( $error );
|
|
|
|
|
}
|
|
|
|
|
$xml .= "</errors>\n";
|
|
|
|
|
return $xml;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Get the error list as a wikitext formatted list
|
2010-04-01 21:16:53 +00:00
|
|
|
*
|
|
|
|
|
* @param $shortContext String: a short enclosing context message name, to
|
|
|
|
|
* be used when there is a single error
|
|
|
|
|
* @param $longContext String: a long enclosing context message name, for a list
|
|
|
|
|
* @return String
|
2008-04-05 18:11:23 +00:00
|
|
|
*/
|
|
|
|
|
function getWikiText( $shortContext = false, $longContext = false ) {
|
|
|
|
|
if ( count( $this->errors ) == 0 ) {
|
|
|
|
|
if ( $this->ok ) {
|
|
|
|
|
$this->fatal( 'internalerror_info',
|
|
|
|
|
__METHOD__." called for a good result, this is incorrect\n" );
|
|
|
|
|
} else {
|
2008-04-14 07:45:50 +00:00
|
|
|
$this->fatal( 'internalerror_info',
|
2008-04-05 18:11:23 +00:00
|
|
|
__METHOD__.": Invalid result object: no error text but not OK\n" );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ( count( $this->errors ) == 1 ) {
|
2010-07-07 02:53:19 +00:00
|
|
|
$s = $this->getWikiTextForError( $this->errors[0], $this->errors[0] );
|
2008-04-05 18:11:23 +00:00
|
|
|
if ( $shortContext ) {
|
|
|
|
|
$s = wfMsgNoTrans( $shortContext, $s );
|
|
|
|
|
} elseif ( $longContext ) {
|
|
|
|
|
$s = wfMsgNoTrans( $longContext, "* $s\n" );
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2010-07-07 02:53:19 +00:00
|
|
|
$s = '* '. implode("\n* ",
|
|
|
|
|
$this->getWikiTextArray( $this->errors ) ) . "\n";
|
2008-04-05 18:11:23 +00:00
|
|
|
if ( $longContext ) {
|
|
|
|
|
$s = wfMsgNoTrans( $longContext, $s );
|
|
|
|
|
} elseif ( $shortContext ) {
|
In Special:RevisionDelete:
* Refactored to remove massive duplication
* Removed page parameter and associated contextPage member variable, doesn't seem to do anything.
* Put ID lists into a single ids parameter and member variable instead of having one for each type.
* Fixed inappropriate call of Title::newFromUrl(), always wrong
* Don't pretend to use the return value from functions that don't return anything, this reduces readability.
* Use the table names for deleteKey/typeName values, they look more like English
* Use protected not private
* Remove requirement for log type to be specified in the target
* Use POST for RevisionDelete entry forms, to avoid URL size limits and issues with non-PATH_INFO URLs
* Don't purge all pages that use the given file
* LocalFile::purgeCache() already calls purgeHistory,() no need to do it again. But do call purgeDescription().
* Removed token from unhide=1 links, unnecessary
* Tokens are necessary on file streaming links, added them
* Fixed private data leakage due to incorrect use of LocalRepo::newFromArchiveName(). Non-existent placeholder file was returned which meant that $oimage->userCan(File::DELETED_FILE) was always true. Pass the archive name to tryShowFile() instead of the storage key.
* Using ls_field='oi_timestamp' is not correct, oi_timestamp refers to the timestamp of the revision in question, whereas the key that is stored is the timestamp of the previous revision (i.e. the timestamp in oi_archive_name). oi_archive_name would be more correct, although only half the field is used.
Elsewhere:
* Added missing message filehist-missing
* Fixed double asterisk in Status::getWikiText()
* Fixed escaping of the target parameter to Special:RevisionDelete from ImagePage
* Deleted FileStore.php. Deprecated in filerepo refactor except for get()/export() but somehow resurrected by RevisionDelete. Hopefully this will be the end of it. New interfaces will be added for wfStreamFile() in a later commit.
* Added convenience function File::getStorageKey(), factored out of Special:Undelete
* Added convenience function Revision::newFromArchiveRow(), factored out of Special:Undelete and Special:RevisionDelete
* Fixed notice in Special:Upload, uninitialised $pageText
FIXME: current revision can be suppressed on undeletion causing an unauthenticated unsuppress. Comments indicate this is a known issue. I fixed the parser cache pollution in this case but not the rest.
2009-06-01 11:37:06 +00:00
|
|
|
$s = wfMsgNoTrans( $shortContext, "\n$s\n" );
|
2008-04-05 18:11:23 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return $s;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-07 02:53:19 +00:00
|
|
|
/**
|
|
|
|
|
* Return the wiki text for a single error.
|
|
|
|
|
* @param $error Mixed With an array & two values keyed by
|
|
|
|
|
* 'message' and 'params', use those keys-value pairs.
|
|
|
|
|
* Otherwise, if its an array, just use the first value as the
|
|
|
|
|
* message and the remaining items as the params.
|
|
|
|
|
*
|
|
|
|
|
* @return String
|
|
|
|
|
*/
|
|
|
|
|
protected function getWikiTextForError( $error ) {
|
|
|
|
|
if ( is_array( $error ) ) {
|
|
|
|
|
if ( isset( $error['message'] ) && isset( $error['params'] ) ) {
|
2011-04-23 17:42:34 +00:00
|
|
|
return wfMsgNoTrans( $error['message'],
|
|
|
|
|
array_map( 'wfEscapeWikiText', $this->cleanParams( $error['params'] ) ) );
|
2010-07-07 02:53:19 +00:00
|
|
|
} else {
|
|
|
|
|
$message = array_shift($error);
|
2011-04-23 17:42:34 +00:00
|
|
|
return wfMsgNoTrans( $message,
|
|
|
|
|
array_map( 'wfEscapeWikiText', $this->cleanParams( $error ) ) );
|
2010-07-07 02:53:19 +00:00
|
|
|
}
|
|
|
|
|
} else {
|
2011-04-23 17:42:34 +00:00
|
|
|
return wfMsgNoTrans( $error );
|
2010-07-07 02:53:19 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Return an array with the wikitext for each item in the array.
|
|
|
|
|
* @param $errors Array
|
|
|
|
|
* @return Array
|
|
|
|
|
*/
|
|
|
|
|
function getWikiTextArray( $errors ) {
|
|
|
|
|
return array_map( array( $this, 'getWikiTextForError' ), $errors );
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-05 18:11:23 +00:00
|
|
|
/**
|
|
|
|
|
* Merge another status object into this one
|
2010-04-01 21:16:53 +00:00
|
|
|
*
|
2011-02-19 00:44:38 +00:00
|
|
|
* @param $other Status Other Status object
|
2010-04-01 21:16:53 +00:00
|
|
|
* @param $overwriteValue Boolean: whether to override the "value" member
|
2008-04-05 18:11:23 +00:00
|
|
|
*/
|
|
|
|
|
function merge( $other, $overwriteValue = false ) {
|
|
|
|
|
$this->errors = array_merge( $this->errors, $other->errors );
|
|
|
|
|
$this->ok = $this->ok && $other->ok;
|
|
|
|
|
if ( $overwriteValue ) {
|
|
|
|
|
$this->value = $other->value;
|
|
|
|
|
}
|
|
|
|
|
$this->successCount += $other->successCount;
|
|
|
|
|
$this->failCount += $other->failCount;
|
|
|
|
|
}
|
2010-02-09 08:39:37 +00:00
|
|
|
|
2010-04-01 21:16:53 +00:00
|
|
|
/**
|
|
|
|
|
* Get the list of errors (but not warnings)
|
|
|
|
|
*
|
|
|
|
|
* @return Array
|
|
|
|
|
*/
|
2008-05-30 19:59:47 +00:00
|
|
|
function getErrorsArray() {
|
2010-07-10 09:26:42 +00:00
|
|
|
return $this->getStatusArray( "error" );
|
2010-07-07 02:53:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Get the list of warnings (but not errors)
|
|
|
|
|
*
|
|
|
|
|
* @return Array
|
|
|
|
|
*/
|
|
|
|
|
function getWarningsArray() {
|
2010-07-10 09:26:42 +00:00
|
|
|
return $this->getStatusArray( "warning" );
|
2010-07-07 02:53:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Returns a list of status messages of the given type
|
|
|
|
|
* @param $type String
|
|
|
|
|
*
|
|
|
|
|
* @return Array
|
|
|
|
|
*/
|
2010-07-10 09:26:42 +00:00
|
|
|
protected function getStatusArray( $type ) {
|
2008-05-30 19:59:47 +00:00
|
|
|
$result = array();
|
|
|
|
|
foreach ( $this->errors as $error ) {
|
2010-07-07 02:53:19 +00:00
|
|
|
if ( $error['type'] === $type ) {
|
|
|
|
|
if( $error['params'] ) {
|
2009-03-29 13:42:29 +00:00
|
|
|
$result[] = array_merge( array( $error['message'] ), $error['params'] );
|
2010-07-07 02:53:19 +00:00
|
|
|
} else {
|
2011-02-25 04:51:17 +00:00
|
|
|
$result[] = array( $error['message'] );
|
2010-07-07 02:53:19 +00:00
|
|
|
}
|
|
|
|
|
}
|
2008-05-30 19:59:47 +00:00
|
|
|
}
|
|
|
|
|
return $result;
|
|
|
|
|
}
|
2011-08-11 22:35:49 +00:00
|
|
|
|
2011-03-05 17:23:35 +00:00
|
|
|
/**
|
|
|
|
|
* Returns a list of status messages of the given type, with message and
|
|
|
|
|
* params left untouched, like a sane version of getStatusArray
|
2011-08-11 22:35:49 +00:00
|
|
|
*
|
2011-03-05 17:23:35 +00:00
|
|
|
* @param $type String
|
|
|
|
|
*
|
|
|
|
|
* @return Array
|
|
|
|
|
*/
|
|
|
|
|
public function getErrorsByType( $type ) {
|
|
|
|
|
$result = array();
|
|
|
|
|
foreach ( $this->errors as $error ) {
|
|
|
|
|
if ( $error['type'] === $type ) {
|
|
|
|
|
$result[] = $error;
|
2011-08-11 22:35:49 +00:00
|
|
|
}
|
2011-03-05 17:23:35 +00:00
|
|
|
}
|
|
|
|
|
return $result;
|
|
|
|
|
}
|
2011-03-24 00:43:27 +00:00
|
|
|
|
2008-06-10 15:38:13 +00:00
|
|
|
/**
|
|
|
|
|
* Returns true if the specified message is present as a warning or error
|
2010-04-01 21:16:53 +00:00
|
|
|
*
|
|
|
|
|
* @param $msg String: message name
|
|
|
|
|
* @return Boolean
|
2008-06-10 15:38:13 +00:00
|
|
|
*/
|
|
|
|
|
function hasMessage( $msg ) {
|
|
|
|
|
foreach ( $this->errors as $error ) {
|
|
|
|
|
if ( $error['message'] === $msg ) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2010-12-04 13:27:05 +00:00
|
|
|
|
* Made the web upgrade process more friendly. Instead of saying "access denied, go away" when the user has a normal LocalSettings.php file, generate a random $wgUpgradeKey and instruct the user to insert it into their LocalSettings.php. The subsequent file modification then authenticates the session and allows the upgrade.
* When an upgrade key is entered, or a supplied upgrade key is edited into LocalSettings.php by the upgrader, fetch database settings from LocalSettings.php and AdminSettings.php for use during the upgrade. This allows the DBConnect page to be skipped, making web upgrade almost as easy to use as CLI upgrade.
* Made LocalSettingsGenerator add $wgUpgradeKey in non-commented form, for easier subsequent upgrades.
* Converted the $wgUpgradeKey check to a normal in-sequence page, called ExistingWiki. This allows the removal of related special cases from WebInstaller. The code for WebInstaller_ExistingWiki is loosely based on WebInstaller_Locked.
* Added Status::replaceMessage(), to support informative DB connection error messages from the ExistingWiki page.
* In WebInstaller::getInfoBox(), call parse() with $lineStart=true, so that line-start syntax like bullet points can work.
* Reduced the length of the generated $wgUpgradeKey from 64 to 16. This is ample for what it does, and makes it fit on the screen and not overlap with the right sidebar when when displayed by WebInstaller_ExistingWiki.
* Added $wgUpgradeKey to DefaultSettings.php.
2010-12-09 08:24:54 +00:00
|
|
|
/**
|
2011-08-11 22:35:49 +00:00
|
|
|
* If the specified source message exists, replace it with the specified
|
* Made the web upgrade process more friendly. Instead of saying "access denied, go away" when the user has a normal LocalSettings.php file, generate a random $wgUpgradeKey and instruct the user to insert it into their LocalSettings.php. The subsequent file modification then authenticates the session and allows the upgrade.
* When an upgrade key is entered, or a supplied upgrade key is edited into LocalSettings.php by the upgrader, fetch database settings from LocalSettings.php and AdminSettings.php for use during the upgrade. This allows the DBConnect page to be skipped, making web upgrade almost as easy to use as CLI upgrade.
* Made LocalSettingsGenerator add $wgUpgradeKey in non-commented form, for easier subsequent upgrades.
* Converted the $wgUpgradeKey check to a normal in-sequence page, called ExistingWiki. This allows the removal of related special cases from WebInstaller. The code for WebInstaller_ExistingWiki is loosely based on WebInstaller_Locked.
* Added Status::replaceMessage(), to support informative DB connection error messages from the ExistingWiki page.
* In WebInstaller::getInfoBox(), call parse() with $lineStart=true, so that line-start syntax like bullet points can work.
* Reduced the length of the generated $wgUpgradeKey from 64 to 16. This is ample for what it does, and makes it fit on the screen and not overlap with the right sidebar when when displayed by WebInstaller_ExistingWiki.
* Added $wgUpgradeKey to DefaultSettings.php.
2010-12-09 08:24:54 +00:00
|
|
|
* destination message, but keep the same parameters as in the original error.
|
|
|
|
|
*
|
|
|
|
|
* Return true if the replacement was done, false otherwise.
|
2011-05-21 20:06:57 +00:00
|
|
|
*
|
|
|
|
|
* @return bool
|
* Made the web upgrade process more friendly. Instead of saying "access denied, go away" when the user has a normal LocalSettings.php file, generate a random $wgUpgradeKey and instruct the user to insert it into their LocalSettings.php. The subsequent file modification then authenticates the session and allows the upgrade.
* When an upgrade key is entered, or a supplied upgrade key is edited into LocalSettings.php by the upgrader, fetch database settings from LocalSettings.php and AdminSettings.php for use during the upgrade. This allows the DBConnect page to be skipped, making web upgrade almost as easy to use as CLI upgrade.
* Made LocalSettingsGenerator add $wgUpgradeKey in non-commented form, for easier subsequent upgrades.
* Converted the $wgUpgradeKey check to a normal in-sequence page, called ExistingWiki. This allows the removal of related special cases from WebInstaller. The code for WebInstaller_ExistingWiki is loosely based on WebInstaller_Locked.
* Added Status::replaceMessage(), to support informative DB connection error messages from the ExistingWiki page.
* In WebInstaller::getInfoBox(), call parse() with $lineStart=true, so that line-start syntax like bullet points can work.
* Reduced the length of the generated $wgUpgradeKey from 64 to 16. This is ample for what it does, and makes it fit on the screen and not overlap with the right sidebar when when displayed by WebInstaller_ExistingWiki.
* Added $wgUpgradeKey to DefaultSettings.php.
2010-12-09 08:24:54 +00:00
|
|
|
*/
|
|
|
|
|
function replaceMessage( $source, $dest ) {
|
|
|
|
|
$replaced = false;
|
|
|
|
|
foreach ( $this->errors as $index => $error ) {
|
|
|
|
|
if ( $error['message'] === $source ) {
|
|
|
|
|
$this->errors[$index]['message'] = $dest;
|
|
|
|
|
$replaced = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return $replaced;
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-04 13:27:05 +00:00
|
|
|
/**
|
|
|
|
|
* Backward compatibility function for WikiError -> Status migration
|
|
|
|
|
*
|
|
|
|
|
* @return String
|
|
|
|
|
*/
|
|
|
|
|
public function getMessage() {
|
|
|
|
|
return $this->getWikiText();
|
|
|
|
|
}
|
2012-03-12 16:55:25 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @return mixed
|
|
|
|
|
*/
|
|
|
|
|
public function getValue() {
|
|
|
|
|
return $this->value;
|
|
|
|
|
}
|
2008-04-05 18:11:23 +00:00
|
|
|
}
|