summaryrefslogtreecommitdiff
path: root/buildmaster/gpg-keys.php
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-09 10:50:09 +0100
committerErich Eckner <git@eckner.net>2018-11-09 10:50:09 +0100
commitf89a3fd4c3577eba5a9e3f1c1d27c26fb8432f7b (patch)
treea7720fef45dd700374cda0843ed2d2354ac5bc28 /buildmaster/gpg-keys.php
parent1a9e9dc143b73b29113c5d22c0812f25c43cd34a (diff)
downloadarchweb32-f89a3fd4c3577eba5a9e3f1c1d27c26fb8432f7b.tar.xz
lib/mysql-joins.php new: it contains mysql_join_* functions similar to the ones in lib/mysql-functions of the build scripts
Diffstat (limited to 'buildmaster/gpg-keys.php')
-rw-r--r--buildmaster/gpg-keys.php9
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`"
);