diff options
| author | Florian Dold <florian.dold@gmail.com> | 2016-01-25 15:04:36 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2016-01-25 15:04:36 +0100 |
| commit | 6426ff70e95d665727c9faf08aa5daf56b4edf28 (patch) | |
| tree | 722cac7551fed779f21fb751907707b4e4812eda | |
| parent | cb319933994c9088d74b509f88976e26973a2482 (diff) | |
| parent | 0af7437d388b3b1106a86b957a1449d7563dd35e (diff) | |
| download | merchant-6426ff70e95d665727c9faf08aa5daf56b4edf28.tar.gz merchant-6426ff70e95d665727c9faf08aa5daf56b4edf28.tar.bz2 merchant-6426ff70e95d665727c9faf08aa5daf56b4edf28.zip | |
Merge branch 'master' of ssh://taler.net/var/git/merchant
| -rw-r--r-- | src/frontend/pay.php | 2 | ||||
| -rw-r--r-- | src/frontend_blog/essay_cc_pay.php | 4 | ||||
| -rw-r--r-- | src/frontend_blog/essay_pay.php | 4 | ||||
| -rw-r--r-- | src/frontend_lib/util.php (renamed from src/frontend/util.php) | 0 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/frontend/pay.php b/src/frontend/pay.php index 243f6dec..84040abc 100644 --- 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 index a0bc8ba8..90cd080f 100644 --- 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 index c1515330..1e017428 100644 --- 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 index 103838cc..103838cc 100644 --- a/src/frontend/util.php +++ b/src/frontend_lib/util.php |