}
protected function getFormFields() {
- return array(
- 'From' => array(
+ return [
+ 'From' => [
'type' => 'info',
'raw' => 1,
'default' => Linker::link(
),
'label-message' => 'emailfrom',
'id' => 'mw-emailuser-sender',
- ),
- 'To' => array(
+ ],
+ 'To' => [
'type' => 'info',
'raw' => 1,
'default' => Linker::link(
),
'label-message' => 'emailto',
'id' => 'mw-emailuser-recipient',
- ),
- 'Target' => array(
+ ],
+ 'Target' => [
'type' => 'hidden',
'default' => $this->mTargetObj->getName(),
- ),
- 'Subject' => array(
+ ],
+ 'Subject' => [
'type' => 'text',
'default' => $this->msg( 'defemailsubject',
$this->getUser()->getName() )->inContentLanguage()->text(),
'maxlength' => 200,
'size' => 60,
'required' => true,
- ),
- 'Text' => array(
+ ],
+ 'Text' => [
'type' => 'textarea',
'rows' => 20,
'cols' => 80,
'label-message' => 'emailmessage',
'required' => true,
- ),
- 'CCMe' => array(
+ ],
+ 'CCMe' => [
'type' => 'check',
'label-message' => 'emailccme',
'default' => $this->getUser()->getBoolOption( 'ccmeonemails' ),
- ),
- );
+ ],
+ ];
}
public function execute( $par ) {
$this->mTargetObj = $ret;
+ // Set the 'relevant user' in the skin, so it displays links like Contributions,
+ // User logs, UserRights, etc.
+ $this->getSkin()->setRelevantUser( $this->mTargetObj );
+
$context = new DerivativeContext( $this->getContext() );
$context->setTitle( $this->getPageTitle() ); // Remove subpage
$form = new HTMLForm( $this->getFormFields(), $context );
// By now we are supposed to be sure that $this->mTarget is a user name
$form->addPreText( $this->msg( 'emailpagetext', $this->mTarget )->parse() );
$form->setSubmitTextMsg( 'emailsend' );
- $form->setSubmitCallback( array( __CLASS__, 'uiSubmit' ) );
+ $form->setSubmitCallback( [ __CLASS__, 'uiSubmit' ] );
$form->setWrapperLegendMsg( 'email-legend' );
$form->loadData();
- if ( !Hooks::run( 'EmailUserForm', array( &$form ) ) ) {
+ if ( !Hooks::run( 'EmailUserForm', [ &$form ] ) ) {
return;
}
$hookErr = false;
- Hooks::run( 'UserCanSendEmail', array( &$user, &$hookErr ) );
- Hooks::run( 'EmailUserPermissionsErrors', array( $user, $editToken, &$hookErr ) );
+ Hooks::run( 'UserCanSendEmail', [ &$user, &$hookErr ] );
+ Hooks::run( 'EmailUserPermissionsErrors', [ $user, $editToken, &$hookErr ] );
if ( $hookErr ) {
return $hookErr;
*/
protected function userForm( $name ) {
$this->getOutput()->addModules( 'mediawiki.userSuggest' );
- $string = Xml::openElement(
- 'form',
- array( 'method' => 'get', 'action' => wfScript(), 'id' => 'askusername' )
- ) .
+ $string = Html::openElement(
+ 'form',
+ [ 'method' => 'get', 'action' => wfScript(), 'id' => 'askusername' ]
+ ) .
Html::hidden( 'title', $this->getPageTitle()->getPrefixedText() ) .
- Xml::openElement( 'fieldset' ) .
+ Html::openElement( 'fieldset' ) .
Html::rawElement( 'legend', null, $this->msg( 'emailtarget' )->parse() ) .
- Xml::inputLabel(
+ Html::label(
$this->msg( 'emailusername' )->text(),
+ 'emailusertarget'
+ ) . ' ' .
+ Html::input(
'target',
- 'emailusertarget',
- 30,
$name,
- array(
+ 'text',
+ [
+ 'id' => 'emailusertarget',
'class' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
'autofocus' => true,
- )
+ 'size' => 30,
+ ]
) .
' ' .
- Xml::submitButton( $this->msg( 'emailusernamesubmit' )->text() ) .
- Xml::closeElement( 'fieldset' ) .
- Xml::closeElement( 'form' ) . "\n";
+ Html::submitButton( $this->msg( 'emailusernamesubmit' )->text(), [] ) .
+ Html::closeElement( 'fieldset' ) .
+ Html::closeElement( 'form' ) . "\n";
return $string;
}
$from->name, $to->name )->inContentLanguage()->text();
$error = '';
- if ( !Hooks::run( 'EmailUser', array( &$to, &$from, &$subject, &$text, &$error ) ) ) {
+ if ( !Hooks::run( 'EmailUser', [ &$to, &$from, &$subject, &$text, &$error ] ) ) {
return $error;
}
$replyTo = null;
}
- $status = UserMailer::send( $to, $mailFrom, $subject, $text, array(
+ $status = UserMailer::send( $to, $mailFrom, $subject, $text, [
'replyTo' => $replyTo,
- ) );
+ ] );
if ( !$status->isGood() ) {
return $status;
// unless they are emailing themselves, in which case one
// copy of the message is sufficient.
if ( $data['CCMe'] && $to != $from ) {
- $cc_subject = $context->msg( 'emailccsubject' )->rawParams(
+ $ccTo = $from;
+ $ccFrom = $from;
+ $ccSubject = $context->msg( 'emailccsubject' )->rawParams(
$target->getName(), $subject )->text();
-
- // target and sender are equal, because this is the CC for the sender
- Hooks::run( 'EmailUserCC', array( &$from, &$from, &$cc_subject, &$text ) );
-
- $ccStatus = UserMailer::send( $from, $from, $cc_subject, $text );
+ $ccText = $text;
+
+ Hooks::run( 'EmailUserCC', [ &$ccTo, &$ccFrom, &$ccSubject, &$ccText ] );
+
+ if ( $config->get( 'UserEmailUseReplyTo' ) ) {
+ $mailFrom = new MailAddress(
+ $config->get( 'PasswordSender' ),
+ wfMessage( 'emailsender' )->inContentLanguage()->text()
+ );
+ $replyTo = $ccFrom;
+ } else {
+ $mailFrom = $ccFrom;
+ $replyTo = null;
+ }
+
+ $ccStatus = UserMailer::send(
+ $ccTo, $mailFrom, $ccSubject, $ccText, [
+ 'replyTo' => $replyTo,
+ ] );
$status->merge( $ccStatus );
}
- Hooks::run( 'EmailUserComplete', array( $to, $from, $subject, $text ) );
+ Hooks::run( 'EmailUserComplete', [ $to, $from, $subject, $text ] );
return $status;
}
$user = User::newFromName( $search );
if ( !$user ) {
// No prefix suggestion for invalid user
- return array();
+ return [];
}
// Autocomplete subpage as user list - public to allow caching
return UserNamePrefixSearch::search( 'public', $search, $limit, $offset );
dépôts / lhc / web / wiklou.git / blobdiff