Adding --dryrun|-d option to assignphone and feide2sipuser

[hermes] / api / lib / alias_functions.php

diff --git a/api/lib/alias_functions.php b/api/lib/alias_functions.php
index 51c3b58379bc9b6accb0cd44c369f77bd53a2869..fddcb20aa7f6c9dc17d8b1fafd7970e629c648d6 100644 (file)
--- a/api/lib/alias_functions.php
+++ b/api/lib/alias_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');
@@ -25,7 +51,7 @@ function get_destination ( $alias_username, $alias_domain )
        // At this point, no error checking is performed, instead the empty array is returned.
        if ( ! $result ) return $aliases; 
 
-       while ( $row = mysql_fetch_assoc( $result ) )
+       while ( $row = @mysql_fetch_assoc( $result ) )
        {
                array_push( $aliases, array( 'destination' => $row['destination'], 'alias' => $row['alias'] ) );
        }
@@ -57,7 +83,7 @@ function get_aliases ( $dest_username, $dest_domain )
        // At this point, no error checking is performed, instead the empty array is returned.
        if ( ! $result ) return $aliases; 
 
-       while ( $row = mysql_fetch_assoc( $result ) )
+       while ( $row = @mysql_fetch_assoc( $result ) )
        {
                array_push( $aliases, array( 'destination' => $row['destination'], 'alias' => $row['alias'] ) );
        }
@@ -85,7 +111,7 @@ function alias_exists( $alias_username, $alias_domain )
        $result = sql_dbquery($config['kamailio_db'], $query);
 
        if ( !$result ) return true; // This is an error. Better to fail claiming alias exists...
-       $row = mysql_fetch_row($result);
+       $row = @mysql_fetch_row($result);
        if ( !$row ) return true; // This is an error. Better to fail claiming alias exists...
        $num_r = $row[0];
        if ( $num_r == 1 ) 
@@ -94,7 +120,7 @@ function alias_exists( $alias_username, $alias_domain )
                        $config['kamailio_alias_table'],
                        sql_clean($alias_username), sql_clean($alias_domain));
                $result = sql_dbquery($config['kamailio_db'], $query);
-               $row = mysql_fetch_row($result);
+               $row =  @mysql_fetch_row($result);
                if ( is_string( $row[0] ) ) return $row[0];
                return true; // Failure mode..
        }