r2852 - getFileLinkInfo(): rework unused function into getFileStats() and use it...

diff --git a/inc/database.php b/inc/database.php
index 612d2148311db11b1f39b025c35d6b8bbbb789f5..fb670151b14cd40cf1466f73887c36a17c52775f 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -3489,46 +3489,30 @@ function getFileLinks ($file_id = 0)
        return $ret;
 }
 
-// Return list of possible file parents along with the number of children.
-// Used on main Files listing page.
-function getFileLinkInfo ()
+function getFileStats ()
 {
-       global $dbxlink;
        $query = 'SELECT entity_type, COUNT(*) AS count FROM FileLink GROUP BY entity_type';
-
        $result = useSelectBlade ($query, __FUNCTION__);
        $ret = array();
-       $ret[0] = array ('entity_type' => 'all', 'name' => 'ALL files');
-       $clist = array ('entity_type', 'name', 'count');
-       $total = 0;
-       $i=2;
        while ($row = $result->fetch (PDO::FETCH_ASSOC))
                if ($row['count'] > 0)
-               {
-                       $total += $row['count'];
-                       $row['name'] = formatEntityName ($row['entity_type']);
-                       foreach ($clist as $cname)
-                               $ret[$i][$cname] = $row[$cname];
-                               $i++;
-               }
-       $result->closeCursor();
+                       $ret["Links in realm '${row['entity_type']}'"] = $row['count'];
+       unset ($result);
 
        // Find number of files without any linkage
        $linkless_sql =
                'SELECT COUNT(*) ' .
                'FROM File ' .
                'WHERE id NOT IN (SELECT file_id FROM FileLink)';
-       $q_linkless = useSelectBlade ($linkless_sql, __FUNCTION__);
-       $ret[1] = array ('entity_type' => 'no_links', 'name' => 'Files w/no links', 'count' => $q_linkless->fetchColumn ());
-       $q_linkless->closeCursor();
+       $result = useSelectBlade ($linkless_sql, __FUNCTION__);
+       $ret["Unattached files"] = $result->fetchColumn ();
+       unset ($result);
 
        // Find total number of files
        $total_sql = 'SELECT COUNT(*) FROM File';
-       $q_total = useSelectBlade ($total_sql, __FUNCTION__);
-       $ret[0]['count'] = $q_total->fetchColumn ();
-       $q_total->closeCursor();
+       $result = useSelectBlade ($total_sql, __FUNCTION__);
+       $ret["Total files"] = $result->fetchColumn ();
 
-       ksort($ret);
        return $ret;
 }
 

diff --git a/inc/interface.php b/inc/interface.php
index 44405d46f923112bcdf9b98a362264460036e880..33c065ae9ad6d3b81a11606deecf1ebabb091922 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -3696,6 +3696,12 @@ function renderSystemReports ()
                        'func' => 'getRackspaceStats'
                ),
                array
+               (
+                       'title' => 'Files',
+                       'type' => 'counters',
+                       'func' => 'getFileStats'
+               ),
+               array
                (
                        'title' => 'Tags top-50',
                        'type' => 'custom',