View | Details | Raw Unified | Return to bug 6925 | Differences between
and this patch

Collapse All | Expand All

(-)a/classes/mail/MailTemplate.inc.php (-4 / +3 lines)
 Lines 12-19    Link Here 
12
 * @brief Subclass of PKPMailTemplate for mailing a template email.
12
 * @brief Subclass of PKPMailTemplate for mailing a template email.
13
 */
13
 */
14
14
15
// $Id$
16
17
15
18
import('mail.PKPMailTemplate');
16
import('mail.PKPMailTemplate');
19
17
 Lines 29-36   class MailTemplate extends PKPMailTemplate { Link Here 
29
	 * @param $conference object optional The conference this message relates to
27
	 * @param $conference object optional The conference this message relates to
30
	 * @param $schedConf object optional The scheduled conference this message relates to
28
	 * @param $schedConf object optional The scheduled conference this message relates to
31
	 * @param $includeSignature boolean optional
29
	 * @param $includeSignature boolean optional
30
	 * @param $ignorePostedData boolean optional
32
	 */
31
	 */
33
	function MailTemplate($emailKey = null, $locale = null, $enableAttachments = null, $conference = null, $schedConf = null, $includeSignature = true) {
32
	function MailTemplate($emailKey = null, $locale = null, $enableAttachments = null, $conference = null, $schedConf = null, $includeSignature = true, $ignorePostedData = false) {
34
		parent::PKPMailTemplate($emailKey, $locale, $enableAttachments, $includeSignature);
33
		parent::PKPMailTemplate($emailKey, $locale, $enableAttachments, $includeSignature);
35
34
36
		// If a conference wasn't specified, use the current request.
35
		// If a conference wasn't specified, use the current request.
 Lines 49-55   class MailTemplate extends PKPMailTemplate { Link Here 
49
			if (!empty($userSig)) $userSig = "\n" . $userSig;
48
			if (!empty($userSig)) $userSig = "\n" . $userSig;
50
		}
49
		}
51
50
52
		if (isset($emailTemplate) && (Request::getUserVar('subject')==null || Request::getUserVar('body')==null)) {
51
		if (isset($emailTemplate) && ($ignorePostedData || (Request::getUserVar('subject')==null && Request::getUserVar('body')==null))) {
53
			$this->setSubject($emailTemplate->getSubject());
52
			$this->setSubject($emailTemplate->getSubject());
54
			$this->setBody($emailTemplate->getBody() . $userSig);
53
			$this->setBody($emailTemplate->getBody() . $userSig);
55
			$this->enabled = $emailTemplate->getEnabled();
54
			$this->enabled = $emailTemplate->getEnabled();
(-)a/classes/mail/PaperMailTemplate.inc.php (-4 / +3 lines)
 Lines 13-20    Link Here 
13
 * This allows for paper-specific functionality like logging, etc.
13
 * This allows for paper-specific functionality like logging, etc.
14
 */
14
 */
15
15
16
//$Id$
17
18
import('mail.MailTemplate');
16
import('mail.MailTemplate');
19
import('paper.log.PaperEmailLogEntry'); // Bring in log constants
17
import('paper.log.PaperEmailLogEntry'); // Bring in log constants
20
18
 Lines 47-56   class PaperMailTemplate extends MailTemplate { Link Here 
47
	 * @param $conference object optional
45
	 * @param $conference object optional
48
	 * @param $schedConf object optional
46
	 * @param $schedConf object optional
49
	 * @param $includeSignature boolean optional
47
	 * @param $includeSignature boolean optional
48
	 * @param $ignorePostedData boolean optional
50
	 * @see MailTemplate::MailTemplate()
49
	 * @see MailTemplate::MailTemplate()
51
	 */
50
	 */
52
	function PaperMailTemplate($paper, $emailKey = null, $locale = null, $enableAttachments = null, $conference = null, $schedConf = null, $includeSignature = true) {
51
	function PaperMailTemplate($paper, $emailKey = null, $locale = null, $enableAttachments = null, $conference = null, $schedConf = null, $includeSignature = true, $ignorePostedData = false) {
53
		parent::MailTemplate($emailKey, $locale, $enableAttachments, $conference, $schedConf, $includeSignature);
52
		parent::MailTemplate($emailKey, $locale, $enableAttachments, $conference, $schedConf, $includeSignature, $ignorePostedData);
54
		$this->paper = $paper;
53
		$this->paper = $paper;
55
	}
54
	}
56
55
(-)a/classes/submission/trackDirector/TrackDirectorAction.inc.php (-2 / +1 lines)
 Lines 13-19    Link Here 
13
 *
13
 *
14
 */
14
 */
15
15
16
// $Id$
17
import('submission.common.Action');
16
import('submission.common.Action');
18
17
19
class TrackDirectorAction extends Action {
18
class TrackDirectorAction extends Action {
 Lines 1626-1632   import('file.PaperFileManager'); Link Here 
1626
1625
1627
		$user =& Request::getUser();
1626
		$user =& Request::getUser();
1628
		import('mail.PaperMailTemplate');
1627
		import('mail.PaperMailTemplate');
1629
		$email = new PaperMailTemplate($paper, 'SUBMISSION_DECISION_REVIEWERS');
1628
		$email = new PaperMailTemplate($paper, 'SUBMISSION_DECISION_REVIEWERS', null, null, null, null, true, true);
1630
1629
1631
		if ($send && !$email->hasErrors() && !$inhibitExistingEmail) {
1630
		if ($send && !$email->hasErrors() && !$inhibitExistingEmail) {
1632
			HookRegistry::call('TrackDirectorAction::blindCcReviewsToReviewers', array(&$paper, &$reviewAssignments, &$email));
1631
			HookRegistry::call('TrackDirectorAction::blindCcReviewsToReviewers', array(&$paper, &$reviewAssignments, &$email));

Return to bug 6925