From adcc105163f0752c516c372abcc50a5e9f40f16f Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Thu, 26 Mar 2009 23:07:45 +0000
Subject: [PATCH] fetchmail.php: - only list fetchmail entries for
 domains/mailboxes someone owns - better sort order for list mode (mailbox,
 src_server, src_user) - best   would be to sort by domain first, but this
 isn't that easy without a   domain column. Anyways, everything is better than
 "order by id" ;-) - changes partly done to prepare "fetchmail for users", see
 patch at  
 https://sourceforge.net/tracker/?func=detail&aid=2715675&group_id=191583&atid=937966
   (patch will be included after the 2.3 release)

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@604 a1433add-5e2c-0410-b055-b7f2511e0802
---
 fetchmail.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fetchmail.php b/fetchmail.php
index e5560a85..93873903 100644
--- a/fetchmail.php
+++ b/fetchmail.php
@@ -121,9 +121,10 @@ if ($delete) {
    $row_id = $edit;
 }
 
-
+$user_mailboxes_sql= "'" . implode("','",escape_string(array_values($fm_defaults["mailbox"]))) . "'"; # mailboxes as SQL
 if ($row_id) {
-   $result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE id=" . $row_id);
+   $result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE id=$row_id AND mailbox IN ($user_mailboxes_sql)");
+   # TODO: the "AND mailbox IN ..." part should obsolete the check_owner call. Remove it after checking again.
    if ($result['rows'] > 0) {
       $edit_row = db_array ($result['result']);
       $account = $edit_row['src_user'] . " @ " . $edit_row['src_server'];
@@ -221,7 +222,8 @@ if ($cancel) { # cancel $new or $edit
 
 $tFmail = array();
 if ($edit + $new == 0) { # display list
-   $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail order by id desc");
+   # TODO: ORDER BY would even be better if it would order by the _domain_ of the target mailbox first
+   $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE mailbox IN ($user_mailboxes_sql) ORDER BY mailbox,src_server,src_user");
    if ($res['rows'] > 0) {
       while ($row = db_array ($res['result'])) {
          $tFmail[] = $row;