From c40bb2bf6c3ed75a6e6a58d938def239cf2a31f2 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 8 Nov 2019 10:22:22 +0100
Subject: [PATCH] Fixed return value not defined + version bumped

---
 flexisip-account-manager.spec |  2 +-
 src/misc/results_values.php   |  1 +
 src/xmlrpc/accounts_email.php | 13 +++++--------
 src/xmlrpc/accounts_phone.php |  7 +++----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec
index 0302206..a471131 100644
--- a/flexisip-account-manager.spec
+++ b/flexisip-account-manager.spec
@@ -8,7 +8,7 @@
 #%define _datadir           %{_datarootdir}
 #%define _docdir            %{_datadir}/doc
 
-%define build_number 11
+%define build_number 12
 #%if %{build_number}
 #%define build_number_ext -%{build_number}
 #%endif
diff --git a/src/misc/results_values.php b/src/misc/results_values.php
index 7340d09..e15ad64 100644
--- a/src/misc/results_values.php
+++ b/src/misc/results_values.php
@@ -60,6 +60,7 @@ define ("ALGO_NOT_SUPPORTED", "ERROR_ALGO_NOT_SUPPORTED");
 
 define ("ACCOUNT_ALREADY_ACTIVATED", "ERROR_ACCOUNT_ALREADY_ACTIVATED");
 define ("ACCOUNT_NOT_YET_ACTIVATED", "ERROR_ACCOUNT_NOT_ACTIVATED");
+define ("ACCOUNT_RECOVERY_IMPOSSIBLE", "ERROR_CANT_RECOVER_ACCOUNT");
 
 /* Format error */
 
diff --git a/src/xmlrpc/accounts_email.php b/src/xmlrpc/accounts_email.php
index 09409fc..e7c15d7 100644
--- a/src/xmlrpc/accounts_email.php
+++ b/src/xmlrpc/accounts_email.php
@@ -103,13 +103,11 @@ function xmlrpc_create_email_account($method, $args) {
 	//need  username + domain
 
 	//We call this function to set the geoloc if enabled
-	if(ENABLE_NEW_ACCOUNTS_GEOLOC){
+	if (ENABLE_NEW_ACCOUNTS_GEOLOC){
 		return update_account_user_info($account->username, $hashed_password, NULL, NULL, "unknown", '0', $account->domain, $algo);
 	}
-	else {
-		return OK;
-	}
 
+	return OK;
 }
 
 // args = [username, email, md5_hash, sha256_hash, useragent, [domain]], return OK
@@ -189,12 +187,11 @@ function xmlrpc_create_email_md5_sha256_account($method, $args) {
 	//We call this function to set the geoloc if enabled
 	// args needed = [username, ha1, firstname, lastname, gender, subscribe, [domain], [algo]]
 	//need  username + domain
-	if(ENABLE_NEW_ACCOUNTS_GEOLOC){
+	if (ENABLE_NEW_ACCOUNTS_GEOLOC){
 		return update_account_user_info($account->username, $md5_hash, NULL, NULL, "unknown", '0', $account->domain, MD5);
 	}
-	else {
-		return OK;
-	}
+	
+	return OK;
 }
 
 // args = [username, key, [domain], [algo]]
diff --git a/src/xmlrpc/accounts_phone.php b/src/xmlrpc/accounts_phone.php
index 1406e17..c95d872 100644
--- a/src/xmlrpc/accounts_phone.php
+++ b/src/xmlrpc/accounts_phone.php
@@ -139,9 +139,8 @@ function xmlrpc_create_phone_account($method, $args) {
 	if (ENABLE_NEW_ACCOUNTS_GEOLOC){
 		return update_account_user_info($account->username, $hashed_password, NULL, NULL, "unknown", '0', $account->domain, $algo);
 	}
-	else {
-		return OK;
-	}
+
+	return OK;
 }
 
 // args = [phone, username, key, [domain], [algo]]
@@ -396,7 +395,7 @@ function xmlrpc_get_phone_number_for_account($method, $args) {
 		return ACCOUNT_NOT_FOUND;
 	}
 
-		return $phone;
+	return $phone;
 }
 
 function xmlrpc_accounts_phone_register_methods($server) {