From 6796a96ba1c646699cf176130d0f668910c0fad9 Mon Sep 17 00:00:00 2001
From: onefang
Date: Mon, 6 Jun 2022 19:21:58 +1000
Subject: Move SledjChisl header and footer to external SSI files.

---
 example/var/www/html/footer.html      |  55 +++++++++++++
 example/var/www/html/header.html      |  16 ++++
 example/var/www/html/headerDebug.html |  26 ++++++
 src/sledjchisl/sledjchisl.c           | 144 +++++++++-------------------------
 4 files changed, 132 insertions(+), 109 deletions(-)
 create mode 100644 example/var/www/html/footer.html
 create mode 100644 example/var/www/html/header.html
 create mode 100644 example/var/www/html/headerDebug.html

diff --git a/example/var/www/html/footer.html b/example/var/www/html/footer.html
new file mode 100644
index 0000000..f514fb6
--- /dev/null
+++ b/example/var/www/html/footer.html
@@ -0,0 +1,55 @@
+    </div>
+    <div class='top-right'>
+      <h1>Experimental account manager</h1>
+      <p>This account manager system is currently experimental, and under heavy development. &nbsp; 
+         Which means it's not all written yet, and things may break.</p>
+      <p>To create an account, choose a name and password, type them in, click the 'create account' button.</p>
+      <p>On the next page, fill in all your details, then click on the 'confirm' button.</p>
+      <p>We follow the usual web site registration process, which sends a validation email, with a link to click. &nbsp; 
+        When you get that email, click on the link, or copy it into a web browser.</p>
+      <p>You will then be logged off. &nbsp; Now you have to wait for an admin to approve your new account. &nbsp; 
+        They should check with the person you listed as vouching for you first. &nbsp; They will tell you after they approve your account.</p>
+      <p>Missing bits that are still being written - editing accounts, listing accounts, deleting accounts.</p>
+      <h1>Experimental chat thingy</h1>
+      <p>In the bottom right corner is an experimental chat thingy, based on Jabber / XMPP.</p>
+      <p>Click on the 'Toggle chat' button to pop it up, then use your grid user name for the 'XMPP Address:' field. &nbsp; 
+         Your user name has to be in the format 'first.last', two words with a dot in the middle. &nbsp; 
+         Then put your grid account password in the 'Password' field and click the 'Log in' button. &nbsp; 
+      <p>Note that the chat windows can be resized by dragging their top or left edges, which I suggest you do, coz the default size is too small.</p>
+      <p>You can also use any other Jabber / XMPP client as well.  So your JID for other clients is first.last@<!--#echo var="host" --></p>
+      <p>Remember this is <b>EXPERIMENTAL</b>, I'll be changing things. &nbsp; Next I'll make it so you don't have to log in to both this chat thingy and the account page separataly.<p>
+      <p>P.S. &nbsp; Yes, I hate the default theme to. &nbsp; lol</p>
+    </div>
+    <div class='bottom-left'>
+      <iframe src='stats.html' style='border:none;height:100%;width:100%;'></iframe>
+    </div>
+    <div class='bottom-right'>
+    </div>
+  </font>
+</body>
+
+<script>
+    converse.initialize({
+        allow_registration: false,
+        assets_path: '/converse.js/dist/',
+        bosh_service_url: 'https://<!--#echo var="host" -->:5281/http-bind/',
+        default_domain: '<!--#echo var="host" -->',
+        muc_clear_messages_on_leave: false,
+        muc_domain: 'chat.<!--#echo var="host" -->',
+        muc_history_max_stanzas: 0,
+        muc_instant_rooms: false,
+        muc_send_probes: true,
+        notify_all_room_messages: true,
+        notification_delay: 500000,
+        notification_icon: '/converse.js/dist/images/logo/conversejs-filled.svg',
+        omemo_default: true,
+        play_sounds: true,
+        registration_domain: '<!--#echo var="host" -->',
+        show_chat_state_notifications: true,
+        show_message_avatar: true,
+        theme: 'dracula',
+        time_format: 'dddd YYYY-MMM-DD HH:mm:ss',
+        view_mode: 'overlayed'
+    })
+</script>
+</html>
diff --git a/example/var/www/html/header.html b/example/var/www/html/header.html
new file mode 100644
index 0000000..b56d057
--- /dev/null
+++ b/example/var/www/html/header.html
@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <title><!--#echo var="title" --></title>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=0.5" />
+    <link rel="manifest" href="/converse.js/manifest.json">
+    <link type='text/css' rel='stylesheet' href='/converse.js/dist/converse.min.css' media='screen' />
+    <script src='/converse.js/3rdparty/libsignal-protocol.min.js'></script>
+    <script src='/converse.js/dist/converse.min.js'></script>
+    <link rel="shortcut icon" href="/SledjHamrIconSmall.png">
+    <link type='text/css' rel='stylesheet' href='/SledjChisl.css' media='all' />
+  </head>
+  <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red' id='page-top' data-spy='scroll' class='converse-website'>
+  <font face='sans-serif'>
+    <div class='top-left'>
diff --git a/example/var/www/html/headerDebug.html b/example/var/www/html/headerDebug.html
new file mode 100644
index 0000000..df0fc99
--- /dev/null
+++ b/example/var/www/html/headerDebug.html
@@ -0,0 +1,26 @@
+<html>
+  <head>
+    <title><!--#echo var="title" --></title>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=0.5" />
+    <link rel="manifest" href="/converse.js/manifest.json">
+    <link type='text/css' rel='stylesheet' href='/converse.js/dist/converse.min.css' media='screen' />
+    <script src='/converse.js/3rdparty/libsignal-protocol.min.js'></script>
+    <script src='/converse.js/dist/converse.min.js'></script>
+    <link rel="shortcut icon" href="/SledjHamrIconSmall.png">
+    <link type='text/css' rel='stylesheet' href='/SledjChisl.css' media='all' />
+    <link type='text/css' rel='stylesheet' href='/debugStyle.css' media='all' />
+  </head>
+  <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red' id='page-top' data-spy='scroll' class='converse-website'>
+  <font face='sans-serif'>
+    <div class='top-left'>
+      <p class='hoverItem'>
+        <div class='hoverWrapper0'>
+          <p>DEBUG</p>
+          <div id='hoverShow0'>
+            <h1>DEBUG log</h1>
+            <!--#echo var="DEBUG" -->
+          </div>
+        </div>
+      </p>
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index adfc2f9..ec24b22 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -488,7 +488,7 @@ struct _reqData
 {
   lua_State *L;
   qhashtbl_t *configs, *queries, *body, *cookies, *headers, *valid, *stuff, *database, *Rcookies, *Rheaders;
-  char *Scheme, *Host, *Method, *Script, *Path, *RUri, *doit, *form, *output, *outQuery;
+  char *Scheme, *Host, *Method, *Script, *Path, *RUri, *doit, *form, *output, *outQuery, *title;
   sesh shs, *lnk;
   gridStats *stats;
   qlist_t *errors, *messages;
@@ -4689,53 +4689,6 @@ struct _fragment
   char *text;
 };
 
