1 files changed, 38 insertions, 22 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 915459a..83a4774 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -467,6 +467,7 @@ int  idleTimeOut  = 24 * 60 * 60;
 int newbieTimeOut = 30;
 float loadAverageInc = 0.5;
 int  simTimeOut = 45;
+boolean DEBUG = TRUE;
 qhashtbl_t *mimeTypes;
 qlist_t *dbRequests;
@@ -2141,7 +2142,12 @@ static void HTMLheader(qgrow_t *reply, char *title)
    "    <title>%s</title>\n"
    "    <meta charset=\"UTF-8\">\n"
    "    <link rel=\"shortcut icon\" href=\"/SledjHamrIconSmall.png\">\n"
-    "    <link type='text/css' rel='stylesheet' href='/debugStyle.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,
    "    <style> \n"
    "      html, body {background-color: black; color: white; font-family: 'sans-serif'; margin: 0; padding: 0;}\n"
    "      a:link {color: aqua;}\n"
@@ -2158,7 +2164,7 @@ static void HTMLheader(qgrow_t *reply, char *title)
    "  </head>\n"
    "  <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red'>\n"
    "  <font face='sans-serif'>"
-    , title);
+    );
 }
 static void HTMLdebug(qgrow_t *reply)
@@ -2372,22 +2378,25 @@ void HTMLfill(reqData *Rd, enum fragmentType type, char *text, int length)
    {
      if (strcmp("DEBUG", text) == 0)
      {
-        Rd->reply->addstrf(Rd->reply, "<h1>FastCGI SledjChisl</h1>\n"
+        if (DEBUG)
-                                      "<p>Request number %d,  Process ID: %d</p>\n", count++, getpid());
+        {
-        Rd->reply->addstrf(Rd->reply, "<p>libfcgi version: %s</p>\n", FCGI_VERSION);
+          Rd->reply->addstrf(Rd->reply, "<h1>FastCGI SledjChisl</h1>\n"
-        Rd->reply->addstrf(Rd->reply, "<p>Lua version: %s</p>\n", LUA_RELEASE);
+                                        "<p>Request number %d,  Process ID: %d</p>\n", count++, getpid());
-        Rd->reply->addstrf(Rd->reply, "<p>LuaJIT version: %s</p>\n", LUAJIT_VERSION);
+          Rd->reply->addstrf(Rd->reply, "<p>libfcgi version: %s</p>\n", FCGI_VERSION);
-        Rd->reply->addstrf(Rd->reply, "<p>MySQL client version: %s</p>\n", mysql_get_client_info());
+          Rd->reply->addstrf(Rd->reply, "<p>Lua version: %s</p>\n", LUA_RELEASE);
-        outize(Rd->reply, Rd->headers, "Environment");
+          Rd->reply->addstrf(Rd->reply, "<p>LuaJIT version: %s</p>\n", LUAJIT_VERSION);
-        outize(Rd->reply, Rd->cookies, "Cookies");
+          Rd->reply->addstrf(Rd->reply, "<p>MySQL client version: %s</p>\n", mysql_get_client_info());
-        outize(Rd->reply, Rd->queries, "Query");
+          outize(Rd->reply, Rd->headers, "Environment");
-        outize(Rd->reply, Rd->body, "POST body");
+          outize(Rd->reply, Rd->cookies, "Cookies");
-        outize(Rd->reply, Rd->stuff, "Stuff");
+          outize(Rd->reply, Rd->queries, "Query");
-        showSesh(Rd->reply, &Rd->shs);
+          outize(Rd->reply, Rd->body, "POST body");
-        if (Rd->lnk)    showSesh(Rd->reply, Rd->lnk);
+          outize(Rd->reply, Rd->stuff, "Stuff");
-        outize(Rd->reply, Rd->database, "Database");
+          showSesh(Rd->reply, &Rd->shs);
-        outizeCookie(Rd->reply, Rd->Rcookies, "Reply Cookies");
+          if (Rd->lnk)  showSesh(Rd->reply, Rd->lnk);
-        outize(Rd->reply, Rd->Rheaders, "Reply HEADERS");
+          outize(Rd->reply, Rd->database, "Database");
+          outizeCookie(Rd->reply, Rd->Rcookies, "Reply Cookies");
+          outize(Rd->reply, Rd->Rheaders, "Reply HEADERS");
+        }
      }
      else if (strcmp("URL", text) == 0)
        Rd->reply->addstrf(Rd->reply, "%s://%s%s", Rd->Scheme, Rd->Host, Rd->Script);
@@ -4083,7 +4092,7 @@ void loginPage(reqData *Rd, char *message)
  Rd->stuff->remove(Rd->stuff, "UUID");
  HTMLheader(Rd->reply, "<!--#echo var=\"grid\" --> account manager");
-  HTMLdebug(Rd->reply);
+  if (DEBUG)    HTMLdebug(Rd->reply);
  Rd->reply->addstrf(Rd->reply, "<h1><!--#echo var=\"grid\" --> account manager</h1>\n");
  Rd->reply->addstr(Rd->reply, linky);
  free(linky);
@@ -4118,7 +4127,7 @@ void accountCreationPage(reqData *Rd, char *message)
 // TODO - eww lots of memory leaks here.
 // TODO - need to check if qLibc does it's own free() calls, and fill in the gaps for when it doesn't.
  HTMLheader(Rd->reply, "<!--#echo var=\"grid\" --> account manager");
-  HTMLdebug(Rd->reply);
+  if (DEBUG)    HTMLdebug(Rd->reply);
  Rd->reply->addstrf(Rd->reply, "<h1><!--#echo var=\"grid\" --> account manager</h1>\n");
  Rd->reply->addstrf(Rd->reply, "<h2>Creating <!--#echo var=\"grid\" --> account for %s</h2>\n", name);
  Rd->reply->addstr(Rd->reply, linky);
@@ -4193,7 +4202,7 @@ void loggedOnPage(reqData *Rd, char *message)
  char *toke_n_munchie = getCookie(Rd->Rcookies, "toke_n_munchie");
  HTMLheader(Rd->reply, "<!--#echo var=\"grid\" --> account manager");
-  HTMLdebug(Rd->reply);
+  if (DEBUG)    HTMLdebug(Rd->reply);
  Rd->reply->addstrf(Rd->reply, "<h1><!--#echo var=\"grid\" --> account manager</h1>\n");
  Rd->reply->addstrf(Rd->reply, "<h2><!--#echo var=\"grid\" --> account for %s</h2>\n", name);
  Rd->reply->addstr(Rd->reply, linky);
@@ -4233,7 +4242,7 @@ void listPage(reqData *Rd, char *message)
  char *toke_n_munchie = getCookie(Rd->Rcookies, "toke_n_munchie");
  HTMLheader(Rd->reply, "<!--#echo var=\"grid\" --> account manager");
-  HTMLdebug(Rd->reply);
+  if (DEBUG)    HTMLdebug(Rd->reply);
  Rd->reply->addstrf(Rd->reply, "<h1><!--#echo var=\"grid\" --> account manager</h1>\n");
  Rd->reply->addstrf(Rd->reply, "<h1><!--#echo var=\"grid\" --> member accounts</h1>\n");
  Rd->reply->addstr(Rd->reply, linky);
@@ -4594,6 +4603,11 @@ jit library is loaded or the JIT compiler will not be activated.
          }
          else if (lua_isstring(L, -1))
            configs->putstr(configs, n, (char *) lua_tostring(L, -1));
+          else if (lua_isboolean(L, -1))
+          {
+            int v = lua_toboolean(L, -1);
+            configs->putint(configs, n, v);
+          }
          else
          {
            char *v = (char *) lua_tostring(L, -1);
@@ -4604,6 +4618,8 @@ jit library is loaded or the JIT compiler will not be activated.
      }
    }
  }
+  DEBUG = configs->getint(configs, "debug");
+  d("Setting DEBUG = %d", DEBUG);
  if ((vd  = configs->get   (configs, "loadAverageInc", NULL, false))   != NULL)  {loadAverageInc       =       *((float *) vd);        d("Setting loadAverageInc = %f", loadAverageInc);}
  if ((vd  = configs->get   (configs, "simTimeOut",     NULL, false))   != NULL)  {simTimeOut           = (int) *((float *) vd);        d("Setting simTimeOut = %d", simTimeOut);}
  if ((tmp = configs->getstr(configs, "scRoot",   false))               != NULL)  {scRoot               = tmp;                          d("Setting scRoot = %s", scRoot);}