Merge branch 'development'

2 files changed, 11 insertions, 16 deletions

diff --git a/ws2a/bugview.js b/ws2a/bugview.js
index 0f1d5c6..60ffb11 100644
--- a/ws2a/bugview.js
+++ b/ws2a/bugview.js
@@ -71,5 +71,14 @@ function loadLastBugs() {
   var bugnum = query["id"];
   xhttp.open("GET", "/cgi-bin/showbug.cgi?id="+bugnum, true);
   xhttp.send();
+  var captcha = new XMLHttpRequest();
+  captcha.onreadystatechange = function() {
+    if (captcha.readyState == 4 && captcha.status == 200) {
+      var imgname = xhttp.response;
+      document.getElementById("captchaimg").innerHTML = "<img src=\"./captchas/" + imgname + ".png";
+    }
+  };
+  captcha.open("GET","/cgi-bin/gencaptcha.cgi",true);
+  captcha.send();
 }
 window.onload = loadLastBugs
diff --git a/ws2a/gencaptcha.c b/ws2a/gencaptcha.c
index 6079d35..964e730 100644
--- a/ws2a/gencaptcha.c
+++ b/ws2a/gencaptcha.c
@@ -50,7 +50,7 @@ void createRandomWords(char* buf){
 
 int main(){
   printf("%s%c%c\n",
-  "Content-Type:image/png;charset=iso-8859-1",13,10);
+  "Content-Type:text/html;charset=iso-8859-1",13,10);
 
   srand(time(NULL));
   char randwords[LONGADJ+LONGNOU+1];
@@ -67,19 +67,5 @@ int main(){
   sprintf(command,"convert \"../ws2a/captchas/%s.png\" -virtual-pixel White -distort Arc %d \"../ws2a/captchas/%s.png\"",randwords,arcdis,randwords);
   system(command);
 
-  FILE* imgfile;
-  char filepath[100];
-  sprintf(filepath,"../ws2a/captchas/%s.png",randwords);
-  imgfile = fopen(filepath,"r");
-  if(imgfile == NULL){
-    printf("Unable to open file!");
-    return 1;
-  }
-  while(!feof(imgfile)){
-    char c = fgetc(imgfile);
-    if(feof(imgfile)){
-      return 0;
-    }
-    putchar(c);
-  }
+  printf(randwords);
 }