Changeset 1796

Timestamp:

09/16/09 23:26:17 (11 months ago)

Author:

spetersen

Message:

Merge with trunk up to change 1795

Location:

branches/postgresql

Files:

• . (modified) (1 prop)
• .htaccess (modified) (2 diffs, 1 prop)
• COPYING (modified) (1 prop)
• INSTALL (modified) (1 prop)
• admin (modified) (1 prop)
• admin/channels.php (modified) (2 diffs)
• ajax.php (modified) (3 diffs, 1 prop)
• api.php (modified) (1 prop)
• author.php (modified) (1 prop)
• cls (modified) (1 prop)
• cls/search.php (modified) (2 diffs)
• cls/update.php (modified) (13 diffs)
• cls/wrappers/feeds.php (modified) (1 diff)
• cls/wrappers/item.php (modified) (1 diff)
• cls/wrappers/searchform.php (modified) (1 diff)
• constants.php (modified) (1 diff, 1 prop)
• core.php (modified) (1 prop)
• css (modified) (1 prop)
• db.php (modified) (1 prop)
• dbinit.php.sample (modified) (1 prop)
• dbstruct.pgsql.sql (modified) (1 prop)
• dist (modified) (1 prop)
• extlib (modified) (1 prop)
• extlib/kses.php (modified) (7 diffs)
• feed.php (modified) (4 diffs, 1 prop)
• index.php (modified) (2 diffs, 1 prop)
• init.php (modified) (1 prop)
• install.php (modified) (1 prop)
• opml.php (modified) (1 prop)
• plugins (modified) (1 prop)
• plugins.php (modified) (1 prop)
• plugins/roundedcorners.php (modified) (3 diffs)
• plugins/rssview.php (modified) (1 diff)
• plugins/stickyflag/stickyflag.php (modified) (2 diffs)
• robots.txt (modified) (1 prop)
• schema.php (modified) (1 prop)
• search.php (modified) (1 prop)
• sql_updates (modified) (1 prop)
• sql_updates/pgsql_svn1755.sql (added)
• state.php (modified) (1 prop)
• tags.php (modified) (3 diffs, 1 prop)
• themes (modified) (1 prop)
• themes.php (modified) (1 diff, 1 prop)
• themes/default/atom/overrides.php (copied) (copied from trunk/gregarius/themes/default/atom/overrides.php)
• themes/default/rss/overrides.php (copied) (copied from trunk/gregarius/themes/default/rss/overrides.php)
• themes/default/web/css/look.css (modified) (1 diff)
• themes/default/web/feedsfeed.php (modified) (1 diff)
• themes/default/web/index.php (modified) (1 diff)
• themes/default/web/media/arrow_refresh.png (copied) (copied from trunk/gregarius/themes/default/web/media/arrow_refresh.png)
• themes/default/web/searchform.php (modified) (1 diff)
• themes/lilina/.themeinfo (modified) (1 diff)
• themes/lilina/web/css/layout.css (modified) (1 diff)
• themes/lilina/web/css/look.css (modified) (1 diff)
• update.php (modified) (4 diffs, 1 prop)
• util.php (modified) (1 prop)

branches/postgresql/.htaccess

@@ -1 @@
-
 # Disable MultiViews: we want the real thing
 # http://httpd.apache.org/docs-2.0/mod/mod_negotiation.html#multiviews
@@ -8 +7 @@
 <IfModule mod_rewrite.c>
   RewriteEngine on
-  
-  
   
   # If we have a file or a directory match then lets set the 

