merchant

commit 6426ff70e95d665727c9faf08aa5daf56b4edf28
parent cb319933994c9088d74b509f88976e26973a2482
Author: Florian Dold <florian.dold@gmail.com>
Date:   Mon, 25 Jan 2016 15:04:36 +0100

Merge branch 'master' of ssh://taler.net/var/git/merchant

Diffstat:
M
src/frontend/pay.php
 | 
2
+-
M
src/frontend_blog/essay_cc_pay.php
 | 
4
----
M
src/frontend_blog/essay_pay.php
 | 
4
+++-
R
src/frontend/util.php -> src/frontend_lib/util.php
 | 
0

4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/frontend/pay.php b/src/frontend/pay.php
@@ -16,7 +16,7 @@
 
 */
 
-include 'util.php';
+include '../frontend_lib/util.php';
 
 function respond_success() {
   $_SESSION['payment_ok'] = true;
diff --git a/src/frontend_blog/essay_cc_pay.php b/src/frontend_blog/essay_cc_pay.php
@@ -11,10 +11,6 @@ if (!isset($_SESSION['allowed_articles']))
   $_SESSION['allowed_articles'] = array ($article => true);
 else $_SESSION['allowed_articles'] = array_merge($_SESSION['allowed_articles'], array ($article => true));
 http_response_code (301);
-// WARNING: the following construct yields non-expected forms when using URL
-// parameter in it
-//$url = (new http\URL($_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST']))
-//  ->mod(array ("path" => "essay_fulfillment.php?article=$article"), http\Url::JOIN_PATH);
 $url =  'http://' . $_SERVER['HTTP_HOST'] . "/essay_fulfillment.php?article=$article";
 header("Location: " . $url);
 echo $url;
diff --git a/src/frontend_blog/essay_pay.php b/src/frontend_blog/essay_pay.php
@@ -22,6 +22,7 @@
  * 3. forward payment to backend
  */
 include("../frontend_lib/merchants.php");
+include("../frontend_lib/util.php");
 include("./blog_lib.php");
 
 session_start();
@@ -57,7 +58,8 @@ $resp = give_to_backend($_SERVER['HTTP_HOST'],
                         "backend/pay",
 			json_encode($complete_deposit_permission, JSON_PRETTY_PRINT));
 $status_code = $resp->getResponseCode();
-file_put_contents("/tmp/log", "gotten smth from backend, status: " . $status_code);
+
+
 // Our response code is the same we got from the backend:
 http_response_code ($status_code);
 // Now generate our body  
diff --git a/src/frontend/util.php b/src/frontend_lib/util.php