diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 14:20:42 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 14:20:42 +0200 |
| commit | aa3058cbd815f1badf0357f976232c0d17c1e614 (patch) | |
| tree | bcd25874d1466725d9eb97c7fa58c5c9a20e7a98 | |
| parent | 3933e70e713a090a9a5dd531bc82498945d42880 (diff) | |
| download | merchant-aa3058cbd815f1badf0357f976232c0d17c1e614.tar.gz merchant-aa3058cbd815f1badf0357f976232c0d17c1e614.tar.bz2 merchant-aa3058cbd815f1badf0357f976232c0d17c1e614.zip | |
minor fix
| -rw-r--r-- | src/backend/README | 5 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 6 | ||||
| -rw-r--r-- | src/frontend/checkout.php | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/backend/README b/src/backend/README index 6c06229a..999dd9e6 100644 --- a/src/backend/README +++ b/src/backend/README @@ -1,2 +1,7 @@ Here are the files implementing the backend which is in charge of doing cryptographic calls, binary manipulations and some HTTP/JSON communication. + +NOTE: + +Makefile.am contains some hardcoded paths that need to be tuned to pick +the right files. diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index 9ac225b5..59f1d1c5 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -633,12 +633,16 @@ url_handler (void *cls, response = json_pack ("{s:o, s:o, s:o}", "contract", contract_enc, "sig", sig_enc, "eddsa_pub", eddsa_pub_enc); TMH_RESPONSE_reply_json (connection, response, MHD_HTTP_OK); + return MHD_YES; + + /* not needed (?) anymore #define page_ok "\ <!DOCTYPE html> <html><title>Ok</title><body><center> \ <h3>Contract's generation succeeded</h3></center></body></html>" status = generate_message (&resp, page_ok); - /* FRONTIER - CODE ABOVE STILL NOT TESTED */ #undef page_ok + */ + /* FRONTIER - CODE ABOVE STILL NOT TESTED */ } } } diff --git a/src/frontend/checkout.php b/src/frontend/checkout.php index b7b028fb..51c3023a 100644 --- a/src/frontend/checkout.php +++ b/src/frontend/checkout.php @@ -52,19 +52,21 @@ $_SESSION['maydonate'] = true; ?> -<form name="tform" action="cert.php" method="POST"> +<form name="tform" action="" method="POST"> <div id="opt-form" align="left"><br> <input type="radio" name="group1" value="Lisa">Lisa<br> <input type="radio" name="group1" value="You Card" checked>You Card<br> <input type="radio" name="group1" value="Card Me">Card Me<br> <input id="t-button-id" type="radio" name="group1" value="Taler" disabled="true">Taler<br> -<input type="submit" value="Ok"--> -<!--input type="button" onclick="ok(this.form)" value="Ok"--> +<input type="button" onclick="ok(this.form)" value="Ok"> </div> </form> <script type="text/javascript"> +// trigger certificate generation on the server, and signal certificate +// arrival "here" in the client. + function ok(form){ for(var cnt=0; cnt < form.group1.length; cnt++){ var choice = form.group1[cnt]; |