Changeset 1687

Show
Ignore:
Timestamp:
02/07/07 08:49:00 (20 months ago)
Author:
mbonetti
Message:

display feed count for each folder

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gregarius/admin/folders.php

    r1561 r1687  
    4444    echo "<table id=\"foldertable\">\n" 
    4545    ."<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"; 
    4848    if (getConfig('rss.config.absoluteordering')) { 
    4949        echo "\t<th>".__('Move')."</th>\n"; 
     
    5353    ."</tr>\n"; 
    5454 
    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               ); 
    5660 
    5761    if (getConfig('rss.config.absoluteordering')) { 
    58         $sql .=" order by position asc"; 
     62        $sql .=" order by f.position asc"; 
    5963    } else { 
    60         $sql .=" order by name asc"; 
    61     } 
     64        $sql .=" order by f.name asc"; 
     65    } 
     66 
     67 
    6268 
    6369    $res = rss_query($sql); 
    6470    $cntr = 0; 
    65     while (list($id, $name) = rss_fetch_row($res)) { 
     71    while (list($id, $name, $cnt) = rss_fetch_row($res)) { 
    6672 
    6773        $name = $name == ''? __('Root'):$name; 
     
    7076 
    7177        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"; 
    7480        if (getConfig('rss.config.absoluteordering')) { 
    7581            echo "\t<td>"; 
     
    211217 
    212218    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); 
    215221        $new_label = rss_real_escape_string($new_label); 
    216222        assert(strlen($label) > 0); 
     
    221227    case CST_ADMIN_MOVE_DOWN_ACTION: 
    222228 
    223         if ($fid == 0) { 
     229if ($fid == 0) { 
    224230            return; 
    225231        }