]> git.wh0rd.org Git - tt-rss.git/commitdiff
move update daemon code to common function, reorganize backend.php (patch from landure)
authorAndrew Dolgov <fox@bah.spb.su>
Sat, 26 Jan 2008 05:33:59 +0000 (06:33 +0100)
committerAndrew Dolgov <fox@bah.spb.su>
Sat, 26 Jan 2008 05:33:59 +0000 (06:33 +0100)
backend.php
functions.php
update_daemon2.php
update_daemon_loop.php
update_feeds.php

index c8271f4f975396a05a10d9c712a0ef380995f196..ce2e73d85ea8ee02522779a535640fed73effeda 100644 (file)
 
        if (!sanity_check($link)) { return; }
 
-       if ($op == "rpc") {
-               handle_rpc_request($link);
-       }
-       
-       if ($op == "feeds") {
-
-               $tags = $_GET["tags"];
-
-               $subop = $_GET["subop"];
-
-               if ($subop == "catchupAll") {
-                       db_query($link, "UPDATE ttrss_user_entries SET 
-                               last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
-               }
-
-               if ($subop == "collapse") {
-                       $cat_id = db_escape_string($_GET["cid"]);
-
-                       db_query($link, "UPDATE ttrss_feed_categories SET
-                               collapsed = NOT collapsed WHERE id = '$cat_id' AND owner_uid = " . 
-                               $_SESSION["uid"]);
-                       return;
-               }
-
-               outputFeedList($link, $tags);
+       switch($op) { // Select action according to $op value.
+               case "rpc":
+                       // Handle remote procedure calls.
+                       handle_rpc_request($link);
+               break; // rpc
+
+               case "feeds":
+                       $tags = $_GET["tags"];
+
+                       $subop = $_GET["subop"];
+
+                       switch($subop) {
+                               case "catchupAll":
+                                       db_query($link, "UPDATE ttrss_user_entries SET 
+                                               last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
+                               break;
+
+                               case "collapse":
+                                       $cat_id = db_escape_string($_GET["cid"]);
+
+                                       db_query($link, "UPDATE ttrss_feed_categories SET
+                                               collapsed = NOT collapsed WHERE id = '$cat_id' AND owner_uid = " . 
+                                               $_SESSION["uid"]);
+                                       return;
+                               break;
+                       }
 
-       }
+                       outputFeedList($link, $tags);
+               break; // feeds
 
-       if ($op == "view") {
+               case "view":
 
-               $id = db_escape_string($_GET["id"]);
-               $feed_id = db_escape_string($_GET["feed"]);
-               $cids = split(",", db_escape_string($_GET["cids"]));
-               $mode = db_escape_string($_GET["mode"]);
-               $omode = db_escape_string($_GET["omode"]);
+                       $id = db_escape_string($_GET["id"]);
+                       $feed_id = db_escape_string($_GET["feed"]);
+                       $cids = split(",", db_escape_string($_GET["cids"]));
+                       $mode = db_escape_string($_GET["mode"]);
+                       $omode = db_escape_string($_GET["omode"]);
 
-               print "<reply>";
+                       print "<reply>";
 
-               // in prefetch mode we only output requested cids, main article 
-               // just gets marked as read (it already exists in client cache)
+                       // in prefetch mode we only output requested cids, main article 
+                       // just gets marked as read (it already exists in client cache)
 
-               if ($mode == "") {
-                       outputArticleXML($link, $id, $feed_id);
-               } else {
-                       catchupArticleById($link, $id, 0);
-               }
+                       if ($mode == "") {
+                               outputArticleXML($link, $id, $feed_id);
+                       } else {
+                               catchupArticleById($link, $id, 0);
+                       }
 
-               foreach ($cids as $cid) {
-                       if ($cid) {
-                               outputArticleXML($link, $cid, $feed_id, false);
+                       foreach ($cids as $cid) {
+                               if ($cid) {
+                                       outputArticleXML($link, $cid, $feed_id, false);
+                               }
                        }
-               }
 
-               if ($mode != "prefetch_old") {
-                       print "<counters>";
-                       getAllCounters($link, $omode);
-                       print "</counters>";
-               }
+                       if ($mode != "prefetch_old") {
+                               print "<counters>";
+                               getAllCounters($link, $omode);
+                               print "</counters>";
+                       }
 
-               print "</reply>";
-       }
+                       print "</reply>";
+               break; // view
 
-       if ($op == "viewfeed") {
+               case "viewfeed":
 
-               $print_exec_time = true;
-               $timing_info = getmicrotime();
+                       $print_exec_time = true;
+                       $timing_info = getmicrotime();
 
-               print "<reply>";
+                       print "<reply>";
 
-               if ($_GET["debug"]) $timing_info = print_checkpoint("0", $timing_info);
+                       if ($_GET["debug"]) $timing_info = print_checkpoint("0", $timing_info);
 
-               $omode = db_escape_string($_GET["omode"]);
+                       $omode = db_escape_string($_GET["omode"]);
 
-               $feed = db_escape_string($_GET["feed"]);
-               $subop = db_escape_string($_GET["subop"]);
-               $view_mode = db_escape_string($_GET["view_mode"]);
-               $limit = db_escape_string($_GET["limit"]);
-               $cat_view = db_escape_string($_GET["cat"]);
-               $next_unread_feed = db_escape_string($_GET["nuf"]);
-               $offset = db_escape_string($_GET["skip"]);
+                       $feed = db_escape_string($_GET["feed"]);
+                       $subop = db_escape_string($_GET["subop"]);
+                       $view_mode = db_escape_string($_GET["view_mode"]);
+                       $limit = db_escape_string($_GET["limit"]);
+                       $cat_view = db_escape_string($_GET["cat"]);
+                       $next_unread_feed = db_escape_string($_GET["nuf"]);
+                       $offset = db_escape_string($_GET["skip"]);
 
-               set_pref($link, "_DEFAULT_VIEW_MODE", $view_mode);
-               set_pref($link, "_DEFAULT_VIEW_LIMIT", $limit);
+                       set_pref($link, "_DEFAULT_VIEW_MODE", $view_mode);
+                       set_pref($link, "_DEFAULT_VIEW_LIMIT", $limit);
 
-               if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
-                       db_query($link, "UPDATE ttrss_feeds SET last_viewed = NOW()
-                               WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
-               }
+                       if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
+                               db_query($link, "UPDATE ttrss_feeds SET last_viewed = NOW()
+                                       WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
+                       }
 
-               print "<headlines id=\"$feed\"><![CDATA[";
+                       print "<headlines id=\"$feed\"><![CDATA[";
 
-               $ret = outputHeadlinesList($link, $feed, $subop, 
-                       $view_mode, $limit, $cat_view, $next_unread_feed, $offset);
+                       $ret = outputHeadlinesList($link, $feed, $subop, 
+                               $view_mode, $limit, $cat_view, $next_unread_feed, $offset);
 
-               $topmost_article_ids = $ret[0];
-               $headlines_count = $ret[1];
-               $returned_feed = $ret[2];
-               $disable_cache = $ret[3];
+                       $topmost_article_ids = $ret[0];
+                       $headlines_count = $ret[1];
+                       $returned_feed = $ret[2];
+                       $disable_cache = $ret[3];
 
-               print "]]></headlines>";
+                       print "]]></headlines>";
 
-               print "<headlines-count value=\"$headlines_count\"/>";
+                       print "<headlines-count value=\"$headlines_count\"/>";
 
-               $headlines_unread = getFeedUnread($link, $returned_feed);
+                       $headlines_unread = getFeedUnread($link, $returned_feed);
 
-               print "<headlines-unread value=\"$headlines_unread\"/>";
-               printf("<disable-cache value=\"%d\"/>", $disable_cache);
+                       print "<headlines-unread value=\"$headlines_unread\"/>";
+                       printf("<disable-cache value=\"%d\"/>", $disable_cache);
 
-               if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info);
+                       if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info);
 
-               if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE')) {
-                       print "<articles>";
-                       foreach ($topmost_article_ids as $id) {
-                               outputArticleXML($link, $id, $feed, false);
+                       if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+                               print "<articles>";
+                               foreach ($topmost_article_ids as $id) {
+                                       outputArticleXML($link, $id, $feed, false);
+                               }
+                               print "</articles>";
                        }
-                       print "</articles>";
-               }
 
-               if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info);
+                       if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info);
 
