X-Git-Url: https://git.defcon.no/?a=blobdiff_plain;f=api%2Fphone.php;h=999824b237bb8795937bd98ca0f1cdad36b40045;hb=e3ea78bd48d210947fcfcb73977e6a34e6b31293;hp=12ae05702da72152eda3fb9fc69acecb79d4ab37;hpb=60bf626a9d34dee29c5644a2a5c8c24829c87f13;p=hermes

diff --git a/api/phone.php b/api/phone.php
index 12ae057..999824b 100644
--- a/api/phone.php
+++ b/api/phone.php
@@ -1,4 +1,30 @@
 <?php
+/*
+#  Copyright (c) 2012, Gjøvik University College
+#  All rights reserved.
+
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#      * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above copyright
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
+#      * Neither the name of the Gjøvik University College nor the
+#        names of its contributors may be used to endorse or promote products
+#        derived from this software without specific prior written permission.
+#       
+#  THIS SOFTWARE IS PROVIDED BY Gjøvik University College ''AS IS'' AND ANY
+#  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+#  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+#  DISCLAIMED. IN NO EVENT SHALL Gjøvik University College BE LIABLE FOR ANY
+#  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+#  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 require_once('config.php');
 require_once('lib/auth_base.php');
 require_once('lib/user_functions.php');
@@ -136,8 +162,7 @@ token_auth();
 				}
 				else
 				{
-					print json_encode( array ( 'response' => 'ok', 'data' => array (
-						'mac' => $mac, 'username' => $username, 'domain' => $domain) ));
+					print json_encode( array ( 'response' => 'ok', 'mac' => $mac, 'username' => $username, 'domain' => $domain) );
 					break;
 				}
 				break;
@@ -201,7 +226,7 @@ token_auth();
 				}
 				else
 				{
-					print json_encode( array ( 'response' => 'ok' ));
+					print json_encode( array ( 'response' => 'ok', 'mac' => $mac, 'username' => $username, 'domain' => $domain ));
 					break;
 				}
 				break;