Changeset 1774 for trunk/gregarius/cls

Timestamp:

12/26/07 22:37:40 (9 months ago)

Author:

cfriesen

Message:

Individual update (hope nothing is missing)

Location:

trunk/gregarius/cls

Files:

• update.php (modified) (13 diffs)
• wrappers/feeds.php (modified) (1 diff)

trunk/gregarius/cls/update.php

@@ -32 +32 @@
 define('NO_NEW_ITEMS', '-');
 define ('UPDATING','...');
+define ('DEFAULT_CID', -1);
 
 
@@ -64 +65 @@
     var $chans = array ();
 
-    function Update($doPopulate = true, $updatePrivateAlso = false) {
+    function Update($doPopulate = true, $updatePrivateAlso = false, $cid = DEFAULT_CID) {
         rss_plugin_hook('rss.plugins.updates.before', null);
         if($doPopulate) {
-            $this->populate($updatePrivateAlso);
+            $this->populate($updatePrivateAlso, $cid);
         }
 
@@ -75 +76 @@
     }
 
-    function populate($updatePrivateAlso = false) {
+    function populate($updatePrivateAlso = false, $cid) {
         $sql = "select c.id, c.url, c.title from ".getTable("channels") . " c "
                . " inner join " . getTable('folders') . " f on f.id = c.parent "
@@ -83 +84 @@
             $sql .= " and not(mode & ".RSS_MODE_PRIVATE_STATE.") ";
         }
-
-        if (getConfig('rss.config.absoluteordering')) {
-            $sql .= " order by f.position asc, c.position asc";
-        } else {
-            $sql .= " order by f.name, c.title asc";
-        }
+        
+        if(DEFAULT_CID != $cid) {
+            $sql .= " and c.id = " . $cid . " ";
+                } else {
+                    if (getConfig('rss.config.absoluteordering')) {
+                            $sql .= " order by f.position asc, c.position asc";
+                    } else {
+                            $sql .= " order by f.name, c.title asc";
+                    }
+                }
 
         $res = rss_query($sql);
@@ -159 +164 @@
 }
 
-
 /**
  * HTTP Server Push update
@@ -165 +169 @@
 class HTTPServerPushUpdate extends Update {
 
-    function HTTPServerPushUpdate() {
-        parent::Update();
+    function HTTPServerPushUpdate($cid) {
+        parent::Update($doPopulate = true, $updatePrivateAlso = false, $cid);
 
         $GLOBALS['rss']->header->appendHeader("Connection: close");
@@ -228 +232 @@
 }
 
-
 /**
  * AJAXUpdate updates feeds via AJAX. It's a bit more server-intesive
@@ -235 +238 @@
 class AJAXUpdate extends Update {
 
-    function AJAXUpdate() {
-        parent::Update();
+    function AJAXUpdate($cid) {
+        parent::Update($doPopulate = true, $updatePrivateAlso = false, $cid);
         $GLOBALS['rss']->header->extraHTML .= "<script type=\"text/javascript\" src=\""
                                               .getPath()."update.php?js\"></script>\n";
@@ -275 +278 @@
 }
 
-
-
 class CommandLineUpdate extends Update {
-    function CommandLineUpdate() {
-        parent::Update($doPopulate = true, $updatePrivateAlso = true);
+    function CommandLineUpdate($cid) {
+        parent::Update($doPopulate = true, $updatePrivateAlso = true, $cid);
     }
 
@@ -309 +310 @@
 
 class MobileUpdate extends Update {
-    function MobileUpdate() {
-        parent::Update($doPopulate = true);
-    }
+    function MobileUpdate($cid) {
+        parent::Update($doPopulate = true, $updatePrivateAlso = false, $cid);
+    }
+    
     function render() {
         $newIds = array();
@@ -334 +336 @@
     }
 }
-
 
 /**
@@ -372 +373 @@
 }
 
-
-
 /**
  * SilentUpdate updates the feeds silently for those lame 
@@ -380 +379 @@
  */
 class SilentUpdate extends Update {
-    function SilentUpdate() {
-        parent::Update($doPopulate = false);
+    function SilentUpdate($cid) {
+        parent::Update($doPopulate = false, $updatePrivateAlso = false, $cid);
     }
 

trunk/gregarius/cls/wrappers/feeds.php

@@ -112 +112 @@
 }
 
+function rss_feeds_feed_id() {
+    return ($GLOBALS['rss']->currentFeedsFeed-> id);
+}
+
 function rss_feeds_feed_title_entities() {
     return htmlentities($GLOBALS['rss']->currentFeedsFeed-> title);