Changeset 1774 for trunk

Timestamp:

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

Author:

cfriesen

Message:

Individual update (hope nothing is missing)

Location:

trunk/gregarius

Files:

• admin/channels.php (modified) (2 diffs)
• cls/update.php (modified) (13 diffs)
• cls/wrappers/feeds.php (modified) (1 diff)
• themes/default/web/feedsfeed.php (modified) (1 diff)
• themes/default/web/media/arrow_refresh.png (added)
• update.php (modified) (4 diffs)

trunk/gregarius/admin/channels.php

@@ -232 +232 @@
         ."&".CST_ADMIN_VIEW."=". CST_ADMIN_DOMAIN_CHANNEL
         ."&action=". CST_ADMIN_EDIT_ACTION. "&cid=$id\">" . __('edit')
-        ."</a>|<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL
+        ."</a>";
+        if(!getConfig('rss.config.restrictrefresh')) {
+            echo "|<a href=\"".getPath()."update.php?cid=$id\">" . __('update') . "</a>\n";
+                }
+        echo "|<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL
         ."&amp;".CST_ADMIN_VIEW."=". CST_ADMIN_DOMAIN_CHANNEL
         ."&amp;action=". CST_ADMIN_DELETE_ACTION ."&amp;cid=$id\">" . __('delete') ."</a></td>\n"
@@ -561 +565 @@
         // Parse into and OPML object
         $opml=getOpml($url);
-
+        
         if (sizeof($opml) > 0) {
 

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);

trunk/gregarius/themes/default/web/feedsfeed.php

@@ -2 +2 @@
 <?php if($icon = rss_feeds_feed_icon()) { ?>
     <img src="<?php echo $icon; ?>" class="favicon" alt="" />
+<?php } ?>
+<?php if(!getConfig('rss.config.restrictrefresh')) { ?>
+<?php echo "<a href=\"" . getPath() . "update.php?cid=" . rss_feeds_feed_id() . "\"><img src=\"" . getExternalThemeFile("media/arrow_refresh.png") . "\" width=\"16\" height=\"16\"></a>"; ?>
 <?php } ?>
     <a class="<?php echo rss_feeds_feed_class(); ?>" title="<?php echo rss_feeds_feed_description_entities(); ?>" href="<?php echo rss_feeds_feed_link();  ?>"><?php echo rss_feeds_feed_title(); ?></a>

trunk/gregarius/update.php

@@ -28 +28 @@
 define ('RSS_NO_CACHE',true);
 require_once('init.php');
+
 $cline = isset($argv) && !$_REQUEST && isset($argc) && $argc;
 if (!$cline && getConfig('rss.config.restrictrefresh')) {
@@ -41 +42 @@
 sajax_init();
 
-    
 if (array_key_exists('js',$_GET)) {
     header('Content-Type: text/javascript');
@@ -52 +52 @@
 }
 
-
 $browser = new Browser();
 $silent = array_key_exists('silent', $_GET) || ($cline && in_array('--silent',$argv));
 $newsonly = array_key_exists('newsonly', $_GET) || ($cline && in_array('--newsonly', $argv));
 $mobile = array_key_exists('mobile',$_GET);
+
+$cid = DEFAULT_CID;
+if(array_key_exists('cid', $_GET)) {
+    $cid = $_GET['cid'];
+} else if ($cline && in_array('--update-only', $argv)) {
+    foreach($argv as $k => $v) {
+        if ('--update-only' == $v) {
+            $cid = $argv[$k+1];
+            break;
+        }
+    }
+}
 
 $GLOBALS['rss'] -> header = new Header(
@@ -68 +79 @@
 $GLOBALS['rss'] -> feedList = new FeedList(false);
 
-
 // Instantiate a different Update object, depending on the client
 if ($cline && !$silent && !$newsonly) {
-    $update = new CommandLineUpdate();
+    $update = new CommandLineUpdate($cid);
 
 } elseif ($cline && !$silent && $newsonly) {
-    $update = new CommandLineUpdateNews();
+    $update = new CommandLineUpdateNews($cid);
     
 } elseif (getConfig('rss.config.serverpush') && !$silent && $browser->supportsServerPush()) {
-    $update = new HTTPServerPushUpdate();   
+    $update = new HTTPServerPushUpdate($cid);   
     
 } elseif(!$silent && $browser->supportsAJAX()) {
-    $update = new AJAXUpdate(); 
+    $update = new AJAXUpdate($cid); 
 
 } elseif($mobile) {
-    $update = new MobileUpdate();
+    $update = new MobileUpdate($cid);
     
 } else {
     error_reporting(0);
-    $update = new SilentUpdate();
+    $update = new SilentUpdate($cid);
 }