From baccef846ab07205bbac42bf4cacf84939bd0392 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Thu, 31 Oct 2013 11:34:19 +0100 Subject: [PATCH] CRM-13687: update email-system-configuration documentation urls --- CRM/Mailing/BAO/Mailing.php | 2 +- CRM/Mailing/Form/Group.php | 2 +- CRM/Utils/Mail.php | 2 +- templates/CRM/Contact/Page/DashBoardDashlet.tpl | 2 +- templates/CRM/Mailing/Form/Schedule.hlp | 2 +- templates/CRM/Mailing/Page/Report.tpl | 2 +- xml/templates/civicrm_msg_template.tpl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 7ba03ff2bd..cb5d0d68fb 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -2642,7 +2642,7 @@ WHERE civicrm_mailing_job.id = %1 // CRM_Core_Error::debug_log_message("Beginning processQueue run: {$config->mailerJobsMax}, {$config->mailerJobSize}"); if ($mode == NULL && CRM_Core_BAO_MailSettings::defaultDomain() == "EXAMPLE.ORG") { - CRM_Core_Error::fatal(ts('The default mailbox has not been configured. You will find more info in the online user and administrator guide', array(1 => CRM_Utils_System::url('civicrm/admin/mailSettings', 'reset=1'), 2 => "http://book.civicrm.org/user/initial-set-up/email-system-configuration"))); + CRM_Core_Error::fatal(ts('The default mailbox has not been configured. You will find more info in the online user and administrator guide', array(1 => CRM_Utils_System::url('civicrm/admin/mailSettings', 'reset=1'), 2 => "http://book.civicrm.org/user/advanced-configuration/email-system-configuration/"))); } // check if we are enforcing number of parallel cron jobs diff --git a/CRM/Mailing/Form/Group.php b/CRM/Mailing/Form/Group.php index 06f5e04f1c..1163319079 100644 --- a/CRM/Mailing/Form/Group.php +++ b/CRM/Mailing/Form/Group.php @@ -54,7 +54,7 @@ class CRM_Mailing_Form_Group extends CRM_Contact_Form_Task { */ public function preProcess() { if (CRM_Core_BAO_MailSettings::defaultDomain() == "EXAMPLE.ORG") { - CRM_Core_Error::fatal(ts('The default mailbox has not been configured. You will find more info in our online user and administrator guide.', array(1 => CRM_Utils_System::url('civicrm/admin/mailSettings', 'reset=1'), 2 => "http://book.civicrm.org/user/initial-set-up/email-system-configuration"))); + CRM_Core_Error::fatal(ts('The default mailbox has not been configured. You will find more info in our online user and administrator guide.', array(1 => CRM_Utils_System::url('civicrm/admin/mailSettings', 'reset=1'), 2 => "http://book.civicrm.org/user/advanced-configuration/email-system-configuration/"))); } $this->_mailingID = CRM_Utils_Request::retrieve('mid', 'Integer', $this, FALSE, NULL); diff --git a/CRM/Utils/Mail.php b/CRM/Utils/Mail.php index 7306769739..e5e56acabb 100644 --- a/CRM/Utils/Mail.php +++ b/CRM/Utils/Mail.php @@ -208,7 +208,7 @@ class CRM_Utils_Mail { } $message .= '
  • ' . ts('The FROM Email Address configured for this feature may not be a valid sender based on your email service provider rules.') . '
    • ' . '' . '

    ' . ts('Check this page for more information.', array( - 1 => CRM_Utils_System::docURL2('user/initial-set-up/email-system-configuration', TRUE))) . '

    '; + 1 => CRM_Utils_System::docURL2('user/advanced-configuration/email-system-configuration', TRUE))) . '

    '; return $message; } diff --git a/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/templates/CRM/Contact/Page/DashBoardDashlet.tpl index 342488640c..0785cf53ca 100644 --- a/templates/CRM/Contact/Page/DashBoardDashlet.tpl +++ b/templates/CRM/Contact/Page/DashBoardDashlet.tpl @@ -51,7 +51,7 @@
    {ts}Go{/ts}
    -
    {ts}Please configure a default mailbox for CiviMail.{/ts} ({ts}learn more{/ts})
    +
    {ts}Please configure a default mailbox for CiviMail.{/ts} ({ts}learn more{/ts})

     {ts}Default CiviMail Mailbox{/ts}

    {/if} diff --git a/templates/CRM/Mailing/Form/Schedule.hlp b/templates/CRM/Mailing/Form/Schedule.hlp index d8fc9a727f..1842a1d05b 100644 --- a/templates/CRM/Mailing/Form/Schedule.hlp +++ b/templates/CRM/Mailing/Form/Schedule.hlp @@ -37,6 +37,6 @@ {ts}Click Continue Later if you're not ready to schedule or send this mailing. Click the Continue link from Unscheduled and Draft Mailings when you are ready to schedule or send it.{/ts}

    - {ts}Trouble-shooting Tip - If you find that your mailings are not being sent, ask the system administrator or technical support contact for your site to verify that the automated task ("cron job") is running - and how frequently.{/ts} {docURL page="user/initial-set-up/email-system-configuration"} + {ts}Trouble-shooting Tip - If you find that your mailings are not being sent, ask the system administrator or technical support contact for your site to verify that the automated task ("cron job") is running - and how frequently.{/ts} {docURL page="user/advanced-configuration/email-system-configuration"}

    {/htxt} diff --git a/templates/CRM/Mailing/Page/Report.tpl b/templates/CRM/Mailing/Page/Report.tpl index 829085df73..521a4b963c 100644 --- a/templates/CRM/Mailing/Page/Report.tpl +++ b/templates/CRM/Mailing/Page/Report.tpl @@ -71,7 +71,7 @@ {/strip} {else}
    - {ts}Delivery has not yet begun for this mailing. If the scheduled delivery date and time is past, ask the system administrator or technical support contact for your site to verify that the automated mailer task ('cron job') is running - and how frequently.{/ts} {docURL page="user/initial-set-up/email-system-configuration"} + {ts}Delivery has not yet begun for this mailing. If the scheduled delivery date and time is past, ask the system administrator or technical support contact for your site to verify that the automated mailer task ('cron job') is running - and how frequently.{/ts} {docURL page="user/advanced-configuration/email-system-configuration"}
    {/if} diff --git a/xml/templates/civicrm_msg_template.tpl b/xml/templates/civicrm_msg_template.tpl index 40d04f0785..2a847eee08 100644 --- a/xml/templates/civicrm_msg_template.tpl +++ b/xml/templates/civicrm_msg_template.tpl @@ -165,7 +165,7 @@ INSERT INTO civicrm_msg_template

    To use CiviMail: Sincerely, -- 2.25.1