-               print "<counters>";
-               getAllCounters($link, $omode, $feed);
-               print "</counters>";
+                       print "<counters>";
+                       getAllCounters($link, $omode, $feed);
+                       print "</counters>";
 
-               if ($_GET["debug"]) $timing_info = print_checkpoint("30", $timing_info);
+                       if ($_GET["debug"]) $timing_info = print_checkpoint("30", $timing_info);
 
-               print_runtime_info($link);
+                       print_runtime_info($link);
 
-               print "</reply>";
-       }
+                       print "</reply>";
+               break; // viewfeed
 
-       if ($op == "pref-feeds") {
-               module_pref_feeds($link);
-       }
+               case "pref-feeds":
+                       module_pref_feeds($link);
+               break; // pref-feeds
 
-       if ($op == "pref-filters") {
-               module_pref_filters($link);
-       }
+               case "pref-filters":
+                       module_pref_filters($link);
+               break; // pref-filters
 
-       if ($op == "pref-labels") {
-               module_pref_labels($link);
-       }
+               case "pref-labels":
+                       module_pref_labels($link);
+               break; // pref-labels
 
-       if ($op == "pref-prefs") {
-               module_pref_prefs($link);
-       }
+               case "pref-prefs":
+                       module_pref_prefs($link);
+               break; // pref-prefs
 
-       if ($op == "pref-users") {
-               module_pref_users($link);
-       }
+               case "pref-users":
+                       module_pref_users($link);
+               break; // prefs-users
 
-       if ($op == "help") {
-               module_help($link);
-       }
+               case "help":
+                       module_help($link);
+               break; // help
 
-       if ($op == "dlg") {
-               module_popup_dialog($link);
-       }
+               case "dlg":
+                       module_popup_dialog($link);
+               break; // dlg
 
-       if ($op == "pref-pub-items") {
-               module_pref_pub_items($link);
-       }
+               case "pref-pub-items":
+                       module_pref_pub_items($link);
+               break; // pref-pub-items
 
