From f8605ec188e81b347d15786a67e6869f75909e48 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Tue, 26 Mar 2024 12:56:11 +0000
Subject: Allow specifying the webcpanel template directory directly.

There's no need to hardcode a base path here.
---
 data/modules.example.conf       | 7 +++++--
 modules/webcpanel/webcpanel.cpp | 5 ++---
 modules/webcpanel/webcpanel.h   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/data/modules.example.conf b/data/modules.example.conf
index f1818e0e2..2137f0309 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -774,8 +774,11 @@ module { name = "sasl" }
 	/* Web server to use. */
 	server = "httpd/main";
 
-	/* Template to use. */
-	template = "default";
+	/*
+	 * The directory containing the webcpanel templates. This is relative to the
+	 * data directory.
+	 */
+	template_dir = "webcpanel/templates/default";
 
 	/* Page title. */
 	title = "Anope IRC Services";
diff --git a/modules/webcpanel/webcpanel.cpp b/modules/webcpanel/webcpanel.cpp
index 8d31e38e3..9aa33ae4b 100644
--- a/modules/webcpanel/webcpanel.cpp
+++ b/modules/webcpanel/webcpanel.cpp
@@ -8,7 +8,7 @@
 #include "webcpanel.h"
 
 Module *me;
-Anope::string provider_name, template_name, template_base, page_title;
+Anope::string provider_name, template_base, page_title;
 
 class ModuleWebCPanel final
 	: public Module
@@ -60,8 +60,7 @@ public:
 
 		Configuration::Block *block = Config->GetModule(this);
 		provider_name = block->Get<const Anope::string>("server", "httpd/main");
-		template_name = block->Get<const Anope::string>("template", "default");
-		template_base = Anope::ExpandData("webcpanel/templates/" + template_name);
+		template_base = Anope::ExpandData(block->Get<const Anope::string>("template_dir", "webcpanel/templates/default"));
 		page_title = block->Get<const Anope::string>("title", "Anope IRC Services");
 
 		provider = ServiceReference<HTTPProvider>("HTTPProvider", provider_name);
diff --git a/modules/webcpanel/webcpanel.h b/modules/webcpanel/webcpanel.h
index 362b5e1ac..cef2d722d 100644
--- a/modules/webcpanel/webcpanel.h
+++ b/modules/webcpanel/webcpanel.h
@@ -15,7 +15,7 @@
 
 extern Module *me;
 
-extern Anope::string provider_name, template_name, template_base, page_title;
+extern Anope::string provider_name, template_base, page_title;
 
 struct SubSection final
 {
-- 
cgit