Changeset 1468
- Timestamp:
- 05/11/06 17:43:17 (2 years ago)
- Location:
- trunk/rss
- Files:
-
- 4 modified
-
cls/update.php (modified) (1 diff)
-
feed.php (modified) (3 diffs)
-
themes/default/mobile/nav.php (modified) (1 diff)
-
update.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/rss/cls/update.php
r1405 r1468 293 293 294 294 } 295 296 295 parent::cleanUp($newIds, $ignorePrivate = true); 297 298 } 299 300 } 301 296 } 297 } 298 299 class MobileUpdate extends Update { 300 function MobileUpdate() { 301 parent::Update($doPopulate = true); 302 } 303 function render() { 304 $newIds = array(); 305 foreach ($this->chans as $chan) { 306 list ($cid, $url, $title) = $chan; 307 echo "$title ...\t"; 308 flush(); 309 $ret = update($cid); 310 311 if (is_array($ret)) { 312 list ($error, $unreadIds) = $ret; 313 $newIds = array_merge($newIds, $unreadIds); 314 } else { 315 $error = 0; 316 $unreadIds = array (); 317 } 318 $unread = count($unreadIds); 319 list($label,$cls) = parent::magpieError($error); 320 echo "\n$label, $unread " . LBL_UPDATE_UNREAD . "<br />"; 321 flush(); 322 } 323 } 324 } 325 326 302 327 /** 303 328 * CommandLineUpdateNews updates the feeds and displays only feeds with -
trunk/rss/feed.php
r1467 r1468 85 85 $sql .=" and not(c.mode & " . RSS_MODE_PRIVATE_STATE .") "; 86 86 } 87 $sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") ";87 //$sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") "; 88 88 89 89 $res = rss_query( $sql ); … … 104 104 $sql .=" and not(c.mode & " . RSS_MODE_PRIVATE_STATE .") "; 105 105 } 106 $sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") ";106 //$sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") "; 107 107 108 108 $res = rss_query( $sql ); … … 157 157 } 158 158 159 $sql .=" and not(i.unread & " . RSS_MODE_DELETED_STATE .") ";159 //$sql .=" and not(i.unread & " . RSS_MODE_DELETED_STATE .") "; 160 160 $sql .=" order by i.added desc, i.id asc"; 161 161 -
trunk/rss/themes/default/mobile/nav.php
r1309 r1468 3 3 $GLOBALS['rss']->nav->appendNavItem(getPath()."?feeds",LBL_H2_CHANNELS); 4 4 $GLOBALS['rss']->nav->appendNavItem(getPath()."?cats",LBL_TAG_FOLDERS); 5 $GLOBALS['rss']->nav->appendNavItem(getPath()."update.php?mobile", LBL_NAV_UPDATE); 5 6 6 7 foreach ($GLOBALS['rss']->nav->items as $item) { 7 if( !eregi( 'update.php ', $item -> href ) && !eregi( 'admin', $item -> href ) ) {8 $item -> render();8 if( !eregi( 'update.php$', $item -> href ) && !eregi( 'admin', $item -> href ) ) { 9 $item -> render(); 9 10 } 10 11 } -
trunk/rss/update.php
r1405 r1468 54 54 $silent = array_key_exists('silent', $_GET) || ($cline && in_array('--silent',$argv)); 55 55 $newsonly = array_key_exists('newsonly', $_GET) || ($cline && in_array('--newsonly', $argv)); 56 $mobile = array_key_exists('mobile',$_GET); 56 57 57 58 $GLOBALS['rss'] -> header = new Header( … … 78 79 } elseif(!$silent && $browser->supportsAJAX()) { 79 80 $update = new AJAXUpdate(); 81 82 } elseif($mobile) { 83 $update = new MobileUpdate(); 80 84 81 85 } else {
