Attachment #3904 for bug #8085

(-)a/classes/controllers/grid/citation/PKPCitationGridHandler.inc.php (-4 lines)

Lines 486-495 class PKPCitationGridHandler extends GridHandler {	Link Here

486

		import('lib.pkp.classes.mail.Mail');

486

		import('lib.pkp.classes.mail.Mail');

487

		$mail = new Mail();

487

		$mail = new Mail();

488

489

		// Sender

490

		$user =& $request->getUser();

491

		$mail->setFrom($user->getEmail(), $user->getFullName());

492

493

		// Recipient

489

		// Recipient

494

		$assocObject =& $this->getAssocObject();

490

		$assocObject =& $this->getAssocObject();

495

		$author =& $assocObject->getUser();

491

		$author =& $assocObject->getUser();




	}

	/**
	 * Set the reply-to of the message.
	 * @param $email string or null to clear
	 * @param $name string optional
	 */
	function setReplyTo($email, $name = '') {
		if ($email === null) $this->setData('replyTo', null);
		return $this->setData('replyTo', array('name' => $name, 'email' => $email));
	}

	/**
	 * Get the reply-to of the message.
	 * @return array
	 */
	function getReplyTo() {
		return $this->getData('replyTo');
	}

	/**
	 * Return a string containing the reply-to address.
	 * @return string
	 */
	function getReplyToString($send = false) {
		$replyTo = $this->getReplyTo();
		if ($replyTo == null) {
			return null;
		} else {
			return (Mail::encodeDisplayName($replyTo['name'], $send) . ' <'.$replyTo['email'].'>');
		}
	}

	/**
	 * Set the subject of the message.
	 * @param $subject string
	 */

			$this->addHeader('From', $from);
		}

		if (($r = $this->getReplyToString()) != '') {
			$this->addHeader('Reply-To', $r);
		}

		$ccs = $this->getAddressArrayString($this->getCcs(), true, true);
		if ($ccs != null) {
			$this->addHeader('Cc', $ccs);

	/**
	 * Encode a display name for proper inclusion with an email address.
	 * @param $displayName string
	 * @param $send boolean True to encode the results for sending
	 * @return string
	 */
	function encodeDisplayName($displayName, $send = false) {




		import('classes.mail.MailTemplate');
		$site =& $request->getSite();
		$mail = new MailTemplate('NOTIFICATION', null, null, null, true, true);
		$mail->setReplyTo($site->getLocalizedContactEmail(), $site->getLocalizedContactName());
		$mail->assignParams(array(
			'notificationContents' => $this->getNotificationContents($request, $notification),
			'url' => $this->getNotificationUrl($request, $notification),

			$dispatcher =& $router->getDispatcher();

			$mail = new MailTemplate('NOTIFICATION_MAILLIST');
			$mail->setReplyTo($site->getLocalizedContactEmail(), $site->getLocalizedContactName());
			$mail->assignParams(array(
				'notificationContents' => $this->getNotificationContents($request, $notification),
				'url' => $this->getNotificationUrl($request, $notification),

		}

		$mail = new MailTemplate($template);
		$mail->setReplyTo($site->getLocalizedContactEmail(), $site->getLocalizedContactName());
		$mail->assignParams($params);
		$mail->addRecipient($email);
		$mail->send();

(-)a/lib/pkp/templates/email/email.tpl (-4 lines)

Lines 145-154 function deleteAttachment(fileId) {	Link Here

145

	<td colspan="2">&nbsp;</td>

145

	<td colspan="2">&nbsp;</td>

146

</tr>

146

</tr>

147

<tr valign="top">

147

<tr valign="top">

148

	<td class="label">{translate key="email.from"}</td>

149

	<td class="value">{$from|escape}</td>

150

</tr>

151

<tr valign="top">

152

	<td width="20%" class="label">{fieldLabel name="subject" key="email.subject"}</td>

148

	<td width="20%" class="label">{fieldLabel name="subject" key="email.subject"}</td>

153

	<td width="80%" class="value"><input type="text" id="subject" name="subject" value="{$subject|escape}" size="60" maxlength="120" class="textField" /></td>

149

	<td width="80%" class="value"><input type="text" id="subject" name="subject" value="{$subject|escape}" size="60" maxlength="120" class="textField" /></td>

154

</tr>

150

</tr>

(-)a/classes/author/form/submit/AuthorSubmitStep5Form.inc.php (-1 / +1 lines)

Lines 176-182 class AuthorSubmitStep5Form extends AuthorSubmitForm {	Link Here

176

		// Send author notification email

176

		// Send author notification email

177

		import('classes.mail.ArticleMailTemplate');

177

		import('classes.mail.ArticleMailTemplate');

178

		$mail = new ArticleMailTemplate($article, 'SUBMISSION_ACK', null, null, null, false);

178

		$mail = new ArticleMailTemplate($article, 'SUBMISSION_ACK', null, null, null, false);

179

		$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

179

		$mail->setReplyTo(null);

180

		if ($mail->isEnabled()) {

180

		if ($mail->isEnabled()) {

181

			$mail->addRecipient($user->getEmail(), $user->getFullName());

181

			$mail->addRecipient($user->getEmail(), $user->getFullName());

182

			// If necessary, BCC the acknowledgement to someone.

182

			// If necessary, BCC the acknowledgement to someone.




		// Default "From" to user if available, otherwise site/journal principal contact
		$user =& Request::getUser();
		if ($user) {
			$this->setReplyTo($user->getEmail(), $user->getFullName());
		}
		if (is_null($journal) || is_null($journal->getSetting('contactEmail'))) {
			$site =& Request::getSite();
			$this->setFrom($site->getLocalizedContactEmail(), $site->getLocalizedContactName());


	 */
	function send($clearAttachments = true) {
		if (isset($this->journal)) {
			//If {$templateSignature} and/or {$templateHeader}
			// exist in the body of the message, replace them with
			// the journal signature; otherwise just pre/append
			// them. This is here to accomodate MIME-encoded
			// messages or other cases where the signature cannot
			// just be appended.
			$header = $this->journal->getSetting('emailHeader');
			if (strstr($this->getBody(), '{$templateHeader}') === false) {
				$this->setBody($header . "\n" . $this->getBody());
			} else {
				$this->setBody(str_replace('{$templateHeader}', $header, $this->getBody()));
			}

			$signature = $this->journal->getSetting('emailSignature');
			if (strstr($this->getBody(), '{$templateSignature}') === false) {
				$this->setBody($this->getBody() . "\n" . $signature);
			} else {
				$this->setBody(str_replace('{$templateSignature}', $signature, $this->getBody()));
			}

			$envelopeSender = $this->journal->getSetting('envelopeSender');

(-)a/classes/manager/form/UserManagementForm.inc.php (-1 / +1 lines)

Lines 353-359 class UserManagementForm extends Form {	Link Here

353

				// Send welcome email to user

353

				// Send welcome email to user

354

				import('classes.mail.MailTemplate');

354

				import('classes.mail.MailTemplate');

355

				$mail = new MailTemplate('USER_REGISTER');

355

				$mail = new MailTemplate('USER_REGISTER');

356

				$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

356

				$mail->setReplyTo(null);

357

				$mail->assignParams(array('username' => $this->getData('username'), 'password' => $password, 'userFullName' => $user->getFullName()));

357

				$mail->assignParams(array('username' => $this->getData('username'), 'password' => $password, 'userFullName' => $user->getFullName()));

358

				$mail->addRecipient($user->getEmail(), $user->getFullName());

358

				$mail->addRecipient($user->getEmail(), $user->getFullName());

359

				$mail->send();

359

				$mail->send();

(-)a/classes/manager/form/setup/JournalSetupStep1Form.inc.php (+1 lines)

Lines 49-54 class JournalSetupStep1Form extends JournalSetupForm {	Link Here

				'contributors' => 'object',

				'contributors' => 'object',

				'history' => 'string',

				'history' => 'string',

				'envelopeSender' => 'string',

				'envelopeSender' => 'string',

				'emailHeader' => 'string',

				'emailSignature' => 'string',

				'emailSignature' => 'string',

				'searchDescription' => 'string',

				'searchDescription' => 'string',

				'searchKeywords' => 'string',

				'searchKeywords' => 'string',

(-)a/classes/payment/ojs/OJSPaymentManager.inc.php (-2 / +2 lines)

Lines 426-432 class OJSPaymentManager extends PaymentManager {	Link Here

426

427

				import('classes.mail.MailTemplate');

427

				import('classes.mail.MailTemplate');

428

				$mail = new MailTemplate('GIFT_AVAILABLE', $giftLocale);

428

				$mail = new MailTemplate('GIFT_AVAILABLE', $giftLocale);

429

				$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

429

				$mail->setReplyTo(null);

430

				$mail->assignParams(array(

430

				$mail->assignParams(array(

431

					'giftJournalName' => $giftJournalName,

431

					'giftJournalName' => $giftJournalName,

432

					'giftNoteTitle' => $giftNoteTitle,

432

					'giftNoteTitle' => $giftNoteTitle,

Lines 459-465 class OJSPaymentManager extends PaymentManager {	Link Here

459

					$mail = new MailTemplate('GIFT_USER_LOGIN', $giftLocale);

459

					$mail = new MailTemplate('GIFT_USER_LOGIN', $giftLocale);

460

461

462

				$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

462

				$mail->setReplyTo(null);

463

				$mail->assignParams($params);

463

				$mail->assignParams($params);

464

				$mail->addRecipient($recipientEmail, $user->getFullName());

464

				$mail->addRecipient($recipientEmail, $user->getFullName());

465

				$mail->send();

465

				$mail->send();

(-)a/classes/sectionEditor/form/CreateReviewerForm.inc.php (-1 / +1 lines)

Lines 193-199 class CreateReviewerForm extends Form {	Link Here

193

			// Send welcome email to user

193

			// Send welcome email to user

194

			import('classes.mail.MailTemplate');

194

			import('classes.mail.MailTemplate');

195

			$mail = new MailTemplate('REVIEWER_REGISTER');

195

			$mail = new MailTemplate('REVIEWER_REGISTER');

196

			$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

196

			$mail->setReplyTo(null);

197

			$mail->assignParams(array('username' => $this->getData('username'), 'password' => $password, 'userFullName' => $user->getFullName()));

197

			$mail->assignParams(array('username' => $this->getData('username'), 'password' => $password, 'userFullName' => $user->getFullName()));

198

			$mail->addRecipient($user->getEmail(), $user->getFullName());

198

			$mail->addRecipient($user->getEmail(), $user->getFullName());

199

			$mail->send();

199

			$mail->send();

(-)a/classes/submission/form/comment/CommentForm.inc.php (-1 / +1 lines)

Lines 129-135 class CommentForm extends Form {	Link Here

129

130

		import('classes.mail.ArticleMailTemplate');

130

		import('classes.mail.ArticleMailTemplate');

131

		$email = new ArticleMailTemplate($article, 'SUBMISSION_COMMENT');

131

		$email = new ArticleMailTemplate($article, 'SUBMISSION_COMMENT');

132

		$email->setFrom($this->user->getEmail(), $this->user->getFullName());

132

		$email->setReplyTo($this->user->getEmail(), $this->user->getFullName());

133

134

		$commentText = $this->getData('comments');

134

		$commentText = $this->getData('comments');

135

(-)a/classes/submission/form/comment/EditCommentForm.inc.php (-1 / +1 lines)

Lines 292-298 class EditCommentForm extends Form {	Link Here

292

		import('classes.mail.ArticleMailTemplate');

292

		import('classes.mail.ArticleMailTemplate');

293

		$email = new ArticleMailTemplate($this->article, 'SUBMISSION_COMMENT');

293

		$email = new ArticleMailTemplate($this->article, 'SUBMISSION_COMMENT');

294

		$journal =& $request->getJournal();

294

		$journal =& $request->getJournal();

295

		if ($journal) $email->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

295

		$email->setReplyTo(null);

296

297

		foreach ($recipients as $emailAddress => $name) {

297

		foreach ($recipients as $emailAddress => $name) {

298

			$email->addRecipient($emailAddress, $name);

298

			$email->addRecipient($emailAddress, $name);

(-)a/classes/submission/reviewer/ReviewerAction.inc.php (-2 / +2 lines)

Lines 51-57 class ReviewerAction extends Action {	Link Here

			$email = new ArticleMailTemplate($reviewerSubmission, $decline?'REVIEW_DECLINE':'REVIEW_CONFIRM');

			$email = new ArticleMailTemplate($reviewerSubmission, $decline?'REVIEW_DECLINE':'REVIEW_CONFIRM');

			// Must explicitly set sender because we may be here on an access

			// Must explicitly set sender because we may be here on an access

			// key, in which case the user is not technically logged in

			// key, in which case the user is not technically logged in

			$email->setFrom($reviewer->getEmail(), $reviewer->getFullName());

			$email->setReplyTo($reviewer->getEmail(), $reviewer->getFullName());

			if (!$email->isEnabled() || ($send && !$email->hasErrors())) {

			if (!$email->isEnabled() || ($send && !$email->hasErrors())) {

				HookRegistry::call('ReviewerAction::confirmReview', array(&$reviewerSubmission, &$email, $decline));

				HookRegistry::call('ReviewerAction::confirmReview', array(&$reviewerSubmission, &$email, $decline));

				if ($email->isEnabled()) {

				if ($email->isEnabled()) {

Lines 131-137 class ReviewerAction extends Action {	Link Here

131

			$email = new ArticleMailTemplate($reviewerSubmission, 'REVIEW_COMPLETE');

131

			$email = new ArticleMailTemplate($reviewerSubmission, 'REVIEW_COMPLETE');

132

			// Must explicitly set sender because we may be here on an access

132

			// Must explicitly set sender because we may be here on an access

133

			// key, in which case the user is not technically logged in

133

			// key, in which case the user is not technically logged in

134

			$email->setFrom($reviewer->getEmail(), $reviewer->getFullName());

134

			$email->setReplyTo($reviewer->getEmail(), $reviewer->getFullName());

135

136

			if (!$email->isEnabled() || ($send && !$email->hasErrors())) {

136

			if (!$email->isEnabled() || ($send && !$email->hasErrors())) {

137

				HookRegistry::call('ReviewerAction::recordRecommendation', array(&$reviewerSubmission, &$email, $recommendation));

137

				HookRegistry::call('ReviewerAction::recordRecommendation', array(&$reviewerSubmission, &$email, $recommendation));

(-)a/classes/subscription/SubscriptionAction.inc.php (-1 / +1 lines)

Lines 647-653 class SubscriptionAction {	Link Here

647

648

		import('classes.mail.MailTemplate');

648

		import('classes.mail.MailTemplate');

649

		$mail = new MailTemplate($mailTemplateKey);

649

		$mail = new MailTemplate($mailTemplateKey);

650

		$mail->setFrom($subscriptionContactEmail, $subscriptionContactName);

650

		$mail->setReplyTo($subscriptionContactEmail, $subscriptionContactName);

651

		$mail->addRecipient($subscriptionContactEmail, $subscriptionContactName);

651

		$mail->addRecipient($subscriptionContactEmail, $subscriptionContactName);

652

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

652

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

653

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));

653

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));

(-)a/classes/subscription/form/SubscriptionForm.inc.php (-1 / +1 lines)

Lines 297-303 class SubscriptionForm extends Form {	Link Here

297

298

		import('classes.mail.MailTemplate');

298

		import('classes.mail.MailTemplate');

299

		$mail = new MailTemplate($mailTemplateKey);

299

		$mail = new MailTemplate($mailTemplateKey);

300

		$mail->setFrom($subscriptionEmail, $subscriptionName);

300

		$mail->setReplyTo($subscriptionEmail, $subscriptionName);

301

		$mail->addRecipient($user->getEmail(), $user->getFullName());

301

		$mail->addRecipient($user->getEmail(), $user->getFullName());

302

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

302

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

303

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));

303

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));

(-)a/classes/tasks/OpenAccessNotification.inc.php (-1 / +1 lines)

Lines 34-40 class OpenAccessNotification extends ScheduledTask {	Link Here

			$email = new MailTemplate('OPEN_ACCESS_NOTIFY', $journal->getPrimaryLocale());

			$email = new MailTemplate('OPEN_ACCESS_NOTIFY', $journal->getPrimaryLocale());

			$email->setSubject($email->getSubject($journal->getPrimaryLocale()));

			$email->setSubject($email->getSubject($journal->getPrimaryLocale()));

			$email->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

			$email->setReplyTo(null);

			$email->addRecipient($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

			$email->addRecipient($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

			$paramArray = array(

			$paramArray = array(

(-)a/classes/tasks/ReviewReminder.inc.php (-1 / +1 lines)

Lines 37-43 class ReviewReminder extends ScheduledTask {	Link Here

		$email = new ArticleMailTemplate($article, $reviewerAccessKeysEnabled?'REVIEW_REMIND_AUTO_ONECLICK':'REVIEW_REMIND_AUTO', $journal->getPrimaryLocale(), false, $journal);

		$email = new ArticleMailTemplate($article, $reviewerAccessKeysEnabled?'REVIEW_REMIND_AUTO_ONECLICK':'REVIEW_REMIND_AUTO', $journal->getPrimaryLocale(), false, $journal);

		$email->setJournal($journal);

		$email->setJournal($journal);

		$email->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

		$email->setReplyTo(null);

		$email->addRecipient($reviewer->getEmail(), $reviewer->getFullName());

		$email->addRecipient($reviewer->getEmail(), $reviewer->getFullName());

		$email->setSubject($email->getSubject($journal->getPrimaryLocale()));

		$email->setSubject($email->getSubject($journal->getPrimaryLocale()));

		$email->setBody($email->getBody($journal->getPrimaryLocale()));

		$email->setBody($email->getBody($journal->getPrimaryLocale()));

(-)a/classes/tasks/SubscriptionExpiryReminder.inc.php (-1 / +1 lines)

Lines 68-74 class SubscriptionExpiryReminder extends ScheduledTask {	Link Here

		import('classes.mail.MailTemplate');

		import('classes.mail.MailTemplate');

		$mail = new MailTemplate($emailKey, $journal->getPrimaryLocale());

		$mail = new MailTemplate($emailKey, $journal->getPrimaryLocale());

		$mail->setFrom($subscriptionEmail, $subscriptionName);

		$mail->setReplyTo($subscriptionEmail, $subscriptionName);

		$mail->addRecipient($user->getEmail(), $user->getFullName());

		$mail->addRecipient($user->getEmail(), $user->getFullName());

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));

(-)a/classes/user/form/RegistrationForm.inc.php (-2 / +2 lines)

Lines 332-338 class RegistrationForm extends Form {	Link Here

332

333

				// Send email validation request to user

333

				// Send email validation request to user

334

				$mail = new MailTemplate('USER_VALIDATE');

334

				$mail = new MailTemplate('USER_VALIDATE');

335

				$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

335

				$mail->setReplyTo(null);

336

				$mail->assignParams(array(

336

				$mail->assignParams(array(

337

					'userFullName' => $user->getFullName(),

337

					'userFullName' => $user->getFullName(),

338

					'activateUrl' => Request::url($journal->getPath(), 'user', 'activateUser', array($this->getData('username'), $accessKey))

338

					'activateUrl' => Request::url($journal->getPath(), 'user', 'activateUser', array($this->getData('username'), $accessKey))

Lines 344-350 class RegistrationForm extends Form {	Link Here

344

			if ($this->getData('sendPassword')) {

344

			if ($this->getData('sendPassword')) {

345

				// Send welcome email to user

345

				// Send welcome email to user

346

				$mail = new MailTemplate('USER_REGISTER');

346

				$mail = new MailTemplate('USER_REGISTER');

347

				$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

347

				$mail->setReplyTo(null);

348

				$mail->assignParams(array(

348

				$mail->assignParams(array(

349

					'username' => $this->getData('username'),

349

					'username' => $this->getData('username'),

350

					'password' => String::substr($this->getData('password'), 0, 30), // Prevent mailer abuse via long passwords

350

					'password' => String::substr($this->getData('password'), 0, 30), // Prevent mailer abuse via long passwords

(-)a/locale/en_US/default.xml (+2 lines)

Lines 129-134 Please follow the following protocol for making electronic revisions to your man	Link Here

129

	<pre>4. FORMATTING

129

	<pre>4. FORMATTING

130

	The paragraph that begins "This last topic..." is not indented.</pre>]]></message>

130

	The paragraph that begins "This last topic..." is not indented.</pre>]]></message>

131

132

	<message key="default.journalSettings.emailHeader">The following message is being delivered on behalf of {$journalName}.

133

________________________________________________________________________</message>

132

	<message key="default.journalSettings.emailSignature">________________________________________________________________________

134

	<message key="default.journalSettings.emailSignature">________________________________________________________________________

133

{$journalName}

135

{$journalName}

134

{$indexUrl}/{$journalPath}</message>

136

{$indexUrl}/{$journalPath}</message>

(-)a/locale/en_US/manager.xml (+2 lines)

Lines 258-263	Link Here

258

	<message key="manager.setup.emailBounceAddressDescription">Any undeliverable emails will result in an error message to this address.</message>

258

	<message key="manager.setup.emailBounceAddressDescription">Any undeliverable emails will result in an error message to this address.</message>

259

	<message key="manager.setup.emailBounceAddressDisabled"><![CDATA[<strong>Note:</strong> To activate this option, the site administrator must enable the <tt>allow_envelope_sender</tt> option in the OJS configuration file. Additional server configuration may be required to support this functionality (which may not be possible on all servers), as indicated in the OJS documentation.]]></message>

259

	<message key="manager.setup.emailBounceAddressDisabled"><![CDATA[<strong>Note:</strong> To activate this option, the site administrator must enable the <tt>allow_envelope_sender</tt> option in the OJS configuration file. Additional server configuration may be required to support this functionality (which may not be possible on all servers), as indicated in the OJS documentation.]]></message>

260

	<message key="manager.setup.emails">Email Identification</message>

260

	<message key="manager.setup.emails">Email Identification</message>

261

	<message key="manager.setup.emailHeader">Email Header</message>

262

	<message key="manager.setup.emailHeaderDescription">The prepared emails that are sent by the system on behalf of the journal will begin with the following header. These emails will be addressed from the Principal Contact, so it's important to clarify that the Primary Contact is not necessarily responsible for the message content, which may be sent on behalf of a different user.</message>

261

	<message key="manager.setup.emailSignature">Signature</message>

263

	<message key="manager.setup.emailSignature">Signature</message>

262

	<message key="manager.setup.emailSignatureDescription">The prepared emails that are sent by the system on behalf of the journal will have the following signature added to the end. The body of the prepared emails are available for editing under Journal Management.</message>

264

	<message key="manager.setup.emailSignatureDescription">The prepared emails that are sent by the system on behalf of the journal will have the following signature added to the end. The body of the prepared emails are available for editing under Journal Management.</message>

263

	<message key="manager.setup.enableAnnouncements">Enable Journal Managers to add journal announcements.</message>

265

	<message key="manager.setup.enableAnnouncements">Enable Journal Managers to add journal announcements.</message>

(-)a/pages/login/LoginHandler.inc.php (-2 / +2 lines)

107

108

		// Set the sender based on the current context

108

		// Set the sender based on the current context

109

		if ($journal && $journal->getSetting('supportEmail')) {

109

		if ($journal && $journal->getSetting('supportEmail')) {

110

			$mail->setFrom($journal->getSetting('supportEmail'), $journal->getSetting('supportName'));

110

			$mail->setReplyTo($journal->getSetting('supportEmail'), $journal->getSetting('supportName'));

111

		} else {

111

		} else {

112

			$mail->setFrom($site->getLocalizedContactEmail(), $site->getLocalizedContactName());

112

			$mail->setReplyTo($site->getLocalizedContactEmail(), $site->getLocalizedContactName());

113

114

115

(-)a/plugins/generic/booksForReview/classes/BooksForReviewReminder.inc.php (-1 / +1 lines)

Lines 40-46 class BooksForReviewReminder extends ScheduledTask {	Link Here

		import('classes.mail.MailTemplate');

		import('classes.mail.MailTemplate');

		$mail = new MailTemplate($emailKey);

		$mail = new MailTemplate($emailKey);

		$mail->setFrom($book->getEditorEmail(), $book->getEditorFullName());

		$mail->setReplyTo($book->getEditorEmail(), $book->getEditorFullName());

		$mail->addRecipient($book->getUserEmail(), $book->getUserFullName());

		$mail->addRecipient($book->getUserEmail(), $book->getUserFullName());

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

		$mail->setSubject($mail->getSubject($journal->getPrimaryLocale()));

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));

		$mail->setBody($mail->getBody($journal->getPrimaryLocale()));




						$user =& $request->getUser();
						$userId = $user->getId();

						$userFullName = $user->getFullName();
						$userEmail = $user->getEmail();

						$editorFullName = $book->getEditorFullName();
						$editorEmail = $book->getEditorEmail();


						);

						$email->addRecipient($editorEmail, $editorFullName);
						$email->setFrom($userEmail, $userFullName);
						$email->assignParams($paramArray);
					}
					$returnUrl = $request->url(null, 'author', 'requestBookForReview', $bookId);




						);

						$email->addRecipient($userEmail, $userName);
						$email->setReplyTo($book->getEditorEmail(), $book->getEditorFullName());
						$email->assignParams($paramArray);
					}
					$returnUrl = $request->url(null, 'editor', 'assignBookForReviewAuthor', $bookId, array('returnPage' => $returnPage, 'userId' => $userId));

					);

					$email->addRecipient($userEmail, $userFullName);
					$email->setReplyTo($book->getEditorEmail(), $book->getEditorFullName());
					$email->assignParams($paramArray);
				}
				$returnUrl = $request->url(null, 'editor', 'denyBookForReviewAuthor', $bookId, array('returnPage' => $returnPage));

					);

					$email->addRecipient($userEmail, $userFullName);
					$email->setReplyTo($book->getEditorEmail(), $book->getEditorFullName());
					$email->assignParams($paramArray);
				}
				$returnUrl = $request->url(null, 'editor', 'notifyBookForReviewMailed', $bookId, array('returnPage' => $returnPage));

					);

					$email->addRecipient($userEmail, $userFullName);
					$email->setReplyTo($book->getEditorEmail(), $book->getEditorFullName());
					$email->assignParams($paramArray);
				}
				$returnUrl = $request->url(null, 'editor', 'removeBookForReviewAuthor', $bookId, array('returnPage' => $returnPage));

(-)a/plugins/generic/sword/SwordPlugin.inc.php (-3 / +1 lines)

Lines 165-174 class SwordPlugin extends GenericPlugin {	Link Here

165

			$submittingUser =& $sectionEditorSubmission->getUser();

165

			$submittingUser =& $sectionEditorSubmission->getUser();

166

167

			import('classes.mail.ArticleMailTemplate');

167

			import('classes.mail.ArticleMailTemplate');

168

			$contactName = $journal->getSetting('contactName');

169

			$contactEmail = $journal->getSetting('contactEmail');

170

			$mail = new ArticleMailTemplate($sectionEditorSubmission, 'SWORD_DEPOSIT_NOTIFICATION', null, null, $journal, true, true);

168

			$mail = new ArticleMailTemplate($sectionEditorSubmission, 'SWORD_DEPOSIT_NOTIFICATION', null, null, $journal, true, true);

171

			$mail->setFrom($contactEmail, $contactName);

169

			$mail->setReplyTo(null);

172

			$mail->addRecipient($submittingUser->getEmail(), $submittingUser->getFullName());

170

			$mail->addRecipient($submittingUser->getEmail(), $submittingUser->getFullName());

173

171

174

			$mail->assignParams(array(

172

			$mail->assignParams(array(

(-)a/plugins/generic/thesis/StudentThesisForm.inc.php (-3 / +3 lines)

Lines 285-294 class StudentThesisForm extends Form {	Link Here

285

286

			import('classes.mail.MailTemplate');

286

			import('classes.mail.MailTemplate');

287

			$mail = new MailTemplate('THESIS_ABSTRACT_CONFIRM');

287

			$mail = new MailTemplate('THESIS_ABSTRACT_CONFIRM');

288

			$mail->setFrom($thesisEmail, "\"" . $thesisName . "\"");

288

			$mail->setReplyTo($thesisEmail, $thesisName);

289

			$mail->assignParams($paramArray);

289

			$mail->assignParams($paramArray);

290

			$mail->addRecipient($thesis->getSupervisorEmail(), "\"" . $supervisorName . "\"");

290

			$mail->addRecipient($thesis->getSupervisorEmail(), $supervisorName);

291

			$mail->addCc($thesis->getStudentEmail(), "\"" . $studentName . "\"");

291

			$mail->addCc($thesis->getStudentEmail(), $studentName);

292

			$mail->send();

292

			$mail->send();

293

294

(-)a/plugins/importexport/users/UserXMLParser.inc.php (-1 / +1 lines)

Lines 192-198 class UserXMLParser {	Link Here

192

193

			$journalDao =& DAORegistry::getDAO('JournalDAO');

193

			$journalDao =& DAORegistry::getDAO('JournalDAO');

194

			$journal =& $journalDao->getById($this->journalId);

194

			$journal =& $journalDao->getById($this->journalId);

195

			$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

195

			$mail->setReplyTo($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));

196

197

198

		for ($i=0, $count=count($this->usersToImport); $i < $count; $i++) {

198

		for ($i=0, $count=count($this->usersToImport); $i < $count; $i++) {

(-)a/plugins/paymethod/manual/ManualPaymentPlugin.inc.php (-1 / +1 lines)

Lines 125-131 class ManualPaymentPlugin extends PaymethodPlugin {	Link Here

125

				$contactName = $journal->getSetting('contactName');

125

				$contactName = $journal->getSetting('contactName');

126

				$contactEmail = $journal->getSetting('contactEmail');

126

				$contactEmail = $journal->getSetting('contactEmail');

127

				$mail = new MailTemplate('MANUAL_PAYMENT_NOTIFICATION');

127

				$mail = new MailTemplate('MANUAL_PAYMENT_NOTIFICATION');

128

				$mail->setFrom($contactEmail, $contactName);

128

				$mail->setReplyTo(null);

129

				$mail->addRecipient($contactEmail, $contactName);

129

				$mail->addRecipient($contactEmail, $contactName);

130

				$mail->assignParams(array(

130

				$mail->assignParams(array(

131

					'journalName' => $journal->getLocalizedTitle(),

131

					'journalName' => $journal->getLocalizedTitle(),

(-)a/plugins/paymethod/paypal/PayPalPlugin.inc.php (-1 / +1 lines)

Lines 168-174 class PayPalPlugin extends PaymethodPlugin {	Link Here

168

			$contactEmail = $journal->getSetting('contactEmail');

168

			$contactEmail = $journal->getSetting('contactEmail');

169

170

		$mail = new MailTemplate('PAYPAL_INVESTIGATE_PAYMENT');

170

		$mail = new MailTemplate('PAYPAL_INVESTIGATE_PAYMENT');

171

		$mail->setFrom($contactEmail, $contactName);

171

		$mail->setReplyTo(null);

172

		$mail->addRecipient($contactEmail, $contactName);

172

		$mail->addRecipient($contactEmail, $contactName);

173

174

		$paymentStatus = $request->getUserVar('payment_status');

174

		$paymentStatus = $request->getUserVar('payment_status');

(-)a/registry/journalSettings.xml (+4 lines)

Lines 51-56	Link Here

		<value>{translate key="default.journalSettings.copyeditInstructions"}</value>

		<value>{translate key="default.journalSettings.copyeditInstructions"}</value>

	</setting>

	</setting>

	<setting type="string" locale="0">

	<setting type="string" locale="0">

		<name>emailHeader</name>

		<value>{translate key="default.journalSettings.emailHeader"}</value>

	</setting>

	<setting type="string" locale="0">

		<name>emailSignature</name>

		<name>emailSignature</name>

		<value>{translate key="default.journalSettings.emailSignature"}</value>

		<value>{translate key="default.journalSettings.emailSignature"}</value>

	</setting>

	</setting>

(-)a/templates/editor/notifyUsersEmail.tpl (+3 lines)

Lines 1-3	Link Here

{literal}{$templateHeader}{/literal}

{$body}

{$body}

{$journal->getLocalizedTitle()|strip_tags}

{$journal->getLocalizedTitle()|strip_tags}

Lines 9-14	Link Here

{if $section.title}{$section.title}{/if}

{if $section.title}{$section.title}{/if}

--------

--------

{literal}{$templateHeader}{/literal}

{foreach from=$section.articles item=article}

{foreach from=$section.articles item=article}

{$article->getLocalizedTitle()|strip_tags}{if $article->getPages()} ({$article->getPages()}){/if}

{$article->getLocalizedTitle()|strip_tags}{if $article->getPages()} ({$article->getPages()}){/if}

(-)a/templates/manager/people/email.tpl (-4 lines)

Lines 136-145 function deleteAttachment(fileId) {	Link Here

136

	<td colspan="2">&nbsp;</td>

136

	<td colspan="2">&nbsp;</td>

137

</tr>

137

</tr>

138

<tr valign="top">

138

<tr valign="top">

139

	<td class="label">{translate key="email.from"}</td>

140

	<td class="value">{$from|escape}</td>

141

</tr>

142

<tr valign="top">

143

	<td width="20%" class="label">{fieldLabel name="subject" key="email.subject"}</td>

139

	<td width="20%" class="label">{fieldLabel name="subject" key="email.subject"}</td>

144

	<td width="80%" class="value"><input type="text" id="subject" name="subject" value="{$subject|escape}" size="60" maxlength="120" class="textField" /></td>

140

	<td width="80%" class="value"><input type="text" id="subject" name="subject" value="{$subject|escape}" size="60" maxlength="120" class="textField" /></td>

145

</tr>

141

</tr>

(-)a/templates/manager/setup/step1.tpl (+7 lines)

Lines 143-148	Link Here

143

<div id="setupEmails">

143

<div id="setupEmails">

144

<h3>1.4 {translate key="manager.setup.emails"}</h3>

144

<h3>1.4 {translate key="manager.setup.emails"}</h3>

145

<table width="100%" class="data">

145

<table width="100%" class="data">

146

	<tr valign="top"><td colspan="2">{translate key="manager.setup.emailHeaderDescription"}<br />&nbsp;</td></tr>

147

	<tr valign="top">

148

		<td class="label">{fieldLabel name="emailHeader" key="manager.setup.emailHeader"}</td>

149

		<td class="value">

150

			<textarea name="emailHeader" id="emailHeader" rows="3" cols="60" class="textArea">{$emailHeader|escape}</textarea>

151

		</td>

152

	</tr>

146

	<tr valign="top"><td colspan="2">{translate key="manager.setup.emailSignatureDescription"}<br />&nbsp;</td></tr>

153

	<tr valign="top"><td colspan="2">{translate key="manager.setup.emailSignatureDescription"}<br />&nbsp;</td></tr>

147

	<tr valign="top">

154

	<tr valign="top">

148

		<td class="label">{fieldLabel name="emailSignature" key="manager.setup.emailSignature"}</td>

155

		<td class="label">{fieldLabel name="emailSignature" key="manager.setup.emailSignature"}</td>

(-)a/templates/rt/email.tpl (-4 lines)

Lines 145-154 function deleteAttachment(fileId) {	Link Here

145

	<td colspan="2">&nbsp;</td>

145

	<td colspan="2">&nbsp;</td>

146

</tr>

146

</tr>

147

<tr valign="top">

147

<tr valign="top">

148

	<td class="label">{translate key="email.from"}</td>

149

	<td class="value">{$from|escape}</td>

150

</tr>

151

<tr valign="top">

152

	<td width="20%" class="label">{fieldLabel name="subject" key="email.subject"}</td>

148

	<td width="20%" class="label">{fieldLabel name="subject" key="email.subject"}</td>

153

	<td width="80%" class="value"><input type="text" id="subject" name="subject" value="{$subject|escape}" size="50" maxlength="120" class="textField" /></td>

149

	<td width="80%" class="value"><input type="text" id="subject" name="subject" value="{$subject|escape}" size="50" maxlength="120" class="textField" /></td>

154

</tr>

150

</tr>

(-)a/templates/subscription/openAccessNotifyEmail.tpl (+3 lines)

Lines 4-9	Link Here

Content-Type: text/plain; charset={$defaultCharset|escape}

Content-Type: text/plain; charset={$defaultCharset|escape}

Content-Transfer-Encoding: quoted-printable

Content-Transfer-Encoding: quoted-printable

{literal}{$templateHeader}{/literal}

{$body}

{$body}

{$issue->getIssueIdentification()}

{$issue->getIssueIdentification()}

Lines 42-47 Content-Transfer-Encoding: quoted-printable	Link Here

		</head>

		</head>

	<body>

	<body>

	<pre>{literal}{$templateHeader}{/literal}</pre>

	<p>{$body|escape|nl2br}</p>

	<p>{$body|escape|nl2br}</p>

		<h3>{$issue->getIssueIdentification()}<br />{translate key="issue.toc"}</h3>

		<h3>{$issue->getIssueIdentification()}<br />{translate key="issue.toc"}</h3>

Return to bug 8085