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, 5 insertions, 4 deletions

diff --git a/buildmaster/log.php b/buildmaster/log.php
index 23bfc72..f6de94b 100644
--- a/buildmaster/log.php
+++ b/buildmaster/log.php
@@ -13,7 +13,7 @@ require_once BASE . "/lib/mysql.php";
       "action" => "`ssh_log`.`action`",
       "parameters" => "`ssh_log`.`parameters`"
     );
-    $join = " LEFT JOIN `build_slaves` ON `ssh_log`.`build_slave`=`build_slaves`.`id`";
+    $join = " LEFT" . mysql_join_ssh_log_build_slaves();
     if (isset($_GET["action"]))
       $filter .= " AND `ssh_log`.`action` LIKE from_base64(\"" . base64_encode($_GET["action"]) . "\")";
     if (isset($_GET["slave"]))
@@ -29,9 +29,10 @@ require_once BASE . "/lib/mysql.php";
       "comment" => "`email_log`.`comment`"
     );
     $join =
-      " LEFT JOIN `email_actions` ON `email_log`.`action`=`email_actions`.`id`" .
-      " LEFT JOIN (`gpg_keys`" .
-        " JOIN `persons` ON `gpg_keys`.`owner`=`persons`.`id`" .
+      " LEFT" . mysql_join_email_log_email_actions() .
+      " LEFT JOIN (" .
+        "`gpg_keys`" .
+        mysql_join_gpg_keys_persons() .
       ") ON `email_log`.`gpg_key`=`gpg_keys`.`id`";
   }