Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/buildmaster/log.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/log.php
parent1a9e9dc143b73b29113c5d22c0812f25c43cd34a (diff)
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/log.php')
-rw-r--r--buildmaster/log.php9
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`";
}