Changeset 130

Timestamp:

03/06/08 03:03:21 (9 months ago)

Author:

tobias382

Message:

* Added support for global and per-feed filters by URL, title, and body to the FeedTicker? plugin (thanks Slynderdale)

Files:

• trunk/Phergie/Plugin/FeedTicker.php (modified) (4 diffs)
• trunk/Phergie/phergie.ini (modified) (2 diffs)

trunk/Phergie/Plugin/FeedTicker.php

@@ -27 +27 @@
-
-    /**
+    * Filter feed title data
+    *
+    * @see run()
+    * @var array
+    */
+    protected $filterTitle = null;
+
+    /**
+    * Filter feed url data
+    *
+    * @see run()
+    * @var array
+    */
+    protected $filterUrl = null;
+
+    /**
+    * Filter article title data
+    *
+    * @see run()
+    * @var array
+    */
+    protected $filterArticle = null;
+
+    /**
-    * Cache of the last update to check for new entries
-    *
@@ -65 +89 @@
-    * @return void
-    */
-
-
+
+
+
+
+
+
+
-        $i = 0;
-        $this->feeds = array();
-        do {
+                // Feed and Chan data
-            $feed = $this->getPluginIni('feed' . $i);
-
+
+
+
+
+
+
-            if (!empty($feed) && !empty($chans)) {
-                $this->feeds[] = array($feed, preg_split('#[\s\r\n,]+#', $chans));
+                // Feed Title, Feed URL and Article Title Filters
+                $this->filterTitle[] = trim(trim(implode('|', array($globalTitle, $filterTitle)), '|'));
+                $this->filterUrl[] = trim(trim(implode('|', array($globalUrl, $filterUrl)), '|'));
+                $this->filterArticle[] = trim(trim(implode('|', array($globalArticle, $filterArticle)), '|'));
-            }
-        } while (++$i < 10);
@@ -188 +227 @@
-            $articles = array_reverse($articles);
-            foreach ($articles as $article) {
-
-
+
+
+
-                    // Decode and trim article title
-                    $article[0] = $this->decode($article[0], 40);
@@ -204 +244 @@
-    }
-
+    // Checks the given feed Title and URL as well as article title against the feed filters
+    protected function filterCheck($id, $title, $url, $article) {
+          // Feed Title, Feed URL and Article Title Filters
+        $filterTitle = $this->filterTitle[$id];
+        $filterUrl = $this->filterUrl[$id];    
+        $filterArticle = $this->filterArticle[$id];   
+        
+        // Check against the filters if any are set
+          if (($filterTitle && preg_match('/'.$filterTitle.'/im', $title, $match)) ||
+              ($filterUrl && preg_match('/'.$filterUrl.'/im', $url, $match)) ||
+              ($filterArticle && preg_match('/'.$filterArticle.'/im', $article, $match))) {
+              return false;
+          }
+          return true;
+    }
+    
-    /**
-    * Transliterates a UTF-8 string into corresponding ASCII characters and

trunk/Phergie/phergie.ini

@@ -134 +134 @@
-;-----------------------------------------------------------------------------
-
-; feedticker.feed0 :
-;    a double quote-enclosed comma-delimited list of feed URLs; this setting
-;    may be repeated with a different number (i.e. feed1, feed2, etc.)
-feedticker.feed0 = ""
-
-; feedticker.chans0 :
-;    a comma- or space-delimited list of channels where the feedN should be
-;    syndicated
-feedticker.chans0 = ""
-
-; feedticker.delay :
-;    the frequency, in seconds, at which the feeds are checked for new data;
@@ -157 +147 @@
-feedticker.format = ""
-
+;# Feed Ticker: Filter Settings #
+; feedticker.filter_title:
+;    a double quote-enclosed regex string filter; this is the global filter
+;    setting used to filter the feed title of all the feeds
+feedticker.filter_title = ""
+
+; feedticker.filter_url :
+;    a double quote-enclosed regex string filter; this is the global filter
+;    setting used to filter the feed url of all the feeds
+feedticker.filter_url = ""
+
+; feedticker.filter_article:
+;    a double quote-enclosed regex string filter; this is the global filter
+;    setting used to filter the article title of all the feeds
+feedticker.filter_article = ""
+
+; feedticker.feed0 :
+;    a double quote-enclosed comma-delimited list of feed URLs; this setting
+;    may be repeated with a different number (i.e. feed1, feed2, etc.)
+feedticker.feed0 = ""
+
+; feedticker.chans0 :
+;    a comma- or space-delimited list of channels where the feedN should be
+;    syndicated
+feedticker.chans0 = ""
+
+; feedticker.filter_title0 :
+;    a double quote-enclosed regex string filter; this setting allows you to
+;    filter each feed title independently and  may be repeated with a different
+;    number. (i.e. filter_title1, filter_title2, etc.)
+feedticker.filter_title0 = ""
+
+; feedticker.filter_url0 :
+;    a double quote-enclosed regex string filter; this setting allows you to
+;    filter each feed url independently and  may be repeated with a different
+;    number. (i.e. filter_url1, filter_url2, etc.)
+feedticker.filter_url0 = ""
+
+; feedticker.filter_article0 :
+;    a double quote-enclosed regex string filter; this setting allows you to
+;    filter each article title independently and  may be repeated with a 
+;    different number. (i.e. filter_article1, filter_article2, etc.)
+feedticker.filter_article0 = ""
+
-;-----------------------------------------------------------------------------
-; Karma