diff options
| -rw-r--r-- | config.php-dist | 5 | ||||
| -rw-r--r-- | functions.php | 6 | ||||
| -rw-r--r-- | sanity_check.php | 2 | ||||
| -rw-r--r-- | templates/digest_template_html.txt | 8 |
4 files changed, 12 insertions, 9 deletions
diff --git a/config.php-dist b/config.php-dist index 6da8eb1f0..55c068441 100644 --- a/config.php-dist +++ b/config.php-dist @@ -149,7 +149,8 @@ define('DIGEST_FROM_NAME', 'Tiny Tiny RSS'); define('DIGEST_FROM_ADDRESS', '[email protected]'); - // Name and address for sending email digests from. + define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours'); + // Name, address and subject for sending email digests from. define('DIGEST_SMTP_HOST', ''); // SMTP Host to send digests. When blank tt-rss uses @@ -160,7 +161,7 @@ // These two options enable SMTP authentication when sending // digests. Require DIGEST_SMTP_HOST. - define('CONFIG_VERSION', 10); + define('CONFIG_VERSION', 11); // Expected config version. Please update this option in config.php // if necessary (after migrating all new options from this file). diff --git a/functions.php b/functions.php index 2303f54ad..ab03832b0 100644 --- a/functions.php +++ b/functions.php @@ -3231,7 +3231,7 @@ } $mail->IsHTML(true); - $mail->Subject = "[tt-rss] New headlines for last 24 hours"; + $mail->Subject = DIGEST_SUBJECT; $mail->Body = $digest; $mail->AltBody = $digest_text; @@ -3323,8 +3323,8 @@ $tpl->setVariable('ARTICLE_TITLE', $line["title"]); $tpl->setVariable('ARTICLE_LINK', $line["link"]); $tpl->setVariable('ARTICLE_UPDATED', $updated); -// $tpl->setVariable('ARTICLE_EXCERPT', -// truncate_string(strip_tags($line["excerpt"]), 100)); + $tpl->setVariable('ARTICLE_EXCERPT', + truncate_string(strip_tags($line["excerpt"]), 100)); $tpl->addBlock('article'); diff --git a/sanity_check.php b/sanity_check.php index 21fc03806..b9290b50c 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -1,7 +1,7 @@ <?php require_once "functions.php"; - define('EXPECTED_CONFIG_VERSION', 10); + define('EXPECTED_CONFIG_VERSION', 11); define('SCHEMA_VERSION', 24); if (!file_exists("config.php")) { diff --git a/templates/digest_template_html.txt b/templates/digest_template_html.txt index 4b85f8ba9..b25010d9a 100644 --- a/templates/digest_template_html.txt +++ b/templates/digest_template_html.txt @@ -1,14 +1,16 @@ <!-- $BeginBlock digest --> -<h1>New headlines for last 24 hours, as of ${CUR_DATE} ${CUR_TIME}</h1> +<h1 style='font-size : x-large'>New headlines for last 24 hours, as of ${CUR_DATE} ${CUR_TIME}</h1> <!-- $BeginBlock feed --> -<h2>${FEED_TITLE}</h2> +<h2 style='font-size : large'>${FEED_TITLE}</h2> <ul> <!-- $BeginBlock article --> <li><a href="${ARTICLE_LINK}">${ARTICLE_TITLE}</a> - ${ARTICLE_UPDATED} +<p style='color : gray'>${ARTICLE_EXCERPT}</p> <!-- $EndBlock article --> </ul> <!-- $EndBlock feed --> -<p><em>To unsubscribe, visit your configuration options or contact instance owner.</em></p> +<hr> +<em>To unsubscribe, visit your configuration options or contact instance owner.</em> <!-- $EndBlock digest --> |