From 8f1fa6dab5a612d62c14917148cb8e2702cf36ac Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Wed, 30 Jul 2014 15:44:53 +0200
Subject: [PATCH] Fixes

---
 snapporder/api/register.php  |  4 ++--
 snapporder/lib/functions.php | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/snapporder/api/register.php b/snapporder/api/register.php
index edf9fca..ec93dea 100644
--- a/snapporder/api/register.php
+++ b/snapporder/api/register.php
@@ -142,6 +142,7 @@ if( $reg_type === "renewal" && $user_id === false ) {
     echo $crypt->json_encode_and_encrypt(array('error' => 'Could not find user with phone: '.$data['phone']));
     die();
 }
+$data['user_id'] = $user_id;
 if( $reg_type === "renewal") {
     $user = get_user($user_id);
     /* Don't allow renewal of an existing valid membership. */
@@ -184,12 +185,11 @@ if( isset($data['source']) && !in_array($data['source'], array('snapporder', 'sn
 
 
 /* Create user */
-$user_id = NULL;
 try {
     if( $reg_type === "new" ) {
         $user_id = add_user($data);
     } else {
-        $user_id = renew_user($data);
+        renew_user($data);
     }
 } catch(InsideDatabaseException $e) {
     set_response_code(500);
diff --git a/snapporder/lib/functions.php b/snapporder/lib/functions.php
index c101210..a102a8a 100644
--- a/snapporder/lib/functions.php
+++ b/snapporder/lib/functions.php
@@ -130,9 +130,11 @@ function get_user($user_id) {
 function renew_user($data) {
     global $conn;
 
-    /* User table  */
+    /* Cleanup for user table */
     $phone = $data['phone'];
     unset($data['phone']);
+    $user_id = $data['user_id'];
+    unset($data['user_id']);
     unset($data['type']);
 
     /* Our own values */
@@ -156,10 +158,10 @@ function renew_user($data) {
         $data[$key] = utf8_decode($value);
     }
 
-    $res = $conn->autoExecute("din_user", $data, DB_AUTOQUERY_UPDATE, "id = $user_id");
+    $res = $conn->autoExecute("din_user", $data, DB_AUTOQUERY_UPDATE, "id=$user_id");
 
     if( DB::isError($res) ) {
-        throw new InsideDatabaseException($res->getMessage());
+        throw new InsideDatabaseException($res->getMessage().". DEBUG: ".$res->getDebugInfo());
     }
 
     /* Phonenumber table, set validated */
@@ -168,12 +170,12 @@ function renew_user($data) {
     $res = $conn->autoExecute("din_userphonenumber", $fields_values, DB_AUTOQUERY_UPDATE, "user_id=$user_id AND number='$number'");
 
     if( DB::isError($res) ) {
-        throw new InsideDatabaseException($res->getMessage());
+        throw new InsideDatabaseException($res->getMessage().". DEBUG: ".$res->getDebugInfo());
     }
 
     log_userupdate($user_id, "Medlemskap fornyet via SnappOrder ($source).");
 
-    return $user_id;
+    return;
 }
 
 function get_user_id_by_username($username) {