-static void HTMLdebug(qgrow_t *reply)
-{
-  reply->addstrf(reply,
-    "      <p class='hoverItem'>\n"
-    "        <div class='hoverWrapper0'>\n"
-    "          <p>DEBUG</p>\n"
-    "          <div id='hoverShow0'>\n"
-    "            <h1>DEBUG log</h1>\n"
-    "            <!--#echo var=\"DEBUG\" -->\n"
-    "          </div>\n"
-    "        </div>\n"
-    "      </p>\n"
-  );
-}
-
-static void HTMLheader(qgrow_t *reply, char *title)
-{
-  reply->addstrf(reply,
-    "<html>\n"
-    "  <head>\n"
-    "    <title>%s</title>\n"
-    "    <meta charset=\"UTF-8\">\n"
-    "    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"
-    "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=0.5\" />\n"
-//    "    <meta name=\"description\" content=\"Converse XMPP/Jabber Chat\"/>\n"
-//    "    <meta name=\"author\" content=\"JC Brand\" />\n"
-    "    <link rel=\"manifest\" href=\"/converse.js/manifest.json\">\n"
-    "    <link type='text/css' rel='stylesheet' href='/converse.js/dist/converse.min.css' media='screen' />\n"
-    "    <script src='/converse.js/3rdparty/libsignal-protocol.min.js'></script>\n"
-    "    <script src='/converse.js/dist/converse.min.js'></script>\n"
-    "    <link rel=\"shortcut icon\" href=\"/SledjHamrIconSmall.png\">\n"
-    "    <link type='text/css' rel='stylesheet' href='/SledjChisl.css' media='all' />\n"
-
-    , title);
-
-  if (DEBUG)
-    reply->addstrf(reply, "    <link type='text/css' rel='stylesheet' href='/debugStyle.css' media='all' />\n");
-
-  reply->addstrf(reply,
-    "  </head>\n"
-    "  <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red' id='page-top' data-spy='scroll' class='converse-website'>\n"
-    "  <font face='sans-serif'>\n"
-    );
-  reply->addstrf(reply, "    <div class='top-left'>\n");
-  if (DEBUG)
-    HTMLdebug(reply);
-}
 
 // TODO - maybe escape non printables as well?
 char *HTMLentities[] =
