X-Git-Url: https://git.defcon.no/?a=blobdiff_plain;f=api%2Flib%2Fcommon_functions.php;h=8f3ac078a9f5d7b72a2ac879be3b089fe33719a9;hb=87cde98c94c33708506b8e94db43726393df5dfa;hp=52d99e8cd57cf0be6b9b5bb1884e8c4eb7d7d8d0;hpb=220a8d4c07bfb4cb6be8122fda7dc6ceb0d1da8f;p=hermes

diff --git a/api/lib/common_functions.php b/api/lib/common_functions.php
index 52d99e8..8f3ac07 100644
--- a/api/lib/common_functions.php
+++ b/api/lib/common_functions.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/common_functions.php');
 require_once('lib/db_functions.php');
@@ -22,10 +48,10 @@ function is_kamailio_domain ( $domain )
 function get_servers( $domain )
 {
 	global $config;
-	$query = sprintf("SELECT registrar, r_port, proxy, p_port FROM %s WHERE domain = '%s'",
-		$config['provision_servers_table'],
+	$query = sprintf("SELECT registrar, r_port, proxy, p_port, prov_url FROM %s WHERE domain = '%s'",
+		$config['hermes_servers_table'],
 		sql_clean( $domain ));
-	$servers = sql_dbquery_single( $config['provision_db'], $query );
+	$servers = sql_dbquery_single( $config['hermes_db'], $query );
 	return $servers;
 }