Changeset 1687
- Timestamp:
- 02/07/07 08:49:00 (20 months ago)
- Files:
-
- 1 modified
-
trunk/gregarius/admin/folders.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/gregarius/admin/folders.php
r1561 r1687 44 44 echo "<table id=\"foldertable\">\n" 45 45 ."<tr>\n" 46 ."\t<th class=\"cntr\">". __('Title') ."</th>\n";47 46 ."\t<th>". __('Title') ."</th>\n" 47 ."\t<th class=\"cntr\">". __('Feeds') ."</th>\n"; 48 48 if (getConfig('rss.config.absoluteordering')) { 49 49 echo "\t<th>".__('Move')."</th>\n"; … … 53 53 ."</tr>\n"; 54 54 55 $sql = "select id,name from " .getTable("folders"); 55 56 $sql = 57 sprintf("select f.id, f.name, count(*) from %s f, %s c where c.parent=f.id group by id", 58 getTable('folders'), getTable('channels') 59 ); 56 60 57 61 if (getConfig('rss.config.absoluteordering')) { 58 $sql .=" order by position asc";62 $sql .=" order by f.position asc"; 59 63 } else { 60 $sql .=" order by name asc"; 61 } 64 $sql .=" order by f.name asc"; 65 } 66 67 62 68 63 69 $res = rss_query($sql); 64 70 $cntr = 0; 65 while (list($id, $name ) = rss_fetch_row($res)) {71 while (list($id, $name, $cnt) = rss_fetch_row($res)) { 66 72 67 73 $name = $name == ''? __('Root'):$name; … … 70 76 71 77 echo "<tr class=\"$class_\">\n" 72 ."\t<td>$name</td>\n" ;73 78 ."\t<td>$name</td>\n" 79 ."\t<td class=\"cntr\">$cnt</td>\n"; 74 80 if (getConfig('rss.config.absoluteordering')) { 75 81 echo "\t<td>"; … … 211 217 212 218 case __('Add'): 213 case 'ACT_ADMIN_ADD':214 $label=sanitize($_REQUEST['new_folder'],RSS_SANITIZER_URL);219 case 'ACT_ADMIN_ADD': 220 $label=sanitize($_REQUEST['new_folder'],RSS_SANITIZER_URL); 215 221 $new_label = rss_real_escape_string($new_label); 216 222 assert(strlen($label) > 0); … … 221 227 case CST_ADMIN_MOVE_DOWN_ACTION: 222 228 223 if ($fid == 0) {229 if ($fid == 0) { 224 230 return; 225 231 }