@@ -5056,6 +5009,10 @@ void HTMLfill(reqData *Rd, enum fragmentType type, char *text, int length)
 	  outize(Rd->reply, Rd->Rheaders, "Reply HEADERS");
 	}
       }
+      else if (strcmp("host", text) == 0)
+	Rd->reply->addstrf(Rd->reply, "%s", Rd->Host);
+      else if (strcmp("title", text) == 0)
+	Rd->reply->addstrf(Rd->reply, "%s", Rd->title);
       else if (strcmp("URL", text) == 0)
 	Rd->reply->addstrf(Rd->reply, "%s://%s%s", Rd->Scheme, Rd->Host, Rd->Script);
       else
@@ -5073,66 +5030,6 @@ void HTMLfill(reqData *Rd, enum fragmentType type, char *text, int length)
   }
 }
 
-static void HTMLfooter(reqData *Rd)
-{
-  Rd->reply->addstrf(Rd->reply, "    </div>\n");
-  Rd->reply->addstr(Rd->reply,
-    "    <div class='top-right'>\n"
-    "      <h1>Experimental account manager</h1>\n"
-    "      <p>This account manager system is currently experimental, and under heavy development. &nbsp; "
-    "         Which means it's not all written yet, and things may break.</p>\n"
-    "      <p>To create an account, choose a name and password, type them in, click the 'create account' button.</p>"
-    "      <p>On the next page, fill in all your details, then click on the 'confirm' button.</p>"
-    "      <p>We follow the usual web site registration process, which sends a validation email, with a link to click. &nbsp; "
-    "        When you get that email, click on the link, or copy it into a web browser.</p>"
-    "      <p>You will then be logged off. &nbsp; Now you have to wait for an admin to approve your new account. &nbsp; "
-    "        They should check with the person you listed as vouching for you first. &nbsp; They will tell you after they approve your account.</p>"
-    "      <p>Missing bits that are still being written - editing accounts, listing accounts, deleting accounts.</p>\n"
-    "      <h1>Experimental chat thingy</h1>\n"
-    "      <p>In the bottom right corner is an experimental chat thingy, based on Jabber / XMPP.</p>\n"
-    "      <p>Click on the 'Toggle chat' button to pop it up, then use your grid user name for the 'XMPP Address:' field. &nbsp; "
-    "         Your user name has to be in the format 'first.last', two words with a dot in the middle. &nbsp; "
-    "         Then put your grid account password in the 'Password' field and click the 'Log in' button. &nbsp; "
-    "         Ignore the 'Don't have a chat account? Create an account' bit.</p>\n"
-    "      <p>Note that the chat windows can be resized by dragging their top or left edges, which I suggest you do, coz the default size is too small.</p>\n"
-    "      <p>You can also use any other Jabber / XMPP client as well.</p>\n"
-    "      <p>Remember this is <b>EXPERIMENTAL</b>, I'll be changing things. &nbsp; Next I'll make it so you don't have to log in to both this chat thingy and the account page separataly.<p>"
-    "      <p>P.S. &nbsp; Yes, I hate the default theme to. &nbsp; lol</p>\n"
-    "    </div>\n");
-//  Rd->reply->addstr(Rd->reply, "    <div class='centre'>\n    </div>\n");
-  Rd->reply->addstrf(Rd->reply,
-    "    <div class='bottom-left'>\n"
-    "      <iframe src='stats.html' style='border:none;height:100%;width:100%;'></iframe>\n"
-    "    </div>\n"
-    "    <div class='bottom-right'>\n"
-    "    </div>\n"
-    "  </font>\n"
-    "</body>\n"
-
-    "<script>\n"
-    "    converse.initialize({\n"
-    "        assets_path: '/converse.js/dist/',\n"
-    "        bosh_service_url: 'https://%s:5281/http-bind/',\n"
-    "        view_mode: 'overlayed',\n"
-    "        default_domain: '%s',\n"
-    "        muc_clear_messages_on_leave: false,\n"
-    "        muc_domain: 'chat.%s',\n"
-    "        muc_history_max_stanzas: 0,\n"
-    "        muc_send_probes: true,\n"
-    "        notify_all_room_messages: true,\n"
-    "        notification_delay:500000,\n"
-    "        play_sounds: true,\n"
-    "        registration_domain: '%s',\n"
-    "        show_chat_state_notifications: true,\n"
-    "        show_message_avatar: false,\n"
-    "        theme: 'dracula',\n"
-    "        time_format: 'dddd YYYY-MMM-DD HH:mm:ss'\n"
-    "    });\n"
-    "</script>\n"
-    "</html>\n", webHost, webHost, webHost, webHost);
-}
-
-
 fragment *newFragment(enum fragmentType type, char *text, int len)
 {
   fragment *frg = xmalloc(sizeof(fragment));
@@ -5298,9 +5195,36 @@ HTMLfile *checkHTMLcache(char *file)
   return ret;
 }
 
