move a bunch of functions into Feeds/Article namespaces

+       static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
+       static function getLastArticleId() {
+       static function queryFeedHeadlines($params) {
+       static function getParentCategories($cat, $owner_uid) {
+       static function getChildCategories($cat, $owner_uid) {

move the rest of functions2.php back to functions.php as it is of more manageable size, remove the former

1 files changed, 1 insertions, 19 deletions

diff --git a/plugins/vf_shared/init.php b/plugins/vf_shared/init.php
index 9caf1093e..ce18f92d5 100644
--- a/plugins/vf_shared/init.php
+++ b/plugins/vf_shared/init.php
@@ -38,28 +38,10 @@ class VF_Shared extends Plugin {
 		return db_fetch_result($result, 0, "count");
 	}
 
-	//function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false) {
-
 	/**
 	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
 	 */
 	function get_headlines($feed_id, $options) {
-		/*$qfh_ret = queryFeedHeadlines(-4,
-			$options['limit'],
-			$this->get_unread(-1) > 0 ? "adaptive" : "all_articles",
-			false,
-			$options['search'],
-			$options['search_mode'],
-			$options['override_order'],
-			$options['offset'],
-			$options['owner_uid'],
-			$options['filter'],
-			$options['since_id'],
-			$options['include_children'],
-			false,
-			"uuid != ''",
-			"ttrss_feeds.title AS feed_title,"); */
-
 		$params = array(
 			"feed" => -4,
 			"limit" => $options["limit"],
@@ -74,7 +56,7 @@ class VF_Shared extends Plugin {
 			"override_vfeed" => "ttrss_feeds.title AS feed_title,"
 		);
 
-		$qfh_ret = queryFeedHeadlines($params);
+		$qfh_ret = Feeds::queryFeedHeadlines($params);
 		$qfh_ret[1] = __("Shared articles");
 
 		return $qfh_ret;