diff options
| author | Andrew Dolgov <[email protected]> | 2024-01-09 11:28:32 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2024-01-09 11:28:32 +0300 |
| commit | ea6cdcccb09f6e254f5de532010b8deea837c339 (patch) | |
| tree | b7761a646b42758f43bed1002380e552df4aec22 | |
| parent | f0f22c23c5986d8f21f82e4a8203a164a5c4aace (diff) | |
* mail test - fill user email address as default
* digest - fix some warnings
| -rw-r--r-- | classes/Digest.php | 4 | ||||
| -rw-r--r-- | classes/Pref_System.php | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/classes/Digest.php b/classes/Digest.php index 27009530f..95827b310 100644 --- a/classes/Digest.php +++ b/classes/Digest.php @@ -17,7 +17,7 @@ class Digest $pdo = Db::pdo(); - $res = $pdo->query("SELECT id,email FROM ttrss_users + $res = $pdo->query("SELECT id, login, email FROM ttrss_users WHERE email != '' AND (last_digest_sent IS NULL OR $interval_qpart)"); while ($line = $res->fetch()) { @@ -191,7 +191,7 @@ class Digest $tpl_t->addBlock('article'); - if ($headlines[$i]['feed_title'] != $headlines[$i + 1]['feed_title']) { + if (!isset($headlines[$i + 1]) || $headlines[$i]['feed_title'] != $headlines[$i + 1]['feed_title']) { $tpl->addBlock('feed'); $tpl_t->addBlock('feed'); } diff --git a/classes/Pref_System.php b/classes/Pref_System.php index e85c1134d..2220199e7 100644 --- a/classes/Pref_System.php +++ b/classes/Pref_System.php @@ -197,9 +197,13 @@ class Pref_System extends Handler_Administrative { <?= \Controls\hidden_tag("op", "Pref_System") ?> <?= \Controls\hidden_tag("method", "sendTestEmail") ?> + <?php + $user = ORM::for_table('ttrss_users')->find_one($_SESSION["uid"]); + ?> + <fieldset> <label><?= __("To:") ?></label> - <?= \Controls\input_tag("mail_address", "", "text", ['required' => 1]) ?> + <?= \Controls\input_tag("mail_address",$user->email, "text", ['required' => 1]) ?> <?= \Controls\submit_tag(__("Send test email")) ?> <span style="display: none; margin-left : 10px" class="alert alert-error" id="mail-test-result">...</span> </fieldset> |