diff options
-rw-r--r-- | dialogs.c | 12 | ||||
-rw-r--r-- | fileio.c | 12 | ||||
-rw-r--r-- | wfm.c | 2 | ||||
-rw-r--r-- | wfm.h | 2 |
4 files changed, 15 insertions, 13 deletions
@@ -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\"> </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\"> </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&login=client&rt.token=' + hex_md5('%s:' + hex_md5(document.wfm.username.value + ':' + document.wfm.password.value)); return false;\"", + "onClick=\"self.location='%s?directory=%s&login=client&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); @@ -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); } @@ -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) { @@ -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" \ |