summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-02-18 13:38:45 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-02-18 13:38:45 +0100
commitf1e49844fd16dc55247ad716a21b961b2e4ddfc3 (patch)
tree3fbf71c4de3b7e85a47e1bfc9a863b5d5496562c
parente4ccb0827b22d10b46fbf45a9c7d7a5f4d398c3c (diff)
downloadmerchant-f1e49844fd16dc55247ad716a21b961b2e4ddfc3.tar.gz
merchant-f1e49844fd16dc55247ad716a21b961b2e4ddfc3.tar.bz2
merchant-f1e49844fd16dc55247ad716a21b961b2e4ddfc3.zip
removing unnecessary CSS from ffillment (blog) page
-rw-r--r--src/frontend_blog/essay_fulfillment.php22
-rw-r--r--src/frontend_lib/config.php2
2 files changed, 16 insertions, 8 deletions
diff --git a/src/frontend_blog/essay_fulfillment.php b/src/frontend_blog/essay_fulfillment.php
index 0e87357c..21ee281a 100644
--- a/src/frontend_blog/essay_fulfillment.php
+++ b/src/frontend_blog/essay_fulfillment.php
@@ -32,7 +32,7 @@
</script>
</head>
<body>
-
+<!--
<header>
<div id="logo">
<svg height="100" width="100">
@@ -49,17 +49,24 @@
<section id="main">
<article>
+ -->
<?php
// TODO return a mock CC payment page if no wallet in place
include '../frontend_lib/util.php';
include './blog_lib.php';
-file_put_contents("/tmp/essayffil.dbg", "called");
-$article = get($_GET["article"]);
+
+$article = get($_GET['article']);
if (null == $article){
http_response_code(400);
echo "<p>Bad request (article missing)</p>";
return;
}
+$hc = get($_GET['uuid']);
+if (null == $article){
+ http_response_code(400);
+ echo "<p>Bad request (UUID missing)</p>";
+ return;
+}
session_start();
@@ -69,13 +76,12 @@ $my_payment = get($payments[$hc]);
$pay_url = url_rel("essay_pay.php");
$offering_url = url_rel("essay_offer.php", true);
$offering_url .= "?article=$article";
-file_put_contents("/tmp/ffilproc", $offering_url);
-
+file_put_contents("/tmp/essay_pay-offer", "pay URL:" . $payurl . "\noffer URL:" . $offering_url);
if (true !== get($my_payment["is_payed"], false) || null === $my_payment)
{
- $tid = get('tid');
- $timestamp = get('timestamp');
+ $tid = get($_GET['tid']);
+ $timestamp = get($_GET['timestamp']);
// FIXME article name should be "melted" in the hash
// TODO reconstruct *here* the contract, hash it, and save it in the state
@@ -100,7 +106,9 @@ $article_doc = get_article($article);
echo $article_doc->saveHTML();
?>
+ <!--
</article>
</section>
+ -->
</body>
</html>
diff --git a/src/frontend_lib/config.php b/src/frontend_lib/config.php
index 5e8a0449..c6029c0c 100644
--- a/src/frontend_lib/config.php
+++ b/src/frontend_lib/config.php
@@ -2,7 +2,7 @@
$REFUND_DELTA = 'P3M';
// set to false when done with local tests
-$explicit_currency = "EUR";
+$explicit_currency = "PUDOS";
$MERCHANT_CURRENCY = $explicit_currency;
$host = $_SERVER["HTTP_HOST"];