+static void HTMLheader(reqData *Rd, /*qgrow_t *reply,*/ char *title)
+{
+  char *f = NULL;
 
+  Rd->title = xmprintf(title);
+  if (DEBUG)
+    f = xmprintf("%s%s/headerDebug.html", scRoot, webRoot);
+  else
+    f = xmprintf("%s%s/header.html", scRoot, webRoot);
+  HTMLfile *thisFile = checkHTMLcache(f);
+  if (NULL != thisFile)
+    unfragize(thisFile->fragments, Rd, FALSE);
+  else
+    E("Can't find %s file!", f);
+  free(thisFile);
+  free(f);
+}
 
+static void HTMLfooter(reqData *Rd)
+{
+  char *f = xmprintf("%s%s/footer.html", scRoot, webRoot);
 
+  HTMLfile *thisFile = checkHTMLcache(f);
+  if (NULL != thisFile)
+    unfragize(thisFile->fragments, Rd, FALSE);
+  else
+    E("Can't find %s file!", f);
+  free(thisFile);
+  free(f);
+}
 
 /* TODO -
 
@@ -7067,7 +6991,8 @@ static void accountWebHeaders(reqData *Rd, inputForm *oF)  //, char *name)
 {
   char *linky = checkLinky(Rd);
 
-  HTMLheader(Rd->reply, "<!--#echo var=\"grid\" --> account manager");
+  Rd->title = xmprintf("<!--#echo var=\"grid\" --> account manager");
+  HTMLheader(Rd, "<!--#echo var=\"grid\" --> account manager");
   Rd->reply->addstrf(Rd->reply, "<h1><!--#echo var=\"grid\" --> account manager</h1>\n");
   if (NULL != Rd->shs.name)
   {
@@ -9931,6 +9856,7 @@ fcgiDone:
 	qhashtbl_free(Rd->queries);
 	if (Rd->lnk)	free(Rd->lnk);
 	free(Rd->RUri);
+	free(Rd->title);
 
 	struct timespec now;
 	if (-1 == clock_gettime(CLOCK_REALTIME, &now))
-- 
cgit v1.1