xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mothra: fix submit fields

Browse source
This commit is contained in:
cinap_lenrek 2012-06-19 12:32:55 +02:00
parent ccb3412765
commit 89efb07d4f
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sys/src/cmd/mothra/forms.c
View file

@ -178,7 +178,6 @@ void rdform(Hglob *g){
f->type=TYPEIN; f->type=TYPEIN;
if(cistrcmp(s, "password")==0) if(cistrcmp(s, "password")==0)
f->type=PASSWD; f->type=PASSWD;
s=f->name; s=f->name;
if(s && cistrcmp(s, "isindex")==0) if(s && cistrcmp(s, "isindex")==0)
f->type=INDEX; f->type=INDEX;
@ -440,6 +439,13 @@ void h_resetinput(Panel *p, int){
case PASSWD: case PASSWD:
plinitentry(f->p, USERFL, f->size*chrwidth, f->value, 0); plinitentry(f->p, USERFL, f->size*chrwidth, f->value, 0);
break; break;
case FILE:
free(f->value);
f->value=strdup("");
if(f->p==nil) break;
f->p->state=0;
pldraw(f->p, screen);
break;
case CHECK: case CHECK:
case RADIO: case RADIO:
f->state=f->checked; f->state=f->checked;
@ -506,17 +512,17 @@ void mencodeform(Form *form, int fd){
break; break;
case CHECK: case CHECK:
case RADIO: case RADIO:
case SUBMIT:
if(!f->state) break; if(!f->state) break;
case HIDDEN: case HIDDEN:
if(f->name==0 || f->value==0) if(f->name==0 || f->value==0)
continue; break;
fprint(fd, "%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s", fprint(fd, "%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s",
sep, f->name, f->value); sep, f->name, f->value);
sep = "\r\n--" BOUNDARY; sep = "\r\n--" BOUNDARY;
break; break;
case SELECT: case SELECT:
if(f->name==0) if(f->name==0) break;
continue;
for(o=f->options;o;o=o->next) for(o=f->options;o;o=o->next)
if(o->selected && o->value){ if(o->selected && o->value){
fprint(fd, "%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s", fprint(fd, "%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s",
@ -525,13 +531,12 @@ void mencodeform(Form *form, int fd){
} }
break; break;
case TEXTWIN: case TEXTWIN:
if(f->name==0) if(f->name==0) break;
continue;
n=plelen(f->textwin); n=plelen(f->textwin);
rp=pleget(f->textwin); rp=pleget(f->textwin);
p=b=malloc(UTFmax*n+1); p=b=malloc(UTFmax*n+1);
if(b == nil) if(b == nil)
continue; break;
while(n > 0){ while(n > 0){
p += runetochar(p, rp); p += runetochar(p, rp);
rp++; rp++;
@ -545,13 +550,13 @@ void mencodeform(Form *form, int fd){
break; break;
case FILE: case FILE:
if(f->name==0 || f->value[0]==0) if(f->name==0 || f->value[0]==0)
continue; break;
if(p = strrchr(f->value, '/')) if(p = strrchr(f->value, '/'))
p++; p++;
if(p == 0 || *p == 0) if(p == 0 || *p == 0)
p = f->value; p = f->value;
if((b = malloc(nb = 8192)) == nil) if((b = malloc(nb = 8192)) == nil)
continue; break;
if((ifd = open(f->value, OREAD)) >= 0){ if((ifd = open(f->value, OREAD)) >= 0){
if(filetype(ifd, b, nb) < 0) if(filetype(ifd, b, nb) < 0)
strcpy(b, "application/octet-stream"); strcpy(b, "application/octet-stream");
@ -589,16 +594,16 @@ void uencodeform(Form *form, int fd){
break; break;
case CHECK: case CHECK:
case RADIO: case RADIO:
case SUBMIT:
if(!f->state) break; if(!f->state) break;
case HIDDEN: case HIDDEN:
if(f->name==0 || f->value==0) if(f->name==0 || f->value==0)
continue; break;
fprint(fd, "%s%U=%U", sep, f->name, f->value); fprint(fd, "%s%U=%U", sep, f->name, f->value);
sep = "&"; sep = "&";
break; break;
case SELECT: case SELECT:
if(f->name==0) if(f->name==0) break;
continue;
for(o=f->options;o;o=o->next) for(o=f->options;o;o=o->next)
if(o->selected && o->value){ if(o->selected && o->value){
fprint(fd, "%s%U=%U", sep, f->name, o->value); fprint(fd, "%s%U=%U", sep, f->name, o->value);
@ -606,13 +611,12 @@ void uencodeform(Form *form, int fd){
} }
break; break;
case TEXTWIN: case TEXTWIN:
if(f->name==0) if(f->name==0) break;
continue;
n=plelen(f->textwin); n=plelen(f->textwin);
rp=pleget(f->textwin); rp=pleget(f->textwin);
p=b=malloc(UTFmax*n+1); p=b=malloc(UTFmax*n+1);
if(b == nil) if(b == nil)
continue; break;
while(n > 0){ while(n > 0){
p += runetochar(p, rp); p += runetochar(p, rp);
rp++; rp++;
@ -629,9 +633,14 @@ void uencodeform(Form *form, int fd){
void h_submitinput(Panel *p, int){ void h_submitinput(Panel *p, int){
char buf[NNAME]; char buf[NNAME];
Form *form; Form *form;
Field *f;
int n, fd; int n, fd;
form=((Field *)p->userp)->form; f = p->userp;
form=f->form;
for(f=form->fields;f;f=f->next)
if(f->type==SUBMIT)
f->state = (f->p == p);
if(form->method==GET){ if(form->method==GET){
strcpy(buf, "/tmp/mfXXXXXXXXXXX"); strcpy(buf, "/tmp/mfXXXXXXXXXXX");
fd = create(mktemp(buf), ORDWR|ORCLOSE, 0600); fd = create(mktemp(buf), ORDWR|ORCLOSE, 0600);