lib/mysql-joins.php new: it contains mysql_join_* functions similar to the ones in lib/mysql-functions of the build scripts

1 files changed, 3 insertions, 6 deletions

diff --git a/buildmaster/gpg-keys.php b/buildmaster/gpg-keys.php
index ae82a5d..db990c2 100644
--- a/buildmaster/gpg-keys.php
+++ b/buildmaster/gpg-keys.php
@@ -8,12 +8,9 @@ require_once BASE . "/lib/mysql.php";
     "`persons`.`name` AS `person`," .
     "`gpg_keys`.`fingerprint`" .
     " FROM `email_actions`" .
-    " JOIN `allowed_email_actions` ON" .
-    " `email_actions`.`id`=`allowed_email_actions`.`action`" .
-    " RIGHT JOIN `gpg_keys` ON" .
-    " `allowed_email_actions`.`gpg_key`=`gpg_keys`.`id`" .
-    " JOIN `persons` ON" .
-    " `gpg_keys`.`owner`=`persons`.`id`" .
+    mysql_join_email_actions_allowed_email_actions() .
+    " RIGHT" . mysql_join_allowed_email_actions_gpg_keys() .
+    mysql_join_gpg_keys_persons() .
     " GROUP BY `gpg_keys`.`id`" .
     " ORDER BY `persons`.`name`"
   );