public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 21:45:55 +00:00
Code Issues Releases Wiki Activity

move digest stuff to Digest class

Browse Source
This commit is contained in:
Andrew Dolgov
2017-05-04 15:41:38 +03:00
parent 0086a89740
commit c2f0f24e4c
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/backend.php
View File

@@ -9,9 +9,7 @@ class Backend extends Handler {
function digestTest() { function digestTest() {
header("Content-type: text/html"); header("Content-type: text/html");
require_once "digest.php"; $rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
$rv = prepare_headlines_digest($_SESSION['uid'], 1, 1000);
$rv[3] = "<pre>" . $rv[3] . "</pre>"; $rv[3] = "<pre>" . $rv[3] . "</pre>";

13
include/digest.php → classes/digest.php
View File

@@ -1,4 +1,7 @@
<?php <?php
class Digest
{
/** /**
* Send by mail a digest of last articles. * Send by mail a digest of last articles.
* *
@@ -6,7 +9,7 @@
* @param integer $limit The maximum number of articles by digest. * @param integer $limit The maximum number of articles by digest.
* @return boolean Return false if digests are not enabled. * @return boolean Return false if digests are not enabled.
*/ */
function send_headlines_digests($debug = false) { static function send_headlines_digests($debug = false) {
require_once 'classes/ttrssmailer.php'; require_once 'classes/ttrssmailer.php';
@@ -31,7 +34,8 @@
// try to send digests within 2 hours of preferred time // try to send digests within 2 hours of preferred time
if ($preferred_ts && time() >= $preferred_ts && if ($preferred_ts && time() >= $preferred_ts &&
time() - $preferred_ts <= 7200) { time() - $preferred_ts <= 7200
) {
if ($debug) _debug("Sending digest for UID:" . $line['id'] . " - " . $line["email"]); if ($debug) _debug("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
@@ -42,7 +46,7 @@
// reset tz_offset global to prevent tz cache clash between users // reset tz_offset global to prevent tz cache clash between users
$tz_offset = -1; $tz_offset = -1;
$tuple = prepare_headlines_digest($line["id"], 1, $limit); $tuple = Digest::prepare_headlines_digest($line["id"], 1, $limit);
$digest = $tuple[0]; $digest = $tuple[0];
$headlines_count = $tuple[1]; $headlines_count = $tuple[1];
$affected_ids = $tuple[2]; $affected_ids = $tuple[2];
@@ -77,7 +81,7 @@
} }
function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) { static function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) {
require_once "lib/MiniTemplator.class.php"; require_once "lib/MiniTemplator.class.php";
@@ -190,3 +194,4 @@
return array($tmp, $headlines_count, $affected_ids, $tmp_t); return array($tmp, $headlines_count, $affected_ids, $tmp_t);
} }
}

4
include/rssfuncs.php
View File

@@ -217,10 +217,8 @@
housekeeping_user($owner_uid); housekeeping_user($owner_uid);
} }
require_once "digest.php";
// Send feed digests by email if needed. // Send feed digests by email if needed.
send_headlines_digests($debug); Digest::send_headlines_digests($debug);
return $nf; return $nf;