branches/postgresql/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) {
 

branches/postgresql/ajax.php

@@ -33 +33 @@
 
 function __exp__setState($id,$state) {
+    $id = sanitize($id, RSS_SANITIZER_NUMERIC);
+    $state = sanitize($state, RSS_SANITIZER_NUMERIC);
     if (isLoggedIn()) {
         rss_query('update '.getTable('item') . " set unread=$state where id=$id");  
@@ -71 +73 @@
 
 function __exp__getFeedContent($cid) {
-
+    $cid = sanitize($cid, RSS_SANITIZER_NUMERIC);
     
     ob_start();
@@ -91 +93 @@
 
 function __exp__rateItem($iid, $rt) {
+    $iid = sanitize($iid, RSS_SANITIZER_NUMERIC);
+    $rt = sanitize($rt, RSS_SANITIZER_NUMERIC);
+    
     list($rrt) = rss_fetch_row(rss_query("select rating from "
         .getTable('rating') . " where iid = $iid"));

branches/postgresql/cls/search.php

@@ -44 +44 @@
 define ('QUERY_MATCH_EXACT','exact');
 define ('QUERY_MATCH_WITHIN', 'within');
+
+define ('QUERY_MATCH_STATE', 'state');
+define ('QUERY_MATCH_UNREAD', 'unread');
+define ('QUERY_MATCH_READ', 'read');
+define ('QUERY_MATCH_BOTH', 'both');
 
 // This is needed for some constants
@@ -214 +219 @@
         }
         $qWhere .= " and (i.unread & ".RSS_MODE_DELETED_STATE.")=0 ";
+        
+        if(array_key_exists(QUERY_MATCH_STATE, $_REQUEST) && QUERY_MATCH_READ == $_REQUEST[QUERY_MATCH_STATE]) {
+                // Show only read items.
+                $qWhere .= " and (i.unread & " . RSS_MODE_UNREAD_STATE . ")=0 ";
+                }
+                else if(array_key_exists(QUERY_MATCH_STATE, $_REQUEST) && QUERY_MATCH_UNREAD == $_REQUEST[QUERY_MATCH_STATE]) {
+                        // Show only unread items.
+                        $qWhere .= " and not (i.unread & " . RSS_MODE_UNREAD_STATE . ")=0 ";
+                }
 
         if ($this->orderBy == QUERY_ORDER_BY_DATE) {

branches/postgresql/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) {
+        $cid = (int)$cid;
         $sql = "select c.id, c.url, c.title from ".getTable("channels") . " c "
                . " inner join " . getTable('folders') . " f on f.id = c.parent "
@@ -83 +85 @@
             $sql .= " and (mode & ".RSS_MODE_PRIVATE_STATE.")=0 ";
         }
-
-        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 +165 @@
 }
 
-
 /**
  * HTTP Server Push update
@@ -165 +170 @@
 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 +233 @@
 }
 
-
 /**
  * AJAXUpdate updates feeds via AJAX. It's a bit more server-intesive
@@ -235 +239 @@
 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 +279 @@
 }
 
-
-
 class CommandLineUpdate extends Update {
-    function CommandLineUpdate() {
-        parent::Update($doPopulate = true, $updatePrivateAlso = true);
+    function CommandLineUpdate($cid) {
+        parent::Update($doPopulate = true, $updatePrivateAlso = true, $cid);
     }
 
@@ -309 +311 @@
 
 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 +337 @@
     }
 }
-
 
 /**
@@ -372 +374 @@
 }
 
-
-
 /**
  * SilentUpdate updates the feeds silently for those lame 
@@ -380 +380 @@
  */
 class SilentUpdate extends Update {
-    function SilentUpdate() {
-        parent::Update($doPopulate = false);
+    function SilentUpdate($cid) {
+        parent::Update($doPopulate = false, $updatePrivateAlso = false, $cid);
     }
 

branches/postgresql/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);

branches/postgresql/cls/wrappers/item.php

@@ -215 +215 @@
         $ea = preg_replace('/[^a-zA-Z0-9]/','_',$a);
         if (getConfig('rss.output.usemodrewrite')) {
-            $a = "<a href=\"".getPath() ."author/$ea\">$a</a>";
+            $a = "<a href=\"".getPath() ."author/$ea/\">$a</a>";
         } else {
             $a = "<a href=\"".getPath() ."author.php?author=$ea\">$a</a>";

branches/postgresql/cls/wrappers/searchform.php

@@ -69 +69 @@
     return ((array_key_exists(QUERY_MATCH_TYPE, $_REQUEST) &&
         $_REQUEST[QUERY_MATCH_TYPE] == QUERY_MATCH_WITHIN)?" checked=\"checked\"":"");  
+}
+
+function rss_search_state_read_checked() {
+    return ((array_key_exists(QUERY_MATCH_STATE, $_REQUEST) &&
+        $_REQUEST[QUERY_MATCH_STATE] == QUERY_MATCH_READ) ?" checked=\"checked\"":"");  
+}
+
+function rss_search_state_unread_checked() {
+    return ((array_key_exists(QUERY_MATCH_STATE, $_REQUEST) &&
+        $_REQUEST[QUERY_MATCH_STATE] == QUERY_MATCH_UNREAD) ?" checked=\"checked\"":"");    
+}
+
+function rss_search_state_both_checked() {
+    return ((array_key_exists(QUERY_MATCH_STATE, $_REQUEST) &&
+        $_REQUEST[QUERY_MATCH_STATE] == QUERY_MATCH_BOTH) ||
+        !array_key_exists(QUERY_MATCH_STATE, $_REQUEST) ?" checked=\"checked\"":"");    
 }
 

branches/postgresql/constants.php

@@ -31 +31 @@
 
 // Application version
-define ('_VERSION_', "0.5.5");
+define ('_VERSION_', "0.6.0");
 define ('MINUTE',60);
 

branches/postgresql/extlib/kses.php

@@ -132 +132 @@
 
   $xhtml_slash = '';
-  if (preg_match('%\s*/\s*$%', $attr))
+  if (preg_match('%\s/\s*$%', $attr))
     $xhtml_slash = ' /';
 
@@ -208 +208 @@
       case 0: # attribute name, href for instance
 
-        if (preg_match('/^([-a-zA-Z]+)\/?/', $attr, $match))
+        if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
         {
           $attrname = $match[1];
           $working = $mode = 1;
-          $attr = preg_replace('/^[-a-zA-Z]+\/?/', '', $attr);
+          $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
         }
 
@@ -241 +241 @@
       case 2: # attribute value, a URL after href= for instance
 
-        if (preg_match('/^"([^"]*)"(\s+|$|\/)?/', $attr, $match))
+        if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
          # "value"
         {
@@ -252 +252 @@
                          'vless' => 'n');
           $working = 1; $mode = 0;
-          $attr = preg_replace('/^"[^"]*"(\s+|$|\/)?/', '', $attr);
+          $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
           break;
         }
 
-        if (preg_match("/^'([^']*)'(\s+|$|\/)?/", $attr, $match))
+        if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
          # 'value'
         {
@@ -267 +267 @@
                          'vless' => 'n');
           $working = 1; $mode = 0;
-          $attr = preg_replace("/^'[^']*'(\s+|$)?/", '', $attr);
+          $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
           break;
         }
 
-        if (preg_match("%^([^\s\"']+)(\s+|$|\/)%", $attr, $match))
+        if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
          # value
         {
@@ -384 +384 @@
 {
   $string = kses_no_null($string);
-  $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
+  $string = preg_replace('/([^\xc3-\xcf])\xad+/', '\\1', $string); # deals with Opera "feature" -- moodle utf8 fix 
   $string2 = $string.'a';
 
@@ -470 +470 @@
 ###############################################################################
 {
-  return preg_replace('/^((&[^;]*;|[\sA-Za-z0-9])*)'.
-                      '(:|:|&#[Xx]3[Aa];)\s*/e',
-                      'kses_bad_protocol_once2("\\1", $allowed_protocols)',
-                      $string);
+  $string2 = preg_split('/:|:|:/i', $string, 2);
+  if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+  {
+    $string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
+  }
+  return $string;
 } # function kses_bad_protocol_once
 

branches/postgresql/feed.php

@@ -34 +34 @@
 define ('ACT_NAV_SUCC_POSTFIX',' →');
 
-
-
-
 // Show unread items on the front page?
 // default to the config value, user can override this via a cookie
@@ -261 +258 @@
     $iid = $cid  = null;
 }
-
-
-
 
 // If we have no channel-id something went terribly wrong.
@@ -728 +722 @@
 
 function doItems($cids,$fid,$vfid,$title,$iid,$y,$m,$d,$nv,$show_what,$show_private) {
-
     $do_show=$show_what;
 
@@ -762 +755 @@
         }
 
-    $items = new PaginatedItemList();
+        $items = new PaginatedItemList();
+
     $severalFeeds = (($fid != null) || ($vfid != null));
 

branches/postgresql/index.php

@@ -128 +128 @@
     _pf('populate unread items');
     $unreadItems = new PaginatedItemList();
+    
     $numItems = getConfig('rss.output.frontpage.numitems');
     
@@ -237 +238 @@
 }
 
-
 ?>

branches/postgresql/plugins/roundedcorners.php

@@ -30 +30 @@
 /// Author: Marco Bonetti
 /// Description: Rounded corners in some GUI elements. Enabling this plugin breaks the CSS validation.
-/// Version: 0.3
+/// Version: 0.4
 
 /**
@@ -37 +37 @@
  * 0.3 Hack for a Gecko bug which did not render rounded corners properly
  *  on large divs. https://bugzilla.mozilla.org/show_bug.cgi?id=252241 - Sameer
+ *
+ * 0.4 Be evil on WebKit browsers, too
  */
 
@@ -48 +50 @@
     $css = "
 /* bad bad bad */
-.frame,.item,h3.collapsed,table,div.content img,#sidemenu li,
+.frame,.item,h3.collapsed,table,div.content img,
 ul.navlist li,a.bookmarklet, fieldset, div#pbholder, div.ief,
-div.ief p a, #loginfo, input[type=\"submit\"] { -moz-border-radius: 5px }
+div.ief p a, #loginfo, input[type=\"submit\"] { -moz-border-radius: 5px; -webkit-border-radius:5px }
+#sidemenu li {
+    -moz-border-radius-top-left:5px;
+    -moz-border-radius-top-right:5px;
+    -webkit-border-top-left-radius:5px;
+    -webkit-border-top-right-radius:5px;
+}
 ";
 

branches/postgresql/plugins/rssview.php

@@ -45 +45 @@
 
     if (strstr($_SERVER['REQUEST_URI'],"?") !== FALSE) {
-        $url .= "&media=$type";
+        $url .= "&media=$type&";
     } else {
         $url .= "?media=$type";

branches/postgresql/plugins/stickyflag/stickyflag.php

@@ -147 +147 @@
     }
  
-    if($options & STICKYFLAG_ENABLE_STICKY_MENU) {
+    if($options & STICKYFLAG_ENABLE_STICKY_MENU || (isMobileDevice() && $options & STICKYFLAG_ENABLE_STICKY_SHORTCUT)) {
         if (true == $usemodrewrite) {
             $url = getPath() . "state/" . RSS_STATE_STICKY . "";
@@ -157 +157 @@
     }
 
-    if($options & STICKYFLAG_ENABLE_FLAG_MENU) {
+    if($options & STICKYFLAG_ENABLE_FLAG_MENU || (isMobileDevice() && $options & STICKYFLAG_ENABLE_FLAG_SHORTCUT)) {
         if (true == $usemodrewrite) {
             $url = getPath() . "state/" . RSS_STATE_FLAG . "";

branches/postgresql/tags.php

@@ -106 +106 @@
         $sqlWhere = " i.id in (".implode(",", $ids).") ";
         // include deprecated feeds while showing tags. 
-        $taggedItems->populate($sqlWhere, "", 0, -1, ITEM_SORT_HINT_MIXED, true);
+        $taggedItems->populate($sqlWhere, "", 0, 1, ITEM_SORT_HINT_MIXED, true);
 
         $rtags = relatedTags($tarr);
@@ -168 +168 @@
         if ($gotsome) {
 
-            $title = $taggedItems->itemCount." ". ($taggedItems->itemCount > 1 ? __('items') : __('item'))." "
-            . ($taggedItems->itemCount > 1 || $taggedItems->itemCount == 0 ? __('tagged') : __('tagged'))
+            $title = $taggedItems->numItems." ". ($taggedItems->numItems > 1 ? __('items') : __('item'))." "
+            . ($taggedItems->numItems > 1 || $taggedItems->numItems == 0 ? __('tagged') : __('tagged'))
             .""." \"".$hrTag."\"";
 
@@ -184 +184 @@
         } else {
             $GLOBALS['rss']->renderWithTemplate('index.php', 'items');
-
-//          echo "<p style=\"height: 10em; text-align:center\">";
-//          printf(__('Oops! No items tagged &laquo;%s&raquo; were found.'), $hrTag);
-//          echo "</p>";
-        }
-        //echo "</div>\n";
-        //rss_footer();
+        }
+
     }
 

branches/postgresql/themes.php

@@ -166 +166 @@
                     (strpos($ua,    'SonyEricsson') !== FALSE)
                 ||  (strpos($ua,    'Nokia') !== FALSE)
+                ||  (strpos($ua,  'Tablet') !== FALSE)
                 ||  (strpos($ua,    'MIDP') !== FALSE)
                 ||  (strpos($ua_lwr,'mobile') !== FALSE)

branches/postgresql/themes/default/web/css/look.css

@@ -292 +292 @@
   border:1px solid #ddd;                                                                                             
 }
+fieldset p { text-align: left;}
+
 fieldset.prune p{ text-align:left }
 .cntr { text-align:center !important}

branches/postgresql/themes/default/web/feedsfeed.php

@@ -3 +3 @@
     <img src="<?php echo $icon; ?>" class="favicon" alt="" />
 <?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>
+<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>
 <?php if (($rdLbl = rss_feeds_feed_read_label()) != "") { ?>
     <?php echo $rdLbl; ?>

branches/postgresql/themes/default/web/index.php

@@ -16 +16 @@
 
 <div id="ctnr">
-
 <ul id="sidemenu">
     <?php rss_main_sidemenu("li") ?>

branches/postgresql/themes/default/web/searchform.php

@@ -21 +21 @@
         <label for="qry_match_within"><?php echo __('Search within words') ?></label>
         <input type="checkbox" id="qry_match_within" name="<?php echo QUERY_MATCH_TYPE ?>" value="<?php echo QUERY_MATCH_WITHIN ?>" <?php echo rss_search_within() ?> />
+    </p>
+    
+    <p>
+        <input type="radio" id="qry_match_unread" name="<?php echo QUERY_MATCH_STATE ?>" value="<?php echo QUERY_MATCH_UNREAD ?>" <?php echo rss_search_state_unread_checked() ?> />
+        <label for="qry_match_unread"><?php echo __('Unread Only') ?></label>
+        
+        <input type="radio" id="qry_match_read" name="<?php echo QUERY_MATCH_STATE ?>" value="<?php echo QUERY_MATCH_READ ?>" <?php echo rss_search_state_read_checked() ?> />
+        <label for="qry_match_read"><?php echo __('Read Only') ?></label>
+
+        <input type="radio" id="qry_match_both" name="<?php echo QUERY_MATCH_STATE ?>" value="<?php echo QUERY_MATCH_BOTH ?>" <?php echo rss_search_state_both_checked() ?> />      
+        <label for="qry_match_both"><?php echo __('Unread & Read') ?></label>
     </p>
 

branches/postgresql/themes/lilina/.themeinfo

@@ -1 +1 @@
 name: Lilina theme 0.5
 official: true
-description: This theme is an imitation of <a href="http://vrypan.net/linkblog">Lilina</a>
+description: This theme is an imitation of the <a href="http://getlilina.org/">Lilina</a> aggregator, by Ryan McCue.
 author: Sameer D'Costa
 url: http://dcostanet.net/wordpress/2005/11/12/lilina-theme-for-gregarius/

branches/postgresql/themes/lilina/web/css/layout.css

@@ +1 @@
+/**
+ * Sections of this stylesheet are Copyright (c) Ryan McCue, http://getlilina.org/
+ * Released under GPL
+ */
 html, body, td, p, th, a  { padding: 0; }
 

branches/postgresql/themes/lilina/web/css/look.css

@@ +1 @@
+/**
+ * Sections of this stylesheet are Copyright (c) Ryan McCue, http://getlilina.org/
+ * Released under GPL
+ */
+
 body {
   text-align: left;

branches/postgresql/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);
 }