X-Git-Url: https://git.defcon.no/?a=blobdiff_plain;f=api%2Flib%2Fnumber_functions.php;h=4e20204e4363577d6924c1c0f97a5edf61712770;hb=HEAD;hp=d814a99f8d8a29580a371613f8512fdf321c0193;hpb=220a8d4c07bfb4cb6be8122fda7dc6ceb0d1da8f;p=hermes

diff --git a/api/lib/number_functions.php b/api/lib/number_functions.php
index d814a99..4e20204 100644
--- a/api/lib/number_functions.php
+++ b/api/lib/number_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');
@@ -37,9 +63,9 @@ function number_inpool( $number )
 	}
 
 	$test = "SELECT COUNT(*) FROM " . $config['numbers_table'] . " WHERE number = '" . $number . "'";
-	$result = sql_dbquery($config['provision_db'], $test);
+	$result = sql_dbquery($config['hermes_db'], $test);
 	if ( !$result ) return false;
-	$row = mysql_fetch_row($result);
+	$row = @mysql_fetch_row($result);
 	if ( !$row ) return false;
 	$num_r = $row[0];
 	if ( $num_r == 1 ) return true;
@@ -53,10 +79,10 @@ function get_random_numbers ( $limit = 0 )
 	$query = "SELECT number FROM " . $config['numbers_table'] . " ORDER BY RAND()";
 	if ( $limit && is_numeric( $limit ) )
 		$query .= " LIMIT " . $limit;
-	$result = sql_dbquery( $config['provision_db'], $query );
-	print mysql_error();
+	$result = sql_dbquery( $config['hermes_db'], $query );
+
 	if ( !$result ) return null;
-	if (mysql_num_rows($result) < 1 ) return null;
+	if ( @mysql_num_rows($result) < 1 ) return null;
 	$rows = array();
 	while ( $row = mysql_fetch_assoc( $result ) )
 	{
@@ -80,10 +106,10 @@ function get_numbers ( $search=null, $limit = 0 )
 		$query .= " LIMIT " . $limit;
 
 
-	$result = sql_dbquery( $config['provision_db'], $query );
-	print mysql_error();
+	$result = sql_dbquery( $config['hermes_db'], $query );
+
 	if ( !$result ) return null;
-	if (mysql_num_rows($result) < 1 ) return null;
+	if ( @mysql_num_rows($result) < 1 ) return null;
 	$rows = array();
 	while ( $row = mysql_fetch_assoc( $result ) )
 	{
@@ -137,7 +163,7 @@ function add_number( $number )
 	if (number_inpool( $number ) ) return false;
 
 	$insert = "INSERT INTO " . $config['numbers_table'] . "	(number) VALUES ('" . $number . "')";
-	return sql_dbexec( $config['provision_db'], $insert);
+	return sql_dbexec( $config['hermes_db'], $insert);
 }
 
 function remove_number ( $number )
@@ -149,7 +175,7 @@ function remove_number ( $number )
 	}
 	if ( !number_inpool( $number ) ) return false;
 	$query = "DELETE FROM " . $config['numbers_table'] . " WHERE number = '" . $number . "'";
-	return sql_dbexec( $config['provision_db'], $query);
+	return sql_dbexec( $config['hermes_db'], $query);
 
 }
 ?>