Permitedcalls is now called permittedcalls in the DB. Fixed a failure-failure resulti...

diff --git a/api/lib/user_functions.php b/api/lib/user_functions.php
index 05ce335e9cc9fade7ec5ddb873b383dddba8acca..a022433554bd6615e268e2db0221594388052b5a 100644 (file)
--- a/api/lib/user_functions.php
+++ b/api/lib/user_functions.php
@@ -307,7 +307,7 @@ function get_userdata( $username, $domain )
        if ( $type == 'local' )
        {
                // WARNING: Note the typo in the name of the 'permittedcalls' column!
-               $query_kamailio = sprintf ("SELECT id, username, domain, password, email_address, ha1, ha1b, rpid, permitedcalls FROM %s WHERE username = '%s' AND domain = '%s'",
+               $query_kamailio = sprintf ("SELECT id, username, domain, password, email_address, ha1, ha1b, rpid, permittedcalls FROM %s WHERE username = '%s' AND domain = '%s'",
                        $config['kamailio_subscriber_table'],
                        sql_clean($username),
                        sql_clean($domain));

diff --git a/api/user.php b/api/user.php
index 7d5494dda1b6356c46db0739c6d89eb15b0ab43b..260ac35016365afc7f19a8d703beccd74ce019e5 100644 (file)
--- a/api/user.php
+++ b/api/user.php
@@ -235,9 +235,10 @@ token_auth();
                                        delete_provision_user( $username, $domain );
                                        // Give errormessage, and quit.
                                        print json_encode( array( 'response' => 'failed', 'cause' => 'dbfail', 'detail' => 'Failed to read recently added data. Operations rolled back' ) );
-       
+                                       break;
                                }
                                print json_encode( array( 'response' => 'ok', 'user' => $userdata ));
+                               break;
                        }
                        else 
                                print json_encode( array( 'response' => 'invalid', 'cause' => 'parameters' ) );
@@ -356,9 +357,10 @@ token_auth();
                                        delete_provision_user( $username, $domain );
                                        // Give errormessage, and quit.
                                        print json_encode( array( 'response' => 'failed', 'cause' => 'dbfail', 'detail' => 'Failed to read recently added data. Operations rolled back' ) );
-       
+                                       break;
                                }
                                print json_encode( array( 'response' => 'ok', 'user' => $userdata ));
+                               break;
                        }
                        else 
                                print json_encode( array( 'response' => 'invalid', 'cause' => 'parameters' ) );