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

Conflicts:
	src/frontend/pay.php

1 files changed, 6 insertions, 16 deletions

diff --git a/src/frontend/pay.php b/src/frontend/pay.php
index ba510cdd..aaa5d2e2 100644
--- a/src/frontend/pay.php
+++ b/src/frontend/pay.php
@@ -28,29 +28,19 @@
 $cli_debug = false;
 $backend_test = true;
 
-if ($_GET['cli_debug'] == 'yes')
-  $cli_debug = true;
-
-if ($_GET['backend_test'] == 'no')
+if (isset($_GET['cli_debug']) && $_GET['cli_debug'] == 'yes')
 {
   $cli_debug = true;
-  $backend_test = false;
 }
 
-session_start();
-
-$cli_debug = false;
-$backend_test = true;
-
-if ($_GET['cli_debug'] == 'yes')
-  $cli_debug = true;
-
-if ($_GET['backend_test'] == 'no')
+if (isset($_GET['backend_test']) &&  $_GET['backend_test'] == 'no')
 {
   $cli_debug = true;
   $backend_test = false;
 }
 
+session_start();
+
 $post_body = file_get_contents('php://input');
 
 $now = new DateTime('now');
@@ -105,8 +95,8 @@ if ($status_code != 200)
   /* error: just forwarding to the wallet what
     gotten from the backend (which is forwarding 'as is'
     the error gotten from the mint) */
-  echo "Error came from the backend\n";
-  echo "json_encode ($new_deposit_permission)";
+  echo json_encode ($new_deposit_permission);
+  echo "Error came from the backend, status $status_code\n";
   echo "\n";
   echo $resp->body->toString ();
 }