+               case "globalUpdateFeeds":
+                       // update feeds of all users, may be used anonymously
 
-       // update feeds of all users, may be used anonymously
-       if ($op == "globalUpdateFeeds") {
+                       // Update all feeds needing a update.
+                       update_daemon_common($link, 0, true, false);
 
-               $result = db_query($link, "SELECT id FROM ttrss_users");
+                       // FIXME : old feed update way. To be removed.
+                       //$result = db_query($link, "SELECT id FROM ttrss_users");
 
-               while ($line = db_fetch_assoc($result)) {
-                       $user_id = $line["id"];
-//                     print "<!-- updating feeds of uid $user_id -->";
-                       update_all_feeds($link, false, $user_id);
-               }
+                       //while ($line = db_fetch_assoc($result)) {
+                       //      $user_id = $line["id"];
+                       //      print "<!-- updating feeds of uid $user_id -->";
+                       //      update_all_feeds($link, false, $user_id);
+                       //}
 
-               print "<rpc-reply>
-                       <message msg=\"All feeds updated\"/>
-               </rpc-reply>";
+                       print "<rpc-reply>
+                               <message msg=\"All feeds updated\"/>
+                       </rpc-reply>";
+               break; // globalUpdateFeeds
 
-       }
+               case "user-details":
 
