}
$value = rtrim( $request->getText( $this->mName ), "\r\n" );
- $ips = $value === '' ? [] : explode( PHP_EOL, $value );
+ $ips = $value === '' ? [] : explode( "\n", $value );
try {
return MWRestrictions::newFromArray( [ 'IPAddresses' => $ips ] );
} catch ( InvalidArgumentException $e ) {
* @param string|MWRestrictions $value The value the field was submitted with
* @param array $alldata The data collected from the form
*
- * @return bool|string True on success, or String error to display, or
+ * @return bool|string|Message True on success, or String/Message error to display, or
* false to fail validation without displaying an error.
*/
public function validate( $value, $alldata ) {
isset( $this->mParams['required'] ) && $this->mParams['required'] !== false
&& $value instanceof MWRestrictions && !$value->toArray()['IPAddresses']
) {
- return $this->msg( 'htmlform-required' )->parse();
+ return $this->msg( 'htmlform-required' );
}
if ( is_string( $value ) ) {
// MWRestrictions::newFromArray failed; one of the IP ranges must be invalid
$status = Status::newGood();
- foreach ( explode( PHP_EOL, $value ) as $range ) {
+ foreach ( explode( "\n", $value ) as $range ) {
if ( !\IP::isIPAddress( $range ) ) {
$status->fatal( 'restrictionsfield-badip', $range );
}
if ( $status->isOK() ) {
$status->fatal( 'unknown-error' );
}
- return $status->getMessage()->parse();
+ return $status->getMessage();
}
if ( isset( $this->mValidationCallback ) ) {
*/
public function getInputHTML( $value ) {
if ( $value instanceof MWRestrictions ) {
- $value = implode( PHP_EOL, $value->toArray()['IPAddresses'] );
+ $value = implode( "\n", $value->toArray()['IPAddresses'] );
}
return parent::getInputHTML( $value );
}
*/
public function getInputOOUI( $value ) {
if ( $value instanceof MWRestrictions ) {
- $value = implode( PHP_EOL, $value->toArray()['IPAddresses'] );
+ $value = implode( "\n", $value->toArray()['IPAddresses'] );
}
return parent::getInputOOUI( $value );
}