X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FForm%2FSetting%2FMail.php;h=989dad279ea9c0b7362ca396dff3c3d69e15ecae;hb=d5ad8c27aae985b4b0e794a8d5328c83da670f57;hp=952f29c87004e09d1f47c31beb4089033216700f;hpb=3b16a28270778af5122d850f6a4ee7400b8f9920;p=civicrm-core.git diff --git a/CRM/Admin/Form/Setting/Mail.php b/CRM/Admin/Form/Setting/Mail.php index 952f29c870..989dad279e 100644 --- a/CRM/Admin/Form/Setting/Mail.php +++ b/CRM/Admin/Form/Setting/Mail.php @@ -1,9 +1,9 @@ CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, + ); + /** - * Build the form object + * Build the form object. * * @return void - * @access public */ public function buildQuickForm() { CRM_Utils_System::setTitle(ts('Settings - CiviMail')); @@ -50,7 +53,6 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting { $this->addElement('text', 'mailerBatchLimit', ts('Mailer Batch Limit')); $this->addElement('text', 'mailThrottleTime', ts('Mailer Throttle Time')); $this->addElement('text', 'mailerJobSize', ts('Mailer Job Size')); - $this->addElement('advcheckbox', 'replyTo', ts('Enable Custom Reply-To')); $this->addElement('text', 'mailerJobsMax', ts('Mailer CRON job limit')); $check = TRUE; @@ -59,10 +61,10 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting { $session->pushUserContext(CRM_Utils_System::url('civicrm/admin', 'reset=1')); $this->addFormRule(array('CRM_Admin_Form_Setting_Mail', 'formRule')); - $this->addRule('mailerBatchLimit', ts('Must be an integer'), 'integer'); - $this->addRule('mailThrottleTime', ts('Must be an integer'), 'integer'); - $this->addRule('mailerJobSize', ts('Must be an integer'), 'integer'); - $this->addRule('mailerJobsMax', ts('Must be an integer'), 'integer'); + $this->addRule('mailerBatchLimit', ts('Please enter a valid integer.'), 'integer'); + $this->addRule('mailThrottleTime', ts('Please enter a valid integer.'), 'integer'); + $this->addRule('mailerJobSize', ts('Please enter a valid integer.'), 'integer'); + $this->addRule('mailerJobsMax', ts('Please enter a valid integer.'), 'integer'); parent::buildQuickForm($check); } @@ -72,7 +74,7 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting { * * @return array|bool */ - static function formRule($fields) { + public static function formRule($fields) { $errors = array(); if (CRM_Utils_Array::value('mailerJobSize', $fields) > 0) { @@ -80,12 +82,13 @@ class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting { $errors['mailerJobSize'] = ts('The job size must be at least 1000 or set to 0 (unlimited).'); } elseif (CRM_Utils_Array::value('mailerJobSize', $fields) < - CRM_Utils_Array::value('mailerBatchLimit', $fields)) { + CRM_Utils_Array::value('mailerBatchLimit', $fields) + ) { $errors['mailerJobSize'] = ts('A job size smaller than the batch limit will negate the effect of the batch limit.'); } } return empty($errors) ? TRUE : $errors; } -} +}