-       if ($op == "user-details") {
+                       if (WEB_DEMO_MODE || $_SESSION["access_level"] < 10) {
+                               return;
+                       }
 
-               if (WEB_DEMO_MODE || $_SESSION["access_level"] < 10) {
-                       return;
-               }
-                         
-/*             print "<html><head>
-                       <title>Tiny Tiny RSS : User Details</title>
-                       <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
-                       <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
-                       </head><body>"; */
-
-               $uid = sprintf("%d", $_GET["id"]);
-
-               print "<div id=\"infoBoxTitle\">User details</div>";
-
-               print "<div class='infoBoxContents'>";
-
-               $result = db_query($link, "SELECT login,
-                       SUBSTRING(last_login,1,16) AS last_login,
-                       access_level,
-                       (SELECT COUNT(int_id) FROM ttrss_user_entries 
-                               WHERE owner_uid = id) AS stored_articles,
-                       SUBSTRING(created,1,16) AS created
-                       FROM ttrss_users 
-                       WHERE id = '$uid'");
+                       /*
+                       print "<html><head>
+                               <title>Tiny Tiny RSS : User Details</title>
+                               <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
+                               <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+                               </head><body>";
+                       */
+
+                       $uid = sprintf("%d", $_GET["id"]);
+
+                       print "<div id=\"infoBoxTitle\">User details</div>";
+
+                       print "<div class='infoBoxContents'>";
+
+                       $result = db_query($link, "SELECT login,
+                               SUBSTRING(last_login,1,16) AS last_login,
+                               access_level,
+                               (SELECT COUNT(int_id) FROM ttrss_user_entries 
+                                       WHERE owner_uid = id) AS stored_articles,
+                               SUBSTRING(created,1,16) AS created
+                               FROM ttrss_users 
+                               WHERE id = '$uid'");
+                               
+                       if (db_num_rows($result) == 0) {
+                               print "<h1>User not found</h1>";
+                               return;
+                       }
                        
-               if (db_num_rows($result) == 0) {
-                       print "<h1>User not found</h1>";
-                       return;
-               }
-               
-#              print "<h1>User Details</h1>";
+                       // print "<h1>User Details</h1>";
 
-               $login = db_fetch_result($result, 0, "login");
+                       $login = db_fetch_result($result, 0, "login");
 
-#              print "<h1>$login</h1>";
+                       // print "<h1>$login</h1>";
 
-               print "<table width='100%'>";
+                       print "<table width='100%'>";
 
-               $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
-                       strtotime(db_fetch_result($result, 0, "last_login")));
+                       $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
+                               strtotime(db_fetch_result($result, 0, "last_login")));
 
-               $created = date(get_pref($link, 'LONG_DATE_FORMAT'),
-                       strtotime(db_fetch_result($result, 0, "created")));
+                       $created = date(get_pref($link, 'LONG_DATE_FORMAT'),
+                               strtotime(db_fetch_result($result, 0, "created")));
 
-               $access_level = db_fetch_result($result, 0, "access_level");
-               $stored_articles = db_fetch_result($result, 0, "stored_articles");
+                       $access_level = db_fetch_result($result, 0, "access_level");
+                       $stored_articles = db_fetch_result($result, 0, "stored_articles");
 
-#              print "<tr><td>Username</td><td>$login</td></tr>";
-#              print "<tr><td>Access level</td><td>$access_level</td></tr>";
-               print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
-               print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
-               print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
+                       // print "<tr><td>Username</td><td>$login</td></tr>";
+                       // print "<tr><td>Access level</td><td>$access_level</td></tr>";
+                       print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
+                       print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
+                       print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
 
-               $result = db_query($link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
-                       WHERE owner_uid = '$uid'");
+                       $result = db_query($link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+                               WHERE owner_uid = '$uid'");
 
-               $num_feeds = db_fetch_result($result, 0, "num_feeds");
+                       $num_feeds = db_fetch_result($result, 0, "num_feeds");
 
-               print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
+                       print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
 
-/*             $result = db_query($link, "SELECT 
-                       SUM(LENGTH(content)+LENGTH(title)+LENGTH(link)+LENGTH(guid)) AS db_size 
-                       FROM ttrss_user_entries,ttrss_entries 
-                               WHERE owner_uid = '$uid' AND ref_id = id");
+                       /*
+                       $result = db_query($link, "SELECT 
+                               SUM(LENGTH(content)+LENGTH(title)+LENGTH(link)+LENGTH(guid)) AS db_size 
+                               FROM ttrss_user_entries,ttrss_entries 
+                                       WHERE owner_uid = '$uid' AND ref_id = id");
 
-               $db_size = round(db_fetch_result($result, 0, "db_size") / 1024);
+                       $db_size = round(db_fetch_result($result, 0, "db_size") / 1024);
 
-               print "<tr><td>Approx. used DB size</td><td>$db_size KBytes</td></tr>";  */
+                       print "<tr><td>Approx. used DB size</td><td>$db_size KBytes</td></tr>";
+                       */
 
-               print "</table>";
+                       print "</table>";
 
-               print "<h1>".__('Subscribed feeds')."</h1>";
+                       print "<h1>".__('Subscribed feeds')."</h1>";
 
-               $result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
-                       WHERE owner_uid = '$uid' ORDER BY title");
+                       $result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
+                               WHERE owner_uid = '$uid' ORDER BY title");
 
-               print "<ul class=\"userFeedList\">";
+                       print "<ul class=\"userFeedList\">";
 
-               $row_class = "odd";
+                       $row_class = "odd";
 
-               while ($line = db_fetch_assoc($result)) {
+                       while ($line = db_fetch_assoc($result)) {
 
-                       $icon_file = ICONS_URL."/".$line["id"].".ico";
+                               $icon_file = ICONS_URL."/".$line["id"].".ico";
 
-                       if (file_exists($icon_file) && filesize($icon_file) > 0) {
-                               $feed_icon = "<img class=\"tinyFeedIcon\" src=\"$icon_file\">";
-                       } else {
-                               $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
-                       }
+                               if (file_exists($icon_file) && filesize($icon_file) > 0) {
+                                       $feed_icon = "<img class=\"tinyFeedIcon\" src=\"$icon_file\">";
+                               } else {
+                                       $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+                               }
 
-                       print "<li class=\"$row_class\">$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
+                               print "<li class=\"$row_class\">$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
-                       $row_class = toggleEvenOdd($row_class);
+                               $row_class = toggleEvenOdd($row_class);
 
-               }
+                       }
 
-               if (db_num_rows($result) < $num_feeds) {
-                        // FIXME - add link to show ALL subscribed feeds here somewhere
-                       print "<li><img 
-                               class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">&nbsp;...</li>";
-               }
-               
-               print "</ul>";
+                       if (db_num_rows($result) < $num_feeds) {
+                               // FIXME - add link to show ALL subscribed feeds here somewhere
+                               print "<li><img 
+                                       class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">&nbsp;...</li>";
+                       }
+                       
+                       print "</ul>";
 
-               print "</div>";
+                       print "</div>";
 
-               print "<div align='center'>
-                       <input type='submit' class='button'                     
-                       onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+                       print "<div align='center'>
+                               <input type='submit' class='button'                     
+                               onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
 
-//             print "</body></html>"; 
+                       // print "</body></html>"; 
 
-       }
+               break; // user-details
 
-       if ($op == "pref-feed-browser") {
-               module_pref_feed_browser($link);
-       }
+               case "pref-feed-browser":
+                       module_pref_feed_browser($link);
+               break; // pref-feed-browser
 
-       if ($op == "publish") {
-               $key = db_escape_string($_GET["key"]);
+               case "publish":
+                       $key = db_escape_string($_GET["key"]);
 
-               $result = db_query($link, "SELECT login, owner_uid 
-                       FROM ttrss_user_prefs, ttrss_users WHERE
-                       pref_name = '_PREFS_PUBLISH_KEY' AND 
-                       value = '$key' AND 
-                       ttrss_users.id = owner_uid");
+                       $result = db_query($link, "SELECT login, owner_uid 
+                               FROM ttrss_user_prefs, ttrss_users WHERE
+                               pref_name = '_PREFS_PUBLISH_KEY' AND 
+                               value = '$key' AND 
+                               ttrss_users.id = owner_uid");
 
-               if (db_num_rows($result) == 1) {
-                       $owner = db_fetch_result($result, 0, "owner_uid");
-                       $login = db_fetch_result($result, 0, "login");
+                       if (db_num_rows($result) == 1) {
+                               $owner = db_fetch_result($result, 0, "owner_uid");
+                               $login = db_fetch_result($result, 0, "login");
 
-                       generate_syndicated_feed($link, $owner, -2, false);
+                               generate_syndicated_feed($link, $owner, -2, false);
 
-               } else {
-                       print "<error>User not found</error>";
-               }
-
-       }
-
-       if ($op == "rss") {
-               $feed = db_escape_string($_GET["id"]);
-               $user = db_escape_string($_GET["user"]);
-               $pass = db_escape_string($_GET["pass"]);
-               $is_cat = $_GET["is_cat"] != false;
+                       } else {
+                               print "<error>User not found</error>";
+                       }
+               break; // publish
 
-               $search = db_escape_string($_GET["q"]);
-               $match_on = db_escape_string($_GET["m"]);
-               $search_mode = db_escape_string($_GET["smode"]);
+               case "rss":
+                       $feed = db_escape_string($_GET["id"]);
+                       $user = db_escape_string($_GET["user"]);
+                       $pass = db_escape_string($_GET["pass"]);
+                       $is_cat = $_GET["is_cat"] != false;
 
-               if (!$_SESSION["uid"] && $user && $pass) {
-                       authenticate_user($link, $user, $pass);
-               }
+                       $search = db_escape_string($_GET["q"]);
+                       $match_on = db_escape_string($_GET["m"]);
+                       $search_mode = db_escape_string($_GET["smode"]);
 
-               if ($_SESSION["uid"] ||
-                       http_authenticate_user($link)) {
+                       if (!$_SESSION["uid"] && $user && $pass) {
+                               authenticate_user($link, $user, $pass);
+                       }
 
-                               generate_syndicated_feed($link, 0, $feed, $is_cat, 
-                                       $search, $search_mode, $match_on);
-               }
+                       if ($_SESSION["uid"] ||
+                               http_authenticate_user($link)) {
 
-       }
+                                       generate_syndicated_feed($link, 0, $feed, $is_cat, 
+                                               $search, $search_mode, $match_on);
+                       }
+               break; // rss
 
-       if ($op == "labelFromSearch") {
-               $search = db_escape_string($_GET["search"]);
-               $search_mode = db_escape_string($_GET["smode"]);
-               $match_on = db_escape_string($_GET["match"]);
-               $is_cat = db_escape_string($_GET["is_cat"]);
-               $title = db_escape_string($_GET["title"]);
-               $feed = sprintf("%d", $_GET["feed"]);
+               case "labelFromSearch":
+                       $search = db_escape_string($_GET["search"]);
+                       $search_mode = db_escape_string($_GET["smode"]);
+                       $match_on = db_escape_string($_GET["match"]);
+                       $is_cat = db_escape_string($_GET["is_cat"]);
+                       $title = db_escape_string($_GET["title"]);
+                       $feed = sprintf("%d", $_GET["feed"]);
 
-               $label_qparts = array();
+                       $label_qparts = array();
 
-               $search_expr = getSearchSql($search, $match_on);
+                       $search_expr = getSearchSql($search, $match_on);
 
-               if ($is_cat) {
-                       if ($feed != 0) {
-                               $search_expr .= " AND ttrss_feeds.cat_id = $feed ";
+                       if ($is_cat) {
+                               if ($feed != 0) {
+                                       $search_expr .= " AND ttrss_feeds.cat_id = $feed ";
+                               } else {
+                                       $search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
+                               }
                        } else {
-                               $search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
-                       }
-               } else {
-                       if ($search_mode == "all_feeds") {
-                               // NOOP
-                       } else if ($search_mode == "this_cat") {
+                               if ($search_mode == "all_feeds") {
+                                       // NOOP
+                               } else if ($search_mode == "this_cat") {
 
-                               $tmp_result = db_query($link, "SELECT cat_id
-                                       FROM ttrss_feeds WHERE id = '$feed'");
+                                       $tmp_result = db_query($link, "SELECT cat_id
+                                               FROM ttrss_feeds WHERE id = '$feed'");
 
-                               $cat_id = db_fetch_result($tmp_result, 0, "cat_id");
+                                       $cat_id = db_fetch_result($tmp_result, 0, "cat_id");
 
-                               if ($cat_id > 0) {
-                                       $search_expr .= " AND ttrss_feeds.cat_id = $cat_id ";
+                                       if ($cat_id > 0) {
+                                               $search_expr .= " AND ttrss_feeds.cat_id = $cat_id ";
+                                       } else {
+                                               $search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
+                                       }
                                } else {
-                                       $search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
+                                       $search_expr .= " AND ttrss_feeds.id = $feed ";
                                }
-                       } else {
-                               $search_expr .= " AND ttrss_feeds.id = $feed ";
-                       }
 
-               }
+                       }
 
-               $search_expr = db_escape_string($search_expr);
+                       $search_expr = db_escape_string($search_expr);
 
-               print $search_expr;
+                       print $search_expr;
 
-               if ($title) {
-                       $result = db_query($link,
-                               "INSERT INTO ttrss_labels (sql_exp,description,owner_uid) 
-                               VALUES ('$search_expr', '$title', '".$_SESSION["uid"]."')");
-               }
-       }
-
-       if ($op == "getUnread") {
-               $login = db_escape_string($_GET["login"]);
+                       if ($title) {
+                               $result = db_query($link,
+                                       "INSERT INTO ttrss_labels (sql_exp,description,owner_uid) 
+                                       VALUES ('$search_expr', '$title', '".$_SESSION["uid"]."')");
+                       }
+               break; // labelFromSearch
 
-               header("Content-Type: text/plain; charset=utf-8");
+               case "getUnread":
+                       $login = db_escape_string($_GET["login"]);
 
-               $result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$login'");
+                       header("Content-Type: text/plain; charset=utf-8");
 
-               if (db_num_rows($result) == 1) {
-                       $uid = db_fetch_result($result, 0, "id");
-                       print getGlobalUnread($link, $uid);
-               } else {
-                       print "-1;User not found";
-               }
+                       $result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$login'");
 
-               $print_exec_time = false;
-       }
+                       if (db_num_rows($result) == 1) {
+                               $uid = db_fetch_result($result, 0, "id");
+                               print getGlobalUnread($link, $uid);
+                       } else {
+                               print "-1;User not found";
+                       }
 
-       if ($op == "digestTest") {
-               header("Content-Type: text/plain");
-               print_r(prepare_headlines_digest($link, $_SESSION["uid"]));
-               $print_exec_time = false;
+                       $print_exec_time = false;
+               break; // getUnread
 
-       }
+               case "digestTest":
+                       header("Content-Type: text/plain");
+                       print_r(prepare_headlines_digest($link, $_SESSION["uid"]));
+                       $print_exec_time = false;
+               break; // digestTest
 
-       if ($op == "digestSend") {
-               header("Content-Type: text/plain");
-               send_headlines_digests($link);
-               $print_exec_time = false;
+               case "digestSend":
+                       header("Content-Type: text/plain");
+                       send_headlines_digests($link);
+                       $print_exec_time = false;
+               break; // digestSend
 
-       }
+       } // Select action according to $op value.
 
+       // We close the connection to database.
        db_close($link);
 ?>
 
index 33a5a9077561369e9e7908be611181dd40be391f..f9771879080d61ef883e9c54db8e0ce25d1d86ae 100644 (file)
        require_once "magpierss/rss_fetch.inc";
        require_once 'magpierss/rss_utils.inc';
 
+       /**
+        * Print a timestamped debug message.
+        * 
+        * @param string $msg The debug message.
+        * @return void
+        */
        function _debug($msg) {
                $ts = strftime("%H:%M:%S", time());
                $ts = "$ts/" . posix_getpid();
                print "[$ts] $msg\n";
-       }
+       } // function _debug
 
        function purge_feed($link, $feed_id, $purge_interval, $debug = false) {
 
        function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
 
                if (!$_GET["daemon"] && !$ignore_daemon) {
-                       return;                 
+                       return false;
                }
 
                if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
                        if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
                                _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
                        }               
-                       return;
+                       return false;
                }
 
                $update_method = db_fetch_result($result, 0, "update_method");
                return $res;
        }
 
+       /**
+        * Send by mail a digest of last articles.
+        * 
+        * @param mixed $link The database connection.
+        * @param integer $limit The maximum number of articles by digest.
+        * @return boolean Return false if digests are not enabled.
+        */
        function send_headlines_digests($link, $limit = 100) {
 
                if (!DIGEST_ENABLE) return false;
                return $url_path;
        }
 
+       /**
+        * Purge a feed contents, marked articles excepted.
+        * 
+        * @param mixed $link The database connection.
+        * @param integer $id The id of the feed to purge.
+        * @return void
+        */
        function clear_feed_articles($link, $id) {
                $result = db_query($link, "DELETE FROM ttrss_user_entries
                        WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
 
                $result = db_query($link, "DELETE FROM ttrss_entries WHERE 
                        (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
-       }
-
-        function add_feed_url() {
+       } // function clear_feed_articles
+
+       /**
+        * Compute the Mozilla Firefox feed adding URL from server HOST and REQUEST_URI.
+        *
+        * @return string The Mozilla Firefox feed adding URL.
+        */
+       function add_feed_url() {
                $url_path = 'http://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
                $url_path .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
                return $url_path;
-        }
-
+       } // function add_feed_url
+
+       /**
+        * Encrypt a password in SHA1.
+        * 
+        * @param string $pass The password to encrypt.
+        * @param string $login A optionnal login.
+        * @return string The encrypted password.
+        */
        function encrypt_password($pass, $login = '') {
                if ($login) {
                        return "SHA1X:" . sha1("$login:$pass");
                } else {
                        return "SHA1:" . sha1($pass);
                }
-       }
+       } // function encrypt_password
+
+       /**
+        * Update a feed batch.
+        * Used by daemons to update n feeds by run.
+        * Only update feed needing a update, and not being processed
+        * by another process.
+        * 
+        * @param mixed $link Database link
+        * @param integer $limit Maximum number of feeds in update batch. Default to DAEMON_FEED_LIMIT.
+        * @param boolean $from_http Set to true if you call this function from http to disable cli specific code.
+        * @param boolean $debug Set to false to disable debug output. Default to true.
+        * @return void
+        */
+       function update_daemon_common($link, $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
+               // Process all other feeds using last_updated and interval parameters
+
+               // Test if the user has loggued in recently. If not, it does not update its feeds.
+               if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+                       if (DB_TYPE == "pgsql") {
+                               $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
+                       } else {
+                               $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
+                       }                       
+               } else {
+                       $login_thresh_qpart = "";
+               }
+
+               // Test if the feed need a update (update interval exceded).
+               if (DB_TYPE == "pgsql") {
+                       $update_limit_qpart = "AND ((
+                                       ttrss_feeds.update_interval = 0
+                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
+                               ) OR (
+                                       ttrss_feeds.update_interval > 0
+                                       AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
+                               ))";
+               } else {
+                       $update_limit_qpart = "AND ((
+                                       ttrss_feeds.update_interval = 0
+                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
+                               ) OR (
+                                       ttrss_feeds.update_interval > 0
+                                       AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
+                               ))";
+               }
+
+               // Test if feed is currently being updated by another process.
+               if (DB_TYPE == "pgsql") {
+                       $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
+               } else {
+                       $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
+               }
+
+               // Test if there is a limit to number of updated feeds
+               $query_limit = "";
+               if($limit) $query_limit = sprintf("LIMIT %d", $limit);
+
+               // We search for feed needing update.
+               $result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
+                               SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated,
+                               ttrss_feeds.update_interval 
+                       FROM 
+                               ttrss_feeds, ttrss_users, ttrss_user_prefs
+                       WHERE
+                               ttrss_feeds.owner_uid = ttrss_users.id
+                               AND ttrss_users.id = ttrss_user_prefs.owner_uid
+                               AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
+                               $login_thresh_qpart $update_limit_qpart
+                                $updstart_thresh_qpart
+                       ORDER BY ttrss_feeds.last_updated ASC $query_limit");
+
+               $user_prefs_cache = array();
+
+               if($debug) _debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
+
+               // Here is a little cache magic in order to minimize risk of double feed updates.
+               $feeds_to_update = array();
+               while ($line = db_fetch_assoc($result)) {
+                       $feeds_to_update[$line['id']] = $line;
+               }
+
+               // We update the feed last update started date before anything else.
+               // There is no lag due to feed contents downloads
+               // It prevent an other process to update the same feed.
+               $feed_ids = array_keys($feeds_to_update);
+               if($feed_ids) {
+                       db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
+                               WHERE id IN (%s)", implode(',', $feed_ids)));
+               }
+
+               // For each feed, we call the feed update function.
+               while ($line = array_pop($feeds_to_update)) {
+
+                       if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
+
+                       // We setup a alarm to alert if the feed take more than 300s to update.
+                       // => HANG alarm.
+                       if(!$from_http) pcntl_alarm(300);
+                       update_rss_feed($link, $line["feed_url"], $line["id"], true);
+                       // Cancel the alarm (the update went well)
+                       if(!$from_http) pcntl_alarm(0);
+
+                       sleep(1); // prevent flood (FIXME make this an option?)
+               }
+
+       // Send feed digests by email if needed.
+       if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
+
+       } // function update_daemon_common
 
 ?>
index 315daa7e0d215605aec83373c7db0cd8e6c1569d..1b4007ac8c15b5b7c2ac150901a93b027c717889 100644 (file)
@@ -88,6 +88,7 @@
        if (!pcntl_fork()) {
                pcntl_signal(SIGINT, 'sigint_handler');
 
+               // Try to lock a file in order to avoid concurrent update.
                $lock_handle = make_lockfile("update_daemon.lock");
 
                if (!$lock_handle) {
 
        while (true) {
 
+               // Since sleep is interupted by SIGCHLD, we need another way to
+               // respect the SPAWN_INTERVAL
                $next_spawn = $last_checkpoint + SPAWN_INTERVAL - time();
 
                if ($next_spawn % 10 == 0) {
                                        //      $last_purge = time();
                                        // }
 
-                                       // Process all other feeds using last_updated and interval parameters
-
-                                       $random_qpart = sql_random_function();
-                                               
-                                       if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
-                                               if (DB_TYPE == "pgsql") {
-                                                       $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
-                                               } else {
-                                                       $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
-                                               }                       
-                                       } else {
-                                               $login_thresh_qpart = "";
-                                       }
-
-                                       if (DB_TYPE == "pgsql") {
-                                               $update_limit_qpart = "AND ((
-                                                               ttrss_feeds.update_interval = 0
-                                                               AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
-                                                       ) OR (
-                                                               ttrss_feeds.update_interval > 0
-                                                               AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
-                                                       ))";
-                                       } else {
-                                               $update_limit_qpart = "AND ((
-                                                               ttrss_feeds.update_interval = 0
-                                                               AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
-                                                       ) OR (
-                                                               ttrss_feeds.update_interval > 0
-                                                               AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
-                                                       ))";
-                                       }
-
-
-                                       if (DB_TYPE == "pgsql") {
-                                               $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
-                                       } else {
-                                               $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
-                                       }
-
-                                       $result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
-                                                       SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated,
-                                                       ttrss_feeds.update_interval 
-                                               FROM 
-                                                       ttrss_feeds, ttrss_users, ttrss_user_prefs
-                                               WHERE
-                                                       ttrss_feeds.owner_uid = ttrss_users.id
-                                                       AND ttrss_users.id = ttrss_user_prefs.owner_uid
-                                                       AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
-                                                       $login_thresh_qpart $update_limit_qpart
-                                                        $updstart_thresh_qpart
-                                               ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);
-
-                                       $user_prefs_cache = array();
-
-                                       _debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
-
-                                       // Here is a little cache magic in order to minimize risk of double feed updates.
-                                       $feeds_to_update = array();
-                                       while ($line = db_fetch_assoc($result)) {
-                                               $feeds_to_update[$line['id']] = $line;
-                                       }
-
-                                       // We update the feed last update started date before anything else.
-                                       // There is no lag due to feed contents downloads
-                                       // It prevent an other process to update the same feed.
-                                       $feed_ids = array_keys($feeds_to_update);
-                                       if($feed_ids) {
-                                               db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
-                                                       WHERE id IN (%s)", implode(',', $feed_ids)));
-                                       }
-
-                                       while ($line = array_pop($feeds_to_update)) {
-
-                                               _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
-
-                                               pcntl_alarm(300);
-                                               update_rss_feed($link, $line["feed_url"], $line["id"], true);   
-                                               pcntl_alarm(0);
-
-                                               sleep(1); // prevent flood (FIXME make this an option?)
-                                       }
-
-                                       if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
+                                       // Call to the feed batch update function
+                                       update_daemon_common($link);
 
                                        _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
  
