From a0c305ec1b70c0d5a8aad8a1d3b2477bc3a15bbe Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 27 Jul 2018 09:31:58 +0200
Subject: git_url() new

---
 buildmaster/build-list.php | 16 +++++++++-------
 buildmaster/todos.php      |  6 +++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'buildmaster')

diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php
index 1b4466f..2ff9b92 100644
--- a/buildmaster/build-list.php
+++ b/buildmaster/build-list.php
@@ -1,6 +1,7 @@
 <?php
 require_once "../init.php";
 
+require_once BASE . "/lib/helper.php";
 require_once BASE . "/lib/mysql.php";
 require_once BASE . "/lib/style.php";
 
@@ -82,13 +83,14 @@ $columns = array(
     "mysql_query" =>
       "IF(`ba_q`.`uses_modification`," .
         "CONCAT(" .
-          "\"<a href=\\\"https://git.archlinux32.org/archlinux32/packages/src/commit/\"," .
-          "`ba_q`.`mod_git_revision`," .
-          "\"/\"," .
-          "`ba_q`.`package_repository`," .
-          "\"/\"," .
-          "`ba_q`.`pkgbase`," .
-          "\"\\\">\"," .
+          "\"<a href=\\\"" .
+          git_url(
+            "packages",
+            "tree",
+            "\",`ba_q`.`mod_git_revision`,\"",
+            "\",`ba_q`.`package_repository`,\"/\",`ba_q`.`pkgbase`,\""
+          ) .
+          "\\\">\"," .
           "`ba_q`.`mod_git_revision`," .
           "\"</a>\"" .
         ")," .
diff --git a/buildmaster/todos.php b/buildmaster/todos.php
index e3d7319..bf77f08 100644
--- a/buildmaster/todos.php
+++ b/buildmaster/todos.php
@@ -1,5 +1,7 @@
 <?php
 require_once "../init.php";
+
+include BASE . "/lib/helper.php";
 include BASE . "/lib/mysql.php";
 
 $result = mysql_run_query(
@@ -76,7 +78,9 @@ if (isset($_GET["graph"])) {
     while ($row = $result->fetch_assoc()) {
       print "<a href=\"#TODO" . $row["id"] . "\" name=\"TODO" . $row["id"] ."\">TODO #" . $row["id"] . "</a>";
       print " - ";
-      print "<a href=\"https://git.archlinux32.org/archlinux32/builder/src/branch/master/" . $row["file"] . "#L" . $row["line"] . "\">" . $row["file"] . "(line " . $row["line"] . ")</a>";
+      print "<a href=\"";
+      print git_url("builder","tree","master",$row["file"],$row["line"]);
+      print "\">" . $row["file"] . "(line " . $row["line"] . ")</a>";
       print ":<br>\n";
       print str_replace("\\n","<br>\n",$row["description"]);
       print "<br>\n";
-- 
cgit v1.2.3