Several changes: Parameter-changes to several nodes, stubs added, verification of...

[hermes] / phone.php

diff --git a/phone.php b/phone.php
index 11dd6dbf8247c2a198717395947de2137adfef1f..9437d66b47738961781d344ca57c5fd2172d5573 100644 (file)
--- a/phone.php
+++ b/phone.php
@@ -35,15 +35,26 @@ if ( !$config['sql_link'] )
                                }
                                else print json_encode( array ( 'response' => 'failed', 'cause' => 'nonexistant', 'detail' => 'No results.'));
                        }
-                       else if ( array_key_exists( 'user', $_GET ) )
+                       else if ( ( array_key_exists( 'username', $_GET) && array_key_exists( 'domain', $_GET ) ) || array_key_exists('user', $_GET) )
                        {
-                               $user = split_sipaddress($_GET['user']);
-                               if (! $user )
+                               $username = "";
+                               $domain = "";
+                               if ( array_key_exists('username', $_GET) )
                                {
-                                       print json_encode ( array( 'response' => 'failed', 'cause' => 'nonexistant', 'detail' => 'Invalid SIP address') );
-                                       break;
+                                       $username = $_GET['username'];
+                                       $domain = $_GET['domain'];
                                }
-                               list ( $username, $domain ) = $user;
+                               else
+                               {
+                                       $user = split_sipaddress($_GET['user']);
+                                       if ( !$user )
+                                       {
+                                               print json_encode ( array( 'response' => 'failed', 'cause' => 'invalid', 'detail' => 'Invalid SIP address') );
+                                               break;
+                                       }
+                                       list ( $username, $domain ) = $user;
+                               }
+
                                $userdata = get_user_phones( $username, $domain );
                                if ( $userdata )
                                {