Attachment #3905 for bug #8085




		return $this->getData('from');
	}

 	/**
	 * 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'].'>');
		}
	}

	function setSubject($subject) {
		return $this->setData('subject', $subject);
	}

			$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);

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

Lines 144-153 function deleteAttachment(fileId) {	Link Here

144

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

144

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

145

</tr>

145

</tr>

146

<tr valign="top">

146

<tr valign="top">

147

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

148

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

149

</tr>

150

<tr valign="top">

151

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

147

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

152

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

148

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

153

</tr>

149

</tr>

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

Lines 187-193 class AuthorSubmitStep5Form extends AuthorSubmitForm {	Link Here

187

		// Send author notification email

187

		// Send author notification email

188

		import('classes.mail.ArticleMailTemplate');

188

		import('classes.mail.ArticleMailTemplate');

189

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

189

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

190

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

190

		$mail->setReplyTo(null);

191

		if ($mail->isEnabled()) {

191

		if ($mail->isEnabled()) {

192

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

192

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

193

			// If necessary, BCC the acknowledgement to someone.

193

			// 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 ($journal == null) {
			$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 356-362 class UserManagementForm extends Form {	Link Here

356

				// Send welcome email to user

356

				// Send welcome email to user

357

				import('classes.mail.MailTemplate');

357

				import('classes.mail.MailTemplate');

358

				$mail = new MailTemplate('USER_REGISTER');

358

				$mail = new MailTemplate('USER_REGISTER');

359

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

359

				$mail->setReplyTo(null);

360

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

360

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

361

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

361

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

362

				$mail->send();

362

				$mail->send();

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

Lines 54-59 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/sectionEditor/form/CreateReviewerForm.inc.php (-1 / +1 lines)

Lines 196-202 class CreateReviewerForm extends Form {	Link Here

196

			// Send welcome email to user

196

			// Send welcome email to user

197

			import('classes.mail.MailTemplate');

197

			import('classes.mail.MailTemplate');

198

			$mail = new MailTemplate('REVIEWER_REGISTER');

198

			$mail = new MailTemplate('REVIEWER_REGISTER');

199

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

199

			$mail->setReplyTo(null);

200

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

200

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

201

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

201

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

202

			$mail->send();

202

			$mail->send();

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

Lines 132-138 class CommentForm extends Form {	Link Here

132

133

		import('classes.mail.ArticleMailTemplate');

133

		import('classes.mail.ArticleMailTemplate');

134

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

134

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

135

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

135

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

136

137

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

137

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

138

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

Lines 294-300 class EditCommentForm extends Form {	Link Here

294

		import('classes.mail.ArticleMailTemplate');

294

		import('classes.mail.ArticleMailTemplate');

295

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

295

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

296

		$journal =& Request::getJournal();

296

		$journal =& Request::getJournal();

297

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

297

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

298

299

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

299

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

300

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

300

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

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

Lines 54-60 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 148-154 class ReviewerAction extends Action {	Link Here

148

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

148

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

149

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

149

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

150

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

150

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

151

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

151

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

152

153

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

153

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

154

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

154

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

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

Lines 645-651 class SubscriptionAction {	Link Here

645

646

		import('classes.mail.MailTemplate');

646

		import('classes.mail.MailTemplate');

647

		$mail = new MailTemplate($mailTemplateKey);

647

		$mail = new MailTemplate($mailTemplateKey);

648

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

648

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

649

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

649

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

650

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

650

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

651

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

651

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

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

Lines 300-306 class SubscriptionForm extends Form {	Link Here

300

301

		import('classes.mail.MailTemplate');

301

		import('classes.mail.MailTemplate');

302

		$mail = new MailTemplate($mailTemplateKey);

302

		$mail = new MailTemplate($mailTemplateKey);

303

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

303

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

304

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

304

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

305

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

305

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

306

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

306

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

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

Lines 37-43 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 40-46 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->setAssoc(ARTICLE_EMAIL_REVIEW_REMIND, ARTICLE_EMAIL_TYPE_REVIEW, $reviewId);

		$email->setAssoc(ARTICLE_EMAIL_REVIEW_REMIND, ARTICLE_EMAIL_TYPE_REVIEW, $reviewId);

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

Lines 71-77 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 307-313 class RegistrationForm extends Form {	Link Here

307

308

				// Send email validation request to user

308

				// Send email validation request to user

309

				$mail = new MailTemplate('USER_VALIDATE');

309

				$mail = new MailTemplate('USER_VALIDATE');

310

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

310

				$mail->setReplyTo(null);

311

				$mail->assignParams(array(

311

				$mail->assignParams(array(

312

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

312

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

313

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

313

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

Lines 319-325 class RegistrationForm extends Form {	Link Here

319

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

319

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

320

				// Send welcome email to user

320

				// Send welcome email to user

321

				$mail = new MailTemplate('USER_REGISTER');

321

				$mail = new MailTemplate('USER_REGISTER');

322

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

322

				$mail->setReplyTo(null);

323

				$mail->assignParams(array(

323

				$mail->assignParams(array(

324

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

324

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

325

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

325

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

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

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

131

	<pre>4. FORMATTING

131

	<pre>4. FORMATTING

132

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

132

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

133

134

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

135

________________________________________________________________________</message>

134

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

136

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

135

{$journalName}

137

{$journalName}

136

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

138

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

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

Lines 260-265	Link Here

260

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

260

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

261

	<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>

261

	<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>

262

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

262

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

263

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

264

	<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>

263

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

265

	<message key="manager.setup.emailSignature">Signature</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>

266

	<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>

265

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

267

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

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

		// Set the sender based on the current context

		// Set the sender based on the current context

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

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

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

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

		} else {

		} else {

100

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

100

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

101

102

103

(-)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 151-160 class SwordPlugin extends GenericPlugin {	Link Here

151

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

151

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

152

153

			import('classes.mail.ArticleMailTemplate');

153

			import('classes.mail.ArticleMailTemplate');

154

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

155

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

156

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

154

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

157

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

155

			$mail->setReplyTo(null);

158

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

156

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

159

157

160

			$mail->assignParams(array(

158

			$mail->assignParams(array(

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

Lines 288-297 class StudentThesisForm extends Form {	Link Here

288

289

			import('classes.mail.MailTemplate');

289

			import('classes.mail.MailTemplate');

290

			$mail = new MailTemplate('THESIS_ABSTRACT_CONFIRM');

290

			$mail = new MailTemplate('THESIS_ABSTRACT_CONFIRM');

291

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

291

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

292

			$mail->assignParams($paramArray);

292

			$mail->assignParams($paramArray);

293

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

293

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

294

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

294

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

295

			$mail->send();

295

			$mail->send();

296

297

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

Lines 195-201 class UserXMLParser {	Link Here

195

196

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

196

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

197

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

197

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

198

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

198

			$mail->setReplyTo(null);

199

200

201

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

201

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

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

Lines 98-104 class ManualPaymentPlugin extends PaymethodPlugin {	Link Here

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

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

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

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

100

				$mail = new MailTemplate('MANUAL_PAYMENT_NOTIFICATION');

100

				$mail = new MailTemplate('MANUAL_PAYMENT_NOTIFICATION');

101

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

101

				$mail->setReplyTo(null);

102

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

102

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

103

				$mail->assignParams(array(

103

				$mail->assignParams(array(

104

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

104

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

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

Lines 153-159 class PayPalPlugin extends PaymethodPlugin {	Link Here

153

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

153

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

154

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

154

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

155

		$mail = new MailTemplate('PAYPAL_INVESTIGATE_PAYMENT');

155

		$mail = new MailTemplate('PAYPAL_INVESTIGATE_PAYMENT');

156

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

156

		$mail->setReplyTo(null);

157

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

157

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

158

159

		$paymentStatus = Request::getUserVar('payment_status');

159

		$paymentStatus = Request::getUserVar('payment_status');

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

Lines 53-58	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 137-146 function deleteAttachment(fileId) {	Link Here

137

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

137

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

138

</tr>

138

</tr>

139

<tr valign="top">

139

<tr valign="top">

140

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

141

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

142

</tr>

143

<tr valign="top">

144

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

140

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

145

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

141

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

146

</tr>

142

</tr>

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

Lines 182-187	Link Here

182

<div id="setupEmails">

182

<div id="setupEmails">

183

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

183

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

184

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

184

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

185

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

186

	<tr valign="top">

187

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

188

		<td class="value">

189

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

190

		</td>

191

	</tr>

185

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

192

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

186

	<tr valign="top">

193

	<tr valign="top">

187

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

194

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

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

Lines 146-155 function deleteAttachment(fileId) {	Link Here

146

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

146

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

147

</tr>

147

</tr>

148

<tr valign="top">

148

<tr valign="top">

149

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

150

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

151

</tr>

152

<tr valign="top">

153

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

149

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

154

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

150

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

155

</tr>

151

</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