Changeset 1604 for branches/multiuser/cls
- Timestamp:
- 10/16/06 06:31:35 (2 years ago)
- Location:
- branches/multiuser/cls
- Files:
-
- 15 modified
-
alltags.php (modified) (3 diffs)
-
categories.php (modified) (5 diffs)
-
channels.php (modified) (7 diffs)
-
header.php (modified) (2 diffs)
-
items.php (modified) (4 diffs)
-
l10n.php (modified) (2 diffs)
-
nav.php (modified) (1 diff)
-
search.php (modified) (1 diff)
-
taglist.php (modified) (2 diffs)
-
update.php (modified) (8 diffs)
-
wrappers/feeds.php (modified) (2 diffs)
-
wrappers/header.php (modified) (3 diffs)
-
wrappers/item.php (modified) (3 diffs)
-
wrappers/searchform.php (modified) (5 diffs)
-
wrappers/toolkit.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/multiuser/cls/alltags.php
r1181 r1604 76 76 .getTable('metatag'); 77 77 if($this -> type == 'channel'){ 78 $sql .= " left join " . getTable('channels') . " c on (fid=c.id) ,"79 . getTable('tag')." t "." wheretid=t.id "80 . " andttype = 'channel'";78 $sql .= " left join " . getTable('channels') . " c on (fid=c.id) " 79 . " inner join " . getTable('tag')." t "." on tid=t.id " 80 . " where ttype = 'channel'"; 81 81 }else{ 82 $sql .= " left join ".getTable('item')." i on (fid=i.id) ,"83 . getTable('tag')." t "." wheretid=t.id "84 ." andttype = 'item'";82 $sql .= " left join ".getTable('item')." i on (fid=i.id) " 83 . " inner join " . getTable('tag')." t "." on tid=t.id " 84 ." where ttype = 'item'"; 85 85 } 86 86 … … 91 91 } 92 92 93 $sql .= " group by tid order by tag";93 $sql .= " group by tid order by tag"; 94 94 95 95 … … 163 163 $taglink = $this -> makeTagLink($tag); 164 164 $ret .= "\t<a href=\"$taglink\" title=\"$cnt " 165 . ($cnt > 1 || $cnt == 0 ? LBL_ITEMS : LBL_ITEM)."\" style=\"font-size: "165 . ($cnt > 1 || $cnt == 0 ? __('items') : __('item'))."\" style=\"font-size: " 166 166 . (SMALLEST + ($cnt / $fontstep)).UNIT.";\">$tag</a> \n"; 167 167 } -
branches/multiuser/cls/categories.php
r1519 r1604 58 58 $this->loadCollapsedState(); 59 59 $this -> populate(); 60 $this -> columnTitle = LBL_TAG_FOLDERS;60 $this -> columnTitle = __('Categories'); 61 61 $GLOBALS['rss']-> feedList = $this; 62 62 } … … 85 85 86 86 function getStats() { 87 return sprintf( LBL_CATCNT_PF, $this -> taggedFeedCnt, $this -> tagCnt, 0);87 return sprintf(__('<strong>%d</strong> feeds in <strong>%d</strong> categories'), $this -> taggedFeedCnt, $this -> tagCnt, 0); 88 88 } 89 89 … … 109 109 //get unread count per folder 110 110 $sql = "select m.tid, t.tag, count(*) as cnt " 111 ." from " 112 .getTable('item') ." i, " 113 .getTable('channels') . " c, " 114 .getTable('metatag') ." m, " 115 .getTable('tag') . " t" 111 ." from ".getTable('item') ." i, " 112 . " inner join " . getTable('channels') . " c on i.cid = c.id " 113 . " inner join " . getTable('metatag') ." m on m.fid = c.id " 114 . " inner join " . getTable('tag') . " t on t.id = m.tid" 116 115 ." where i.unread & ". RSS_MODE_UNREAD_STATE 117 116 ." and not(i.unread & ". RSS_MODE_DELETED_STATE .")"; … … 119 118 $sql .=" and not(unread & " . RSS_MODE_PRIVATE_STATE .") "; 120 119 } 121 $sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") "; 122 $sql .= " and i.cid=c.id and c.id=m.fid and m.tid=t.id" 120 $sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") " 123 121 ." group by m.tid"; 124 122 _pf('query'); … … 142 140 $sql = "select " 143 141 ." c.id, c.title, c.url, c.siteurl, t.tag, c.parent, c.icon, c.descr, c.mode, t.id " 144 ." from " 145 .getTable('channels') ." c, " 146 .getTable('metatag') ." m, " 147 .getTable('tag') . " t " 148 ." where m.fid = c.id and m.ttype = 'channel' " 149 ." and m.tid = t.id "; 142 ." from ".getTable('channels') ." c, " 143 . " inner join " . getTable('metatag') ." m on m.fid = c.id " 144 . " inner join " . getTable('tag') . " t on t.id = m.tid" 145 ." where m.ttype = 'channel' "; 150 146 151 147 -
branches/multiuser/cls/channels.php
r1595 r1604 97 97 98 98 if ($unreadCount > 0) { 99 $this->rdLbl= sprintf( LBL_UNREAD_PF, "cid$id","",$unreadCount);99 $this->rdLbl= sprintf(__('<strong id="%s" style="%s">(%d unread)</strong>'), "cid$id","",$unreadCount); 100 100 $this->class_= "feed title unread"; 101 101 } else { … … 151 151 var $activeId; 152 152 var $feedCount = 0; 153 var $columnTitle = LBL_H2_CHANNELS;153 var $columnTitle; 154 154 var $stats; 155 155 156 156 function FeedList($activeId) { 157 157 _pf('FeedList() ctor'); 158 $this ->columnTitle= __('Feeds'); 158 159 $this->activeId = $activeId; 159 160 $this->loadCollapsedState(); … … 170 171 _pf(' ... totalCount'); 171 172 $sql = 172 "select count(*) from ".getTable("item2user") . "i ,"173 . getTable('channels2user') . " c2u "174 ." where i.fkcid=c2u.fkcid andi.flgdeleted=0 "173 "select count(*) from ".getTable("item2user") . "i " 174 . " inner join " . getTable('channels2user') . " c2u " 175 ." on i.fkcid=c2u.fkcid where i.flgdeleted=0 " 175 176 ." and c2u.fkuid=" . rss_user_id() 176 177 ." and i.fkuid=" . rss_user_id() … … 194 195 _pf(' ... done: feedsCount'); 195 196 196 $this ->stats = sprintf( LBL_ITEMCOUNT_PF, $total, $unread, $channelcount);197 $this ->stats = sprintf(__('<strong>%d</strong> items (<strong id="fucnt">%d</strong> unread) in <strong>%d</strong> feeds'), $total, $unread, $channelcount); 197 198 _pf('done: getStats()'); 198 199 return $this -> stats; … … 221 222 //get unread count per folder 222 223 $sql = "select f.id, f.name, count(*) as cnt " 223 ." from " 224 .getTable('item2user') ." i2u, " 225 .getTable('channels2user') . " c2u, " 226 .getTable('folders') ." f " 224 ." from " . getTable('item2user') ." i2u " 225 . " inner join " . getTable('channels2user') . " c2u on c2u.fkuid=" . rss_user_id() 226 . " inner join " . getTable('folders') ." f on c2u.parent=f.id" 227 227 ." where i2u.flgunread =1 " 228 228 ." and i2u.flgdeleted=0 "; … … 230 230 $sql .=" and i2u.flgprivate =0 "; 231 231 } 232 $sql .= " and c2u.fkuid=" . rss_user_id();233 232 $sql .= " and c2u.flgdeleted=0 "; 234 $sql .= " and c2u.parent=f.id "235 233 ." group by f.id"; 236 234 _pf('query'); … … 255 253 $sql = "select " 256 254 ." c.id, c.title, c.url, c.siteurl, f.name, c2u.parent, c2u.icon, c.descr, c2u.flgdeleted,c2u.flgprivate " 257 ." from " 258 .getTable("channels")." c, " 259 .getTable("channels2user")." c2u, " 260 .getTable("folders")." f " 261 262 ." where " 263 ." f.id = c.parent " 264 ." and c2u.fkcid=c.id " 265 . " and c2u.fkuid=" . rss_user_id(); 255 ." from ".getTable("channels")." c " 256 . " inner join " . getTable("channels2user")." c2u on c2u.fkcid=c.id " 257 . " inner join " . getTable("folders") . " f.id = c.parent " 258 259 ." where c2u.fkuid=" . rss_user_id(); 266 260 if (hidePrivate()) { 267 261 $sql .= " and c2u.flgprivate=0 "; -
branches/multiuser/cls/header.php
r1181 r1604 60 60 is_array($cidfid) && 61 61 ($uc = getUnreadCount($cidfid['cid'], $cidfid['fid']))) { 62 $this->docTitle .= " ($uc ". LBL_UNREAD.")";62 $this->docTitle .= " ($uc ".__('unread').")"; 63 63 } 64 64 … … 95 95 96 96 $GLOBALS['rss'] -> sideMenu = new SideMenu(); 97 $GLOBALS['rss'] -> sideMenu -> addMenu( LBL_H2_CHANNELS,'FeedList' , "_side('FeedList')");98 $GLOBALS['rss'] -> sideMenu -> addMenu( LBL_TAG_FOLDERS, 'CatList', "_side('CatList')");99 $GLOBALS['rss'] -> sideMenu -> addMenu( LBL_TAG_TAGS, 'TagList', "_side('TagList')");97 $GLOBALS['rss'] -> sideMenu -> addMenu(__('Feeds'),'FeedList' , "_side('FeedList')"); 98 $GLOBALS['rss'] -> sideMenu -> addMenu(__('Categories'), 'CatList', "_side('CatList')"); 99 $GLOBALS['rss'] -> sideMenu -> addMenu(__('Tags'), 'TagList', "_side('TagList')"); 100 100 } 101 101 -
branches/multiuser/cls/items.php
r1541 r1604 296 296 ." left join " 297 297 .getTable("item") ." i " 298 ." on (i2u.fkiid = i.id) left join " 299 //." left join " 300 //. getTable("rating") ." r on (i.id = r.iid), " 301 .getTable('channels2user') ." c2u on (i.cid=c2u.fkcid) left join " 302 .getTable("channels")." c on (c2u.fkcid=c.id) left join " 303 .getTable("folders") ." f on (c2u.parent=f.id) "; 298 ." on (i2u.fkiid = i.id)" 299 //." inner join " . getTable("rating") ." r on (i.id = r.iid), " 300 . " inner join " . getTable('channels2user') ." c2u on (i.cid=c2u.fkcid)" 301 . " inner join " . getTable("channels")." c on (c2u.fkcid=c.id)" 302 . " inner join " . getTable("folders") ." f on (c2u.parent=f.id) "; 304 303 305 304 … … 428 427 // fetch the tags for the items; 429 428 $sql = "select t.tag,m.fid,i.cid " 430 ." from " 431 .getTable('tag')." t, " 432 .getTable('metatag')." m, " 433 .getTable('item')." i " 434 ." where m.tid = t.id and i.id=m.fid and m.ttype = 'item' and m.fid in (".implode(",", $this -> iids).")"; 429 ." from " . getTable('tag')." t " 430 . " inner join " . getTable('metatag')." m on m.tid = t.id" 431 . " inner join " . getTable('item')." i on i.id = m.fid" 432 ." where m.ttype = 'item' and m.fid in (".implode(",", $this -> iids).")"; 435 433 436 434 $res = $GLOBALS['rss_db']->rss_query($sql); … … 502 500 var $_parent; 503 501 var $pages; 504 function ItemListNavigation( $il) {502 function ItemListNavigation(&$il) { 505 503 $this -> _parent = $il; 506 504 $this -> pages = array(); … … 552 550 . $this -> _sqlActualWhere; 553 551 list($this -> numItems) = rss_fetch_row(rss_query($sql)); 554 $this -> navigation = new ItemListNavigation( &$this);552 $this -> navigation = new ItemListNavigation($this); 555 553 } 556 554 } -
branches/multiuser/cls/l10n.php
r1479 r1604 28 28 rss_require('extlib/l10n/streams.php'); 29 29 rss_require('extlib/l10n/gettext.php'); 30 30 define('RSS_LOCALE_COOKIE','rss_preferred_locale'); 31 31 class RSSl10n { 32 32 33 33 var $l10n; 34 34 var $cache; 35 var $locale; 36 var $isolang; 35 37 36 function RSSl10n($locale) { 37 $path = GREGARIUS_HOME .'/intl/' . $locale . '/LC_MESSAGES/messages.mo'; 38 function RSSl10n() { 39 $this -> locale = preg_replace('#[^a-zA-Z_]#','',$this -> __detectUserLang()); 40 41 $ll=explode('_',$this -> locale); 42 $this->isloang=$ll[0].'-'.strtoupper($ll[1]); 43 44 if (function_exists('version_compare') && version_compare("4.3.0",PHP_VERSION, "<=") && preg_match('#([a-z]{2})_([A-Z]{2})#',$this -> locale,$m)) { 45 $locales=array( 46 $m[0].'UTF-8', 47 $m[0].'utf-8', 48 $m[0], 49 $m[1].'_'.strtoupper($m[1]), 50 $m[1], 51 $m[2] 52 ); 53 setlocale(LC_ALL, $locales); 54 } else { 55 setlocale(LC_ALL, $this -> locale); 56 } 57 58 $path = GREGARIUS_HOME .'/intl/' . $this -> locale . '/LC_MESSAGES/messages.mo'; 38 59 $streamer = new FileReader($path); 39 60 $this -> l10n = new gettext_reader($streamer); … … 41 62 } 42 63 43 function translate($msg ) {44 if (isset($this -> cache[$msg ])) {45 return $this -> cache[$msg ];64 function translate($msg, $cnt = null) { 65 if (isset($this -> cache[$msg . $cnt])) { 66 return $this -> cache[$msg . $cnt]; 46 67 } 47 $ret = $this -> l10n -> translate($msg );48 $this -> cache[$msg ] = $ret;68 $ret = $this -> l10n -> translate($msg, $cnt); 69 $this -> cache[$msg . $cnt] = $ret; 49 70 return $ret; 50 51 71 } 72 73 function getLocale() { 74 return $this -> locale; 75 } 76 function getISOLang() { 77 return $this ->isloang; 78 } 79 /** 80 * Detect users preferred language. Losely based on http://grep.be/data/accept-to-gettext.inc 81 */ 82 function __detectUserLang() { 83 if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_[A-Z]{2}$#',$_REQUEST['lang']) && file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang'])) { 84 setcookie(RSS_LOCALE_COOKIE,$_REQUEST['lang'],time()+3600*6,getPath()); 85 return $_REQUEST['lang']; 86 } elseif (isset($_COOKIE[RSS_LOCALE_COOKIE])) { 87 return trim($_COOKIE[RSS_LOCALE_COOKIE]); 88 } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { 89 $alparts=@preg_split("/,/",$_SERVER['HTTP_ACCEPT_LANGUAGE']); 90 foreach($alparts as $part) { 91 $part=trim($part); 92 if(preg_match("/;/", $part)) { 93 $lang=@preg_split("/;/",$part); 94 $ll = $lang[0]; 95 } else { 96 $ll = $part; 97 } 98 99 if (preg_match('#^([a-z]{2})[\-_]?([a-z]{2})?$#i',$ll,$pm)) { 100 $ret =null; 101 if (isset($pm[2])){ 102 if (file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[2]))) { 103 // xx-yy -> xx_YY 104 $ret= $pm[1] ."_".strtoupper($pm[2]); 105 } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) { 106 // xx-yy -> xx_XX 107 $ret= $pm[1] ."_".strtoupper($pm[1]); 108 } 109 } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) { 110 // xx -> xx_XX 111 $ret= $pm[1] ."_".strtoupper($pm[1]); 112 } elseif($pm[1] == 'en') { 113 // ugly: a better way would be to look up all the available locales 114 // and match against that list 115 $ret='en_US'; 116 } 117 if ($ret) { 118 // remember the detected locale for a couple hours 119 setcookie(RSS_LOCALE_COOKIE,$ret,time()+3600*6,getPath()); 120 return $ret; 121 } 122 } 123 124 } 125 } 126 // If everything fails, return the user selected language 127 return getConfig('rss.output.lang'); 128 } 52 129 } 130 53 131 54 function __($msg) { 55 return $GLOBALS['rssl10n'] -> translate($msg); 132 133 function __($msg, $cnt = null) { 134 return $GLOBALS['rssl10n'] -> translate($msg, $cnt); 56 135 } 57 136 ?> -
branches/multiuser/cls/nav.php
r1347 r1604 60 60 function Navigation() { 61 61 62 $this->appendNavItem(getPath(),LBL_NAV_HOME,LOCATION_HOME); 63 $this->appendNavItem(getPath().'update.php',LBL_NAV_UPDATE,LOCATION_UPDATE); 64 $this->appendNavItem(getPath().'search.php',LBL_NAV_SEARCH,LOCATION_SEARCH); 65 $this->appendNavItem(getPath().'admin/',LBL_NAV_CHANNEL_ADMIN,LOCATION_ADMIN); 62 $this->appendNavItem(getPath(),__('<span>H</span>ome'),LOCATION_HOME); 63 if (!getConfig("rss.config.restrictrefresh")) { 64 $this->appendNavItem(getPath().'update.php',__('<span>R</span>efresh'),LOCATION_UPDATE); 65 } 66 $this->appendNavItem(getPath().'search.php',__('<span>S</span>earch'),LOCATION_SEARCH); 67 $this->appendNavItem(getPath().'admin/',__('A<span>d</span>min'),LOCATION_ADMIN); 66 68 67 69 if (($an = rss_plugin_hook('rss.plugins.afternav', null)) != null) { -
branches/multiuser/cls/search.php
r1530 r1604 211 211 if ($this->resultsPerPage != INFINE_RESULTS && $this->itemCount > $this->resultsPerPage) { 212 212 $nav .= "<div class=\"readmore\">"; 213 $nav .= LBL_SEARCH_RESULTS;213 $nav .= __('Results: '); 214 214 215 215 // first page -
branches/multiuser/cls/taglist.php
r1181 r1604 67 67 function TagList() { 68 68 $this -> populate(); 69 $this -> columnTitle = LBL_TAG_TAGS;69 $this -> columnTitle = __('Tags'); 70 70 $GLOBALS['rss']-> feedList = $this; 71 71 } … … 84 84 85 85 function getStats() { 86 return sprintf( LBL_TAGCOUNT_PF, $this -> countTaggedItems, $this->tagCount);86 return sprintf(__('<strong>%d</strong> tagged items, in <strong>%d</strong> tags'), $this -> countTaggedItems, $this->tagCount); 87 87 } 88 88 -
branches/multiuser/cls/update.php
r1524 r1604 76 76 77 77 function populate($updatePrivateAlso = false) { 78 $sql = "select c.id, c.url, c.title from ".getTable("channels") . " c ,"79 . getTable('folders') . " f";78 $sql = "select c.id, c.url, c.title from ".getTable("channels") . " c " 79 . " inner join ". getTable('folders') . " f on c.parent = f.id"; 80 80 $sql .= " where not(c.mode & ".RSS_MODE_DELETED_STATE.") "; 81 $sql .= " and c.parent = f.id ";82 81 83 82 if (hidePrivate() && !$updatePrivateAlso) { … … 116 115 if ($error & MAGPIE_FEED_ORIGIN_CACHE) { 117 116 if ($error & MAGPIE_FEED_ORIGIN_HTTP_304) { 118 $label = LBL_UPDATE_NOT_MODIFIED;117 $label = __('OK (304 Not modified)'); 119 118 $cls = ERROR_NOERROR; 120 119 } 121 120 elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_TIMEOUT) { 122 $label = LBL_UPDATE_CACHE_TIMEOUT;121 $label = __('HTTP Timeout (Local cache)'); 123 122 $cls = ERROR_WARNING; 124 123 } 125 124 elseif ($error & MAGPIE_FEED_ORIGIN_NOT_FETCHED) { 126 $label = LBL_UPDATE_STATUS_CACHED;125 $label = __('OK (Local cache)'); 127 126 $cls = ERROR_NOERROR; 128 127 } 129 128 elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_404) { 130 $label = LBL_UPDATE_NOT_FOUND;129 $label = __('404 Not Found (Local cache)'); 131 130 $cls = ERROR_ERROR; 132 131 } … … 137 136 } 138 137 elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_200) { 139 $label = LBL_UPDATE_STATUS_OK;138 $label = __('OK (HTTP 200)'); 140 139 $cls = ERROR_NOERROR; 141 140 } 142 141 else { 143 142 if (is_numeric($error)) { 144 $label = LBL_UPDATE_STATUS_ERROR;143 $label = __('ERROR'); 145 144 $cls = ERROR_ERROR; 146 145 } else { … … 177 176 178 177 echo 179 "<h2>".sprintf( LBL_UPDATE_H2, count($this -> chans))."</h2>\n"178 "<h2>".sprintf(__('Updating %d Feeds...'), count($this -> chans))."</h2>\n" 180 179 ."<table id=\"updatetable\">\n" 181 180 ."<tr>\n" 182 ."<th class=\"lc\">". LBL_UPDATE_CHANNEL."</th>\n"183 ."<th class=\"mc\">". LBL_UPDATE_STATUS."</th>\n"184 ."<th class=\"rc\">". LBL_UPDATE_UNREAD."</th>\n"181 ."<th class=\"lc\">".__('Feed')."</th>\n" 182 ."<th class=\"mc\">".__('Status')."</th>\n" 183 ."<th class=\"rc\">".__('New Items')."</th>\n" 185 184 ."</tr>"; 186 185 … … 239 238 function render() { 240 239 241 echo "<h2 style=\"margin-bottom:1em;\">". sprintf( LBL_UPDATE_H2,count($this -> chans)) ."</h2>\n";240 echo "<h2 style=\"margin-bottom:1em;\">". sprintf(__('Updating %d Feeds...'),count($this -> chans)) ."</h2>\n"; 242 241 243 242 echo "<table id=\"updatetable\">\n" 244 243 ."<tr>\n" 245 ."<th class=\"lc\">". LBL_UPDATE_CHANNEL."</th>\n"246 ."<th class=\"mc\">". LBL_UPDATE_STATUS."</th>\n"247 ."<th class=\"rc\">". LBL_UPDATE_UNREAD."</th>\n"244 ."<th class=\"lc\">".__('Feed')."</th>\n" 245 ."<th class=\"mc\">".__('Status')."</th>\n" 246 ."<th class=\"rc\">".__('New Items')."</th>\n" 248 247 ."</tr>\n"; 249 248 … … 296 295 297 296 list($label,$cls) = parent::magpieError($error); 298 echo "\n$label, $unread " . LBL_UPDATE_UNREAD. "\n\n";297 echo "\n$label, $unread " . __('New Items') . "\n\n"; 299 298 flush(); 300 299 … … 325 324 $unread = count($unreadIds); 326 325 list($label,$cls) = parent::magpieError($error); 327 echo "\n$label, $unread " . LBL_UPDATE_UNREAD. "<br />";326 echo "\n$label, $unread " . __('New Items') . "<br />"; 328 327 flush(); 329 328 } … … 357 356 echo "$title ...\t"; 358 357 flush(); 359 echo "\n$label, $unread " . LBL_UPDATE_UNREAD. "\n\n";358 echo "\n$label, $unread " . __('New Items') . "\n\n"; 360 359 flush(); 361 360 } -
branches/multiuser/cls/wrappers/feeds.php
r1315 r1604 60 60 } 61 61 62 function rss_feeds_folders_unread_count($label=LBL_UNREAD_PF) { 62 function rss_feeds_folders_unread_count($label=null) { 63 if ($label === null) { 64 $label=__('<strong id="%s" style="%s">(%d unread)</strong>'); 65 } 63 66 if (array_key_exists($GLOBALS['rss']->currentFeedsFolder->id,$GLOBALS['rss']->feedList->collapsed_folders)) { 64 67 $sCls = ($GLOBALS['rss']->currentFeedsFolder->isCollapsed?"display:inline":"display:none"); … … 68 71 69 72 switch( $GLOBALS['rss']->feedList -> columnTitle ) { 70 case LBL_TAG_FOLDERS:73 case __('Categories'): 71 74 $ret = rss_plugin_hook("rss.plugins.sidemenu.categoryunreadlabel", $ret); 72 75 break; 73 case LBL_H2_CHANNELS:76 case __('Feeds'): 74 77 $ret = rss_plugin_hook("rss.plugins.sidemenu.folderunreadlabel", $ret); 75 78 break; -
branches/multiuser/cls/wrappers/header.php
