From 4880a7d6814a041b78bc48dec8e38314e0fc1d87 Mon Sep 17 00:00:00 2001
From: Sam White <webmaster@ycra.org.uk>
Date: Wed, 8 Dec 2021 11:42:41 +0000
Subject: [PATCH] Move link helper functions to HTML templating include.

---
 public_html/includes/html-templating.php | 12 ++++++++++++
 public_html/includes/utils.php           | 10 ----------
 public_html/index.php                    |  1 -
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/public_html/includes/html-templating.php b/public_html/includes/html-templating.php
index aac4210..ac29f2e 100644
--- a/public_html/includes/html-templating.php
+++ b/public_html/includes/html-templating.php
@@ -25,3 +25,15 @@ function javascript($name) {
   <script type="text/javascript" <?php
           src($rel_path . $suffix);?>"></script><?php
 }
+
+// Link output helper functions.
+function href($path) {
+  echo 'href="';
+  esc(rel_url($path));
+  echo '"';
+}
+function src($path) {
+  echo 'src="';
+  esc(rel_url($path));
+  echo '"';
+}
diff --git a/public_html/includes/utils.php b/public_html/includes/utils.php
index a9f096f..bb62dc0 100644
--- a/public_html/includes/utils.php
+++ b/public_html/includes/utils.php
@@ -21,16 +21,6 @@ function rel_url($path) {
 function abs_url($path) {
   return 'https://ycra.org.uk' . rel_url($path);
 }
-function href($path) {
-  echo 'href="';
-  esc(rel_url($path));
-  echo '"';
-}
-function src($path) {
-  echo 'src="';
-  esc(rel_url($path));
-  echo '"';
-}
 
 /** Return cache control file suffix for file at $path
  *
diff --git a/public_html/index.php b/public_html/index.php
index 20caeed..20aeabb 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -1,5 +1,4 @@
 <?php
-require_once('includes/utils.php');
 require_once('includes/html-templating.php');
 
 
-- 
2.25.1