2008-04-05 18:11:23 +00:00
|
|
|
<?php
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 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 */
|
|
|
|
|
var $successCount = 0, $failCount = 0;
|
|
|
|
|
|
|
|
|
|
/*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
|
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
|
|
|
|
|
*/
|
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
|
|
|
|
|
*
|
|
|
|
|
* @param $ok Boolean: whether to operation completed
|
|
|
|
|
* @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;
|
|
|
|
|
}
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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" .
|
|
|
|
|
Xml::element( 'text', null, wfMsgReal( $item['message'], $params ) ) ."\n";
|
|
|
|
|
foreach ( $params as $param ) {
|
|
|
|
|
$xml .= Xml::element( 'param', null, $param );
|
|
|
|
|
}
|
|
|
|
|
$xml .= "</{$this->type}>\n";
|
|
|
|
|
return $xml;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Get the error list as XML
|
|
|
|
|
*/
|
|
|
|
|
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 ) {
|
|
|
|
|
$params = array_map( 'wfEscapeWikiText', $this->cleanParams( $this->errors[0]['params'] ) );
|
|
|
|
|
$s = wfMsgReal( $this->errors[0]['message'], $params, true, false, false );
|
|
|
|
|
if ( $shortContext ) {
|
|
|
|
|
$s = wfMsgNoTrans( $shortContext, $s );
|
|
|
|
|
} elseif ( $longContext ) {
|
|
|
|
|
$s = wfMsgNoTrans( $longContext, "* $s\n" );
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
$s = '';
|
|
|
|
|
foreach ( $this->errors as $error ) {
|
|
|
|
|
$params = array_map( 'wfEscapeWikiText', $this->cleanParams( $error['params'] ) );
|
|
|
|
|
$s .= '* ' . wfMsgReal( $error['message'], $params, true, false, false ) . "\n";
|
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Merge another status object into this one
|
2010-04-01 21:16:53 +00:00
|
|
|
*
|
|
|
|
|
* @param $other Other Status object
|
|
|
|
|
* @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() {
|
|
|
|
|
$result = array();
|
|
|
|
|
foreach ( $this->errors as $error ) {
|
|
|
|
|
if ( $error['type'] == 'error' )
|
2009-03-29 13:42:29 +00:00
|
|
|
if( $error['params'] )
|
|
|
|
|
$result[] = array_merge( array( $error['message'] ), $error['params'] );
|
|
|
|
|
else
|
|
|
|
|
$result[] = $error['message'];
|
2008-05-30 19:59:47 +00:00
|
|
|
}
|
|
|
|
|
return $result;
|
|
|
|
|
}
|
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;
|
|
|
|
|
}
|
2008-04-05 18:11:23 +00:00
|
|
|
}
|