index 320bec414437f92410003aeda8d321eab5ad1057..737194aee4fa5e6183013cdf4e5d9bb309bc1f1e 100644 (file)
@@ -88,7 +88,7 @@
 
        // Process all other feeds using last_updated and interval parameters
 
-       $random_qpart = sql_random_function();
+//     $random_qpart = sql_random_function();
 
 /*             
                                ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
                        marked = false AND 
                        feed_id = '$feed_id' AND 
                        ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */                
-       
-       if (DAEMON_UPDATE_LOGIN_LIMIT > 0) {
-               if (DB_TYPE == "pgsql") {
-                       $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
-               } else {
-                       $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
-               }                       
-       } else {
-               $login_thresh_qpart = "";
-       }
-
-       if (DB_TYPE == "pgsql") {
-               $update_limit_qpart = "AND ((
-                               ttrss_feeds.update_interval = 0
-                               AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
-                       ) OR (
-                               ttrss_feeds.update_interval > 0
-                               AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
-                       ))";
-       } else {
-               $update_limit_qpart = "AND ((
-                               ttrss_feeds.update_interval = 0
-                               AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
-                       ) OR (
-                               ttrss_feeds.update_interval > 0
-                               AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
-                       ))";
-       }
-
-       if (DB_TYPE == "pgsql") {
-               $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
-       } else {
-               $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
-       }                       
-
-       $result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
-                       SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated,
-                       ttrss_feeds.update_interval 
-               FROM 
-                       ttrss_feeds, ttrss_users, ttrss_user_prefs
-               WHERE
-                       ttrss_feeds.owner_uid = ttrss_users.id
-                       AND ttrss_users.id = ttrss_user_prefs.owner_uid
-                       AND ttrss_user_prefs.pref_name='DEFAULT_UPDATE_INTERVAL'
-                       $login_thresh_qpart $update_limit_qpart
-                        $updstart_thresh_qpart
-               ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);
-
-       $user_prefs_cache = array();
-
-       _debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result)));
-
-       // Here is a little cache magic in order to minimize risk of double feed updates.
-       $feeds_to_update = array();
-       while ($line = db_fetch_assoc($result)) {
-               $feeds_to_update[$line['id']] = $line;
-       }
-
-       // We update the feed last update started date before anything else.
-       // There is no lag due to feed contents downloads
-       // It prevent an other process to update the same feed (for exemple, forced update by user).
-       $feed_ids = array_keys($feeds_to_update);
-       if($feed_ids) {
-               db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW()
-               WHERE id IN (%s)", implode(',', $feed_ids)));
-       }
-
-       while ($line = array_pop($feeds_to_update)) {
-
-               _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
-
-               pcntl_alarm(300);
-               update_rss_feed($link, $line["feed_url"], $line["id"], true);   
-               pcntl_alarm(0);
-
-               sleep(1); // prevent flood (FIXME make this an option?)
-       }
 
-       if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
+       // Call to the feed batch update function
+       update_daemon_common($link);
 
        db_close($link);
 
index 4909d881ec0ea4d26b2dc18f116d72d7c4840920..4b6ad3c4fedba68b3b3fbc4b1e7c13282a23aed3 100644 (file)
 
        $lock_handle = make_lockfile($lock_filename);
 
+               // Try to lock a file in order to avoid concurrent update.
        if (!$lock_handle) {
                die("error: Can't create lockfile ($lock_filename). ".
                        "Maybe another process is already running.\n");
        }
 
+       // Create a database connection.
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
 
        if (!$link) {
                }
        }
 
-       $result = db_query($link, "SELECT id FROM ttrss_users");
-
-       while ($line = db_fetch_assoc($result)) {
-                       $user_id = $line["id"];
-                       initialize_user_prefs($link, $user_id);
-                       update_all_feeds($link, false, $user_id, true);
-       }
+       // Update all feeds needing a update.
+       update_daemon_common($link, $limit=0);
 
+       // Send feed digests by email if needed.
        if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
 
        db_close($link);