From d24ebd53cbe25a40e09ab5b0b7aa1a2d2caf3bcf Mon Sep 17 00:00:00 2001
From: tenox <as@tenoware.com>
Date: Tue, 10 Jul 2018 22:53:59 -0700
Subject: fix rt.token

---
 dialogs.c | 12 ++++++------
 fileio.c  | 12 ++++++------
 wfm.c     |  2 ++
 wfm.h     |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dialogs.c b/dialogs.c
index 5477a84..aa2d0ce 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -89,7 +89,7 @@ void multiprompt_ui(char *m_action) {
         "    <P><CENTER>\n"
         "    <INPUT TYPE=\"HIDDEN\" NAME=\"action\" VALUE=\"%s\">\n"
         "    <INPUT TYPE=\"HIDDEN\" NAME=\"directory\" VALUE=\"%s\">\n"
-        "    <INPUT TYPE=\"HIDDEN\" NAME=\"rt.token\" VALUE=\"%s\">\n"
+        "    <INPUT TYPE=\"HIDDEN\" NAME=\"token\" VALUE=\"%s\">\n"
         "    <INPUT TYPE=\"SUBMIT\" VALUE=\" OK \" NAME=\"OK\">\n"
         "    <INPUT TYPE=\"SUBMIT\" VALUE=\" Cancel \" NAME=\"noop\">\n"
         "    </CENTER><BR>\n"
@@ -156,7 +156,7 @@ void singleprompt_ui(char *m_action) {
         "    <P><CENTER>\n"
         "    <INPUT TYPE=\"HIDDEN\" NAME=\"action\" VALUE=\"%s\">\n"
         "    <INPUT TYPE=\"HIDDEN\" NAME=\"directory\" VALUE=\"%s\">\n"
-        "    <INPUT TYPE=\"HIDDEN\" NAME=\"rt.token\" VALUE=\"%s\">\n"
+        "    <INPUT TYPE=\"HIDDEN\" NAME=\"token\" VALUE=\"%s\">\n"
         "    <INPUT TYPE=\"SUBMIT\" VALUE=\" OK \" NAME=\"OK\">\n"
         "    <INPUT TYPE=\"SUBMIT\" VALUE=\" Cancel \" NAME=\"noop\">\n"
         "    </CENTER><BR>\n"
@@ -210,7 +210,7 @@ void error(char *msg, ...) {
             "<FORM ACTION=\"%s\" METHOD=\"POST\" ENCTYPE=\"multipart/form-data\">\n"
             "<INPUT TYPE=\"SUBMIT\" VALUE=\" OK \" NAME=\"noop\">\n"
             "<INPUT TYPE=\"HIDDEN\" NAME=\"directory\" VALUE=\"%s\">\n"
-            "<INPUT TYPE=\"HIDDEN\" NAME=\"rt.token\" VALUE=\"%s\">\n"
+            "<INPUT TYPE=\"HIDDEN\" NAME=\"token\" VALUE=\"%s\">\n"
             "</FORM>\n</TD></TR>\n"
             "<TR><TD COLSPAN=3 BGCOLOR=\"#EEEEEE\">&nbsp;</TD></TR>\n"
             "</TABLE>\n"
@@ -287,7 +287,7 @@ void about(void) {
         "<FORM ACTION=\"%s\" METHOD=\"POST\" ENCTYPE=\"multipart/form-data\">\n"
         "<INPUT TYPE=\"SUBMIT\" VALUE=\" OK \" NAME=\"noop\">\n"
         "<INPUT TYPE=\"HIDDEN\" NAME=\"directory\" VALUE=\"%s\">\n"
-        "<INPUT TYPE=\"HIDDEN\" NAME=\"rt.token\" VALUE=\"%s\">\n"
+        "<INPUT TYPE=\"HIDDEN\" NAME=\"token\" VALUE=\"%s\">\n"
         "</FORM>\n</TD></TR>\n"
         "<TR><TD COLSPAN=3 BGCOLOR=\"#EEEEEE\">&nbsp;</TD></TR>\n"
         "</TABLE>\n"
@@ -345,7 +345,7 @@ void login_ui(void) {
         cgiScriptName, wp.virt_dirname, (getenv("HTTPS")) ? "SSL" : "Plaintext");
 
     if(rt.js>=2) fprintf(cgiOut,
-        "onClick=\"self.location='%s?directory=%s&amp;login=client&amp;rt.token=' + hex_md5('%s:' + hex_md5(document.wfm.username.value + ':' + document.wfm.password.value)); return false;\"",
+        "onClick=\"self.location='%s?directory=%s&amp;login=client&amp;token=' + hex_md5('%s:' + hex_md5(document.wfm.username.value + ':' + document.wfm.password.value)); return false;\"",
         cgiScriptName, wp.virt_dirname_urlencoded, cgiRemoteAddr);
 
     fputs(
@@ -482,7 +482,7 @@ void edit_ui(void) {
     "<INPUT TYPE=\"hidden\" NAME=\"action\" VALUE=\"edit_save\">\n"
     "<INPUT TYPE=\"hidden\" NAME=\"filename\" VALUE=\"%s\">\n"
     "<INPUT TYPE=\"hidden\" NAME=\"directory\" VALUE=\"%s\">\n"
-    "<INPUT TYPE=\"hidden\" NAME=\"rt.token\" VALUE=\"%s\">\n"
+    "<INPUT TYPE=\"hidden\" NAME=\"token\" VALUE=\"%s\">\n"
     "<INPUT TYPE=\"hidden\" NAME=\"backup\" VALUE=\"%s\">\n"
     "</FORM></BODY></HTML>\n",
     wp.virt_filename,  wp.virt_dirname, rt.token, backup);
diff --git a/fileio.c b/fileio.c
index 4c70702..122539a 100644
--- a/fileio.c
+++ b/fileio.c
@@ -116,7 +116,7 @@ void receivefile(void) {
 
     wfm_commit(CHANGE, NULL);
     
-    redirect("%s?highlight=%s&directory=%s&rt.token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
+    redirect("%s?highlight=%s&directory=%s&token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
 
 }
 
@@ -138,7 +138,7 @@ void mkfile(void) {
 
     wfm_commit(CHANGE, NULL);
 
-    redirect("%s?highlight=%s&directory=%s&rt.token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
+    redirect("%s?highlight=%s&directory=%s&token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
 
 }
 
@@ -153,7 +153,7 @@ void newdir(void) {
     if(mkdir(wp.phys_filename, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH )!=0)
         error("Unable to create directory.<BR>%s", strerror(errno));
 
-    redirect("%s?highlight=%s&directory=%s&rt.token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
+    redirect("%s?highlight=%s&directory=%s&token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
 
 }
 
@@ -245,7 +245,7 @@ void edit_save(void) {
 
     wfm_commit(CHANGE, NULL);
 
-    redirect("%s?highlight=%s&directory=%s&rt.token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
+    redirect("%s?highlight=%s&directory=%s&token=%s", cgiScriptName, wp.virt_filename_urlencoded, wp.virt_dirname_urlencoded, rt.token);
 }
 
 //
@@ -332,7 +332,7 @@ void delete(void) {
         }
     }           
 
-    redirect("%s?directory=%s&rt.token=%s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token);
+    redirect("%s?directory=%s&token=%s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token);
 }
 
 //
@@ -377,7 +377,7 @@ void move(void) {
         }
     }           
 
-    redirect("%s?highlight=%s&directory=%s&rt.token=%s", cgiScriptName, url_encode(wp.virt_destination), wp.virt_dirname_urlencoded, rt.token);
+    redirect("%s?highlight=%s&directory=%s&token=%s", cgiScriptName, url_encode(wp.virt_destination), wp.virt_dirname_urlencoded, rt.token);
 }
 
 
diff --git a/wfm.c b/wfm.c
index e1f1bb0..a72f261 100644
--- a/wfm.c
+++ b/wfm.c
@@ -131,6 +131,8 @@ void access_check(char *access_string) {
     char pass[64]={0};
     char type[4]={0};
 
+    dbgprintf("access_check=%s\n", access_string);
+
     if(sscanf(access_string, "access-ip=%2s:%30s", type, ipaddr)==2) {
 
         if(ipaddr[0]=='*' || strcmp(cgiRemoteAddr, ipaddr)==0) {
diff --git a/wfm.h b/wfm.h
index 321040c..0e86090 100644
--- a/wfm.h
+++ b/wfm.h
@@ -2,7 +2,7 @@
 #define COPYRIGHT "<!-- WFM Version " VERSION ", Mountain View, CA, " __DATE__ " [" __TIME__ "] -->\n" \
                   "<!-- Copyright (c) 1994-2018 by Antoni Sawicki -->\n"
 
-#define FONT_SIZE "13px"
+#define FONT_SIZE "12px"
 
 #define CSS_STYLE         \
             "  <STYLE TYPE=\"text/css\"><!-- \n" \
-- 
cgit v1.2.3