From 56c203d9258190041874ae56c2565630fe8f28a7 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 4 Feb 2022 23:39:45 +0100 Subject: [PATCH] Added serve_folder_relative member to PagedArticle. --- modules/paged_article/paged_article.cpp | 10 +++++++++- modules/paged_article/paged_article.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/paged_article/paged_article.cpp b/modules/paged_article/paged_article.cpp index f21e2b3..5663015 100644 --- a/modules/paged_article/paged_article.cpp +++ b/modules/paged_article/paged_article.cpp @@ -102,7 +102,12 @@ void PagedArticle::load() { file_cache->clear(); if (serve_folder != "") { - file_cache->wwwroot = serve_folder; + if (serve_folder_relative) { + file_cache->wwwroot = articles_folder + "/" + serve_folder; + } else { + file_cache->wwwroot = serve_folder; + } + file_cache->wwwroot_refresh_cache(); } @@ -127,6 +132,9 @@ PagedArticle::PagedArticle() : WebNode() { file_cache = new FileCache(); + + serve_folder_relative = true; + serve_folder = "files"; } PagedArticle::~PagedArticle() { diff --git a/modules/paged_article/paged_article.h b/modules/paged_article/paged_article.h index 7bd7206..78f81b3 100644 --- a/modules/paged_article/paged_article.h +++ b/modules/paged_article/paged_article.h @@ -24,7 +24,7 @@ public: ~PagedArticle(); String articles_folder; - //todo make this somehow articles_folder + "/files" by default + bool serve_folder_relative; String serve_folder; protected: