diff --git a/e107_languages/English/admin/help/admin_log.php b/e107_languages/English/admin/help/admin_log.php index 9b754c45e..828402092 100644 --- a/e107_languages/English/admin/help/admin_log.php +++ b/e107_languages/English/admin/help/admin_log.php @@ -21,12 +21,12 @@ if (e_QUERY) list($action,$junk) = explode('.', e_QUERY); else $action = 'list'; function common_filters() { - $ret = "Data filters
+ return "Data filters
You can specify various filters which restrict the amount of data to view. These are retained in a cookie until you log off.
The start and end date/time filters have to be enabled through their respective checkboxes.
Other filters are active when there is a value in the box.
"; - return $ret; + } @@ -72,4 +72,4 @@ default : (At present, logging is still being added to the code, so the list is not complete.)

"; $text .= common_filters(); } -$ns -> tablerender($caption, $text); +e107::getRender()->tablerender($caption, $text); diff --git a/e107_languages/English/admin/help/mailout.php b/e107_languages/English/admin/help/mailout.php index 5ca57105a..2d515a978 100644 --- a/e107_languages/English/admin/help/mailout.php +++ b/e107_languages/English/admin/help/mailout.php @@ -50,9 +50,9 @@ $action = e107::getParser()->toDB(varset($_GET['mode'],'makemail')); case 'prefs' : $text = 'Configure mailshot options.
A test email is sent using the current method and settings. If you are having problems with emails bouncing, try sending a test email to: check-auth@verifier.port25.com to ensure your server MX records are correct. Of course, be sure your site email address is correct before doing so.

'; - $text .= 'Emailing Method
- Use SMTP to send mail if possible. The settings will depend on your host's mail server.

'; - $text .= 'Default email format
+ $text .= "Emailing Method
+ Use SMTP to send mail if possible. The settings will depend on your host's mail server.

"; + $text .= "Default email format
Emails may be sent either in plain text only, or in HTML format. The latter generally gives a better appearance, but is more prone to being filtered by various security measures. If you select HTML, a separate plain text part is added.

'; $text .= 'Bulk mail controls
@@ -62,13 +62,13 @@ $action = e107::getParser()->toDB(varset($_GET['mode'],'makemail')); You can specify an email address to receive the return response when an email is undeliverable. If you have control over your server, you can specify the separate scheduler-driven auto-processing script; this receives bounce messages as they arrive, and updates status instantly. Otherwise you can specify a separate email account, which can be checked either periodically (using the scheduler), or manually via the user options menu. Normally this will be a standard - POP3 account; use the TLS-related options only if specifically required by your host

'; - $text .= 'Email Address Sources
- If you have additional mail-related plugins, you can select which of them may contribute email addresses to the list.

'; - $text .= 'Logging
+ POP3 account; use the TLS-related options only if specifically required by your host

"; + $text .= "Email Address Sources
+ If you have additional mail-related plugins, you can select which of them may contribute email addresses to the list.

"; + $text .= "Logging
The logging option creates a text file in the system log directory. This must be deleted periodically. The 'logging only' options allow you to see exactly who would receive emails if actually sent. The 'with errors' option fails every - 7th email, primarily for testing'; + 7th email, primarily for testing"; break; case 'maint' : $text = 'Maintenance functions for the mail database'; @@ -77,4 +77,4 @@ $action = e107::getParser()->toDB(varset($_GET['mode'],'makemail')); $text = 'Undocumented option'; } -$ns->tablerender('Mail Help', $text); +e107::getRender()->tablerender('Mail Help', $text); diff --git a/e107_languages/English/admin/help/newspost.php b/e107_languages/English/admin/help/newspost.php index ebf94b2ce..abe4bec0b 100644 --- a/e107_languages/English/admin/help/newspost.php +++ b/e107_languages/English/admin/help/newspost.php @@ -51,7 +51,7 @@ If you set a start and/or end date your news item will only be displayed between break; case 'list' : default : - $text = 'List of all news items. To edit or delete, click on one of the icons in the 'options' column. To view the item, click - on the ID.'; + $text = "List of all news items. To edit or delete, click on one of the icons in the 'options' column. To view the item, click + on the ID."; } -$ns -> tablerender($caption, $text); +e107::getRender()->tablerender($caption, $text); diff --git a/e107_languages/English/admin/lan_eurl.php b/e107_languages/English/admin/lan_eurl.php index ebb8f0657..410def437 100644 --- a/e107_languages/English/admin/lan_eurl.php +++ b/e107_languages/English/admin/lan_eurl.php @@ -26,7 +26,7 @@ return [ 'LAN_EURL_FORM_HELP_ALIAS_0' => "Default value is", 'LAN_EURL_FORM_HELP_ALIAS_1' => "Alias when in", 'LAN_EURL_FORM_HELP_EXAMPLE' => "Base URL", - 'LAN_EURL_ERR_ALIAS_MODULE' => "Alias "%1\$s" can't be saved - there is a system URL profile with the same name. Please choose another alias value for system URL profile "%2\$s"", + 'LAN_EURL_ERR_ALIAS_MODULE' => "Alias "%1\\$s" can't be saved - there is a system URL profile with the same name. Please choose another alias value for system URL profile "%2\$s"", 'LAN_EURL_SURL_UPD' => "  SEF URLs were updated.", 'LAN_EURL_SURL_NUPD' => "  SEF URLs were NOT updated.", 'LAN_EURL_SETTINGS_PATHINFO' => "Remove filename from the URL",